diff --git a/.hgtags b/.hgtags index cc1f425ff14..5413b0483ef 100644 --- a/.hgtags +++ b/.hgtags @@ -391,3 +391,4 @@ d62173b931bf5b6bffc6e80a9060bb2e8b8efc75 jdk-9+143 581331db696a62dd411926ba7fd437252252a71d jdk-9+146 f4e854a77aa38749bd90f722b06974a56e7233d5 jdk-9+147 5c71ea43933b6c7e8a85eb1a4eb2213011b95d82 jdk-9+148 +cf139f925da04c8bd7efd33270a0315d72b338d3 jdk-9+149 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index cb9368a1832..5f49404eb68 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -391,3 +391,4 @@ ff98aa9ec9fae991e426ce5926fc9036d25f5562 jdk-9+145 a22e2671d88f6b22a4aa82e3966986542ed2a381 jdk-9+146 5f6920274c48eb00d31afee6c034826a754c13d9 jdk-9+147 3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148 +b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149 diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README deleted file mode 100644 index a93b35b994c..00000000000 --- a/THIRD_PARTY_README +++ /dev/null @@ -1,3605 +0,0 @@ -DO NOT TRANSLATE OR LOCALIZE. ------------------------------ - -%% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and -OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2000-2011 France Télécom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to BSDiff v4.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright 2003-2005 Colin Percival -All rights reserved - -Redistribution and use in source and binary forms, with or without -modification, are permitted providing 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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CodeViewer 1.0, which may be -included with JDK 8. - ---- begin of LICENSE --- - -Copyright 1999 by CoolServlets.com. - -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. 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. - -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. - -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." - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Cryptix AES 3.2.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CUP Parser Generator for -Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Document Object Model (DOM) Level 2 -& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 -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 -site-policy@w3.org. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Dynalink v0.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2009-2013, Attila Szegedi - -All rights reserved.Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met:* 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 Attila -Szegedi nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Elliptic Curve Cryptography, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - -You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 8 and OpenJDK 8 source distributions, and as object code in -the JRE 8 & JDK 8 runtimes. - -In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do -NOT apply to the Elliptic Curve Cryptography library; it is licensed under the -following license, separately from Oracle's JDK & JRE. If you do not wish to -install the Elliptic Curve Cryptography library, 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. - - - Copyright (C) - - 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. - - , 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 ECMAScript Language -Specification ECMA-262 Edition 5.1 which may be included with -JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright notice -Copyright © 2011 Ecma International -Ecma International -Rue du Rhone 114 -CH-1204 Geneva -Tel: +41 22 849 6000 -Fax: +41 22 849 6001 -Web: http://www.ecma-international.org - -This document and possible translations of it may be copied and furnished to -others, and derivative works that comment on or otherwise explain it or assist -in its implementation may be prepared, copied, published, and distributed, in -whole or in part, without restriction of any kind, provided that the above -copyright notice and this section are included on all such copies and derivative -works. However, this document itself may not be modified in any way, including -by removing the copyright notice or references to Ecma International, except as -needed for the purpose of developing any document or deliverable produced by -Ecma International (in which case the rules applied to copyrights must be -followed) or as required to translate it into languages other than English. The -limited permissions granted above are perpetual and will not be revoked by Ecma -International or its successors or assigns. This document and the information -contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL -DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY -WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP -RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE." Software License - -All Software contained in this document ("Software)" is protected by copyright -and is being made available under the "BSD License", included below. This -Software may be subject to third party rights (rights from parties other than -Ecma International), including patent rights, and no licenses under such third -party rights are granted under this license even if the third party concerned is -a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS -AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR -INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO -IMPLEMENT ECMA INTERNATIONAL STANDARDS*. 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 authors nor Ecma International may be used to endorse -or promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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 Dynalink library which is included -with the Nashorn technology. - ---- begin of LICENSE --- -Copyright (c) 2009-2013, Attila Szegedi - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -* 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 the copyright holder nor the names of - 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 COPYRIGHT HOLDER -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 Joni library which is included -with the Nashorn technology. - ---- begin of 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: - -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 FontConfig 2.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on -Linux and Solaris. - ---- begin of LICENSE --- - -Copyright © 2001,2003 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IAIK PKCS#11 Wrapper, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -IAIK PKCS#11 Wrapper 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: - -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 IAIK of Graz University of - Technology." - - Alternately, this acknowledgment may appear in the software itself, if and - wherever such third-party acknowledgments normally appear. - -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. - -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 1995-2010 International Business Machines Corporation and others - -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, 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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IJG JPEG 6b, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -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. - -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". - -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. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to Joni v1.1.9, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of 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: - -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 JOpt-Simple v3.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - 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. - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Kronos OpenGL headers, which may be -included with JDK 8 and OpenJDK 8 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.5.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 following -this sentence. - -This code is released under the libpng license. - -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 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 - - Cosmin Truta - -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. - -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: - - 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: - - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner - -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: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -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 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. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -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, 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: - - 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 a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -July 7, 2011 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to libungif 4.1.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 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 Little CMS 2.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Little CMS -Copyright (c) 1998-2010 Marti Maria Saguer - -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 --- - -------------------------------------------------------------------------------- - -%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the -U.S. and other countries. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mesa 3D Graphics Library v4.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. - ---- begin of LICENSE --- - - 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mozilla Network Security -Services (NSS), which is supplied with the JDK test suite in the OpenJDK -source code repository. It is licensed under Mozilla Public License (MPL), -version 2.0. - -The NSS libraries are supplied in executable form, built from unmodified -NSS source code labeled with the "NSS_3.13.1_RTM" release tag. - -The NSS source code is available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/src - -The NSS libraries are available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/lib - ---- begin of LICENSE --- - -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - 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. License Grants and Conditions --------------------------------- - -2.1. Grants - -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 such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -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 Software 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 placed in a text file included with all distributions of the Covered -Software under this License. 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. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software 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 Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any 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 Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, 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. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the 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. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. - ---- begin of LICENSE --- - -Copyright (c) 1999-2004 David Corcoran -Copyright (c) 1999-2004 Ludovic Rousseau -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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran - 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. - -Changes to this license can be made only by the copyright author with -explicit written consent. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PorterStemmer v4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -See: http://tartarus.org/~martin/PorterStemmer - -The software is completely free for any purpose, unless notes at the head of -the program text indicates otherwise (which is rare). In any case, the notes -about licensing are never more restrictive than the BSD License. - -In every case where the software is not written by me (Martin Porter), this -licensing arrangement has been endorsed by the contributor, and it is -therefore unnecessary to ask the contributor again to confirm it. - -I have not asked any contributors (or their employers, if they have them) for -proofs that they have the right to distribute their software in this way. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Relax NG Object/Parser v.20050510, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) Kohsuke Kawaguchi - -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 RelaxNGCC v1.12, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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: - -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 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. - -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. - -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. - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SAX 2.0.1, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- 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. - - 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. - - David Megginson, sax@megginson.com - 1998-05-11 - - SAX 2.0 - - 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@megginson.com - 2000-05-05 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SoftFloat version 2b, which may be -included with JRE 8, JDK 8, and OpenJDK 8 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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Sparkle 1.5, -which may be included with JRE 8 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -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 --- - -------------------------------------------------------------------------------- - -%% Portions licensed from Taligent, Inc. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Thai Dictionary, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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.2.0 & CLDR 21.0.1 -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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-2013 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-2012 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 may be included -with JRE 8 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 - - -PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN -TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION. - - -ABSTRACT -======== - - UPX and UCL are copyrighted software distributed under the terms - of the GNU General Public License (hereinafter the "GPL"). - - 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. - - As a special exception we grant the free usage of UPX for all - executables, including commercial programs. - See below for details and restrictions. - - -COPYRIGHT -========= - - 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@jk.uni-linz.ac.at ml1050@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 may be included with JRE 8, JDK 8, and OpenJDK 8 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 may be -included with JRE 8, JDK 8, and OpenJDK 8 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. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following -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: - -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) 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 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. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2. The Open Group - -Copyright 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. - -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. 3.2. -Berkeley-based copyrights: - -o -3.2.1. General - -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 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 - -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 - -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@urwpp.de or design@bigelowandholmes.com - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to zlib v1.2.5, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - version 1.2.5, 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@gzip.org madler@alumni.caltech.edu - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: - - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 - Apache Xerces Java 2.10.0 - Apache XML Resolver 1.1 - Dynalink 0.5 - - ---- 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 --- - -------------------------------------------------------------------------------- - diff --git a/common/autoconf/bootcycle-spec.gmk.in b/common/autoconf/bootcycle-spec.gmk.in index e26450ae3fc..adde830e382 100644 --- a/common/autoconf/bootcycle-spec.gmk.in +++ b/common/autoconf/bootcycle-spec.gmk.in @@ -50,9 +50,6 @@ BOOT_JDK := $(JDK_IMAGE_DIR) # The bootcycle build has a different output directory OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@ BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build -# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk. Must not -# use space in this patsubst to avoid leading space in HOTSPOT_DIST. -HOTSPOT_DIST:=$(patsubst $(OLD_BUILD_OUTPUT)%,$(BUILD_OUTPUT)%,$(HOTSPOT_DIST)) SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR)) JAVA_CMD:=$(BOOT_JDK)/bin/java diff --git a/common/autoconf/buildjdk-spec.gmk.in b/common/autoconf/buildjdk-spec.gmk.in index ddd388c0f1c..d6abc423239 100644 --- a/common/autoconf/buildjdk-spec.gmk.in +++ b/common/autoconf/buildjdk-spec.gmk.in @@ -44,15 +44,12 @@ SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@ # These directories should not be moved to BUILDJDK_OUTPUTDIR HOTSPOT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR)) -HOTSPOT_DIST := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_DIST)) SUPPORT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR)) JDK_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR)) IMAGES_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR)) OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@ OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@ -OPENJDK_BUILD_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@ -OPENJDK_TARGET_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@ OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@ OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@ OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@ @@ -90,6 +87,7 @@ ENABLE_DEBUG_SYMBOLS := false BUILD_GTEST := false JVM_VARIANTS := server +JVM_VARIANT_MAIN := server # Some users still set EXTRA_*FLAGS on the make command line. Must # make sure to override that when building buildjdk. diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in index 44933806256..76d921f4b32 100644 --- a/common/autoconf/compare.sh.in +++ b/common/autoconf/compare.sh.in @@ -33,7 +33,6 @@ export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@ export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@" export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@" -export OPENJDK_TARGET_CPU_LIBDIR="@OPENJDK_TARGET_CPU_LIBDIR@" export DEBUG_LEVEL="@DEBUG_LEVEL@" export AWK="@AWK@" diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index 4879d05622b..e9aff624d73 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -205,7 +205,7 @@ JDKOPT_SETUP_CODE_COVERAGE # Need toolchain to setup dtrace HOTSPOT_SETUP_DTRACE -HOTSPOT_SETUP_JVM_FEATURES +HOTSPOT_ENABLE_DISABLE_AOT HOTSPOT_ENABLE_DISABLE_GTEST ############################################################################### @@ -220,6 +220,10 @@ BASIC_COMPILE_FIXPATH LIB_DETERMINE_DEPENDENCIES LIB_SETUP_LIBRARIES +# Hotspot setup depends on lib checks (AOT needs libelf). + +HOTSPOT_SETUP_JVM_FEATURES + ############################################################################### # # We need to do some final tweaking, when everything else is done. diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 767f6bed510..0621463ff45 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -23,6 +23,101 @@ # questions. # +################################################################################ +# +# Setup ABI profile (for arm) +# +AC_DEFUN([FLAGS_SETUP_ABI_PROFILE], +[ + AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile], + [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])]) + + if test "x$with_abi_profile" != x; then + if test "x$OPENJDK_TARGET_CPU" != xarm && \ + test "x$OPENJDK_TARGET_CPU" != xaarch64; then + AC_MSG_ERROR([--with-abi-profile only available on arm/aarch64]) + fi + + OPENJDK_TARGET_ABI_PROFILE=$with_abi_profile + AC_MSG_CHECKING([for ABI profle]) + AC_MSG_RESULT([$OPENJDK_TARGET_ABI_PROFILE]) + + if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then + ARM_FLOAT_TYPE=vfp-sflt + ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then + ARM_FLOAT_TYPE=vfp-hflt + ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then + ARM_FLOAT_TYPE=sflt + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then + ARM_FLOAT_TYPE=vfp-sflt + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then + ARM_FLOAT_TYPE=vfp-hflt + ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm64; then + # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME + ARM_FLOAT_TYPE= + ARM_ARCH_TYPE_FLAGS= + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then + # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME + ARM_FLOAT_TYPE= + ARM_ARCH_TYPE_FLAGS= + else + AC_MSG_ERROR([Invalid ABI profile: "$OPENJDK_TARGET_ABI_PROFILE"]) + fi + + if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then + ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt' + elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then + ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt' + elif test "x$ARM_FLOAT_TYPE" = xsflt; then + ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp' + fi + AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags]) + AC_MSG_RESULT([$ARM_FLOAT_TYPE_FLAGS]) + + AC_MSG_CHECKING([for arch type flags]) + AC_MSG_RESULT([$ARM_ARCH_TYPE_FLAGS]) + + # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the + # autoconf target triplet. + [ JDK_ARCH_ABI_PROP_NAME=`$ECHO $OPENJDK_TARGET_AUTOCONF_NAME | $SED -e 's/.*-\([^-]*\)$/\1/'` ] + # Sanity check that it is a known ABI. + if test "x$JDK_ARCH_ABI_PROP_NAME" != xgnu && \ + test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabi && \ + test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabihf; then + AC_MSG_WARN([Unknown autoconf target triplet ABI: "$JDK_ARCH_ABI_PROP_NAME"]) + fi + AC_MSG_CHECKING([for ABI property name]) + AC_MSG_RESULT([$JDK_ARCH_ABI_PROP_NAME]) + AC_SUBST(JDK_ARCH_ABI_PROP_NAME) + + # Pass these on to the open part of configure as if they were set using + # --with-extra-c[xx]flags. + EXTRA_CFLAGS="$EXTRA_CFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + # Get rid of annoying "note: the mangling of 'va_list' has changed in GCC 4.4" + # FIXME: This should not really be set using extra_cflags. + if test "x$OPENJDK_TARGET_CPU" = xarm; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wno-psabi" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -Wno-psabi" + fi + # Also add JDK_ARCH_ABI_PROP_NAME define, but only to CFLAGS. + EXTRA_CFLAGS="$EXTRA_CFLAGS -DJDK_ARCH_ABI_PROP_NAME='\"\$(JDK_ARCH_ABI_PROP_NAME)\"'" + # And pass the architecture flags to the linker as well + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + fi + + # When building with an abi profile, the name of that profile is appended on the + # bundle platform, which is used in bundle names. + if test "x$OPENJDK_TARGET_ABI_PROFILE" != x; then + OPENJDK_TARGET_BUNDLE_PLATFORM="$OPENJDK_TARGET_OS_BUNDLE-$OPENJDK_TARGET_ABI_PROFILE" + fi +]) + # Reset the global CFLAGS/LDFLAGS variables and initialize them with the # corresponding configure arguments instead AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS], @@ -306,9 +401,17 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], PICFLAG='-fPIC' SHARED_LIBRARY_FLAGS='-shared' SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' - SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' + + # arm specific settings + if test "x$OPENJDK_TARGET_CPU" = "xarm"; then + # '-Wl,-z,origin' isn't used on arm. + SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1' + else + SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" + fi + fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then if test "x$OPENJDK_TARGET_CPU" = xsparcv9; then @@ -669,6 +772,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION], AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], [ + FLAGS_SETUP_ABI_PROFILE FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER([TARGET]) FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER([BUILD], [OPENJDK_BUILD_]) @@ -758,6 +862,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing" + $2COMMON_CCXXFLAGS_JDK="${$2COMMON_CCXXFLAGS_JDK} -fsigned-char" ;; ppc ) # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing @@ -1160,26 +1265,25 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], $2JDKLIB_LIBS="" else $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base" if test "x$1" = "xTARGET"; then - # On some platforms (mac) the linker warns about non existing -L dirs. - # Add server first if available. Linking aginst client does not always produce the same results. - # Only add client/minimal dir if client/minimal is being built. - # Default to server for other variants. - if HOTSPOT_CHECK_JVM_VARIANT(server); then - $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" - elif HOTSPOT_CHECK_JVM_VARIANT(client); then - $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client" - elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then - $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal" - else - $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" - fi + # On some platforms (mac) the linker warns about non existing -L dirs. + # For any of the variants server, client or minimal, the dir matches the + # variant name. The "main" variant should be used for linking. For the + # rest, the dir is just server. + if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \ + || HOTSPOT_CHECK_JVM_VARIANT(minimal); then + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN" + else + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" + fi elif test "x$1" = "xBUILD"; then # When building a buildjdk, it's always only the server variant $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" fi $2JDKLIB_LIBS="-ljava -ljvm" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 79ef6b5bfca..5cad333a8ef 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -654,6 +654,17 @@ NUM_CORES ENABLE_GENERATE_CLASSLIST BUILD_FAILURE_HANDLER ENABLE_INTREE_EC +VALID_JVM_FEATURES +JVM_FEATURES_custom +JVM_FEATURES_zeroshark +JVM_FEATURES_zero +JVM_FEATURES_minimal +JVM_FEATURES_core +JVM_FEATURES_client +JVM_FEATURES_server +INCLUDE_GRAAL +ELF_LIBS +ELF_CFLAGS STLPORT_LIB LIBZIP_CAN_USE_MMAP LIBDL @@ -692,14 +703,7 @@ LIBCXX FIXPATH_DETACH_FLAG FIXPATH BUILD_GTEST -VALID_JVM_FEATURES -JVM_FEATURES_custom -JVM_FEATURES_zeroshark -JVM_FEATURES_zero -JVM_FEATURES_minimal -JVM_FEATURES_core -JVM_FEATURES_client -JVM_FEATURES_server +ENABLE_AOT INCLUDE_DTRACE GCOV_ENABLED ZIP_EXTERNAL_DEBUG_SYMBOLS @@ -749,6 +753,7 @@ CFLAGS_JDKEXE CFLAGS_JDKLIB MACOSX_VERSION_MIN CXXSTD_CXXFLAG +JDK_ARCH_ABI_PROP_NAME CXX_O_FLAG_SIZE CXX_O_FLAG_NONE CXX_O_FLAG_DEBUG @@ -863,12 +868,12 @@ TOOLCHAIN_TYPE STATIC_BUILD IMPORT_MODULES_MAKE IMPORT_MODULES_SRC +IMPORT_MODULES_MAN +IMPORT_MODULES_LEGAL IMPORT_MODULES_CONF IMPORT_MODULES_LIBS IMPORT_MODULES_CMDS IMPORT_MODULES_CLASSES -BUILD_HOTSPOT -HOTSPOT_DIST BUILD_OUTPUT JDK_TOPDIR NASHORN_TOPDIR @@ -961,6 +966,7 @@ CONF_NAME SPEC SDKROOT XCODEBUILD +JVM_VARIANT_MAIN VALID_JVM_VARIANTS JVM_VARIANTS DEBUG_LEVEL @@ -981,10 +987,8 @@ OPENJDK_BUILD_BUNDLE_PLATFORM OPENJDK_BUILD_CPU_BUNDLE OPENJDK_BUILD_OS_BUNDLE OPENJDK_BUILD_OS_EXPORT_DIR -OPENJDK_BUILD_CPU_JLI_CFLAGS OPENJDK_BUILD_CPU_OSARCH OPENJDK_BUILD_CPU_ISADIR -OPENJDK_BUILD_CPU_LIBDIR OPENJDK_BUILD_CPU_LEGACY_LIB OPENJDK_BUILD_CPU_LEGACY HOTSPOT_TARGET_CPU_DEFINE @@ -998,10 +1002,8 @@ OPENJDK_TARGET_BUNDLE_PLATFORM OPENJDK_TARGET_CPU_BUNDLE OPENJDK_TARGET_OS_BUNDLE OPENJDK_TARGET_OS_EXPORT_DIR -OPENJDK_TARGET_CPU_JLI_CFLAGS OPENJDK_TARGET_CPU_OSARCH OPENJDK_TARGET_CPU_ISADIR -OPENJDK_TARGET_CPU_LIBDIR OPENJDK_TARGET_CPU_LEGACY_LIB OPENJDK_TARGET_CPU_LEGACY REQUIRED_OS_VERSION @@ -1135,6 +1137,7 @@ with_jdk_variant enable_debug with_debug_level with_jvm_variants +with_cpu_port with_devkit with_sys_root with_sysroot @@ -1184,14 +1187,14 @@ with_extra_ldflags with_toolchain_version with_build_devkit with_jtreg +with_abi_profile enable_warnings_as_errors with_native_debug_symbols enable_debug_symbols enable_zip_debug_info enable_native_coverage enable_dtrace -with_jvm_features -with_jvm_interpreter +enable_aot enable_hotspot_gtest with_stdc__lib with_msvcr_dll @@ -1219,6 +1222,11 @@ with_lcms with_dxsdk with_dxsdk_lib with_dxsdk_include +with_libelf +with_libelf_include +with_libelf_lib +with_jvm_features +with_jvm_interpreter enable_jtreg_failure_handler enable_generate_classlist with_num_cores @@ -1343,6 +1351,8 @@ PNG_CFLAGS PNG_LIBS LCMS_CFLAGS LCMS_LIBS +ELF_CFLAGS +ELF_LIBS ICECC_CMD ICECC_CREATE_ENV ICECC_WRAPPER @@ -1988,6 +1998,10 @@ Optional Features: --enable-dtrace[=yes/no/auto] enable dtrace. Default is auto, where dtrace is enabled if all dependencies are present. + --enable-aot[=yes/no/auto] + enable ahead of time compilation feature. Default is + auto, where aot is enabled if all dependencies are + present. --disable-hotspot-gtest Disables building of the Hotspot unit tests --disable-freetype-bundling disable bundling of the freetype library with the @@ -2030,6 +2044,8 @@ Optional Packages: --with-jvm-variants JVM variants (separated by commas) to build (server,client,minimal,core,zero,zeroshark,custom) [server] + --with-cpu-port specify sources to use for Hotspot 64-bit ARM port + (arm64,aarch64) [aarch64] --with-devkit use this devkit for compilers, tools and resources --with-sys-root alias for --with-sysroot for backwards compatability --with-sysroot use this directory as sysroot @@ -2097,9 +2113,8 @@ Optional Packages: compatibility and is ignored --with-override-jdk Deprecated. Option is kept for backwards compatibility and is ignored - --with-import-hotspot import hotspot binaries from this jdk image or - hotspot build dist dir instead of building from - source + --with-import_hotspot Deprecated. Option is kept for backwards + compatibility and is ignored --with-import-modules import a set of prebuilt modules either as a zip file or an exploded directory --with-toolchain-type the toolchain type (or family) to use, use '--help' @@ -2113,13 +2128,13 @@ Optional Packages: dependent] --with-build-devkit Devkit to use for the build platform toolchain --with-jtreg Regression Test Harness [probed] + --with-abi-profile specify ABI profile for ARM builds + (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, + armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) + [toolchain dependent] --with-native-debug-symbols set the native debug symbol configuration (none, internal, external, zipped) [varying] - --with-jvm-features additional JVM features to enable (separated by - comma), use '--help' to show possible values [none] - --with-jvm-interpreter Deprecated. Option is kept for backwards - compatibility and is ignored --with-stdc++lib=,, force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as @@ -2166,6 +2181,15 @@ Optional Packages: compatibility and is ignored --with-dxsdk-include Deprecated. Option is kept for backwards compatibility and is ignored + --with-libelf specify prefix directory for the libelf package + (expecting the libraries under PATH/lib and the + headers under PATH/include) + --with-libelf-include specify directory for the libelf include files + --with-libelf-lib specify directory for the libelf library + --with-jvm-features additional JVM features to enable (separated by + comma), use '--help' to show possible values [none] + --with-jvm-interpreter Deprecated. Option is kept for backwards + compatibility and is ignored --with-num-cores number of cores in the build system, e.g. --with-num-cores=8 [probed] --with-memory-size memory (in MB) available in the build system, e.g. @@ -2295,6 +2319,8 @@ Some influential environment variables: PNG_LIBS linker flags for PNG, overriding pkg-config LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config LCMS_LIBS linker flags for LCMS, overriding pkg-config + ELF_CFLAGS C compiler flags for ELF, overriding pkg-config + ELF_LIBS linker flags for ELF, overriding pkg-config ICECC_CMD Override default value for ICECC_CMD ICECC_CREATE_ENV Override default value for ICECC_CREATE_ENV @@ -3997,6 +4023,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # questions. # +################################################################################ +# +# Setup ABI profile (for arm) +# + + # Reset the global CFLAGS/LDFLAGS variables and initialize them with the # corresponding configure arguments instead @@ -4182,6 +4214,8 @@ apt_help() { PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; dtrace) PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;; + elf) + PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;; esac } @@ -4201,6 +4235,8 @@ yum_help() { PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;; ccache) PKGHANDLER_COMMAND="sudo yum install ccache" ;; + elf) + PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;; esac } @@ -4253,7 +4289,8 @@ pkgadd_help() { # All valid JVM features, regardless of platform VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \ - fprof vm-structs jni-check services management all-gcs nmt cds static-build" + graal fprof vm-structs jni-check services management all-gcs nmt cds \ + static-build link-time-opt aot" # All valid JVM variants VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" @@ -4297,6 +4334,11 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" # +################################################################################ +# Check if AOT should be enabled +# + + ############################################################################### # Set up all JVM features for each JVM variant. # @@ -4307,6 +4349,16 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" # +################################################################################ +# +# Specify which sources will be used to build the 64-bit ARM port +# +# --with-cpu-port=arm64 will use hotspot/src/cpu/arm +# --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64 +# + + + ################################################################################ # Check if gtest should be built # @@ -4720,6 +4772,36 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" ################################################################################ +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +################################################################################ +# Setup libelf (ELF library) +################################################################################ + + ################################################################################ # Determine which libraries are needed for this configuration @@ -5088,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1481104795 +DATE_WHEN_GENERATED=1482168759 ############################################################################### # @@ -15790,15 +15872,6 @@ $as_echo "$COMPILE_TYPE" >&6; } fi - # This is the name of the cpu (but using i386 and amd64 instead of - # x86 and x86_64, respectively), preceeded by a /, to be used when - # locating libraries. On macosx, it's empty, though. - OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB" - if test "x$OPENJDK_TARGET_OS" = xmacosx; then - OPENJDK_TARGET_CPU_LIBDIR="" - fi - - # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to # /amd64 or /sparcv9. This string is appended to some library paths, like this: # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so @@ -15830,16 +15903,6 @@ $as_echo "$COMPILE_TYPE" >&6; } # On all platforms except macosx, we replace x86_64 with amd64. OPENJDK_TARGET_CPU_JLI="amd64" fi - # Now setup the -D flags for building libjli. - OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'" - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" - elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" - fi - fi - if test "x$OPENJDK_TARGET_OS" = xmacosx; then OPENJDK_TARGET_OS_EXPORT_DIR=macosx @@ -15965,15 +16028,6 @@ $as_echo "$COMPILE_TYPE" >&6; } fi - # This is the name of the cpu (but using i386 and amd64 instead of - # x86 and x86_64, respectively), preceeded by a /, to be used when - # locating libraries. On macosx, it's empty, though. - OPENJDK_BUILD_CPU_LIBDIR="/$OPENJDK_BUILD_CPU_LEGACY_LIB" - if test "x$OPENJDK_BUILD_OS" = xmacosx; then - OPENJDK_BUILD_CPU_LIBDIR="" - fi - - # OPENJDK_BUILD_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to # /amd64 or /sparcv9. This string is appended to some library paths, like this: # /usr/lib${OPENJDK_BUILD_CPU_ISADIR}/libexample.so @@ -16005,16 +16059,6 @@ $as_echo "$COMPILE_TYPE" >&6; } # On all platforms except macosx, we replace x86_64 with amd64. OPENJDK_BUILD_CPU_JLI="amd64" fi - # Now setup the -D flags for building libjli. - OPENJDK_BUILD_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_BUILD_CPU_JLI\"'" - if test "x$OPENJDK_BUILD_OS" = xsolaris; then - if test "x$OPENJDK_BUILD_CPU_ARCH" = xsparc; then - OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" - elif test "x$OPENJDK_BUILD_CPU_ARCH" = xx86; then - OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" - fi - fi - if test "x$OPENJDK_BUILD_OS" = xmacosx; then OPENJDK_BUILD_OS_EXPORT_DIR=macosx @@ -16705,6 +16749,26 @@ if test "${with_jvm_variants+set}" = set; then : fi + + +# Check whether --with-cpu-port was given. +if test "${with_cpu_port+set}" = set; then : + withval=$with_cpu_port; +fi + + + if test "x$with_cpu_port" != x; then + if test "x$OPENJDK_TARGET_CPU" != xaarch64; then + as_fn_error $? "--with-cpu-port only available on aarch64" "$LINENO" 5 + fi + if test "x$with_cpu_port" != xarm64 && \ + test "x$with_cpu_port" != xaarch64; then + as_fn_error $? "--with-cpu-port must specify arm64 or aarch64" "$LINENO" 5 + fi + HOTSPOT_TARGET_CPU_PORT="$with_cpu_port" + fi + + if test "x$with_jvm_variants" = x; then with_jvm_variants="server" fi @@ -16750,6 +16814,21 @@ $as_echo "$as_me: Unknown variant(s) specified: $INVALID_VARIANTS" >&6;} as_fn_error $? "You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS." "$LINENO" 5 fi + # The "main" variant is the one used by other libs to link against during the + # build. + if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then + MAIN_VARIANT_PRIO_ORDER="server client minimal" + for variant in $MAIN_VARIANT_PRIO_ORDER; do + if [[ " $JVM_VARIANTS " =~ " $variant " ]] ; then + JVM_VARIANT_MAIN="$variant" + break + fi + done + else + JVM_VARIANT_MAIN="$JVM_VARIANTS" + fi + + @@ -30992,33 +31071,17 @@ fi BUILD_OUTPUT="$OUTPUT_ROOT" - - HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist" - BUILD_HOTSPOT=true + JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" -# Check whether --with-import-hotspot was given. +# Check whether --with-import_hotspot was given. if test "${with_import_hotspot+set}" = set; then : - withval=$with_import_hotspot; + withval=$with_import_hotspot; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&2;} fi - if test "x$with_import_hotspot" != x; then - CURDIR="$PWD" - cd "$with_import_hotspot" - HOTSPOT_DIST="`pwd`" - cd "$CURDIR" - if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then - as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be imported" >&5 -$as_echo_n "checking if hotspot should be imported... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from $HOTSPOT_DIST" >&5 -$as_echo "yes from $HOTSPOT_DIST" >&6; } - BUILD_HOTSPOT=false - fi - JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" @@ -31189,6 +31252,12 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\" if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf" fi + if test -d "$IMPORT_MODULES_TOPDIR/modules_legal"; then + IMPORT_MODULES_LEGAL="$IMPORT_MODULES_TOPDIR/modules_legal" + fi + if test -d "$IMPORT_MODULES_TOPDIR/modules_man"; then + IMPORT_MODULES_MAN="$IMPORT_MODULES_TOPDIR/modules_man" + fi if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi @@ -31210,6 +31279,8 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\" + + ############################################################################### # # Setup the toolchain (compilers etc), i.e. tools used to compile and process @@ -49044,9 +49115,17 @@ $as_echo "$ac_cv_c_bigendian" >&6; } PICFLAG='-fPIC' SHARED_LIBRARY_FLAGS='-shared' SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN$1' - SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-soname=$1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=$1' + + # arm specific settings + if test "x$OPENJDK_TARGET_CPU" = "xarm"; then + # '-Wl,-z,origin' isn't used on arm. + SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN$1' + else + SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" + fi + fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then if test "x$OPENJDK_TARGET_CPU" = xsparcv9; then @@ -49636,6 +49715,108 @@ $as_echo "$supports" >&6; } + +# Check whether --with-abi-profile was given. +if test "${with_abi_profile+set}" = set; then : + withval=$with_abi_profile; +fi + + + if test "x$with_abi_profile" != x; then + if test "x$OPENJDK_TARGET_CPU" != xarm && \ + test "x$OPENJDK_TARGET_CPU" != xaarch64; then + as_fn_error $? "--with-abi-profile only available on arm/aarch64" "$LINENO" 5 + fi + + OPENJDK_TARGET_ABI_PROFILE=$with_abi_profile + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ABI profle" >&5 +$as_echo_n "checking for ABI profle... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_ABI_PROFILE" >&5 +$as_echo "$OPENJDK_TARGET_ABI_PROFILE" >&6; } + + if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then + ARM_FLOAT_TYPE=vfp-sflt + ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then + ARM_FLOAT_TYPE=vfp-hflt + ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then + ARM_FLOAT_TYPE=sflt + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then + ARM_FLOAT_TYPE=vfp-sflt + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then + ARM_FLOAT_TYPE=vfp-hflt + ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm' + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm64; then + # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME + ARM_FLOAT_TYPE= + ARM_ARCH_TYPE_FLAGS= + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then + # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME + ARM_FLOAT_TYPE= + ARM_ARCH_TYPE_FLAGS= + else + as_fn_error $? "Invalid ABI profile: \"$OPENJDK_TARGET_ABI_PROFILE\"" "$LINENO" 5 + fi + + if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then + ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt' + elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then + ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt' + elif test "x$ARM_FLOAT_TYPE" = xsflt; then + ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp' + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ARM_FLOAT_TYPE floating point flags" >&5 +$as_echo_n "checking for $ARM_FLOAT_TYPE floating point flags... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARM_FLOAT_TYPE_FLAGS" >&5 +$as_echo "$ARM_FLOAT_TYPE_FLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for arch type flags" >&5 +$as_echo_n "checking for arch type flags... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARM_ARCH_TYPE_FLAGS" >&5 +$as_echo "$ARM_ARCH_TYPE_FLAGS" >&6; } + + # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the + # autoconf target triplet. + JDK_ARCH_ABI_PROP_NAME=`$ECHO $OPENJDK_TARGET_AUTOCONF_NAME | $SED -e 's/.*-\([^-]*\)$/\1/'` + # Sanity check that it is a known ABI. + if test "x$JDK_ARCH_ABI_PROP_NAME" != xgnu && \ + test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabi && \ + test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabihf; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown autoconf target triplet ABI: \"$JDK_ARCH_ABI_PROP_NAME\"" >&5 +$as_echo "$as_me: WARNING: Unknown autoconf target triplet ABI: \"$JDK_ARCH_ABI_PROP_NAME\"" >&2;} + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ABI property name" >&5 +$as_echo_n "checking for ABI property name... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_ARCH_ABI_PROP_NAME" >&5 +$as_echo "$JDK_ARCH_ABI_PROP_NAME" >&6; } + + + # Pass these on to the open part of configure as if they were set using + # --with-extra-c[xx]flags. + EXTRA_CFLAGS="$EXTRA_CFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + # Get rid of annoying "note: the mangling of 'va_list' has changed in GCC 4.4" + # FIXME: This should not really be set using extra_cflags. + if test "x$OPENJDK_TARGET_CPU" = xarm; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wno-psabi" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -Wno-psabi" + fi + # Also add JDK_ARCH_ABI_PROP_NAME define, but only to CFLAGS. + EXTRA_CFLAGS="$EXTRA_CFLAGS -DJDK_ARCH_ABI_PROP_NAME='\"\$(JDK_ARCH_ABI_PROP_NAME)\"'" + # And pass the architecture flags to the linker as well + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" + fi + + # When building with an abi profile, the name of that profile is appended on the + # bundle platform, which is used in bundle names. + if test "x$OPENJDK_TARGET_ABI_PROFILE" != x; then + OPENJDK_TARGET_BUNDLE_PLATFORM="$OPENJDK_TARGET_OS_BUNDLE-$OPENJDK_TARGET_ABI_PROFILE" + fi + + # Special extras... if test "x$TOOLCHAIN_TYPE" = xsolstudio; then if test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then @@ -49787,6 +49968,7 @@ $as_echo "$supports" >&6; } arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" + COMMON_CCXXFLAGS_JDK="${COMMON_CCXXFLAGS_JDK} -fsigned-char" ;; ppc ) # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing @@ -50379,26 +50561,25 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA JDKLIB_LIBS="" else JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base" if test "xTARGET" = "xTARGET"; then - # On some platforms (mac) the linker warns about non existing -L dirs. - # Add server first if available. Linking aginst client does not always produce the same results. - # Only add client/minimal dir if client/minimal is being built. - # Default to server for other variants. - if [[ " $JVM_VARIANTS " =~ " server " ]] ; then - JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" - elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then - JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/client" - elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then - JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/minimal" - else - JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" - fi + # On some platforms (mac) the linker warns about non existing -L dirs. + # For any of the variants server, client or minimal, the dir matches the + # variant name. The "main" variant should be used for linking. For the + # rest, the dir is just server. + if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \ + || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN" + else + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" + fi elif test "xTARGET" = "xBUILD"; then # When building a buildjdk, it's always only the server variant JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" fi JDKLIB_LIBS="-ljava -ljvm" @@ -50610,6 +50791,7 @@ $as_echo "$supports" >&6; } arm ) # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -fno-strict-aliasing" + OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="${OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK} -fsigned-char" ;; ppc ) # on ppc we don't prevent gcc to omit frame pointer but do prevent strict aliasing @@ -51202,26 +51384,25 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA OPENJDK_BUILD_JDKLIB_LIBS="" else OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base" if test "xBUILD" = "xTARGET"; then - # On some platforms (mac) the linker warns about non existing -L dirs. - # Add server first if available. Linking aginst client does not always produce the same results. - # Only add client/minimal dir if client/minimal is being built. - # Default to server for other variants. - if [[ " $JVM_VARIANTS " =~ " server " ]] ; then - OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" - elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then - OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/client" - elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then - OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/minimal" - else - OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" - fi + # On some platforms (mac) the linker warns about non existing -L dirs. + # For any of the variants server, client or minimal, the dir matches the + # variant name. The "main" variant should be used for linking. For the + # rest, the dir is just server. + if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \ + || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN" + else + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" + fi elif test "xBUILD" = "xBUILD"; then # When building a buildjdk, it's always only the server variant OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ - -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" + -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server" fi OPENJDK_BUILD_JDKLIB_LIBS="-ljava -ljvm" @@ -52740,113 +52921,52 @@ $as_echo "yes, dependencies present" >&6; } - # The user can in some cases supply additional jvm features. For the custom - # variant, this defines the entire variant. - -# Check whether --with-jvm-features was given. -if test "${with_jvm_features+set}" = set; then : - withval=$with_jvm_features; + # Check whether --enable-aot was given. +if test "${enable_aot+set}" = set; then : + enableval=$enable_aot; fi - if test "x$with_jvm_features" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5 -$as_echo_n "checking additional JVM features... " >&6; } - JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5 -$as_echo "$JVM_FEATURES" >&6; } - fi - # Verify that dependencies are met for explicitly set features. - if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then - as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5 - fi - - if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then - as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5 - fi - - if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then - as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5 - fi - - if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then - as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5 - fi - - if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then - as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5 - fi - - # Turn on additional features based on other parts of configure - if test "x$INCLUDE_DTRACE" = "xtrue"; then - JVM_FEATURES="$JVM_FEATURES dtrace" + if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then + ENABLE_AOT="true" + elif test "x$enable_aot" = "xyes"; then + ENABLE_AOT="true" + elif test "x$enable_aot" = "xno"; then + ENABLE_AOT="false" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5 +$as_echo_n "checking if aot should be enabled... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5 +$as_echo "no, forced" >&6; } else - if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then - as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5 + as_fn_error $? "Invalid value for --enable-aot: $enable_aot" "$LINENO" 5 + fi + + if test "x$ENABLE_AOT" = "xtrue"; then + # Only enable AOT on linux-X64. + if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then + if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then + if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then + ENABLE_AOT="true" + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + as_fn_error $? "Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot." "$LINENO" 5 + fi + fi + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + as_fn_error $? "Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5 + fi + fi + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + as_fn_error $? "AOT is currently only supported on Linux-x86_64. Remove --enable-aot." "$LINENO" 5 + fi fi fi - if test "x$STATIC_BUILD" = "xtrue"; then - JVM_FEATURES="$JVM_FEATURES static-build" - else - if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then - as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5 - fi - fi - - if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then - if [[ " $JVM_FEATURES " =~ " zero " ]] ; then - as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5 - fi - fi - - if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then - if [[ " $JVM_FEATURES " =~ " shark " ]] ; then - as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5 - fi - fi - - # Only enable jvmci on x86_64, sparcv9 and aarch64. - if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ - test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ - test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then - JVM_FEATURES_jvmci="jvmci" - else - JVM_FEATURES_jvmci="" - fi - - # All variants but minimal (and custom) get these features - NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" - - # Enable features depending on variant. - JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" - JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" - JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" - JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" - JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" - JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" - JVM_FEATURES_custom="$JVM_FEATURES" - - - - - - - - - - # Used for verification of Makefiles by check-jvm-feature - - - # We don't support --with-jvm-interpreter anymore, use zero instead. - - -# Check whether --with-jvm-interpreter was given. -if test "${with_jvm_interpreter+set}" = set; then : - withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5 -$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;} -fi - @@ -63814,6 +63934,275 @@ $as_echo "no, not found at $STLPORT_LIB" >&6; } +# Check whether --with-libelf was given. +if test "${with_libelf+set}" = set; then : + withval=$with_libelf; +fi + + +# Check whether --with-libelf-include was given. +if test "${with_libelf_include+set}" = set; then : + withval=$with_libelf_include; +fi + + +# Check whether --with-libelf-lib was given. +if test "${with_libelf_lib+set}" = set; then : + withval=$with_libelf_lib; +fi + + + if test "x$ENABLE_AOT" = xfalse; then + if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \ + (test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \ + (test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&5 +$as_echo "$as_me: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&2;} + fi + LIBELF_CFLAGS= + LIBELF_LIBS= + else + LIBELF_FOUND=no + + if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then + ENABLE_AOT="false" + if test "x${enable_aot}" = xyes; then + as_fn_error $? "libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT." "$LINENO" 5 + fi + else + if test "x${with_libelf}" != x; then + ELF_LIBS="-L${with_libelf}/lib -lelf" + ELF_CFLAGS="-I${with_libelf}/include" + LIBELF_FOUND=yes + fi + if test "x${with_libelf_include}" != x; then + ELF_CFLAGS="-I${with_libelf_include}" + LIBELF_FOUND=yes + fi + if test "x${with_libelf_lib}" != x; then + ELF_LIBS="-L${with_libelf_lib} -lelf" + LIBELF_FOUND=yes + fi + # Do not try pkg-config if we have a sysroot set. + if test "x$SYSROOT" = x; then + if test "x$LIBELF_FOUND" = xno; then + # Figure out ELF_CFLAGS and ELF_LIBS + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5 +$as_echo_n "checking for ELF... " >&6; } + +if test -n "$ELF_CFLAGS"; then + pkg_cv_ELF_CFLAGS="$ELF_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelf") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELF_CFLAGS=`$PKG_CONFIG --cflags "libelf" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ELF_LIBS"; then + pkg_cv_ELF_LIBS="$ELF_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libelf") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELF_LIBS=`$PKG_CONFIG --libs "libelf" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ELF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libelf" 2>&1` + else + ELF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libelf" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELF_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBELF_FOUND=no +elif test $pkg_failed = untried; then + LIBELF_FOUND=no +else + ELF_CFLAGS=$pkg_cv_ELF_CFLAGS + ELF_LIBS=$pkg_cv_ELF_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LIBELF_FOUND=yes +fi + fi + fi + if test "x$LIBELF_FOUND" = xno; then + for ac_header in libelf.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "libelf.h" "ac_cv_header_libelf_h" "$ac_includes_default" +if test "x$ac_cv_header_libelf_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBELF_H 1 +_ACEOF + + LIBELF_FOUND=yes + ELF_CFLAGS= + ELF_LIBS=-lelf + +else + LIBELF_FOUND=no + +fi + +done + + fi + if test "x$LIBELF_FOUND" = xno; then + ENABLE_AOT="false" + + # Print a helpful message on how to acquire the necessary build dependency. + # elf is the help tag: freetype, cups, alsa etc + MISSING_DEPENDENCY=elf + + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then + cygwin_help $MISSING_DEPENDENCY + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then + msys_help $MISSING_DEPENDENCY + else + PKGHANDLER_COMMAND= + + case $PKGHANDLER in + apt-get) + apt_help $MISSING_DEPENDENCY ;; + yum) + yum_help $MISSING_DEPENDENCY ;; + port) + port_help $MISSING_DEPENDENCY ;; + pkgutil) + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." + fi + fi + + if test "x${enable_aot}" = xyes; then + as_fn_error $? "libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&5 +$as_echo "$as_me: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&2;} + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libelf works" >&5 +$as_echo_n "checking if libelf works... " >&6; } + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $ELF_CFLAGS" + OLD_LIBS="$LIBS" + LIBS="$LIBS $ELF_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + + elf_version(0); + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBELF_WORKS=yes +else + LIBELF_WORKS=no + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBELF_WORKS" >&5 +$as_echo "$LIBELF_WORKS" >&6; } + + if test "x$LIBELF_WORKS" = xno; then + ENABLE_AOT="false" + + # Print a helpful message on how to acquire the necessary build dependency. + # elf is the help tag: freetype, cups, alsa etc + MISSING_DEPENDENCY=elf + + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then + cygwin_help $MISSING_DEPENDENCY + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then + msys_help $MISSING_DEPENDENCY + else + PKGHANDLER_COMMAND= + + case $PKGHANDLER in + apt-get) + apt_help $MISSING_DEPENDENCY ;; + yum) + yum_help $MISSING_DEPENDENCY ;; + port) + port_help $MISSING_DEPENDENCY ;; + pkgutil) + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." + fi + fi + + if test "x$enable_aot" = "xyes"; then + as_fn_error $? "Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&5 +$as_echo "$as_me: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&2;} + fi + fi + fi + fi + fi @@ -63825,6 +64214,194 @@ $as_echo "no, not found at $STLPORT_LIB" >&6; } + + + + + + + +# Hotspot setup depends on lib checks (AOT needs libelf). + + + # The user can in some cases supply additional jvm features. For the custom + # variant, this defines the entire variant. + +# Check whether --with-jvm-features was given. +if test "${with_jvm_features+set}" = set; then : + withval=$with_jvm_features; +fi + + if test "x$with_jvm_features" != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5 +$as_echo_n "checking additional JVM features... " >&6; } + JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5 +$as_echo "$JVM_FEATURES" >&6; } + fi + + # Override hotspot cpu definitions for ARM platforms + if test "x$OPENJDK_TARGET_CPU" = xarm; then + HOTSPOT_TARGET_CPU=arm_32 + HOTSPOT_TARGET_CPU_DEFINE="ARM32" + JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" + JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" + elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then + HOTSPOT_TARGET_CPU=arm_64 + HOTSPOT_TARGET_CPU_ARCH=arm + JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" + JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" + fi + + # Verify that dependencies are met for explicitly set features. + if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then + as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5 + fi + + if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then + as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5 + fi + + if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then + as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5 + fi + + if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then + as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5 + fi + + if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then + as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5 + fi + + # Turn on additional features based on other parts of configure + if test "x$INCLUDE_DTRACE" = "xtrue"; then + JVM_FEATURES="$JVM_FEATURES dtrace" + else + if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then + as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5 + fi + fi + + if test "x$STATIC_BUILD" = "xtrue"; then + JVM_FEATURES="$JVM_FEATURES static-build" + else + if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then + as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5 + fi + fi + + if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then + if [[ " $JVM_FEATURES " =~ " zero " ]] ; then + as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5 + fi + fi + + if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then + if [[ " $JVM_FEATURES " =~ " shark " ]] ; then + as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5 + fi + fi + + # Only enable jvmci on x86_64, sparcv9 and aarch64. + if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ + test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ + test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then + JVM_FEATURES_jvmci="jvmci" + else + JVM_FEATURES_jvmci="" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.vm.compiler should be built" >&5 +$as_echo_n "checking if jdk.vm.compiler should be built... " >&6; } + if [[ " $JVM_FEATURES " =~ " graal " ]] ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5 +$as_echo "yes, forced" >&6; } + if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then + as_fn_error $? "Specified JVM feature 'graal' requires feature 'jvmci'" "$LINENO" 5 + fi + INCLUDE_GRAAL="true" + else + # By default enable graal build where AOT is available + if test "x$ENABLE_AOT" = "xtrue"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + JVM_FEATURES_graal="graal" + INCLUDE_GRAAL="true" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + JVM_FEATURES_graal="" + INCLUDE_GRAAL="false" + fi + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5 +$as_echo_n "checking if aot should be enabled... " >&6; } + if test "x$ENABLE_AOT" = "xtrue"; then + if test "x$enable_aot" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5 +$as_echo "yes, forced" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + JVM_FEATURES_aot="aot" + else + if test "x$enable_aot" = "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5 +$as_echo "no, forced" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + JVM_FEATURES_aot="" + fi + + if test "x$OPENJDK_TARGET_CPU" = xarm ; then + # Default to use link time optimizations on minimal on arm + JVM_FEATURES_link_time_opt="link-time-opt" + else + JVM_FEATURES_link_time_opt="" + fi + + # All variants but minimal (and custom) get these features + NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" + + # Enable features depending on variant. + JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" + JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" + JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" + JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt" + JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" + JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" + JVM_FEATURES_custom="$JVM_FEATURES" + + + + + + + + + + # Used for verification of Makefiles by check-jvm-feature + + + # We don't support --with-jvm-interpreter anymore, use zero instead. + + +# Check whether --with-jvm-interpreter was given. +if test "${with_jvm_interpreter+set}" = set; then : + withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;} +fi + + + + ############################################################################### # # We need to do some final tweaking, when everything else is done. diff --git a/common/autoconf/help.m4 b/common/autoconf/help.m4 index 98e2a9258b5..76824e54787 100644 --- a/common/autoconf/help.m4 +++ b/common/autoconf/help.m4 @@ -121,6 +121,8 @@ apt_help() { PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; dtrace) PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;; + elf) + PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;; esac } @@ -140,6 +142,8 @@ yum_help() { PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;; ccache) PKGHANDLER_COMMAND="sudo yum install ccache" ;; + elf) + PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;; esac } diff --git a/common/autoconf/hotspot.m4 b/common/autoconf/hotspot.m4 index cda292e3f87..b12914b4dcd 100644 --- a/common/autoconf/hotspot.m4 +++ b/common/autoconf/hotspot.m4 @@ -25,7 +25,8 @@ # All valid JVM features, regardless of platform VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \ - fprof vm-structs jni-check services management all-gcs nmt cds static-build" + graal fprof vm-structs jni-check services management all-gcs nmt cds \ + static-build link-time-opt aot" # All valid JVM variants VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" @@ -69,6 +70,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS], AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], [JVM variants (separated by commas) to build (server,client,minimal,core,zero,zeroshark,custom) @<:@server@:>@])]) + SETUP_HOTSPOT_TARGET_CPU_PORT + if test "x$with_jvm_variants" = x; then with_jvm_variants="server" fi @@ -111,8 +114,23 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS], AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.]) fi + # The "main" variant is the one used by other libs to link against during the + # build. + if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then + MAIN_VARIANT_PRIO_ORDER="server client minimal" + for variant in $MAIN_VARIANT_PRIO_ORDER; do + if HOTSPOT_CHECK_JVM_VARIANT($variant); then + JVM_VARIANT_MAIN="$variant" + break + fi + done + else + JVM_VARIANT_MAIN="$JVM_VARIANTS" + fi + AC_SUBST(JVM_VARIANTS) AC_SUBST(VALID_JVM_VARIANTS) + AC_SUBST(JVM_VARIANT_MAIN) if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then # zero behaves as a platform and rewrites these values. This is really weird. :( @@ -174,6 +192,55 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE], AC_SUBST(INCLUDE_DTRACE) ]) +################################################################################ +# Check if AOT should be enabled +# +AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT], +[ + AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@], + [enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])]) + + if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then + ENABLE_AOT="true" + elif test "x$enable_aot" = "xyes"; then + ENABLE_AOT="true" + elif test "x$enable_aot" = "xno"; then + ENABLE_AOT="false" + AC_MSG_CHECKING([if aot should be enabled]) + AC_MSG_RESULT([no, forced]) + else + AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot]) + fi + + if test "x$ENABLE_AOT" = "xtrue"; then + # Only enable AOT on linux-X64. + if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then + if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then + if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then + ENABLE_AOT="true" + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.]) + fi + fi + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.]) + fi + fi + else + ENABLE_AOT="false" + if test "x$enable_aot" = "xyes"; then + AC_MSG_ERROR([AOT is currently only supported on Linux-x86_64. Remove --enable-aot.]) + fi + fi + fi + + AC_SUBST(ENABLE_AOT) +]) + ############################################################################### # Set up all JVM features for each JVM variant. # @@ -189,6 +256,19 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], AC_MSG_RESULT([$JVM_FEATURES]) fi + # Override hotspot cpu definitions for ARM platforms + if test "x$OPENJDK_TARGET_CPU" = xarm; then + HOTSPOT_TARGET_CPU=arm_32 + HOTSPOT_TARGET_CPU_DEFINE="ARM32" + JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" + JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" + elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then + HOTSPOT_TARGET_CPU=arm_64 + HOTSPOT_TARGET_CPU_ARCH=arm + JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char" + JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char" + fi + # Verify that dependencies are met for explicitly set features. if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) @@ -241,21 +321,67 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], # Only enable jvmci on x86_64, sparcv9 and aarch64. if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ - test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ - test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then + test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ + test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then JVM_FEATURES_jvmci="jvmci" else JVM_FEATURES_jvmci="" fi + AC_MSG_CHECKING([if jdk.vm.compiler should be built]) + if HOTSPOT_CHECK_JVM_FEATURE(graal); then + AC_MSG_RESULT([yes, forced]) + if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then + AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) + fi + INCLUDE_GRAAL="true" + else + # By default enable graal build where AOT is available + if test "x$ENABLE_AOT" = "xtrue"; then + AC_MSG_RESULT([yes]) + JVM_FEATURES_graal="graal" + INCLUDE_GRAAL="true" + else + AC_MSG_RESULT([no]) + JVM_FEATURES_graal="" + INCLUDE_GRAAL="false" + fi + fi + + AC_SUBST(INCLUDE_GRAAL) + + AC_MSG_CHECKING([if aot should be enabled]) + if test "x$ENABLE_AOT" = "xtrue"; then + if test "x$enable_aot" = "xyes"; then + AC_MSG_RESULT([yes, forced]) + else + AC_MSG_RESULT([yes]) + fi + JVM_FEATURES_aot="aot" + else + if test "x$enable_aot" = "xno"; then + AC_MSG_RESULT([no, forced]) + else + AC_MSG_RESULT([no]) + fi + JVM_FEATURES_aot="" + fi + + if test "x$OPENJDK_TARGET_CPU" = xarm ; then + # Default to use link time optimizations on minimal on arm + JVM_FEATURES_link_time_opt="link-time-opt" + else + JVM_FEATURES_link_time_opt="" + fi + # All variants but minimal (and custom) get these features NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" # Enable features depending on variant. - JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" + JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" - JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" + JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt" JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" JVM_FEATURES_custom="$JVM_FEATURES" @@ -304,6 +430,31 @@ AC_DEFUN_ONCE([HOTSPOT_VALIDATE_JVM_FEATURES], done ]) +################################################################################ +# +# Specify which sources will be used to build the 64-bit ARM port +# +# --with-cpu-port=arm64 will use hotspot/src/cpu/arm +# --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64 +# +AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT], +[ + AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port], + [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])]) + + if test "x$with_cpu_port" != x; then + if test "x$OPENJDK_TARGET_CPU" != xaarch64; then + AC_MSG_ERROR([--with-cpu-port only available on aarch64]) + fi + if test "x$with_cpu_port" != xarm64 && \ + test "x$with_cpu_port" != xaarch64; then + AC_MSG_ERROR([--with-cpu-port must specify arm64 or aarch64]) + fi + HOTSPOT_TARGET_CPU_PORT="$with_cpu_port" + fi +]) + + ################################################################################ # Check if gtest should be built # diff --git a/common/autoconf/lib-elf.m4 b/common/autoconf/lib-elf.m4 new file mode 100644 index 00000000000..9d5230b6968 --- /dev/null +++ b/common/autoconf/lib-elf.m4 @@ -0,0 +1,129 @@ +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +################################################################################ +# Setup libelf (ELF library) +################################################################################ +AC_DEFUN_ONCE([LIB_SETUP_LIBELF], +[ + AC_ARG_WITH(libelf, [AS_HELP_STRING([--with-libelf], + [specify prefix directory for the libelf package + (expecting the libraries under PATH/lib and the headers under PATH/include)])]) + AC_ARG_WITH(libelf-include, [AS_HELP_STRING([--with-libelf-include], + [specify directory for the libelf include files])]) + AC_ARG_WITH(libelf-lib, [AS_HELP_STRING([--with-libelf-lib], + [specify directory for the libelf library])]) + + if test "x$ENABLE_AOT" = xfalse; then + if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \ + (test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \ + (test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then + AC_MSG_WARN([[libelf is not used, so --with-libelf[-*] is ignored]]) + fi + LIBELF_CFLAGS= + LIBELF_LIBS= + else + LIBELF_FOUND=no + + if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then + ENABLE_AOT="false" + if test "x${enable_aot}" = xyes; then + AC_MSG_ERROR([libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT.]) + fi + else + if test "x${with_libelf}" != x; then + ELF_LIBS="-L${with_libelf}/lib -lelf" + ELF_CFLAGS="-I${with_libelf}/include" + LIBELF_FOUND=yes + fi + if test "x${with_libelf_include}" != x; then + ELF_CFLAGS="-I${with_libelf_include}" + LIBELF_FOUND=yes + fi + if test "x${with_libelf_lib}" != x; then + ELF_LIBS="-L${with_libelf_lib} -lelf" + LIBELF_FOUND=yes + fi + # Do not try pkg-config if we have a sysroot set. + if test "x$SYSROOT" = x; then + if test "x$LIBELF_FOUND" = xno; then + # Figure out ELF_CFLAGS and ELF_LIBS + PKG_CHECK_MODULES([ELF], [libelf], [LIBELF_FOUND=yes], [LIBELF_FOUND=no]) + fi + fi + if test "x$LIBELF_FOUND" = xno; then + AC_CHECK_HEADERS([libelf.h], + [ + LIBELF_FOUND=yes + ELF_CFLAGS= + ELF_LIBS=-lelf + ], + [LIBELF_FOUND=no] + ) + fi + if test "x$LIBELF_FOUND" = xno; then + ENABLE_AOT="false" + HELP_MSG_MISSING_DEPENDENCY([elf]) + if test "x${enable_aot}" = xyes; then + AC_MSG_ERROR([libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG]) + else + AC_MSG_WARN([libelf not found, cannot build AOT. $HELP_MSG]) + fi + else + AC_MSG_CHECKING([if libelf works]) + AC_LANG_PUSH(C) + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $ELF_CFLAGS" + OLD_LIBS="$LIBS" + LIBS="$LIBS $ELF_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [ + elf_version(0); + return 0; + ])], + [LIBELF_WORKS=yes], + [LIBELF_WORKS=no] + ) + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" + AC_LANG_POP(C) + AC_MSG_RESULT([$LIBELF_WORKS]) + + if test "x$LIBELF_WORKS" = xno; then + ENABLE_AOT="false" + HELP_MSG_MISSING_DEPENDENCY([elf]) + if test "x$enable_aot" = "xyes"; then + AC_MSG_ERROR([Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG]) + else + AC_MSG_WARN([Found libelf but could not link and compile with it. $HELP_MSG]) + fi + fi + fi + fi + fi + + AC_SUBST(ELF_CFLAGS) + AC_SUBST(ELF_LIBS) +]) diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index 3ca12d4da7d..bd5a40a7eaf 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -31,6 +31,7 @@ m4_include([lib-ffi.m4]) m4_include([lib-freetype.m4]) m4_include([lib-std.m4]) m4_include([lib-x11.m4]) +m4_include([lib-elf.m4]) ################################################################################ # Determine which libraries are needed for this configuration @@ -90,6 +91,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], LIB_SETUP_BUNDLED_LIBS LIB_SETUP_MISC_LIBS LIB_SETUP_SOLARIS_STLPORT + LIB_SETUP_LIBELF ]) ################################################################################ diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 392a23ad4cd..5217ca32e3e 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -308,15 +308,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], fi AC_SUBST(OPENJDK_$1_CPU_LEGACY_LIB) - # This is the name of the cpu (but using i386 and amd64 instead of - # x86 and x86_64, respectively), preceeded by a /, to be used when - # locating libraries. On macosx, it's empty, though. - OPENJDK_$1_CPU_LIBDIR="/$OPENJDK_$1_CPU_LEGACY_LIB" - if test "x$OPENJDK_$1_OS" = xmacosx; then - OPENJDK_$1_CPU_LIBDIR="" - fi - AC_SUBST(OPENJDK_$1_CPU_LIBDIR) - # OPENJDK_$1_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to # /amd64 or /sparcv9. This string is appended to some library paths, like this: # /usr/lib${OPENJDK_$1_CPU_ISADIR}/libexample.so @@ -348,16 +339,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], # On all platforms except macosx, we replace x86_64 with amd64. OPENJDK_$1_CPU_JLI="amd64" fi - # Now setup the -D flags for building libjli. - OPENJDK_$1_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_$1_CPU_JLI\"'" - if test "x$OPENJDK_$1_OS" = xsolaris; then - if test "x$OPENJDK_$1_CPU_ARCH" = xsparc; then - OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" - elif test "x$OPENJDK_$1_CPU_ARCH" = xx86; then - OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" - fi - fi - AC_SUBST(OPENJDK_$1_CPU_JLI_CFLAGS) if test "x$OPENJDK_$1_OS" = xmacosx; then OPENJDK_$1_OS_EXPORT_DIR=macosx diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4 index 81137cf95ff..49db4734596 100644 --- a/common/autoconf/source-dirs.m4 +++ b/common/autoconf/source-dirs.m4 @@ -62,27 +62,9 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS], [ BUILD_OUTPUT="$OUTPUT_ROOT" AC_SUBST(BUILD_OUTPUT) - - HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist" - BUILD_HOTSPOT=true - AC_SUBST(HOTSPOT_DIST) - AC_SUBST(BUILD_HOTSPOT) - AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot], - [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])]) - if test "x$with_import_hotspot" != x; then - CURDIR="$PWD" - cd "$with_import_hotspot" - HOTSPOT_DIST="`pwd`" - cd "$CURDIR" - if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then - AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!]) - fi - AC_MSG_CHECKING([if hotspot should be imported]) - AC_MSG_RESULT([yes from $HOTSPOT_DIST]) - BUILD_HOTSPOT=false - fi - JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" + + BASIC_DEPRECATED_ARG_WITH(import_hotspot) ]) ################################################################################ @@ -123,6 +105,12 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES], if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf" fi + if test -d "$IMPORT_MODULES_TOPDIR/modules_legal"; then + IMPORT_MODULES_LEGAL="$IMPORT_MODULES_TOPDIR/modules_legal" + fi + if test -d "$IMPORT_MODULES_TOPDIR/modules_man"; then + IMPORT_MODULES_MAN="$IMPORT_MODULES_TOPDIR/modules_man" + fi if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi @@ -140,6 +128,8 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES], AC_SUBST(IMPORT_MODULES_CMDS) AC_SUBST(IMPORT_MODULES_LIBS) AC_SUBST(IMPORT_MODULES_CONF) + AC_SUBST(IMPORT_MODULES_LEGAL) + AC_SUBST(IMPORT_MODULES_MAN) AC_SUBST(IMPORT_MODULES_SRC) AC_SUBST(IMPORT_MODULES_MAKE) ]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index fa16d6bc266..a15b9f462fe 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -75,11 +75,9 @@ COMPILE_TYPE:=@COMPILE_TYPE@ # Legacy support OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@ -OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@ OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@ OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@ OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@ -OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@ OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@ HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@ @@ -145,6 +143,8 @@ IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@ IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@ IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@ IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@ +IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@ +IMPORT_MODULES_MAN:=@IMPORT_MODULES_MAN@ IMPORT_MODULES_SRC:=@IMPORT_MODULES_SRC@ IMPORT_MODULES_MAKE:=@IMPORT_MODULES_MAKE@ @@ -220,6 +220,7 @@ JDK_VARIANT:=@JDK_VARIANT@ # Which JVM variants to build (space-separated list) JVM_VARIANTS := @JVM_VARIANTS@ +JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@ # Lists of features per variant. Only relevant for the variants listed in # JVM_VARIANTS. @@ -273,8 +274,6 @@ JAVADOC_OUTPUTDIR = $(DOCS_IMAGE_DIR) CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk -HOTSPOT_DIST=@HOTSPOT_DIST@ - BUILD_HOTSPOT=@BUILD_HOTSPOT@ BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@ @@ -686,6 +685,7 @@ TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@ # Build setup +ENABLE_AOT:=@ENABLE_AOT@ ENABLE_JFR=@ENABLE_JFR@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ @@ -760,6 +760,8 @@ USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@ PNG_LIBS:=@PNG_LIBS@ PNG_CFLAGS:=@PNG_CFLAGS@ +ELF_CFLAGS:=@ELF_CFLAGS@ +ELF_LIBS:=@ELF_LIBS@ #################################################### # @@ -767,6 +769,7 @@ PNG_CFLAGS:=@PNG_CFLAGS@ # INCLUDE_SA=@INCLUDE_SA@ +INCLUDE_GRAAL=@INCLUDE_GRAAL@ OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@ OS_VERSION_MINOR:=@OS_VERSION_MINOR@ diff --git a/common/bin/compare.sh b/common/bin/compare.sh index de909e0154c..3385423fb4a 100644 --- a/common/bin/compare.sh +++ b/common/bin/compare.sh @@ -509,30 +509,32 @@ compare_zip_file() { | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") fi - $RM -f $WORK_DIR/$ZIP_FILE.diffs - for file in $DIFFING_FILES; do - if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then - diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs - fi - done + if [ "$CMP_ZIPS_CONTENTS" = "true" ]; then + $RM -f $WORK_DIR/$ZIP_FILE.diffs + for file in $DIFFING_FILES; do + if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then + diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs + fi + done - if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then - return_value=1 - echo " Differing files in $ZIP_FILE" - $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \ - $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist - $CAT $WORK_DIR/$ZIP_FILE.difflist + if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then + return_value=1 + echo " Differing files in $ZIP_FILE" + $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \ + $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist + $CAT $WORK_DIR/$ZIP_FILE.difflist - if [ -n "$SHOW_DIFFS" ]; then - for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do - if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then - LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap - elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then - LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i - else - LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i - fi - done + if [ -n "$SHOW_DIFFS" ]; then + for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do + if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap + elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i + else + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i + fi + done + fi fi fi @@ -1072,7 +1074,8 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1 echo "-perms Compare the permission bits on all files and directories" echo "-types Compare the output of the file command on all files" echo "-general Compare the files not convered by the specialized comparisons" - echo "-zips Compare the contents of all zip files" + echo "-zips Compare the contents of all zip files and files in them" + echo "-zips-names Compare the file names inside all zip files" echo "-jars Compare the contents of all jar files" echo "-libs Compare all native libraries" echo "-execs Compare all executables" @@ -1100,6 +1103,7 @@ CMP_PERMS=false CMP_TYPES=false CMP_GENERAL=false CMP_ZIPS=false +CMP_ZIPS_CONTENTS=true CMP_JARS=false CMP_LIBS=false CMP_EXECS=false @@ -1143,6 +1147,11 @@ while [ -n "$1" ]; do ;; -zips) CMP_ZIPS=true + CMP_ZIPS_CONTENTS=true + ;; + -zips-names) + CMP_ZIPS=true + CMP_ZIPS_CONTENTS=false ;; -jars) CMP_JARS=true diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl index 5042cdcc104..8aa1df11f8d 100644 --- a/common/bin/compare_exceptions.sh.incl +++ b/common/bin/compare_exceptions.sh.incl @@ -57,21 +57,21 @@ if [ "$OPENJDK_TARGET_OS" = "linux" ]; then ./demo/jvmti/mtrace/lib/libmtrace.so ./demo/jvmti/versionCheck/lib/libversionCheck.so ./demo/jvmti/waiters/lib/libwaiters.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjsig.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjvm.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libattach.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libdt_socket.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libinstrument.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsdt.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsig.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libmanagement.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnet.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnpt.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/libverify.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjsig.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjsig.so - ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjvm.so + ./lib/client/libjsig.so + ./lib/client/libjvm.so + ./lib/libattach.so + ./lib/libdt_socket.so + ./lib/libinstrument.so + ./lib/libjsdt.so + ./lib/libjsig.so + ./lib/libmanagement.so + ./lib/libnet.so + ./lib/libnpt.so + ./lib/libverify.so + ./lib/minimal/libjsig.so + ./lib/minimal/libjvm.so + ./lib/server/libjsig.so + ./lib/server/libjvm.so ./bin/appletviewer ./bin/idlj ./bin/jar @@ -122,12 +122,12 @@ if [ "$OPENJDK_TARGET_OS" = "linux" ]; then # So for now, accept the difference but put a limit on the size. The # different order of functions shouldn't result in a very big diff. KNOWN_FULLDUMP_DIFF=" - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so + ./lib/minimal/libjvm.so " # Link time optimization adds random numbers to symbol names NEED_DIS_DIFF_FILTER=" - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so + ./lib/minimal/libjvm.so " DIS_DIFF_FILTER="$SED -r \ -e 's/\.[0-9]+/.X/g' \ @@ -135,12 +135,12 @@ if [ "$OPENJDK_TARGET_OS" = "linux" ]; then -e 's/\t[0-9a-f]{5,} /\t /' \ " KNOWN_DIS_DIFF=" - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so + ./lib/minimal/libjvm.so " MAX_KNOWN_DIS_DIFF_SIZE="3000" NEED_SYMBOLS_DIFF_FILTER=" - ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so + ./lib/minimal/libjvm.so " SYMBOLS_DIFF_FILTER="$SED -r \ -e 's/\.[0-9]+/.X/g' @@ -163,11 +163,11 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; " SORT_SYMBOLS=" - ./lib/amd64/server/libjvm.so - ./lib/amd64/libfontmanager.so - ./lib/amd64/libjimage.so - ./lib/amd64/libsaproc.so - ./lib/amd64/libunpack.so + ./lib/server/libjvm.so + ./lib/libfontmanager.so + ./lib/libjimage.so + ./lib/libsaproc.so + ./lib/libunpack.so ./bin/unpack200 " @@ -183,48 +183,48 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; ./demo/jvmti/mtrace/lib/libmtrace.so ./demo/jvmti/versionCheck/lib/libversionCheck.so ./demo/jvmti/waiters/lib/libwaiters.so - ./lib/amd64/jli/libjli.so - ./lib/amd64/jspawnhelper - ./lib/amd64/libJdbcOdbc.so - ./lib/amd64/libattach.so - ./lib/amd64/libawt.so - ./lib/amd64/libawt_headless.so - ./lib/amd64/libawt_xawt.so - ./lib/amd64/libdcpr.so - ./lib/amd64/libdt_socket.so - ./lib/amd64/libfontmanager.so - ./lib/amd64/libinstrument.so - ./lib/amd64/libj2gss.so - ./lib/amd64/libj2pcsc.so - ./lib/amd64/libj2pkcs11.so - ./lib/amd64/libj2ucrypto.so - ./lib/amd64/libjaas_unix.so - ./lib/amd64/libjava.so - ./lib/amd64/libjawt.so - ./lib/amd64/libjdwp.so - ./lib/amd64/libjpeg.so - ./lib/amd64/libjsdt.so - ./lib/amd64/libjsound.so - ./lib/amd64/libkcms.so - ./lib/amd64/liblcms.so - ./lib/amd64/libmanagement.so - ./lib/amd64/libmlib_image.so - ./lib/amd64/libnet.so - ./lib/amd64/libnio.so - ./lib/amd64/libnpt.so - ./lib/amd64/libsctp.so - ./lib/amd64/libsplashscreen.so - ./lib/amd64/libsunec.so - ./lib/amd64/libsunwjdga.so - ./lib/amd64/libt2k.so - ./lib/amd64/libunpack.so - ./lib/amd64/libverify.so - ./lib/amd64/libzip.so - ./lib/amd64/server/64/libjvm_db.so - ./lib/amd64/server/64/libjvm_dtrace.so - ./lib/amd64/server/libjvm.so - ./lib/amd64/server/libjvm_db.so - ./lib/amd64/server/libjvm_dtrace.so + ./lib/jli/libjli.so + ./lib/jspawnhelper + ./lib/libJdbcOdbc.so + ./lib/libattach.so + ./lib/libawt.so + ./lib/libawt_headless.so + ./lib/libawt_xawt.so + ./lib/libdcpr.so + ./lib/libdt_socket.so + ./lib/libfontmanager.so + ./lib/libinstrument.so + ./lib/libj2gss.so + ./lib/libj2pcsc.so + ./lib/libj2pkcs11.so + ./lib/libj2ucrypto.so + ./lib/libjaas_unix.so + ./lib/libjava.so + ./lib/libjawt.so + ./lib/libjdwp.so + ./lib/libjpeg.so + ./lib/libjsdt.so + ./lib/libjsound.so + ./lib/libkcms.so + ./lib/liblcms.so + ./lib/libmanagement.so + ./lib/libmlib_image.so + ./lib/libnet.so + ./lib/libnio.so + ./lib/libnpt.so + ./lib/libsctp.so + ./lib/libsplashscreen.so + ./lib/libsunec.so + ./lib/libsunwjdga.so + ./lib/libt2k.so + ./lib/libunpack.so + ./lib/libverify.so + ./lib/libzip.so + ./lib/server/64/libjvm_db.so + ./lib/server/64/libjvm_dtrace.so + ./lib/server/libjvm.so + ./lib/server/libjvm_db.so + ./lib/server/libjvm_dtrace.so ./bin/appletviewer ./bin/idlj ./bin/jar @@ -292,13 +292,13 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ] SORT_SYMBOLS=" ./demo/jvmti/waiters/lib/libwaiters.so - ./lib/sparcv9/libjsig.so - ./lib/sparcv9/libfontmanager.so - ./lib/sparcv9/libjimage.so - ./lib/sparcv9/libsaproc.so - ./lib/sparcv9/libunpack.so - ./lib/sparcv9/server/libjvm.so - ./lib/sparcv9/server/libjvm_dtrace.so + ./lib/libjsig.so + ./lib/libfontmanager.so + ./lib/libjimage.so + ./lib/libsaproc.so + ./lib/libunpack.so + ./lib/server/libjvm.so + ./lib/server/libjvm_dtrace.so ./bin/unpack200 " @@ -314,46 +314,46 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ] ./demo/jvmti/mtrace/lib/libmtrace.so ./demo/jvmti/versionCheck/lib/libversionCheck.so ./demo/jvmti/waiters/lib/libwaiters.so - ./lib/sparcv9/client/libjvm.so - ./lib/sparcv9/jli/libjli.so - ./lib/sparcv9/jspawnhelper - ./lib/sparcv9/libJdbcOdbc.so - ./lib/sparcv9/libattach.so - ./lib/sparcv9/libawt.so - ./lib/sparcv9/libawt_headless.so - ./lib/sparcv9/libawt_xawt.so - ./lib/sparcv9/libdcpr.so - ./lib/sparcv9/libdt_socket.so - ./lib/sparcv9/libfontmanager.so - ./lib/sparcv9/libinstrument.so - ./lib/sparcv9/libj2gss.so - ./lib/sparcv9/libj2pcsc.so - ./lib/sparcv9/libj2pkcs11.so - ./lib/sparcv9/libj2ucrypto.so - ./lib/sparcv9/libjaas_unix.so - ./lib/sparcv9/libjava.so - ./lib/sparcv9/libjawt.so - ./lib/sparcv9/libjdwp.so - ./lib/sparcv9/libjpeg.so - ./lib/sparcv9/libjsdt.so - ./lib/sparcv9/libjsound.so - ./lib/sparcv9/libkcms.so - ./lib/sparcv9/liblcms.so - ./lib/sparcv9/libmanagement.so - ./lib/sparcv9/libmlib_image.so - ./lib/sparcv9/libmlib_image_v.so - ./lib/sparcv9/libnet.so - ./lib/sparcv9/libnio.so - ./lib/sparcv9/libnpt.so - ./lib/sparcv9/libsctp.so - ./lib/sparcv9/libsplashscreen.so - ./lib/sparcv9/libsunec.so - ./lib/sparcv9/libsunwjdga.so - ./lib/sparcv9/libt2k.so - ./lib/sparcv9/libunpack.so - ./lib/sparcv9/libverify.so - ./lib/sparcv9/libzip.so - ./lib/sparcv9/server/libjvm.so + ./lib/client/libjvm.so + ./lib/jli/libjli.so + ./lib/jspawnhelper + ./lib/libJdbcOdbc.so + ./lib/libattach.so + ./lib/libawt.so + ./lib/libawt_headless.so + ./lib/libawt_xawt.so + ./lib/libdcpr.so + ./lib/libdt_socket.so + ./lib/libfontmanager.so + ./lib/libinstrument.so + ./lib/libj2gss.so + ./lib/libj2pcsc.so + ./lib/libj2pkcs11.so + ./lib/libj2ucrypto.so + ./lib/libjaas_unix.so + ./lib/libjava.so + ./lib/libjawt.so + ./lib/libjdwp.so + ./lib/libjpeg.so + ./lib/libjsdt.so + ./lib/libjsound.so + ./lib/libkcms.so + ./lib/liblcms.so + ./lib/libmanagement.so + ./lib/libmlib_image.so + ./lib/libmlib_image_v.so + ./lib/libnet.so + ./lib/libnio.so + ./lib/libnpt.so + ./lib/libsctp.so + ./lib/libsplashscreen.so + ./lib/libsunec.so + ./lib/libsunwjdga.so + ./lib/libt2k.so + ./lib/libunpack.so + ./lib/libverify.so + ./lib/libzip.so + ./lib/server/libjvm.so ./bin/appletviewer ./bin/idlj ./bin/jar @@ -409,7 +409,7 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ] " KNOWN_DIS_DIFF=" - ./lib/sparcv9/libsaproc.so + ./lib/libsaproc.so " MAX_KNOWN_DIS_DIFF_SIZE="3000" @@ -417,8 +417,8 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ] # On slowdebug the disassembly can differ randomly. if [ "$DEBUG_LEVEL" = "slowdebug" ]; then ACCEPTED_DIS_DIFF=" - ./lib/sparcv9/libfontmanager.so - ./lib/sparcv9/server/libjvm.so + ./lib/libfontmanager.so + ./lib/server/libjvm.so " fi diff --git a/common/bin/unshuffle_list.txt b/common/bin/unshuffle_list.txt index daa919b9444..a43b049fce4 100644 --- a/common/bin/unshuffle_list.txt +++ b/common/bin/unshuffle_list.txt @@ -28,6 +28,11 @@ corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/java corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba +corba/src/java.corba/share/classes/com/sun/jndi/cosnaming : jdk/src/share/classes/com/sun/jndi/cosnaming +corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba : jdk/src/share/classes/com/sun/jndi/toolkit/corba +corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname : jdk/src/share/classes/com/sun/jndi/url/corbaname +corba/src/java.corba/share/classes/com/sun/jndi/url/iiop : jdk/src/share/classes/com/sun/jndi/url/iiop +corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname : jdk/src/share/classes/com/sun/jndi/url/iiopname corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal @@ -516,11 +521,6 @@ jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c : jdk/src/win jdk/src/java.base/windows/native/libnio/ch : jdk/src/windows/native/sun/nio/ch jdk/src/java.base/windows/native/libnio/fs : jdk/src/windows/native/sun/nio/fs jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c : jdk/src/windows/native/java/nio/MappedByteBuffer.c -jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming : jdk/src/share/classes/com/sun/jndi/cosnaming -jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba : jdk/src/share/classes/com/sun/jndi/toolkit/corba -jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname : jdk/src/share/classes/com/sun/jndi/url/corbaname -jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop : jdk/src/share/classes/com/sun/jndi/url/iiop -jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname : jdk/src/share/classes/com/sun/jndi/url/iiopname jdk/src/java.desktop/aix/native/libawt : jdk/src/aix/porting jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html : jdk/src/macosx/classes/com/apple/eawt/event/package.html @@ -1266,33 +1266,33 @@ jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp : jdk/src/share/native/s jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi -jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11 -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h -jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h -jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c -jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h -jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c -jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h -jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c -jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h -jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c -jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h +jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11 +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h +jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h +jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c +jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h +jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c +jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h +jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c +jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h +jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c +jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof @@ -1427,26 +1427,26 @@ jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/s jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi -jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp -jdk/src/jdk.pack200/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h -jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp -jdk/src/jdk.pack200/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h -jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp -jdk/src/jdk.pack200/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h -jdk/src/jdk.pack200/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h -jdk/src/jdk.pack200/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h -jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp -jdk/src/jdk.pack200/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h -jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp -jdk/src/jdk.pack200/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h -jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp -jdk/src/jdk.pack200/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h -jdk/src/jdk.pack200/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace -jdk/src/jdk.pack200/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp -jdk/src/jdk.pack200/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp -jdk/src/jdk.pack200/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c -jdk/src/jdk.pack200/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c -jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest +jdk/src/jdk.pack/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp +jdk/src/jdk.pack/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h +jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp +jdk/src/jdk.pack/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h +jdk/src/jdk.pack/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp +jdk/src/jdk.pack/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h +jdk/src/jdk.pack/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h +jdk/src/jdk.pack/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h +jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp +jdk/src/jdk.pack/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h +jdk/src/jdk.pack/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp +jdk/src/jdk.pack/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h +jdk/src/jdk.pack/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp +jdk/src/jdk.pack/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h +jdk/src/jdk.pack/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace +jdk/src/jdk.pack/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp +jdk/src/jdk.pack/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp +jdk/src/jdk.pack/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c +jdk/src/jdk.pack/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c +jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic diff --git a/common/nb_native/nbproject/configurations.xml b/common/nb_native/nbproject/configurations.xml index 8b23549b276..026734b8a14 100644 --- a/common/nb_native/nbproject/configurations.xml +++ b/common/nb_native/nbproject/configurations.xml @@ -2166,7 +2166,7 @@ - + @@ -2318,7 +2318,7 @@ - + @@ -29422,35 +29422,35 @@ - - - - - @@ -29460,63 +29460,63 @@ - - - - - - - - - @@ -30022,12 +30022,12 @@ - - @@ -30037,7 +30037,7 @@ - @@ -30047,7 +30047,7 @@ - @@ -30057,7 +30057,7 @@ - @@ -30067,7 +30067,7 @@ - @@ -30077,12 +30077,12 @@ - - @@ -31752,7 +31752,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -31760,10 +31760,10 @@ ../../jdk/src/java.base/unix/native/include ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava - ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 - ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11 ../../jdk/src/java.base/macosx/native/libjava - ../../build/support/headers/jdk.crypto.pkcs11 + ../../build/support/headers/jdk.crypto.token ../../make @@ -31772,7 +31772,7 @@ - + THIS_FILE="j2secmod_md.c" @@ -31899,7 +31899,7 @@ - + DEBUG @@ -31908,7 +31908,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -31917,7 +31917,7 @@ ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/macosx/native/libjava ../../make @@ -31927,7 +31927,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -31936,7 +31936,7 @@ ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/macosx/native/libjava ../../make @@ -31947,10 +31947,10 @@ - + - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../jdk/src/java.base/share/native/include @@ -44741,14 +44741,14 @@ - - @@ -44758,7 +44758,7 @@ - @@ -44768,7 +44768,7 @@ - @@ -44778,7 +44778,7 @@ - @@ -44788,7 +44788,7 @@ - @@ -44798,7 +44798,7 @@ - @@ -44808,7 +44808,7 @@ - @@ -44818,7 +44818,7 @@ - @@ -44828,7 +44828,7 @@ - @@ -44838,7 +44838,7 @@ - @@ -44848,7 +44848,7 @@ - @@ -44858,14 +44858,14 @@ - - @@ -45364,14 +45364,14 @@ - - @@ -45381,7 +45381,7 @@ - @@ -45391,7 +45391,7 @@ - @@ -45401,7 +45401,7 @@ - @@ -45411,7 +45411,7 @@ - @@ -45421,14 +45421,14 @@ - - @@ -47795,7 +47795,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -47803,10 +47803,10 @@ ../../jdk/src/java.base/unix/native/include ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava - ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 - ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11 ../../jdk/src/java.base/linux/native/libjava - ../../build/support/headers/jdk.crypto.pkcs11 + ../../build/support/headers/jdk.crypto.token ../../make @@ -47815,7 +47815,7 @@ - + THIS_FILE="j2secmod_md.c" @@ -47942,7 +47942,7 @@ - + DEBUG @@ -47951,7 +47951,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -47960,7 +47960,7 @@ ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/linux/native/libjava ../../make @@ -47970,7 +47970,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -47979,7 +47979,7 @@ ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/linux/native/libjava ../../make @@ -47990,10 +47990,10 @@ - + - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8 @@ -62728,14 +62728,14 @@ - - @@ -62745,7 +62745,7 @@ - @@ -62755,7 +62755,7 @@ - @@ -62765,7 +62765,7 @@ - @@ -62775,7 +62775,7 @@ - @@ -62785,7 +62785,7 @@ - @@ -62795,7 +62795,7 @@ - @@ -62805,7 +62805,7 @@ - @@ -62815,7 +62815,7 @@ - @@ -62825,7 +62825,7 @@ - @@ -62835,7 +62835,7 @@ - @@ -62845,14 +62845,14 @@ - - @@ -63395,14 +63395,14 @@ - - @@ -63412,7 +63412,7 @@ - @@ -63422,7 +63422,7 @@ - @@ -63432,7 +63432,7 @@ - @@ -63442,7 +63442,7 @@ - @@ -63452,14 +63452,14 @@ - - @@ -66281,7 +66281,7 @@ - + ../../jdk/src/java.base/share/native/include @@ -66289,10 +66289,10 @@ ../../jdk/src/java.base/unix/native/include ../../jdk/src/java.base/share/native/libjava ../../jdk/src/java.base/unix/native/libjava - ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 - ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11 + ../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11 ../../jdk/src/java.base/solaris/native/libjava - ../../build/support/headers/jdk.crypto.pkcs11 + ../../build/support/headers/jdk.crypto.token ../../make @@ -66301,7 +66301,7 @@ - + THIS_FILE="j2secmod_md.c" @@ -66462,7 +66462,7 @@ - + DEBUG @@ -66471,11 +66471,11 @@ - + ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/solaris/native/libjava ../../make @@ -66485,11 +66485,11 @@ - + ../../build/support/headers/java.base - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../jdk/src/java.base/solaris/native/libjava ../../make @@ -66500,10 +66500,10 @@ - + - ../../jdk/src/jdk.pack200/share/native/common-unpack + ../../jdk/src/jdk.pack/share/native/common-unpack ../../make diff --git a/corba/.hgtags b/corba/.hgtags index 02f91e90c58..a1d96e43021 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -391,3 +391,4 @@ a44b156ae7f06bf41b9bece30df7775e482395dd jdk-9+145 ecd74b41ab65bf228837b5bdf99690638d55425c jdk-9+146 dc49e0922a8e4387cbf8670bbe1dc51c9874b74b jdk-9+147 f95cc86b6ac22ec1ade5d4f825dc7782adeea228 jdk-9+148 +00b19338e505690abe93d5995ed74a473d969c2c jdk-9+149 diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtx.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CNNameParser.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java similarity index 97% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java index a0cc08034f6..a24044a52cb 100644 --- a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java +++ b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java @@ -29,7 +29,7 @@ import javax.naming.Name; import javax.naming.NamingException; import java.net.MalformedURLException; -import com.sun.jndi.toolkit.url.UrlUtil; +import com.sun.jndi.toolkit.corba.CorbaUtils; /** * Extract components of a "corbaname" URL. @@ -102,7 +102,7 @@ public final class CorbanameUrl { addrEnd = url.length(); stringName = ""; } else { - stringName = UrlUtil.decode(url.substring(addrEnd+1)); + stringName = CorbaUtils.decode(url.substring(addrEnd+1)); } location = url.substring(addrStart, addrEnd); diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java similarity index 98% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java index a51d6a4880c..d328f52ab24 100644 --- a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java +++ b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java @@ -31,7 +31,7 @@ import javax.naming.NamingException; import java.net.MalformedURLException; import java.util.Vector; import java.util.StringTokenizer; -import com.sun.jndi.toolkit.url.UrlUtil; +import com.sun.jndi.toolkit.corba.CorbaUtils; /** * Extract components of an "iiop" or "iiopname" URL. @@ -188,7 +188,7 @@ public final class IiopUrl { addrEnd = url.length(); stringName = ""; } else { - stringName = UrlUtil.decode(url.substring(addrEnd+1)); + stringName = CorbaUtils.decode(url.substring(addrEnd+1)); } addresses = new Vector<>(3); if (oldFormat) { diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties b/corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties rename to corba/src/java.corba/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java similarity index 83% rename from jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java rename to corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java index 122c9df57f5..422857bcc1e 100644 --- a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java +++ b/corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java @@ -41,10 +41,15 @@ import javax.naming.ConfigurationException; import javax.rmi.CORBA.Stub; import javax.rmi.PortableRemoteObject; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URLDecoder; + /** * Contains utilities for performing CORBA-related tasks: * 1. Get the org.omg.CORBA.Object for a java.rmi.Remote object. * 2. Create an ORB to use for a given host/port, and environment properties. + * ... * * @author Simon Nash * @author Bryan Atsatt @@ -176,4 +181,37 @@ public class CorbaUtils { return ORB.init(new String[0], orbProp); } + + /** + * Decode a URI string (according to RFC 2396). + */ + public static final String decode(String s) throws MalformedURLException { + try { + return decode(s, "8859_1"); + } catch (UnsupportedEncodingException e) { + // ISO-Latin-1 should always be available? + throw new MalformedURLException("ISO-Latin-1 decoder unavailable"); + } + } + + /** + * Decode a URI string (according to RFC 2396). + * + * Three-character sequences '%xy', where 'xy' is the two-digit + * hexadecimal representation of the lower 8-bits of a character, + * are decoded into the character itself. + * + * The string is subsequently converted using the specified encoding + */ + public static final String decode(String s, String enc) + throws MalformedURLException, UnsupportedEncodingException { + try { + return URLDecoder.decode(s, enc); + } catch (IllegalArgumentException iae) { + MalformedURLException mue = new MalformedURLException("Invalid URI encoding: " + s); + mue.initCause(iae); + throw mue; + } + } + } diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java b/corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java rename to corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java diff --git a/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java new file mode 100644 index 00000000000..1c78b925637 --- /dev/null +++ b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/GenericURLContext.java @@ -0,0 +1,537 @@ +/* + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.jndi.url.iiop; + +import com.sun.jndi.toolkit.corba.CorbaUtils; + +import javax.naming.*; +import javax.naming.spi.ResolveResult; +import javax.naming.spi.NamingManager; + +import java.util.Hashtable; +import java.net.MalformedURLException; + +/** + * This abstract class is a generic URL context that accepts as the + * name argument either a string URL or a Name whose first component + * is a URL. It resolves the URL to a target context and then continues + * the operation using the remaining name in the target context as if + * the first component names a junction. + * + * A subclass must define getRootURLContext() + * to process the URL into head/tail pieces. If it wants to control how + * URL strings are parsed and compared for the rename() operation, then + * it should override getNonRootURLSuffixes() and urlEquals(). + * + * @author Scott Seligman + * @author Rosanna Lee + */ +abstract public class GenericURLContext implements Context { + protected Hashtable myEnv = null; + + @SuppressWarnings("unchecked") // Expect Hashtable + public GenericURLContext(Hashtable env) { + // context that is not tied to any specific URL + myEnv = + (Hashtable)(env == null ? null : env.clone()); + } + + public void close() throws NamingException { + myEnv = null; + } + + public String getNameInNamespace() throws NamingException { + return ""; // %%% check this out: A URL context's name is "" + } + + /** + * Resolves 'name' into a target context with remaining name. + * For example, with a JNDI URL "jndi://dnsname/rest_name", + * this method resolves "jndi://dnsname/" to a target context, + * and returns the target context with "rest_name". + * The definition of "root URL" and how much of the URL to + * consume is implementation specific. + * If rename() is supported for a particular URL scheme, + * getRootURLContext(), getURLPrefix(), and getURLSuffix() + * must be in sync wrt how URLs are parsed and returned. + */ + abstract protected ResolveResult getRootURLContext(String url, + Hashtable env) throws NamingException; + + /** + * Returns the suffix of the url. The result should be identical to + * that of calling getRootURLContext().getRemainingName(), but + * without the overhead of doing anything with the prefix like + * creating a context. + *

+ * This method returns a Name instead of a String because to give + * the provider an opportunity to return a Name (for example, + * for weakly separated naming systems like COS naming). + *

+ * The default implementation uses skips 'prefix', calls + * CorbaUtils.decode() on it, and returns the result as a single component + * CompositeName. + * Subclass should override if this is not appropriate. + * This method is used only by rename(). + * If rename() is supported for a particular URL scheme, + * getRootURLContext(), getURLPrefix(), and getURLSuffix() + * must be in sync wrt how URLs are parsed and returned. + *

+ * For many URL schemes, this method is very similar to URL.getFile(), + * except getFile() will return a leading slash in the + * 2nd, 3rd, and 4th cases. For schemes like "ldap" and "iiop", + * the leading slash must be skipped before the name is an acceptable + * format for operation by the Context methods. For schemes that treat the + * leading slash as significant (such as "file"), + * the subclass must override getURLSuffix() to get the correct behavior. + * Remember, the behavior must match getRootURLContext(). + * + * 

{@code
+     * URL                                     Suffix
+     * foo://host:port                         
+     * foo://host:port/rest/of/name            rest/of/name
+     * foo:///rest/of/name                     rest/of/name
+     * foo:/rest/of/name                       rest/of/name
+     * foo:rest/of/name                        rest/of/name
+     * }
+ */ + protected Name getURLSuffix(String prefix, String url) throws NamingException { + String suffix = url.substring(prefix.length()); + if (suffix.length() == 0) { + return new CompositeName(); + } + + if (suffix.charAt(0) == '/') { + suffix = suffix.substring(1); // skip leading slash + } + + try { + return new CompositeName().add(CorbaUtils.decode(suffix)); + } catch (MalformedURLException e) { + throw new InvalidNameException(e.getMessage()); + } + } + + /** + * Finds the prefix of a URL. + * Default implementation looks for slashes and then extracts + * prefixes using String.substring(). + * Subclass should override if this is not appropriate. + * This method is used only by rename(). + * If rename() is supported for a particular URL scheme, + * getRootURLContext(), getURLPrefix(), and getURLSuffix() + * must be in sync wrt how URLs are parsed and returned. + *

+ * URL Prefix + * foo://host:port foo://host:port + * foo://host:port/rest/of/name foo://host:port + * foo:///rest/of/name foo:// + * foo:/rest/of/name foo: + * foo:rest/of/name foo: + */ + protected String getURLPrefix(String url) throws NamingException { + int start = url.indexOf(':'); + + if (start < 0) { + throw new OperationNotSupportedException("Invalid URL: " + url); + } + ++start; // skip ':' + + if (url.startsWith("//", start)) { + start += 2; // skip double slash + + // find last slash + int posn = url.indexOf('/', start); + if (posn >= 0) { + start = posn; + } else { + start = url.length(); // rest of URL + } + } + + // else 0 or 1 initial slashes; start is unchanged + return url.substring(0, start); + } + + /** + * Determines whether two URLs are the same. + * Default implementation uses String.equals(). + * Subclass should override if this is not appropriate. + * This method is used by rename(). + */ + protected boolean urlEquals(String url1, String url2) { + return url1.equals(url2); + } + + /** + * Gets the context in which to continue the operation. This method + * is called when this context is asked to process a multicomponent + * Name in which the first component is a URL. + * Treat the first component like a junction: resolve it and then use + * NamingManager.getContinuationContext() to get the target context in + * which to operate on the remainder of the name (n.getSuffix(1)). + */ + protected Context getContinuationContext(Name n) throws NamingException { + Object obj = lookup(n.get(0)); + CannotProceedException cpe = new CannotProceedException(); + cpe.setResolvedObj(obj); + cpe.setEnvironment(myEnv); + return NamingManager.getContinuationContext(cpe); + } + + public Object lookup(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.lookup(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public Object lookup(Name name) throws NamingException { + if (name.size() == 1) { + return lookup(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.lookup(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public void bind(String name, Object obj) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + ctx.bind(res.getRemainingName(), obj); + } finally { + ctx.close(); + } + } + + public void bind(Name name, Object obj) throws NamingException { + if (name.size() == 1) { + bind(name.get(0), obj); + } else { + Context ctx = getContinuationContext(name); + try { + ctx.bind(name.getSuffix(1), obj); + } finally { + ctx.close(); + } + } + } + + public void rebind(String name, Object obj) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + ctx.rebind(res.getRemainingName(), obj); + } finally { + ctx.close(); + } + } + + public void rebind(Name name, Object obj) throws NamingException { + if (name.size() == 1) { + rebind(name.get(0), obj); + } else { + Context ctx = getContinuationContext(name); + try { + ctx.rebind(name.getSuffix(1), obj); + } finally { + ctx.close(); + } + } + } + + public void unbind(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + ctx.unbind(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public void unbind(Name name) throws NamingException { + if (name.size() == 1) { + unbind(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + ctx.unbind(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public void rename(String oldName, String newName) throws NamingException { + String oldPrefix = getURLPrefix(oldName); + String newPrefix = getURLPrefix(newName); + if (!urlEquals(oldPrefix, newPrefix)) { + throw new OperationNotSupportedException( + "Renaming using different URL prefixes not supported : " + + oldName + " " + newName); + } + + ResolveResult res = getRootURLContext(oldName, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + ctx.rename(res.getRemainingName(), getURLSuffix(newPrefix, newName)); + } finally { + ctx.close(); + } + } + + public void rename(Name name, Name newName) throws NamingException { + if (name.size() == 1) { + if (newName.size() != 1) { + throw new OperationNotSupportedException( + "Renaming to a Name with more components not supported: " + newName); + } + rename(name.get(0), newName.get(0)); + } else { + // > 1 component with 1st one being URL + // URLs must be identical; cannot deal with diff URLs + if (!urlEquals(name.get(0), newName.get(0))) { + throw new OperationNotSupportedException( + "Renaming using different URLs as first components not supported: " + + name + " " + newName); + } + + Context ctx = getContinuationContext(name); + try { + ctx.rename(name.getSuffix(1), newName.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public NamingEnumeration list(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.list(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public NamingEnumeration list(Name name) throws NamingException { + if (name.size() == 1) { + return list(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.list(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public NamingEnumeration listBindings(String name) + throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.listBindings(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public NamingEnumeration listBindings(Name name) throws NamingException { + if (name.size() == 1) { + return listBindings(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.listBindings(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public void destroySubcontext(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + ctx.destroySubcontext(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public void destroySubcontext(Name name) throws NamingException { + if (name.size() == 1) { + destroySubcontext(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + ctx.destroySubcontext(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public Context createSubcontext(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.createSubcontext(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public Context createSubcontext(Name name) throws NamingException { + if (name.size() == 1) { + return createSubcontext(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.createSubcontext(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public Object lookupLink(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.lookupLink(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public Object lookupLink(Name name) throws NamingException { + if (name.size() == 1) { + return lookupLink(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.lookupLink(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public NameParser getNameParser(String name) throws NamingException { + ResolveResult res = getRootURLContext(name, myEnv); + Context ctx = (Context)res.getResolvedObj(); + try { + return ctx.getNameParser(res.getRemainingName()); + } finally { + ctx.close(); + } + } + + public NameParser getNameParser(Name name) throws NamingException { + if (name.size() == 1) { + return getNameParser(name.get(0)); + } else { + Context ctx = getContinuationContext(name); + try { + return ctx.getNameParser(name.getSuffix(1)); + } finally { + ctx.close(); + } + } + } + + public String composeName(String name, String prefix) + throws NamingException { + if (prefix.equals("")) { + return name; + } else if (name.equals("")) { + return prefix; + } else { + return (prefix + "/" + name); + } + } + + public Name composeName(Name name, Name prefix) throws NamingException { + Name result = (Name)prefix.clone(); + result.addAll(name); + return result; + } + + public Object removeFromEnvironment(String propName) + throws NamingException { + if (myEnv == null) { + return null; + } + return myEnv.remove(propName); + } + + public Object addToEnvironment(String propName, Object propVal) + throws NamingException { + if (myEnv == null) { + myEnv = new Hashtable(11, 0.75f); + } + return myEnv.put(propName, propVal); + } + + @SuppressWarnings("unchecked") // clone() + public Hashtable getEnvironment() throws NamingException { + if (myEnv == null) { + return new Hashtable<>(5, 0.75f); + } else { + return (Hashtable)myEnv.clone(); + } + } + +/* +// To test, declare getURLPrefix and getURLSuffix static. + + public static void main(String[] args) throws Exception { + String[] tests = {"file://host:port", + "file:///rest/of/name", + "file://host:port/rest/of/name", + "file:/rest/of/name", + "file:rest/of/name"}; + for (int i = 0; i < tests.length; i++) { + String pre = getURLPrefix(tests[i]); + System.out.println(pre); + System.out.println(getURLSuffix(pre, tests[i])); + } + } +*/ +} diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java similarity index 98% rename from jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java rename to corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java index 445fa490662..2f83f4aaa41 100644 --- a/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java +++ b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java @@ -40,7 +40,7 @@ import com.sun.jndi.cosnaming.CorbanameUrl; */ public class iiopURLContext - extends com.sun.jndi.toolkit.url.GenericURLContext { + extends GenericURLContext { iiopURLContext(Hashtable env) { super(env); diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java rename to corba/src/java.corba/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java b/corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java similarity index 100% rename from jdk/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java rename to corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 3a531937f19..7b65fd37ac5 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -551,3 +551,4 @@ d87d5d430c42342f0320ca7f5cbe0cbd1f9d62ba jdk-9+143 a82cb5350cad96a0b4de496afebe3ded89f27efa jdk-9+146 132a72c782071cc11ab25cc7c9ee167c3632fea4 jdk-9+147 5e4e893520ecdbd517c6ed6375f0885664fe62c4 jdk-9+148 +30e1996bd55da36183434f24ed964adebf9ca71e jdk-9+149 diff --git a/hotspot/make/gensrc/GensrcAdlc.gmk b/hotspot/make/gensrc/GensrcAdlc.gmk index abe6fd44f57..3153476960b 100644 --- a/hotspot/make/gensrc/GensrcAdlc.gmk +++ b/hotspot/make/gensrc/GensrcAdlc.gmk @@ -114,6 +114,10 @@ ifeq ($(call check-jvm-feature, compiler2), true) ADLCFLAGS += -U_LP64 endif + ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) + ADLCFLAGS += -DARM=1 + endif + ############################################################################## # Concatenate all ad source files into a single file, which will be fed to # adlc. Also include a #line directive at the start of every included file diff --git a/hotspot/make/lib/CompileJvm.gmk b/hotspot/make/lib/CompileJvm.gmk index 5a6ec7c8211..870dde18d78 100644 --- a/hotspot/make/lib/CompileJvm.gmk +++ b/hotspot/make/lib/CompileJvm.gmk @@ -63,8 +63,8 @@ JVM_CFLAGS_INCLUDES += \ # INCLUDE_SUFFIX_* is only meant for including the proper # platform files. Don't use it to guard code. Use the value of # HOTSPOT_TARGET_CPU_DEFINE etc. instead. -# Remaining TARGET_ARCH_* is needed to distinguish closed and open -# 64-bit ARM ports (also called AARCH64). +# Remaining TARGET_ARCH_* is needed to select the cpu specific +# sources for 64-bit ARM ports (arm versus aarch64). JVM_CFLAGS_TARGET_DEFINES += \ -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \ -DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \ @@ -139,6 +139,20 @@ endif ################################################################################ # Platform specific setup +# ARM source selection + +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-arm) + JVM_EXCLUDE_PATTERNS += arm_64 + +else ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-aarch64) + # For 64-bit arm builds, we use the 64 bit hotspot/src/cpu/arm + # hotspot sources if HOTSPOT_TARGET_CPU_ARCH is set to arm. + # Exclude the aarch64 and 32 bit arm files for this build. + ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) + JVM_EXCLUDE_PATTERNS += arm_32 aarch64 + endif +endif + ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp endif diff --git a/hotspot/make/lib/JvmFeatures.gmk b/hotspot/make/lib/JvmFeatures.gmk index 00b3f397e4d..c5e06af9ce2 100644 --- a/hotspot/make/lib/JvmFeatures.gmk +++ b/hotspot/make/lib/JvmFeatures.gmk @@ -154,3 +154,108 @@ else compiledIC_aot_x86_64.cpp compilerRuntime.cpp \ aotCodeHeap.cpp aotCompiledMethod.cpp aotLoader.cpp compiledIC_aot.cpp endif +################################################################################ + +ifeq ($(call check-jvm-feature, link-time-opt), true) + # NOTE: Disable automatic opimization level and let the explicit cflag control + # optimization level instead. This activates O3 on slowdebug builds, just + # like the old build, but it's probably not right. + JVM_OPTIMIZATION := + JVM_CFLAGS_FEATURES += -O3 -flto + JVM_LDFLAGS_FEATURES += -O3 -flto -fwhole-program -fno-strict-aliasing +endif + +ifeq ($(call check-jvm-feature, minimal), true) + ifeq ($(call check-jvm-feature, link-time-opt), false) + JVM_OPTIMIZATION := SIZE + OPT_SPEED_SRC := \ + allocation.cpp \ + assembler.cpp \ + assembler_linux_arm.cpp \ + barrierSet.cpp \ + basicLock.cpp \ + biasedLocking.cpp \ + bytecode.cpp \ + bytecodeInterpreter.cpp \ + bytecodeInterpreter_x86.cpp \ + c1_Compilation.cpp \ + c1_Compiler.cpp \ + c1_GraphBuilder.cpp \ + c1_LinearScan.cpp \ + c1_LIR.cpp \ + ciEnv.cpp \ + ciObjectFactory.cpp \ + codeBlob.cpp \ + constantPool.cpp \ + constMethod.cpp \ + classLoader.cpp \ + classLoaderData.cpp \ + classFileParser.cpp \ + classFileStream.cpp \ + cpCache.cpp \ + defNewGeneration.cpp \ + frame_arm.cpp \ + genCollectedHeap.cpp \ + generation.cpp \ + genMarkSweep.cpp \ + growableArray.cpp \ + handles.cpp \ + hashtable.cpp \ + heap.cpp \ + icache.cpp \ + icache_arm.cpp \ + instanceKlass.cpp \ + invocationCounter.cpp \ + iterator.cpp \ + javaCalls.cpp \ + javaClasses.cpp \ + jniFastGetField_arm.cpp \ + jvm.cpp \ + jvm_linux.cpp \ + linkResolver.cpp \ + klass.cpp \ + klassVtable.cpp \ + markSweep.cpp \ + memRegion.cpp \ + memoryPool.cpp \ + method.cpp \ + methodHandles.cpp \ + methodHandles_arm.cpp \ + methodLiveness.cpp \ + metablock.cpp \ + metaspace.cpp \ + mutex.cpp \ + mutex_linux.cpp \ + mutexLocker.cpp \ + nativeLookup.cpp \ + objArrayKlass.cpp \ + os_linux.cpp \ + os_linux_arm.cpp \ + placeHolders.cpp \ + quickSort.cpp \ + resourceArea.cpp \ + rewriter.cpp \ + sharedRuntime.cpp \ + signature.cpp \ + space.cpp \ + stackMapTable.cpp \ + symbolTable.cpp \ + systemDictionary.cpp \ + symbol.cpp \ + synchronizer.cpp \ + threadLS_bsd_x86.cpp \ + threadLS_linux_arm.cpp \ + threadLS_linux_x86.cpp \ + timer.cpp \ + typeArrayKlass.cpp \ + unsafe.cpp \ + utf8.cpp \ + vmSymbols.cpp \ + # + + $(foreach s, $(OPT_SPEED_SRC), \ + $(eval BUILD_LIBJVM_$s_OPTIMIZATION := HIGHEST_JVM)) + + BUILD_LIBJVM_systemDictionary.cpp_CXXFLAGS := -fno-optimize-sibling-calls + endif +endif diff --git a/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp b/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp new file mode 100644 index 00000000000..7899c102e5b --- /dev/null +++ b/hotspot/src/cpu/arm/vm/abstractInterpreter_arm.cpp @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/constMethod.hpp" +#include "oops/method.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/synchronizer.hpp" +#include "utilities/macros.hpp" + +int AbstractInterpreter::BasicType_as_index(BasicType type) { + int i = 0; + switch (type) { +#ifdef AARCH64 + case T_BOOLEAN: i = 0; break; + case T_CHAR : i = 1; break; + case T_BYTE : i = 2; break; + case T_SHORT : i = 3; break; + case T_INT : // fall through + case T_LONG : // fall through + case T_VOID : // fall through + case T_FLOAT : // fall through + case T_DOUBLE : i = 4; break; + case T_OBJECT : // fall through + case T_ARRAY : i = 5; break; +#else + case T_VOID : i = 0; break; + case T_BOOLEAN: i = 1; break; + case T_CHAR : i = 2; break; + case T_BYTE : i = 3; break; + case T_SHORT : i = 4; break; + case T_INT : i = 5; break; + case T_OBJECT : // fall through + case T_ARRAY : i = 6; break; + case T_LONG : i = 7; break; + case T_FLOAT : i = 8; break; + case T_DOUBLE : i = 9; break; +#endif // AARCH64 + default : ShouldNotReachHere(); + } + assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers, "index out of bounds"); + return i; +} + +// These should never be compiled since the interpreter will prefer +// the compiled version to the intrinsic version. +bool AbstractInterpreter::can_be_compiled(methodHandle m) { + switch (method_kind(m)) { + case Interpreter::java_lang_math_sin : // fall thru + case Interpreter::java_lang_math_cos : // fall thru + case Interpreter::java_lang_math_tan : // fall thru + case Interpreter::java_lang_math_abs : // fall thru + case Interpreter::java_lang_math_log : // fall thru + case Interpreter::java_lang_math_log10 : // fall thru + case Interpreter::java_lang_math_sqrt : + return false; + default: + return true; + } +} + +// How much stack a method activation needs in words. +int AbstractInterpreter::size_top_interpreter_activation(Method* method) { + const int stub_code = AARCH64_ONLY(24) NOT_AARCH64(12); // see generate_call_stub + // Save space for one monitor to get into the interpreted method in case + // the method is synchronized + int monitor_size = method->is_synchronized() ? + 1*frame::interpreter_frame_monitor_size() : 0; + + // total overhead size: monitor_size + (sender SP, thru expr stack bottom). + // be sure to change this if you add/subtract anything to/from the overhead area + const int overhead_size = monitor_size + + (frame::sender_sp_offset - frame::interpreter_frame_initial_sp_offset); + const int method_stack = (method->max_locals() + method->max_stack()) * + Interpreter::stackElementWords; + return overhead_size + method_stack + stub_code; +} + +// asm based interpreter deoptimization helpers +int AbstractInterpreter::size_activation(int max_stack, + int tempcount, + int extra_args, + int moncount, + int callee_param_count, + int callee_locals, + bool is_top_frame) { + // Note: This calculation must exactly parallel the frame setup + // in TemplateInterpreterGenerator::generate_fixed_frame. + // fixed size of an interpreter frame: + int overhead = frame::sender_sp_offset - frame::interpreter_frame_initial_sp_offset; + + // Our locals were accounted for by the caller (or last_frame_adjust on the transistion) + // Since the callee parameters already account for the callee's params we only need to account for + // the extra locals. + + int size = overhead + + ((callee_locals - callee_param_count)*Interpreter::stackElementWords) + + (moncount*frame::interpreter_frame_monitor_size()) + + tempcount*Interpreter::stackElementWords + extra_args; + +#ifdef AARCH64 + size = round_to(size, StackAlignmentInBytes/BytesPerWord); +#endif // AARCH64 + + return size; +} + +void AbstractInterpreter::layout_activation(Method* method, + int tempcount, + int popframe_extra_args, + int moncount, + int caller_actual_parameters, + int callee_param_count, + int callee_locals, + frame* caller, + frame* interpreter_frame, + bool is_top_frame, + bool is_bottom_frame) { + + // Set up the method, locals, and monitors. + // The frame interpreter_frame is guaranteed to be the right size, + // as determined by a previous call to the size_activation() method. + // It is also guaranteed to be walkable even though it is in a skeletal state + // NOTE: return size is in words not bytes + + // fixed size of an interpreter frame: + int max_locals = method->max_locals() * Interpreter::stackElementWords; + int extra_locals = (method->max_locals() - method->size_of_parameters()) * Interpreter::stackElementWords; + +#ifdef ASSERT + assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable"); +#endif + + interpreter_frame->interpreter_frame_set_method(method); + // NOTE the difference in using sender_sp and interpreter_frame_sender_sp + // interpreter_frame_sender_sp is the original sp of the caller (the unextended_sp) + // and sender_sp is (fp + sender_sp_offset*wordSize) + +#ifdef AARCH64 + intptr_t* locals; + if (caller->is_interpreted_frame()) { + // attach locals to the expression stack of caller interpreter frame + locals = caller->interpreter_frame_tos_address() + caller_actual_parameters*Interpreter::stackElementWords - 1; + } else { + assert (is_bottom_frame, "should be"); + locals = interpreter_frame->fp() + frame::sender_sp_offset + method->max_locals() - 1; + } + + if (TraceDeoptimization) { + tty->print_cr("layout_activation:"); + + if (caller->is_entry_frame()) { + tty->print("entry "); + } + if (caller->is_compiled_frame()) { + tty->print("compiled "); + } + if (caller->is_interpreted_frame()) { + tty->print("interpreted "); + } + tty->print_cr("caller: sp=%p, unextended_sp=%p, fp=%p, pc=%p", caller->sp(), caller->unextended_sp(), caller->fp(), caller->pc()); + tty->print_cr("interpreter_frame: sp=%p, unextended_sp=%p, fp=%p, pc=%p", interpreter_frame->sp(), interpreter_frame->unextended_sp(), interpreter_frame->fp(), interpreter_frame->pc()); + tty->print_cr("method: max_locals = %d, size_of_parameters = %d", method->max_locals(), method->size_of_parameters()); + tty->print_cr("caller_actual_parameters = %d", caller_actual_parameters); + tty->print_cr("locals = %p", locals); + } + +#ifdef ASSERT + if (caller_actual_parameters != method->size_of_parameters()) { + assert(caller->is_interpreted_frame(), "adjusted caller_actual_parameters, but caller is not interpreter frame"); + Bytecode_invoke inv(caller->interpreter_frame_method(), caller->interpreter_frame_bci()); + + if (is_bottom_frame) { + assert(caller_actual_parameters == 0, "invalid adjusted caller_actual_parameters value for bottom frame"); + assert(inv.is_invokedynamic() || inv.is_invokehandle(), "adjusted caller_actual_parameters for bottom frame, but not invokedynamic/invokehandle"); + } else { + assert(caller_actual_parameters == method->size_of_parameters()+1, "invalid adjusted caller_actual_parameters value"); + assert(!inv.is_invokedynamic() && MethodHandles::has_member_arg(inv.klass(), inv.name()), "adjusted caller_actual_parameters, but no member arg"); + } + } + if (caller->is_interpreted_frame()) { + intptr_t* locals_base = (locals - method->max_locals()*Interpreter::stackElementWords + 1); + locals_base = (intptr_t*)round_down((intptr_t)locals_base, StackAlignmentInBytes); + assert(interpreter_frame->sender_sp() <= locals_base, "interpreter-to-interpreter frame chaining"); + + } else if (caller->is_compiled_frame()) { + assert(locals + 1 <= caller->unextended_sp(), "compiled-to-interpreter frame chaining"); + + } else { + assert(caller->is_entry_frame(), "should be"); + assert(locals + 1 <= caller->fp(), "entry-to-interpreter frame chaining"); + } +#endif // ASSERT + +#else + intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1; +#endif // AARCH64 + + interpreter_frame->interpreter_frame_set_locals(locals); + BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin(); + BasicObjectLock* monbot = montop - moncount; + interpreter_frame->interpreter_frame_set_monitor_end(monbot); + + // Set last_sp + intptr_t* stack_top = (intptr_t*) monbot - + tempcount*Interpreter::stackElementWords - + popframe_extra_args; +#ifdef AARCH64 + interpreter_frame->interpreter_frame_set_stack_top(stack_top); + + intptr_t* extended_sp = (intptr_t*) monbot - + (method->max_stack() + 1) * Interpreter::stackElementWords - // +1 is reserved slot for exception handler + popframe_extra_args; + extended_sp = (intptr_t*)round_down((intptr_t)extended_sp, StackAlignmentInBytes); + interpreter_frame->interpreter_frame_set_extended_sp(extended_sp); +#else + interpreter_frame->interpreter_frame_set_last_sp(stack_top); +#endif // AARCH64 + + // All frames but the initial (oldest) interpreter frame we fill in have a + // value for sender_sp that allows walking the stack but isn't + // truly correct. Correct the value here. + +#ifdef AARCH64 + if (caller->is_interpreted_frame()) { + intptr_t* sender_sp = (intptr_t*)round_down((intptr_t)caller->interpreter_frame_tos_address(), StackAlignmentInBytes); + interpreter_frame->set_interpreter_frame_sender_sp(sender_sp); + + } else { + // in case of non-interpreter caller sender_sp of the oldest frame is already + // set to valid value + } +#else + if (extra_locals != 0 && + interpreter_frame->sender_sp() == interpreter_frame->interpreter_frame_sender_sp() ) { + interpreter_frame->set_interpreter_frame_sender_sp(caller->sp() + extra_locals); + } +#endif // AARCH64 + + *interpreter_frame->interpreter_frame_cache_addr() = + method->constants()->cache(); + *interpreter_frame->interpreter_frame_mirror_addr() = + method->method_holder()->java_mirror(); +} diff --git a/hotspot/src/cpu/arm/vm/arm.ad b/hotspot/src/cpu/arm/vm/arm.ad new file mode 100644 index 00000000000..ef84124ef43 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/arm.ad @@ -0,0 +1,14428 @@ +// +// Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. +// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +// +// This code is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License version 2 only, as +// published by the Free Software Foundation. +// +// This code is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// version 2 for more details (a copy is included in the LICENSE file that +// accompanied this code). +// +// You should have received a copy of the GNU General Public License version +// 2 along with this work; if not, write to the Free Software Foundation, +// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. +// + +// ARM Architecture Description File + +//----------DEFINITION BLOCK--------------------------------------------------- +// Define name --> value mappings to inform the ADLC of an integer valued name +// Current support includes integer values in the range [0, 0x7FFFFFFF] +// Format: +// int_def ( , ); +// Generated Code in ad_.hpp +// #define () +// // value == +// Generated code in ad_.cpp adlc_verification() +// assert( == , "Expect () to equal "); +// +definitions %{ +// The default cost (of an ALU instruction). + int_def DEFAULT_COST ( 100, 100); + int_def HUGE_COST (1000000, 1000000); + +// Memory refs are twice as expensive as run-of-the-mill. + int_def MEMORY_REF_COST ( 200, DEFAULT_COST * 2); + +// Branches are even more expensive. + int_def BRANCH_COST ( 300, DEFAULT_COST * 3); + int_def CALL_COST ( 300, DEFAULT_COST * 3); +%} + + +//----------SOURCE BLOCK------------------------------------------------------- +// This is a block of C++ code which provides values, functions, and +// definitions necessary in the rest of the architecture description +source_hpp %{ +// Header information of the source block. +// Method declarations/definitions which are used outside +// the ad-scope can conveniently be defined here. +// +// To keep related declarations/definitions/uses close together, +// we switch between source %{ }% and source_hpp %{ }% freely as needed. + +// Does destination need to be loaded in a register then passed to a +// branch instruction? +extern bool maybe_far_call(const CallNode *n); +extern bool maybe_far_call(const MachCallNode *n); +static inline bool cache_reachable() { + return MacroAssembler::_cache_fully_reachable(); +} + +#ifdef AARCH64 +#define ldr_32 ldr_w +#define str_32 str_w +#else +#define ldr_32 ldr +#define str_32 str +#define tst_32 tst +#define teq_32 teq +#endif +#if 1 +extern bool PrintOptoAssembly; +#endif + +class c2 { +public: + static OptoRegPair return_value(int ideal_reg); +}; + +class CallStubImpl { + + //-------------------------------------------------------------- + //---< Used for optimization in Compile::Shorten_branches >--- + //-------------------------------------------------------------- + + public: + // Size of call trampoline stub. + static uint size_call_trampoline() { + return 0; // no call trampolines on this platform + } + + // number of relocations needed by a call trampoline stub + static uint reloc_call_trampoline() { + return 0; // no call trampolines on this platform + } +}; + +class HandlerImpl { + + public: + + static int emit_exception_handler(CodeBuffer &cbuf); + static int emit_deopt_handler(CodeBuffer& cbuf); + + static uint size_exception_handler() { +#ifdef AARCH64 + // ldr_literal; br; (pad); + return 3 * Assembler::InstructionSize + wordSize; +#else + return ( 3 * 4 ); +#endif + } + + + static uint size_deopt_handler() { + return ( 9 * 4 ); + } + +}; + +%} + +source %{ +#define __ _masm. + +static FloatRegister reg_to_FloatRegister_object(int register_encoding); +static Register reg_to_register_object(int register_encoding); + + +// **************************************************************************** + +// REQUIRED FUNCTIONALITY + +// Indicate if the safepoint node needs the polling page as an input. +// Since ARM does not have absolute addressing, it does. +bool SafePointNode::needs_polling_address_input() { + return true; +} + +// emit an interrupt that is caught by the debugger (for debugging compiler) +void emit_break(CodeBuffer &cbuf) { + MacroAssembler _masm(&cbuf); + __ breakpoint(); +} + +#ifndef PRODUCT +void MachBreakpointNode::format( PhaseRegAlloc *, outputStream *st ) const { + st->print("TA"); +} +#endif + +void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + emit_break(cbuf); +} + +uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const { + return MachNode::size(ra_); +} + + +void emit_nop(CodeBuffer &cbuf) { + MacroAssembler _masm(&cbuf); + __ nop(); +} + + +void emit_call_reloc(CodeBuffer &cbuf, const MachCallNode *n, MachOper *m, RelocationHolder const& rspec) { + int ret_addr_offset0 = n->as_MachCall()->ret_addr_offset(); + int call_site_offset = cbuf.insts()->mark_off(); + MacroAssembler _masm(&cbuf); + __ set_inst_mark(); // needed in emit_to_interp_stub() to locate the call + address target = (address)m->method(); + assert(n->as_MachCall()->entry_point() == target, "sanity"); + assert(maybe_far_call(n) == !__ reachable_from_cache(target), "sanity"); + assert(cache_reachable() == __ cache_fully_reachable(), "sanity"); + + assert(target != NULL, "need real address"); + + int ret_addr_offset = -1; + if (rspec.type() == relocInfo::runtime_call_type) { + __ call(target, rspec); + ret_addr_offset = __ offset(); + } else { + // scratches Rtemp + ret_addr_offset = __ patchable_call(target, rspec, true); + } + assert(ret_addr_offset - call_site_offset == ret_addr_offset0, "fix ret_addr_offset()"); +} + +//============================================================================= +// REQUIRED FUNCTIONALITY for encoding +void emit_lo(CodeBuffer &cbuf, int val) { } +void emit_hi(CodeBuffer &cbuf, int val) { } + + +//============================================================================= +const RegMask& MachConstantBaseNode::_out_RegMask = PTR_REG_mask(); + +int Compile::ConstantTable::calculate_table_base_offset() const { +#ifdef AARCH64 + return 0; +#else + int offset = -(size() / 2); + // flds, fldd: 8-bit offset multiplied by 4: +/- 1024 + // ldr, ldrb : 12-bit offset: +/- 4096 + if (!Assembler::is_simm10(offset)) { + offset = Assembler::min_simm10(); + } + return offset; +#endif +} + +bool MachConstantBaseNode::requires_postalloc_expand() const { return false; } +void MachConstantBaseNode::postalloc_expand(GrowableArray *nodes, PhaseRegAlloc *ra_) { + ShouldNotReachHere(); +} + +void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const { + Compile* C = ra_->C; + Compile::ConstantTable& constant_table = C->constant_table(); + MacroAssembler _masm(&cbuf); + + Register r = as_Register(ra_->get_encode(this)); + CodeSection* consts_section = __ code()->consts(); + int consts_size = consts_section->align_at_start(consts_section->size()); + assert(constant_table.size() == consts_size, "must be: %d == %d", constant_table.size(), consts_size); + + // Materialize the constant table base. + address baseaddr = consts_section->start() + -(constant_table.table_base_offset()); + RelocationHolder rspec = internal_word_Relocation::spec(baseaddr); + __ mov_address(r, baseaddr, rspec); +} + +uint MachConstantBaseNode::size(PhaseRegAlloc*) const { +#ifdef AARCH64 + return 5 * Assembler::InstructionSize; +#else + return 8; +#endif +} + +#ifndef PRODUCT +void MachConstantBaseNode::format(PhaseRegAlloc* ra_, outputStream* st) const { + char reg[128]; + ra_->dump_register(this, reg); + st->print("MOV_SLOW &constanttable,%s\t! constant table base", reg); +} +#endif + +#ifndef PRODUCT +void MachPrologNode::format( PhaseRegAlloc *ra_, outputStream *st ) const { + Compile* C = ra_->C; + + for (int i = 0; i < OptoPrologueNops; i++) { + st->print_cr("NOP"); st->print("\t"); + } +#ifdef AARCH64 + if (OptoPrologueNops <= 0) { + st->print_cr("NOP\t! required for safe patching"); + st->print("\t"); + } +#endif + + size_t framesize = C->frame_size_in_bytes(); + assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned"); + int bangsize = C->bang_size_in_bytes(); + // Remove two words for return addr and rbp, + framesize -= 2*wordSize; + bangsize -= 2*wordSize; + + // Calls to C2R adapters often do not accept exceptional returns. + // We require that their callers must bang for them. But be careful, because + // some VM calls (such as call site linkage) can use several kilobytes of + // stack. But the stack safety zone should account for that. + // See bugs 4446381, 4468289, 4497237. + if (C->need_stack_bang(bangsize)) { + st->print_cr("! stack bang (%d bytes)", bangsize); st->print("\t"); + } + st->print_cr("PUSH R_FP|R_LR_LR"); st->print("\t"); + if (framesize != 0) { + st->print ("SUB R_SP, R_SP, " SIZE_FORMAT,framesize); + } +} +#endif + +void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + Compile* C = ra_->C; + MacroAssembler _masm(&cbuf); + + for (int i = 0; i < OptoPrologueNops; i++) { + __ nop(); + } +#ifdef AARCH64 + if (OptoPrologueNops <= 0) { + __ nop(); // required for safe patching by patch_verified_entry() + } +#endif + + size_t framesize = C->frame_size_in_bytes(); + assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned"); + int bangsize = C->bang_size_in_bytes(); + // Remove two words for return addr and fp, + framesize -= 2*wordSize; + bangsize -= 2*wordSize; + + // Calls to C2R adapters often do not accept exceptional returns. + // We require that their callers must bang for them. But be careful, because + // some VM calls (such as call site linkage) can use several kilobytes of + // stack. But the stack safety zone should account for that. + // See bugs 4446381, 4468289, 4497237. + if (C->need_stack_bang(bangsize)) { + __ arm_stack_overflow_check(bangsize, Rtemp); + } + + __ raw_push(FP, LR); + if (framesize != 0) { + __ sub_slow(SP, SP, framesize); + } + + // offset from scratch buffer is not valid + if (strcmp(cbuf.name(), "Compile::Fill_buffer") == 0) { + C->set_frame_complete( __ offset() ); + } + + if (C->has_mach_constant_base_node()) { + // NOTE: We set the table base offset here because users might be + // emitted before MachConstantBaseNode. + Compile::ConstantTable& constant_table = C->constant_table(); + constant_table.set_table_base_offset(constant_table.calculate_table_base_offset()); + } +} + +uint MachPrologNode::size(PhaseRegAlloc *ra_) const { + return MachNode::size(ra_); +} + +int MachPrologNode::reloc() const { + return 10; // a large enough number +} + +//============================================================================= +#ifndef PRODUCT +void MachEpilogNode::format( PhaseRegAlloc *ra_, outputStream *st ) const { + Compile* C = ra_->C; + + size_t framesize = C->frame_size_in_bytes(); + framesize -= 2*wordSize; + + if (framesize != 0) { + st->print("ADD R_SP, R_SP, " SIZE_FORMAT "\n\t",framesize); + } + st->print("POP R_FP|R_LR_LR"); + + if (do_polling() && ra_->C->is_method_compilation()) { + st->print("\n\t"); +#ifdef AARCH64 + if (MacroAssembler::page_reachable_from_cache(os::get_polling_page())) { + st->print("ADRP Rtemp, #PollAddr\t! Load Polling address\n\t"); + st->print("LDR ZR,[Rtemp + #PollAddr & 0xfff]\t!Poll for Safepointing"); + } else { + st->print("mov_slow Rtemp, #PollAddr\t! Load Polling address\n\t"); + st->print("LDR ZR,[Rtemp]\t!Poll for Safepointing"); + } +#else + st->print("MOV Rtemp, #PollAddr\t! Load Polling address\n\t"); + st->print("LDR Rtemp,[Rtemp]\t!Poll for Safepointing"); +#endif + } +} +#endif + +void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + MacroAssembler _masm(&cbuf); + Compile* C = ra_->C; + + size_t framesize = C->frame_size_in_bytes(); + framesize -= 2*wordSize; + if (framesize != 0) { + __ add_slow(SP, SP, framesize); + } + __ raw_pop(FP, LR); + + // If this does safepoint polling, then do it here + if (do_polling() && ra_->C->is_method_compilation()) { +#ifdef AARCH64 + if (false && MacroAssembler::page_reachable_from_cache(os::get_polling_page())) { +/* FIXME: TODO + __ relocate(relocInfo::xxx); + __ adrp(Rtemp, (intptr_t)os::get_polling_page()); + __ relocate(relocInfo::poll_return_type); + int offset = os::get_polling_page() & 0xfff; + __ ldr(ZR, Address(Rtemp + offset)); +*/ + } else { + __ mov_address(Rtemp, (address)os::get_polling_page(), symbolic_Relocation::polling_page_reference); + __ relocate(relocInfo::poll_return_type); + __ ldr(ZR, Address(Rtemp)); + } +#else + // mov_slow here is usually one or two instruction + __ mov_address(Rtemp, (address)os::get_polling_page(), symbolic_Relocation::polling_page_reference); + __ relocate(relocInfo::poll_return_type); + __ ldr(Rtemp, Address(Rtemp)); +#endif + } +} + +uint MachEpilogNode::size(PhaseRegAlloc *ra_) const { +#ifdef AARCH64 + // allow for added alignment nop from mov_address bind_literal + return MachNode::size(ra_) + 1 * Assembler::InstructionSize; +#else + return MachNode::size(ra_); +#endif +} + +int MachEpilogNode::reloc() const { + return 16; // a large enough number +} + +const Pipeline * MachEpilogNode::pipeline() const { + return MachNode::pipeline_class(); +} + +int MachEpilogNode::safepoint_offset() const { + assert( do_polling(), "no return for this epilog node"); + // return MacroAssembler::size_of_sethi(os::get_polling_page()); + Unimplemented(); + return 0; +} + +//============================================================================= + +// Figure out which register class each belongs in: rc_int, rc_float, rc_stack +enum RC { rc_bad, rc_int, rc_float, rc_stack }; +static enum RC rc_class( OptoReg::Name reg ) { + if (!OptoReg::is_valid(reg)) return rc_bad; + if (OptoReg::is_stack(reg)) return rc_stack; + VMReg r = OptoReg::as_VMReg(reg); + if (r->is_Register()) return rc_int; + assert(r->is_FloatRegister(), "must be"); + return rc_float; +} + +static inline bool is_iRegLd_memhd(OptoReg::Name src_first, OptoReg::Name src_second, int offset) { +#ifdef AARCH64 + return is_memoryHD(offset); +#else + int rlo = Matcher::_regEncode[src_first]; + int rhi = Matcher::_regEncode[src_second]; + if (!((rlo&1)==0 && (rlo+1 == rhi))) { + tty->print_cr("CAUGHT BAD LDRD/STRD"); + } + return (rlo&1)==0 && (rlo+1 == rhi) && is_memoryHD(offset); +#endif +} + +uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, + PhaseRegAlloc *ra_, + bool do_size, + outputStream* st ) const { + // Get registers to move + OptoReg::Name src_second = ra_->get_reg_second(in(1)); + OptoReg::Name src_first = ra_->get_reg_first(in(1)); + OptoReg::Name dst_second = ra_->get_reg_second(this ); + OptoReg::Name dst_first = ra_->get_reg_first(this ); + + enum RC src_second_rc = rc_class(src_second); + enum RC src_first_rc = rc_class(src_first); + enum RC dst_second_rc = rc_class(dst_second); + enum RC dst_first_rc = rc_class(dst_first); + + assert( OptoReg::is_valid(src_first) && OptoReg::is_valid(dst_first), "must move at least 1 register" ); + + // Generate spill code! + int size = 0; + + if (src_first == dst_first && src_second == dst_second) + return size; // Self copy, no move + +#ifdef TODO + if (bottom_type()->isa_vect() != NULL) { + } +#endif + + // Shared code does not expect instruction set capability based bailouts here. + // Handle offset unreachable bailout with minimal change in shared code. + // Bailout only for real instruction emit. + // This requires a single comment change in shared code. ( see output.cpp "Normal" instruction case ) + + MacroAssembler _masm(cbuf); + + // -------------------------------------- + // Check for mem-mem move. Load into unused float registers and fall into + // the float-store case. + if (src_first_rc == rc_stack && dst_first_rc == rc_stack) { + int offset = ra_->reg2offset(src_first); + if (cbuf && !is_memoryfp(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + if (src_second_rc != rc_bad) { + assert((src_first&1)==0 && src_first+1 == src_second, "pair of registers must be aligned/contiguous"); + src_first = OptoReg::Name(R_mem_copy_lo_num); + src_second = OptoReg::Name(R_mem_copy_hi_num); + src_first_rc = rc_float; + src_second_rc = rc_float; + if (cbuf) { + __ ldr_double(Rmemcopy, Address(SP, offset)); + } else if (!do_size) { + st->print(LDR_DOUBLE " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset); + } + } else { + src_first = OptoReg::Name(R_mem_copy_lo_num); + src_first_rc = rc_float; + if (cbuf) { + __ ldr_float(Rmemcopy, Address(SP, offset)); + } else if (!do_size) { + st->print(LDR_FLOAT " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset); + } + } + size += 4; + } + } + + if (src_second_rc == rc_stack && dst_second_rc == rc_stack) { + Unimplemented(); + } + + // -------------------------------------- + // Check for integer reg-reg copy + if (src_first_rc == rc_int && dst_first_rc == rc_int) { + // Else normal reg-reg copy + assert( src_second != dst_first, "smashed second before evacuating it" ); + if (cbuf) { + __ mov(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first])); +#ifndef PRODUCT + } else if (!do_size) { + st->print("MOV R_%s, R_%s\t# spill", + Matcher::regName[dst_first], + Matcher::regName[src_first]); +#endif + } +#ifdef AARCH64 + if (src_first+1 == src_second && dst_first+1 == dst_second) { + return size + 4; + } +#endif + size += 4; + } + + // Check for integer store + if (src_first_rc == rc_int && dst_first_rc == rc_stack) { + int offset = ra_->reg2offset(dst_first); + if (cbuf && !is_memoryI(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + if (src_second_rc != rc_bad && is_iRegLd_memhd(src_first, src_second, offset)) { + assert((src_first&1)==0 && src_first+1 == src_second, "pair of registers must be aligned/contiguous"); + if (cbuf) { + __ str_64(reg_to_register_object(Matcher::_regEncode[src_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(STR_64 " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first), offset); +#endif + } + return size + 4; + } else { + if (cbuf) { + __ str_32(reg_to_register_object(Matcher::_regEncode[src_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(STR_32 " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first), offset); +#endif + } + } + } + size += 4; + } + + // Check for integer load + if (dst_first_rc == rc_int && src_first_rc == rc_stack) { + int offset = ra_->reg2offset(src_first); + if (cbuf && !is_memoryI(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + if (src_second_rc != rc_bad && is_iRegLd_memhd(dst_first, dst_second, offset)) { + assert((src_first&1)==0 && src_first+1 == src_second, "pair of registers must be aligned/contiguous"); + if (cbuf) { + __ ldr_64(reg_to_register_object(Matcher::_regEncode[dst_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(LDR_64 " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(dst_first), offset); +#endif + } + return size + 4; + } else { + if (cbuf) { + __ ldr_32(reg_to_register_object(Matcher::_regEncode[dst_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(LDR_32 " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(dst_first), offset); +#endif + } + } + } + size += 4; + } + + // Check for float reg-reg copy + if (src_first_rc == rc_float && dst_first_rc == rc_float) { + if (src_second_rc != rc_bad) { + assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous"); + if (cbuf) { + __ mov_double(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first])); +#ifndef PRODUCT + } else if (!do_size) { + st->print(MOV_DOUBLE " R_%s, R_%s\t# spill", + Matcher::regName[dst_first], + Matcher::regName[src_first]); +#endif + } + return 4; + } + if (cbuf) { + __ mov_float(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first])); +#ifndef PRODUCT + } else if (!do_size) { + st->print(MOV_FLOAT " R_%s, R_%s\t# spill", + Matcher::regName[dst_first], + Matcher::regName[src_first]); +#endif + } + size = 4; + } + + // Check for float store + if (src_first_rc == rc_float && dst_first_rc == rc_stack) { + int offset = ra_->reg2offset(dst_first); + if (cbuf && !is_memoryfp(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + // Further check for aligned-adjacent pair, so we can use a double store + if (src_second_rc != rc_bad) { + assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers and stack slots must be aligned/contiguous"); + if (cbuf) { + __ str_double(reg_to_FloatRegister_object(Matcher::_regEncode[src_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(STR_DOUBLE " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset); +#endif + } + return size + 4; + } else { + if (cbuf) { + __ str_float(reg_to_FloatRegister_object(Matcher::_regEncode[src_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(STR_FLOAT " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset); +#endif + } + } + } + size += 4; + } + + // Check for float load + if (dst_first_rc == rc_float && src_first_rc == rc_stack) { + int offset = ra_->reg2offset(src_first); + if (cbuf && !is_memoryfp(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + // Further check for aligned-adjacent pair, so we can use a double store + if (src_second_rc != rc_bad) { + assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers and stack slots must be aligned/contiguous"); + if (cbuf) { + __ ldr_double(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(LDR_DOUBLE " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(dst_first),offset); +#endif + } + return size + 4; + } else { + if (cbuf) { + __ ldr_float(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(LDR_FLOAT " R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(dst_first),offset); +#endif + } + } + } + size += 4; + } + + // check for int reg -> float reg move + if (src_first_rc == rc_int && dst_first_rc == rc_float) { + // Further check for aligned-adjacent pair, so we can use a single instruction + if (src_second_rc != rc_bad) { + assert((dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous"); + assert((src_first&1)==0 && src_first+1 == src_second, "pairs of registers must be aligned/contiguous"); + assert(src_second_rc == rc_int && dst_second_rc == rc_float, "unsupported"); + if (cbuf) { +#ifdef AARCH64 + __ fmov_dx(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first])); +#else + __ fmdrr(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first]), reg_to_register_object(Matcher::_regEncode[src_second])); +#endif +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); +#ifdef AARCH64 + st->print("FMOV_DX R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(src_first)); +#else + st->print("FMDRR R_%s, R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(src_first), OptoReg::regname(src_second)); +#endif +#endif + } + return size + 4; + } else { + if (cbuf) { + __ fmsr(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first])); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(FMSR " R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(src_first)); +#endif + } + size += 4; + } + } + + // check for float reg -> int reg move + if (src_first_rc == rc_float && dst_first_rc == rc_int) { + // Further check for aligned-adjacent pair, so we can use a single instruction + if (src_second_rc != rc_bad) { + assert((src_first&1)==0 && src_first+1 == src_second, "pairs of registers must be aligned/contiguous"); + assert((dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous"); + assert(src_second_rc == rc_float && dst_second_rc == rc_int, "unsupported"); + if (cbuf) { +#ifdef AARCH64 + __ fmov_xd(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first])); +#else + __ fmrrd(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[dst_second]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first])); +#endif +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); +#ifdef AARCH64 + st->print("FMOV_XD R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(src_first)); +#else + st->print("FMRRD R_%s, R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(dst_second), OptoReg::regname(src_first)); +#endif +#endif + } + return size + 4; + } else { + if (cbuf) { + __ fmrs(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first])); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print(FMRS " R_%s, R_%s\t! spill",OptoReg::regname(dst_first), OptoReg::regname(src_first)); +#endif + } + size += 4; + } + } + + // -------------------------------------------------------------------- + // Check for hi bits still needing moving. Only happens for misaligned + // arguments to native calls. + if (src_second == dst_second) + return size; // Self copy; no move + assert( src_second_rc != rc_bad && dst_second_rc != rc_bad, "src_second & dst_second cannot be Bad" ); + +#ifndef AARCH64 + // Check for integer reg-reg copy. Hi bits are stuck up in the top + // 32-bits of a 64-bit register, but are needed in low bits of another + // register (else it's a hi-bits-to-hi-bits copy which should have + // happened already as part of a 64-bit move) + if (src_second_rc == rc_int && dst_second_rc == rc_int) { + if (cbuf) { + __ mov(reg_to_register_object(Matcher::_regEncode[dst_second]), reg_to_register_object(Matcher::_regEncode[src_second])); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print("MOV R_%s, R_%s\t# spill high", + Matcher::regName[dst_second], + Matcher::regName[src_second]); +#endif + } + return size+4; + } + + // Check for high word integer store + if (src_second_rc == rc_int && dst_second_rc == rc_stack) { + int offset = ra_->reg2offset(dst_second); + + if (cbuf && !is_memoryP(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + if (cbuf) { + __ str(reg_to_register_object(Matcher::_regEncode[src_second]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print("STR R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_second), offset); +#endif + } + } + return size + 4; + } + + // Check for high word integer load + if (dst_second_rc == rc_int && src_second_rc == rc_stack) { + int offset = ra_->reg2offset(src_second); + if (cbuf && !is_memoryP(offset)) { + ra_->C->record_method_not_compilable("unable to handle large constant offsets"); + return 0; + } else { + if (cbuf) { + __ ldr(reg_to_register_object(Matcher::_regEncode[dst_second]), Address(SP, offset)); +#ifndef PRODUCT + } else if (!do_size) { + if (size != 0) st->print("\n\t"); + st->print("LDR R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(dst_second), offset); +#endif + } + } + return size + 4; + } +#endif + + Unimplemented(); + return 0; // Mute compiler +} + +#ifndef PRODUCT +void MachSpillCopyNode::format( PhaseRegAlloc *ra_, outputStream *st ) const { + implementation( NULL, ra_, false, st ); +} +#endif + +void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + implementation( &cbuf, ra_, false, NULL ); +} + +uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const { + return implementation( NULL, ra_, true, NULL ); +} + +//============================================================================= +#ifndef PRODUCT +void MachNopNode::format( PhaseRegAlloc *, outputStream *st ) const { + st->print("NOP \t# %d bytes pad for loops and calls", 4 * _count); +} +#endif + +void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc * ) const { + MacroAssembler _masm(&cbuf); + for(int i = 0; i < _count; i += 1) { + __ nop(); + } +} + +uint MachNopNode::size(PhaseRegAlloc *ra_) const { + return 4 * _count; +} + + +//============================================================================= +#ifndef PRODUCT +void BoxLockNode::format( PhaseRegAlloc *ra_, outputStream *st ) const { + int offset = ra_->reg2offset(in_RegMask(0).find_first_elem()); + int reg = ra_->get_reg_first(this); + st->print("ADD %s,R_SP+#%d",Matcher::regName[reg], offset); +} +#endif + +void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + MacroAssembler _masm(&cbuf); + int offset = ra_->reg2offset(in_RegMask(0).find_first_elem()); + int reg = ra_->get_encode(this); + Register dst = reg_to_register_object(reg); + + if (is_aimm(offset)) { + __ add(dst, SP, offset); + } else { + __ mov_slow(dst, offset); +#ifdef AARCH64 + __ add(dst, SP, dst, ex_lsl); +#else + __ add(dst, SP, dst); +#endif + } +} + +uint BoxLockNode::size(PhaseRegAlloc *ra_) const { + // BoxLockNode is not a MachNode, so we can't just call MachNode::size(ra_) + assert(ra_ == ra_->C->regalloc(), "sanity"); + return ra_->C->scratch_emit_size(this); +} + +//============================================================================= +#ifndef PRODUCT +#ifdef AARCH64 +#define R_RTEMP "R_R16" +#else +#define R_RTEMP "R_R12" +#endif +void MachUEPNode::format( PhaseRegAlloc *ra_, outputStream *st ) const { + st->print_cr("\nUEP:"); + if (UseCompressedClassPointers) { + st->print_cr("\tLDR_w " R_RTEMP ",[R_R0 + oopDesc::klass_offset_in_bytes]\t! Inline cache check"); + st->print_cr("\tdecode_klass " R_RTEMP); + } else { + st->print_cr("\tLDR " R_RTEMP ",[R_R0 + oopDesc::klass_offset_in_bytes]\t! Inline cache check"); + } + st->print_cr("\tCMP " R_RTEMP ",R_R8" ); + st->print ("\tB.NE SharedRuntime::handle_ic_miss_stub"); +} +#endif + +void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { + MacroAssembler _masm(&cbuf); + Register iCache = reg_to_register_object(Matcher::inline_cache_reg_encode()); + assert(iCache == Ricklass, "should be"); + Register receiver = R0; + + __ load_klass(Rtemp, receiver); + __ cmp(Rtemp, iCache); +#ifdef AARCH64 + Label match; + __ b(match, eq); + __ jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type, Rtemp); + __ bind(match); +#else + __ jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type, noreg, ne); +#endif +} + +uint MachUEPNode::size(PhaseRegAlloc *ra_) const { + return MachNode::size(ra_); +} + + +//============================================================================= + +// Emit exception handler code. +int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) { + MacroAssembler _masm(&cbuf); + + address base = __ start_a_stub(size_exception_handler()); + if (base == NULL) { + ciEnv::current()->record_failure("CodeCache is full"); + return 0; // CodeBuffer::expand failed + } + + int offset = __ offset(); + + // OK to trash LR, because exception blob will kill it + __ jump(OptoRuntime::exception_blob()->entry_point(), relocInfo::runtime_call_type, LR_tmp); + + assert(__ offset() - offset <= (int) size_exception_handler(), "overflow"); + + __ end_a_stub(); + + return offset; +} + +int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) { + // Can't use any of the current frame's registers as we may have deopted + // at a poll and everything can be live. + MacroAssembler _masm(&cbuf); + + address base = __ start_a_stub(size_deopt_handler()); + if (base == NULL) { + ciEnv::current()->record_failure("CodeCache is full"); + return 0; // CodeBuffer::expand failed + } + + int offset = __ offset(); + address deopt_pc = __ pc(); + +#ifdef AARCH64 + // See LR saved by caller in sharedRuntime_arm.cpp + // see also hse1 ws + // see also LIR_Assembler::emit_deopt_handler + + __ raw_push(LR, LR); // preserve LR in both slots + __ mov_relative_address(LR, deopt_pc); + __ str(LR, Address(SP, 1 * wordSize)); // save deopt PC + // OK to kill LR, because deopt blob will restore it from SP[0] + __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, LR_tmp); +#else + __ sub(SP, SP, wordSize); // make room for saved PC + __ push(LR); // save LR that may be live when we get here + __ mov_relative_address(LR, deopt_pc); + __ str(LR, Address(SP, wordSize)); // save deopt PC + __ pop(LR); // restore LR + __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg); +#endif + + assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow"); + + __ end_a_stub(); + return offset; +} + +const bool Matcher::match_rule_supported(int opcode) { + if (!has_match_rule(opcode)) + return false; + + switch (opcode) { + case Op_PopCountI: + case Op_PopCountL: + if (!UsePopCountInstruction) + return false; + break; + case Op_LShiftCntV: + case Op_RShiftCntV: + case Op_AddVB: + case Op_AddVS: + case Op_AddVI: + case Op_AddVL: + case Op_SubVB: + case Op_SubVS: + case Op_SubVI: + case Op_SubVL: + case Op_MulVS: + case Op_MulVI: + case Op_LShiftVB: + case Op_LShiftVS: + case Op_LShiftVI: + case Op_LShiftVL: + case Op_RShiftVB: + case Op_RShiftVS: + case Op_RShiftVI: + case Op_RShiftVL: + case Op_URShiftVB: + case Op_URShiftVS: + case Op_URShiftVI: + case Op_URShiftVL: + case Op_AndV: + case Op_OrV: + case Op_XorV: + return VM_Version::has_simd(); + case Op_LoadVector: + case Op_StoreVector: + case Op_AddVF: + case Op_SubVF: + case Op_MulVF: +#ifdef AARCH64 + return VM_Version::has_simd(); +#else + return VM_Version::has_vfp() || VM_Version::has_simd(); +#endif + case Op_AddVD: + case Op_SubVD: + case Op_MulVD: + case Op_DivVF: + case Op_DivVD: +#ifdef AARCH64 + return VM_Version::has_simd(); +#else + return VM_Version::has_vfp(); +#endif + } + + return true; // Per default match rules are supported. +} + +const bool Matcher::match_rule_supported_vector(int opcode, int vlen) { + + // TODO + // identify extra cases that we might want to provide match rules for + // e.g. Op_ vector nodes and other intrinsics while guarding with vlen + bool ret_value = match_rule_supported(opcode); + // Add rules here. + + return ret_value; // Per default match rules are supported. +} + +const bool Matcher::has_predicated_vectors(void) { + return false; +} + +const int Matcher::float_pressure(int default_pressure_threshold) { + return default_pressure_threshold; +} + +int Matcher::regnum_to_fpu_offset(int regnum) { + return regnum - 32; // The FP registers are in the second chunk +} + +// Vector width in bytes +const int Matcher::vector_width_in_bytes(BasicType bt) { + return MaxVectorSize; +} + +// Vector ideal reg corresponding to specified size in bytes +const int Matcher::vector_ideal_reg(int size) { + assert(MaxVectorSize >= size, ""); + switch(size) { + case 8: return Op_VecD; + case 16: return Op_VecX; + } + ShouldNotReachHere(); + return 0; +} + +const int Matcher::vector_shift_count_ideal_reg(int size) { + return vector_ideal_reg(size); +} + +// Limits on vector size (number of elements) loaded into vector. +const int Matcher::max_vector_size(const BasicType bt) { + assert(is_java_primitive(bt), "only primitive type vectors"); + return vector_width_in_bytes(bt)/type2aelembytes(bt); +} + +const int Matcher::min_vector_size(const BasicType bt) { + assert(is_java_primitive(bt), "only primitive type vectors"); + return 8/type2aelembytes(bt); +} + +// ARM doesn't support misaligned vectors store/load. +const bool Matcher::misaligned_vectors_ok() { + return false; +} + +// ARM doesn't support AES intrinsics +const bool Matcher::pass_original_key_for_aes() { + return false; +} + +const bool Matcher::convL2FSupported(void) { +#ifdef AARCH64 + return true; +#else + return false; +#endif +} + +// Is this branch offset short enough that a short branch can be used? +// +// 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 br_size, int offset) { + // The passed offset is relative to address of the branch. + // On ARM a branch displacement is calculated relative to address + // of the branch + 8. + // + // offset -= 8; + // return (Assembler::is_simm24(offset)); + return false; +} + +const bool Matcher::isSimpleConstant64(jlong value) { + // Will one (StoreL ConL) be cheaper than two (StoreI ConI)?. +#ifdef AARCH64 + return (value == 0); +#else + return false; +#endif +} + +// No scaling for the parameter the ClearArray node. +const bool Matcher::init_array_count_is_in_bytes = true; + +#ifdef AARCH64 +const int Matcher::long_cmove_cost() { return 1; } +#else +// Needs 2 CMOV's for longs. +const int Matcher::long_cmove_cost() { return 2; } +#endif + +#ifdef AARCH64 +const int Matcher::float_cmove_cost() { return 1; } +#else +// CMOVF/CMOVD are expensive on ARM. +const int Matcher::float_cmove_cost() { return ConditionalMoveLimit; } +#endif + +// Does the CPU require late expand (see block.cpp for description of late expand)? +const bool Matcher::require_postalloc_expand = false; + +// Do we need to mask the count passed to shift instructions or does +// the cpu only look at the lower 5/6 bits anyway? +// FIXME: does this handle vector shifts as well? +#ifdef AARCH64 +const bool Matcher::need_masked_shift_count = false; +#else +const bool Matcher::need_masked_shift_count = true; +#endif + +const bool Matcher::convi2l_type_required = true; + +// Should the Matcher clone shifts on addressing modes, expecting them +// to be subsumed into complex addressing expressions or compute them +// into registers? +bool Matcher::clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, VectorSet& address_visited) { + return clone_base_plus_offset_address(m, mstack, address_visited); +} + +void Compile::reshape_address(AddPNode* addp) { +} + +bool Matcher::narrow_oop_use_complex_address() { + NOT_LP64(ShouldNotCallThis()); + assert(UseCompressedOops, "only for compressed oops code"); + return false; +} + +bool Matcher::narrow_klass_use_complex_address() { + NOT_LP64(ShouldNotCallThis()); + assert(UseCompressedClassPointers, "only for compressed klass code"); + return false; +} + +bool Matcher::const_oop_prefer_decode() { + NOT_LP64(ShouldNotCallThis()); + return true; +} + +bool Matcher::const_klass_prefer_decode() { + NOT_LP64(ShouldNotCallThis()); + return true; +} + +// Is it better to copy float constants, or load them directly from memory? +// Intel can load a float constant from a direct address, requiring no +// extra registers. Most RISCs will have to materialize an address into a +// register first, so they would do better to copy the constant from stack. +const bool Matcher::rematerialize_float_constants = false; + +// If CPU can load and store mis-aligned doubles directly then no fixup is +// needed. Else we split the double into 2 integer pieces and move it +// piece-by-piece. Only happens when passing doubles into C code as the +// Java calling convention forces doubles to be aligned. +#ifdef AARCH64 +// On stack replacement support: +// We don't need Load[DL]_unaligned support, because interpreter stack +// has correct alignment +const bool Matcher::misaligned_doubles_ok = true; +#else +const bool Matcher::misaligned_doubles_ok = false; +#endif + +// No-op on ARM. +void Matcher::pd_implicit_null_fixup(MachNode *node, uint idx) { +} + +// Advertise here if the CPU requires explicit rounding operations +// to implement the UseStrictFP mode. +const bool Matcher::strict_fp_requires_explicit_rounding = false; + +// Are floats converted to double when stored to stack during deoptimization? +// ARM does not handle callee-save floats. +bool Matcher::float_in_double() { + return false; +} + +// Do ints take an entire long register or just half? +// Note that we if-def off of _LP64. +// The relevant question is how the int is callee-saved. In _LP64 +// the whole long is written but de-opt'ing will have to extract +// the relevant 32 bits, in not-_LP64 only the low 32 bits is written. +#ifdef _LP64 +const bool Matcher::int_in_long = true; +#else +const bool Matcher::int_in_long = false; +#endif + +// Return whether or not this register is ever used as an argument. This +// function is used on startup to build the trampoline stubs in generateOptoStub. +// Registers not mentioned will be killed by the VM call in the trampoline, and +// arguments in those registers not be available to the callee. +bool Matcher::can_be_java_arg( int reg ) { +#ifdef AARCH64 + if (reg >= R_R0_num && reg < R_R8_num) return true; + if (reg >= R_V0_num && reg <= R_V7b_num && ((reg & 3) < 2)) return true; +#else + if (reg == R_R0_num || + reg == R_R1_num || + reg == R_R2_num || + reg == R_R3_num) return true; + + if (reg >= R_S0_num && + reg <= R_S13_num) return true; +#endif + return false; +} + +bool Matcher::is_spillable_arg( int reg ) { + return can_be_java_arg(reg); +} + +bool Matcher::use_asm_for_ldiv_by_con( jlong divisor ) { + return false; +} + +// Register for DIVI projection of divmodI +RegMask Matcher::divI_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + +// Register for MODI projection of divmodI +RegMask Matcher::modI_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + +// Register for DIVL projection of divmodL +RegMask Matcher::divL_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + +// Register for MODL projection of divmodL +RegMask Matcher::modL_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + +const RegMask Matcher::method_handle_invoke_SP_save_mask() { + return FP_REGP_mask(); +} + +bool maybe_far_call(const CallNode *n) { + return !MacroAssembler::_reachable_from_cache(n->as_Call()->entry_point()); +} + +bool maybe_far_call(const MachCallNode *n) { + return !MacroAssembler::_reachable_from_cache(n->as_MachCall()->entry_point()); +} + +%} + +//----------ENCODING BLOCK----------------------------------------------------- +// This block specifies the encoding classes used by the compiler to output +// byte streams. Encoding classes are parameterized macros used 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. Again, a function +// is available to check if the constant displacement is an oop. They use the +// ins_encode keyword to specify their encoding classes (which must be +// a sequence of enc_class names, and their parameters, 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 %{ + enc_class call_epilog %{ + // nothing + %} + + enc_class Java_To_Runtime (method meth) %{ + // CALL directly to the runtime + emit_call_reloc(cbuf, as_MachCall(), $meth, runtime_call_Relocation::spec()); + %} + + enc_class Java_Static_Call (method meth) %{ + // CALL to fixup routine. Fixup routine uses ScopeDesc info to determine + // who we intended to call. + + if ( !_method) { + emit_call_reloc(cbuf, as_MachCall(), $meth, runtime_call_Relocation::spec()); + } else { + int method_index = resolved_method_index(cbuf); + RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index) + : static_call_Relocation::spec(method_index); + emit_call_reloc(cbuf, as_MachCall(), $meth, rspec); + + // Emit stubs for static call. + address stub = CompiledStaticCall::emit_to_interp_stub(cbuf); + if (stub == NULL) { + ciEnv::current()->record_failure("CodeCache is full"); + return; + } + } + %} + + enc_class save_last_PC %{ + // preserve mark + address mark = cbuf.insts()->mark(); + debug_only(int off0 = cbuf.insts_size()); + MacroAssembler _masm(&cbuf); + int ret_addr_offset = as_MachCall()->ret_addr_offset(); + __ adr(LR, mark + ret_addr_offset); + __ str(LR, Address(Rthread, JavaThread::last_Java_pc_offset())); + debug_only(int off1 = cbuf.insts_size()); + assert(off1 - off0 == 2 * Assembler::InstructionSize, "correct size prediction"); + // restore mark + cbuf.insts()->set_mark(mark); + %} + + enc_class preserve_SP %{ + // preserve mark + address mark = cbuf.insts()->mark(); + debug_only(int off0 = cbuf.insts_size()); + MacroAssembler _masm(&cbuf); + // FP is preserved across all calls, even compiled calls. + // Use it to preserve SP in places where the callee might change the SP. + __ mov(Rmh_SP_save, SP); + debug_only(int off1 = cbuf.insts_size()); + assert(off1 - off0 == 4, "correct size prediction"); + // restore mark + cbuf.insts()->set_mark(mark); + %} + + enc_class restore_SP %{ + MacroAssembler _masm(&cbuf); + __ mov(SP, Rmh_SP_save); + %} + + enc_class Java_Dynamic_Call (method meth) %{ + MacroAssembler _masm(&cbuf); + Register R8_ic_reg = reg_to_register_object(Matcher::inline_cache_reg_encode()); + assert(R8_ic_reg == Ricklass, "should be"); + __ set_inst_mark(); +#ifdef AARCH64 +// TODO: see C1 LIR_Assembler::ic_call() + InlinedAddress oop_literal((address)Universe::non_oop_word()); + int offset = __ offset(); + int fixed_size = mov_oop_size * 4; + if (VM_Version::prefer_moves_over_load_literal()) { + uintptr_t val = (uintptr_t)Universe::non_oop_word(); + __ movz(R8_ic_reg, (val >> 0) & 0xffff, 0); + __ movk(R8_ic_reg, (val >> 16) & 0xffff, 16); + __ movk(R8_ic_reg, (val >> 32) & 0xffff, 32); + __ movk(R8_ic_reg, (val >> 48) & 0xffff, 48); + } else { + __ ldr_literal(R8_ic_reg, oop_literal); + } + assert(__ offset() - offset == fixed_size, "bad mov_oop size"); +#else + __ movw(R8_ic_reg, ((unsigned int)Universe::non_oop_word()) & 0xffff); + __ movt(R8_ic_reg, ((unsigned int)Universe::non_oop_word()) >> 16); +#endif + address virtual_call_oop_addr = __ inst_mark(); + // CALL to fixup routine. Fixup routine uses ScopeDesc info to determine + // who we intended to call. + int method_index = resolved_method_index(cbuf); + __ relocate(virtual_call_Relocation::spec(virtual_call_oop_addr, method_index)); + emit_call_reloc(cbuf, as_MachCall(), $meth, RelocationHolder::none); +#ifdef AARCH64 + if (!VM_Version::prefer_moves_over_load_literal()) { + Label skip_literal; + __ b(skip_literal); + int off2 = __ offset(); + __ bind_literal(oop_literal); + if (__ offset() - off2 == wordSize) { + // no padding, so insert nop for worst-case sizing + __ nop(); + } + __ bind(skip_literal); + } +#endif + %} + + enc_class LdReplImmI(immI src, regD dst, iRegI tmp, int cnt, int wth) %{ + // FIXME: load from constant table? + // Load a constant replicated "count" times with width "width" + int count = $cnt$$constant; + int width = $wth$$constant; + assert(count*width == 4, "sanity"); + int val = $src$$constant; + if (width < 4) { + int bit_width = width * 8; + val &= (((int)1) << bit_width) - 1; // mask off sign bits + for (int i = 0; i < count - 1; i++) { + val |= (val << bit_width); + } + } + MacroAssembler _masm(&cbuf); + + if (val == -1) { + __ mvn($tmp$$Register, 0); + } else if (val == 0) { + __ mov($tmp$$Register, 0); + } else { + __ movw($tmp$$Register, val & 0xffff); + __ movt($tmp$$Register, (unsigned int)val >> 16); + } + __ fmdrr($dst$$FloatRegister, $tmp$$Register, $tmp$$Register); + %} + + enc_class LdReplImmF(immF src, regD dst, iRegI tmp) %{ + // Replicate float con 2 times and pack into vector (8 bytes) in regD. + float fval = $src$$constant; + int val = *((int*)&fval); + MacroAssembler _masm(&cbuf); + + if (val == -1) { + __ mvn($tmp$$Register, 0); + } else if (val == 0) { + __ mov($tmp$$Register, 0); + } else { + __ movw($tmp$$Register, val & 0xffff); + __ movt($tmp$$Register, (unsigned int)val >> 16); + } + __ fmdrr($dst$$FloatRegister, $tmp$$Register, $tmp$$Register); + %} + + enc_class enc_String_Compare(R0RegP str1, R1RegP str2, R2RegI cnt1, R3RegI cnt2, iRegI result, iRegI tmp1, iRegI tmp2) %{ + Label Ldone, Lloop; + MacroAssembler _masm(&cbuf); + + Register str1_reg = $str1$$Register; + Register str2_reg = $str2$$Register; + Register cnt1_reg = $cnt1$$Register; // int + Register cnt2_reg = $cnt2$$Register; // int + Register tmp1_reg = $tmp1$$Register; + Register tmp2_reg = $tmp2$$Register; + Register result_reg = $result$$Register; + + assert_different_registers(str1_reg, str2_reg, cnt1_reg, cnt2_reg, tmp1_reg, tmp2_reg); + + // Compute the minimum of the string lengths(str1_reg) and the + // difference of the string lengths (stack) + + // See if the lengths are different, and calculate min in str1_reg. + // Stash diff in tmp2 in case we need it for a tie-breaker. + __ subs_32(tmp2_reg, cnt1_reg, cnt2_reg); +#ifdef AARCH64 + Label Lskip; + __ _lsl_w(cnt1_reg, cnt1_reg, exact_log2(sizeof(jchar))); // scale the limit + __ b(Lskip, mi); + __ _lsl_w(cnt1_reg, cnt2_reg, exact_log2(sizeof(jchar))); // scale the limit + __ bind(Lskip); +#else + __ mov(cnt1_reg, AsmOperand(cnt1_reg, lsl, exact_log2(sizeof(jchar)))); // scale the limit + __ mov(cnt1_reg, AsmOperand(cnt2_reg, lsl, exact_log2(sizeof(jchar))), pl); // scale the limit +#endif + + // reallocate cnt1_reg, cnt2_reg, result_reg + // Note: limit_reg holds the string length pre-scaled by 2 + Register limit_reg = cnt1_reg; + Register chr2_reg = cnt2_reg; + Register chr1_reg = tmp1_reg; + // str{12} are the base pointers + + // Is the minimum length zero? + __ cmp_32(limit_reg, 0); + if (result_reg != tmp2_reg) { + __ mov(result_reg, tmp2_reg, eq); + } + __ b(Ldone, eq); + + // Load first characters + __ ldrh(chr1_reg, Address(str1_reg, 0)); + __ ldrh(chr2_reg, Address(str2_reg, 0)); + + // Compare first characters + __ subs(chr1_reg, chr1_reg, chr2_reg); + if (result_reg != chr1_reg) { + __ mov(result_reg, chr1_reg, ne); + } + __ b(Ldone, ne); + + { + // Check after comparing first character to see if strings are equivalent + // Check if the strings start at same location + __ cmp(str1_reg, str2_reg); + // Check if the length difference is zero + __ cond_cmp(tmp2_reg, 0, eq); + __ mov(result_reg, 0, eq); // result is zero + __ b(Ldone, eq); + // Strings might not be equal + } + + __ subs(chr1_reg, limit_reg, 1 * sizeof(jchar)); + if (result_reg != tmp2_reg) { + __ mov(result_reg, tmp2_reg, eq); + } + __ b(Ldone, eq); + + // Shift str1_reg and str2_reg to the end of the arrays, negate limit + __ add(str1_reg, str1_reg, limit_reg); + __ add(str2_reg, str2_reg, limit_reg); + __ neg(limit_reg, chr1_reg); // limit = -(limit-2) + + // Compare the rest of the characters + __ bind(Lloop); + __ ldrh(chr1_reg, Address(str1_reg, limit_reg)); + __ ldrh(chr2_reg, Address(str2_reg, limit_reg)); + __ subs(chr1_reg, chr1_reg, chr2_reg); + if (result_reg != chr1_reg) { + __ mov(result_reg, chr1_reg, ne); + } + __ b(Ldone, ne); + + __ adds(limit_reg, limit_reg, sizeof(jchar)); + __ b(Lloop, ne); + + // If strings are equal up to min length, return the length difference. + if (result_reg != tmp2_reg) { + __ mov(result_reg, tmp2_reg); + } + + // Otherwise, return the difference between the first mismatched chars. + __ bind(Ldone); + %} + + enc_class enc_String_Equals(R0RegP str1, R1RegP str2, R2RegI cnt, iRegI result, iRegI tmp1, iRegI tmp2) %{ + Label Lword_loop, Lpost_word, Lchar, Lchar_loop, Ldone, Lequal; + MacroAssembler _masm(&cbuf); + + Register str1_reg = $str1$$Register; + Register str2_reg = $str2$$Register; + Register cnt_reg = $cnt$$Register; // int + Register tmp1_reg = $tmp1$$Register; + Register tmp2_reg = $tmp2$$Register; + Register result_reg = $result$$Register; + + assert_different_registers(str1_reg, str2_reg, cnt_reg, tmp1_reg, tmp2_reg, result_reg); + + __ cmp(str1_reg, str2_reg); //same char[] ? + __ b(Lequal, eq); + + __ cbz_32(cnt_reg, Lequal); // count == 0 + + //rename registers + Register limit_reg = cnt_reg; + Register chr1_reg = tmp1_reg; + Register chr2_reg = tmp2_reg; + + __ logical_shift_left(limit_reg, limit_reg, exact_log2(sizeof(jchar))); + + //check for alignment and position the pointers to the ends + __ orr(chr1_reg, str1_reg, str2_reg); + __ tst(chr1_reg, 0x3); + + // notZero means at least one not 4-byte aligned. + // We could optimize the case when both arrays are not aligned + // but it is not frequent case and it requires additional checks. + __ b(Lchar, ne); + + // Compare char[] arrays aligned to 4 bytes. + __ char_arrays_equals(str1_reg, str2_reg, limit_reg, result_reg, + chr1_reg, chr2_reg, Ldone); + + __ b(Lequal); // equal + + // char by char compare + __ bind(Lchar); + __ mov(result_reg, 0); + __ add(str1_reg, limit_reg, str1_reg); + __ add(str2_reg, limit_reg, str2_reg); + __ neg(limit_reg, limit_reg); //negate count + + // Lchar_loop + __ bind(Lchar_loop); + __ ldrh(chr1_reg, Address(str1_reg, limit_reg)); + __ ldrh(chr2_reg, Address(str2_reg, limit_reg)); + __ cmp(chr1_reg, chr2_reg); + __ b(Ldone, ne); + __ adds(limit_reg, limit_reg, sizeof(jchar)); + __ b(Lchar_loop, ne); + + __ bind(Lequal); + __ mov(result_reg, 1); //equal + + __ bind(Ldone); + %} + + enc_class enc_Array_Equals(R0RegP ary1, R1RegP ary2, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI result) %{ + Label Lvector, Ldone, Lloop, Lequal; + MacroAssembler _masm(&cbuf); + + Register ary1_reg = $ary1$$Register; + Register ary2_reg = $ary2$$Register; + Register tmp1_reg = $tmp1$$Register; + Register tmp2_reg = $tmp2$$Register; + Register tmp3_reg = $tmp3$$Register; + Register result_reg = $result$$Register; + + assert_different_registers(ary1_reg, ary2_reg, tmp1_reg, tmp2_reg, tmp3_reg, result_reg); + + int length_offset = arrayOopDesc::length_offset_in_bytes(); + int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR); + + // return true if the same array +#ifdef AARCH64 + __ cmp(ary1_reg, ary2_reg); + __ b(Lequal, eq); + + __ mov(result_reg, 0); + + __ cbz(ary1_reg, Ldone); // not equal + + __ cbz(ary2_reg, Ldone); // not equal +#else + __ teq(ary1_reg, ary2_reg); + __ mov(result_reg, 1, eq); + __ b(Ldone, eq); // equal + + __ tst(ary1_reg, ary1_reg); + __ mov(result_reg, 0, eq); + __ b(Ldone, eq); // not equal + + __ tst(ary2_reg, ary2_reg); + __ mov(result_reg, 0, eq); + __ b(Ldone, eq); // not equal +#endif + + //load the lengths of arrays + __ ldr_s32(tmp1_reg, Address(ary1_reg, length_offset)); // int + __ ldr_s32(tmp2_reg, Address(ary2_reg, length_offset)); // int + + // return false if the two arrays are not equal length +#ifdef AARCH64 + __ cmp_w(tmp1_reg, tmp2_reg); + __ b(Ldone, ne); // not equal + + __ cbz_w(tmp1_reg, Lequal); // zero-length arrays are equal +#else + __ teq_32(tmp1_reg, tmp2_reg); + __ mov(result_reg, 0, ne); + __ b(Ldone, ne); // not equal + + __ tst(tmp1_reg, tmp1_reg); + __ mov(result_reg, 1, eq); + __ b(Ldone, eq); // zero-length arrays are equal +#endif + + // load array addresses + __ add(ary1_reg, ary1_reg, base_offset); + __ add(ary2_reg, ary2_reg, base_offset); + + // renaming registers + Register chr1_reg = tmp3_reg; // for characters in ary1 + Register chr2_reg = tmp2_reg; // for characters in ary2 + Register limit_reg = tmp1_reg; // length + + // set byte count + __ logical_shift_left_32(limit_reg, limit_reg, exact_log2(sizeof(jchar))); + + // Compare char[] arrays aligned to 4 bytes. + __ char_arrays_equals(ary1_reg, ary2_reg, limit_reg, result_reg, + chr1_reg, chr2_reg, Ldone); + __ bind(Lequal); + __ mov(result_reg, 1); //equal + + __ bind(Ldone); + %} +%} + +//----------FRAME-------------------------------------------------------------- +// Definition of frame structure and management information. +// +// S T A C K L A Y O U T Allocators stack-slot number +// | (to get allocators register number +// G Owned by | | v add VMRegImpl::stack0) +// r CALLER | | +// o | +--------+ pad to even-align allocators stack-slot +// w V | pad0 | numbers; owned by CALLER +// t -----------+--------+----> Matcher::_in_arg_limit, unaligned +// h ^ | in | 5 +// | | args | 4 Holes in incoming args owned by SELF +// | | | | 3 +// | | +--------+ +// V | | old out| Empty on Intel, window on Sparc +// | old |preserve| Must be even aligned. +// | SP-+--------+----> Matcher::_old_SP, 8 (or 16 in LP64)-byte aligned +// | | in | 3 area for Intel ret address +// Owned by |preserve| Empty on Sparc. +// SELF +--------+ +// | | pad2 | 2 pad to align old SP +// | +--------+ 1 +// | | locks | 0 +// | +--------+----> VMRegImpl::stack0, 8 (or 16 in LP64)-byte aligned +// | | pad1 | 11 pad to align new SP +// | +--------+ +// | | | 10 +// | | spills | 9 spills +// V | | 8 (pad0 slot for callee) +// -----------+--------+----> Matcher::_out_arg_limit, unaligned +// ^ | out | 7 +// | | args | 6 Holes in outgoing args owned by CALLEE +// Owned by +--------+ +// CALLEE | new out| 6 Empty on Intel, window on Sparc +// | new |preserve| Must be even-aligned. +// | SP-+--------+----> Matcher::_new_SP, even aligned +// | | | +// +// Note 1: Only region 8-11 is determined by the allocator. Region 0-5 is +// known from SELF's arguments and the Java calling convention. +// Region 6-7 is determined per call site. +// Note 2: If the calling convention leaves holes in the incoming argument +// area, those holes are owned by SELF. Holes in the outgoing area +// are owned by the CALLEE. Holes should not be nessecary in the +// incoming area, as the Java calling convention is completely under +// the control of the AD file. Doubles can be sorted and packed to +// avoid holes. Holes in the outgoing arguments may be nessecary for +// varargs C calling conventions. +// Note 3: Region 0-3 is even aligned, with pad2 as needed. Region 3-5 is +// even aligned with pad0 as needed. +// Region 6 is even aligned. Region 6-7 is NOT even aligned; +// region 6-11 is even aligned; it may be padded out more so that +// the region from SP to FP meets the minimum stack alignment. + +frame %{ + // What direction does stack grow in (assumed to be same for native & Java) + stack_direction(TOWARDS_LOW); + + // These two registers define part of the calling convention + // between compiled code and the interpreter. + inline_cache_reg(R_Ricklass); // Inline Cache Register or Method* for I2C + interpreter_method_oop_reg(R_Rmethod); // Method Oop Register when calling interpreter + + // Optional: name the operand used by cisc-spilling to access [stack_pointer + offset] + cisc_spilling_operand_name(indOffset); + + // Number of stack slots consumed by a Monitor enter + sync_stack_slots(1 * VMRegImpl::slots_per_word); + + // Compiled code's Frame Pointer +#ifdef AARCH64 + frame_pointer(R_SP); +#else + frame_pointer(R_R13); +#endif + + // Stack alignment requirement + stack_alignment(StackAlignmentInBytes); + // LP64: Alignment size in bytes (128-bit -> 16 bytes) + // !LP64: Alignment size in bytes (64-bit -> 8 bytes) + + // Number of stack slots between incoming argument block and the start of + // a new frame. The PROLOG must add this many slots to the stack. The + // EPILOG must remove this many slots. + // FP + LR + in_preserve_stack_slots(2 * VMRegImpl::slots_per_word); + + // Number of outgoing stack slots killed above the out_preserve_stack_slots + // for calls to C. Supports the var-args backing area for register parms. + // ADLC doesn't support parsing expressions, so I folded the math by hand. + varargs_C_out_slots_killed( 0); + + // The after-PROLOG location of the return address. Location of + // return address specifies a type (REG or STACK) and a number + // representing the register number (i.e. - use a register name) or + // stack slot. + // Ret Addr is on stack in slot 0 if no locks or verification or alignment. + // Otherwise, it is above the locks and verification slot and alignment word + return_addr(STACK - 1*VMRegImpl::slots_per_word + + round_to((Compile::current()->in_preserve_stack_slots() + + Compile::current()->fixed_slots()), + stack_alignment_in_slots())); + + // Body of function which returns an OptoRegs array locating + // arguments either in registers or in stack slots for calling + // java + calling_convention %{ + (void) SharedRuntime::java_calling_convention(sig_bt, regs, length, is_outgoing); + + %} + + // Body of function which returns an OptoRegs array locating + // arguments either in registers or in stack slots for callin + // C. + c_calling_convention %{ + // This is obviously always outgoing + (void) SharedRuntime::c_calling_convention(sig_bt, regs, /*regs2=*/NULL, length); + %} + + // Location of compiled Java return values. Same as C + return_value %{ + return c2::return_value(ideal_reg); + %} + +%} + +//----------ATTRIBUTES--------------------------------------------------------- +//----------Instruction Attributes--------------------------------------------- +ins_attrib ins_cost(DEFAULT_COST); // Required cost attribute +ins_attrib ins_size(32); // Required size attribute (in bits) +ins_attrib ins_short_branch(0); // Required flag: is this instruction a + // non-matching short branch variant of some + // long branch? + +//----------OPERANDS----------------------------------------------------------- +// Operand definitions must precede instruction definitions for correct parsing +// in the ADLC because operands constitute user defined types which are used in +// instruction definitions. + +//----------Simple Operands---------------------------------------------------- +// Immediate Operands +// Integer Immediate: 32-bit +operand immI() %{ + match(ConI); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 8-bit unsigned - for VMOV +operand immU8() %{ + predicate(0 <= n->get_int() && (n->get_int() <= 255)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 16-bit +operand immI16() %{ + predicate((n->get_int() >> 16) == 0 && VM_Version::supports_movw()); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +#ifndef AARCH64 +// Integer Immediate: offset for half and double word loads and stores +operand immIHD() %{ + predicate(is_memoryHD(n->get_int())); + match(ConI); + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: offset for fp loads and stores +operand immIFP() %{ + predicate(is_memoryfp(n->get_int()) && ((n->get_int() & 3) == 0)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} +#endif + +// Valid scale values for addressing modes and shifts +operand immU5() %{ + predicate(0 <= n->get_int() && (n->get_int() <= 31)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 6-bit +operand immU6Big() %{ + predicate(n->get_int() >= 32 && n->get_int() <= 63); + match(ConI); + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 0-bit +operand immI0() %{ + predicate(n->get_int() == 0); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 1 +operand immI_1() %{ + predicate(n->get_int() == 1); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 2 +operand immI_2() %{ + predicate(n->get_int() == 2); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 3 +operand immI_3() %{ + predicate(n->get_int() == 3); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 4 +operand immI_4() %{ + predicate(n->get_int() == 4); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 8 +operand immI_8() %{ + predicate(n->get_int() == 8); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Int Immediate non-negative +operand immU31() +%{ + predicate(n->get_int() >= 0); + match(ConI); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the values 32-63 +operand immI_32_63() %{ + predicate(n->get_int() >= 32 && n->get_int() <= 63); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Immediates for special shifts (sign extend) + +// Integer Immediate: the value 16 +operand immI_16() %{ + predicate(n->get_int() == 16); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 24 +operand immI_24() %{ + predicate(n->get_int() == 24); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 255 +operand immI_255() %{ + predicate( n->get_int() == 255 ); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: the value 65535 +operand immI_65535() %{ + predicate(n->get_int() == 65535); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediates for arithmetic instructions + +operand aimmI() %{ + predicate(is_aimm(n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand aimmIneg() %{ + predicate(is_aimm(-n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand aimmU31() %{ + predicate((0 <= n->get_int()) && is_aimm(n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediates for logical instructions + +operand limmI() %{ + predicate(is_limmI(n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand limmIlow8() %{ + predicate(is_limmI_low(n->get_int(), 8)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand limmU31() %{ + predicate(0 <= n->get_int() && is_limmI(n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand limmIn() %{ + predicate(is_limmI(~n->get_int())); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +#ifdef AARCH64 +// Long Immediate: for logical instruction +operand limmL() %{ + predicate(is_limmL(n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand limmLn() %{ + predicate(is_limmL(~n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: for arithmetic instruction +operand aimmL() %{ + predicate(is_aimm(n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand aimmLneg() %{ + predicate(is_aimm(-n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} +#endif // AARCH64 + +// Long Immediate: the value FF +operand immL_FF() %{ + predicate( n->get_long() == 0xFFL ); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: the value FFFF +operand immL_FFFF() %{ + predicate( n->get_long() == 0xFFFFL ); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Pointer Immediate: 32 or 64-bit +operand immP() %{ + match(ConP); + + op_cost(5); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immP0() %{ + predicate(n->get_ptr() == 0); + match(ConP); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immP_poll() %{ + predicate(n->get_ptr() != 0 && n->get_ptr() == (intptr_t)os::get_polling_page()); + match(ConP); + + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +// Pointer Immediate +operand immN() +%{ + match(ConN); + + op_cost(10); + format %{ %} + interface(CONST_INTER); +%} + +operand immNKlass() +%{ + match(ConNKlass); + + op_cost(10); + format %{ %} + interface(CONST_INTER); +%} + +// NULL Pointer Immediate +operand immN0() +%{ + predicate(n->get_narrowcon() == 0); + match(ConN); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +operand immL() %{ + match(ConL); + op_cost(40); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immL0() %{ + predicate(n->get_long() == 0L); + match(ConL); + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: 16-bit +operand immL16() %{ + predicate(n->get_long() >= 0 && n->get_long() < (1<<16) && VM_Version::supports_movw()); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: low 32-bit mask +operand immL_32bits() %{ + predicate(n->get_long() == 0xFFFFFFFFL); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Double Immediate +operand immD() %{ + match(ConD); + + op_cost(40); + format %{ %} + interface(CONST_INTER); +%} + +// Double Immediate: +0.0d. +operand immD0() %{ + predicate(jlong_cast(n->getd()) == 0); + + match(ConD); + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +operand imm8D() %{ + predicate(Assembler::double_num(n->getd()).can_be_imm8()); + match(ConD); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Float Immediate +operand immF() %{ + match(ConF); + + op_cost(20); + format %{ %} + interface(CONST_INTER); +%} + +// Float Immediate: +0.0f +operand immF0() %{ + predicate(jint_cast(n->getf()) == 0); + match(ConF); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Float Immediate: encoded as 8 bits +operand imm8F() %{ + predicate(Assembler::float_num(n->getf()).can_be_imm8()); + match(ConF); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + +// Integer Register Operands +// Integer Register +operand iRegI() %{ + constraint(ALLOC_IN_RC(int_reg)); + match(RegI); + match(R0RegI); + match(R1RegI); + match(R2RegI); + match(R3RegI); +#ifdef AARCH64 + match(ZRRegI); +#else + match(R12RegI); +#endif + + format %{ %} + interface(REG_INTER); +%} + +// Pointer Register +operand iRegP() %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(RegP); + match(R0RegP); + match(R1RegP); + match(R2RegP); + match(RExceptionRegP); + match(R8RegP); + match(R9RegP); + match(RthreadRegP); // FIXME: move to sp_ptr_RegP? + match(R12RegP); + match(LRRegP); + + match(sp_ptr_RegP); + match(store_ptr_RegP); + + format %{ %} + interface(REG_INTER); +%} + +// GPRs + Rthread + SP +operand sp_ptr_RegP() %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(RegP); + match(iRegP); + match(SPRegP); // FIXME: check cost + + format %{ %} + interface(REG_INTER); +%} + +#ifdef AARCH64 +// Like sp_ptr_reg, but exclude regs (Aarch64 SP) that can't be +// stored directly. Includes ZR, so can't be used as a destination. +operand store_ptr_RegP() %{ + constraint(ALLOC_IN_RC(store_ptr_reg)); + match(RegP); + match(iRegP); + match(ZRRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand store_RegI() %{ + constraint(ALLOC_IN_RC(store_reg)); + match(RegI); + match(iRegI); + match(ZRRegI); + + format %{ %} + interface(REG_INTER); +%} + +operand store_RegL() %{ + constraint(ALLOC_IN_RC(store_ptr_reg)); + match(RegL); + match(iRegL); + match(ZRRegL); + + format %{ %} + interface(REG_INTER); +%} + +operand store_RegN() %{ + constraint(ALLOC_IN_RC(store_reg)); + match(RegN); + match(iRegN); + match(ZRRegN); + + format %{ %} + interface(REG_INTER); +%} +#endif + +operand R0RegP() %{ + constraint(ALLOC_IN_RC(R0_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand R1RegP() %{ + constraint(ALLOC_IN_RC(R1_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand R2RegP() %{ + constraint(ALLOC_IN_RC(R2_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand RExceptionRegP() %{ + constraint(ALLOC_IN_RC(Rexception_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand RthreadRegP() %{ + constraint(ALLOC_IN_RC(Rthread_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand IPRegP() %{ + constraint(ALLOC_IN_RC(IP_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand LRRegP() %{ + constraint(ALLOC_IN_RC(LR_regP)); + match(iRegP); + + format %{ %} + interface(REG_INTER); +%} + +operand R0RegI() %{ + constraint(ALLOC_IN_RC(R0_regI)); + match(iRegI); + + format %{ %} + interface(REG_INTER); +%} + +operand R1RegI() %{ + constraint(ALLOC_IN_RC(R1_regI)); + match(iRegI); + + format %{ %} + interface(REG_INTER); +%} + +operand R2RegI() %{ + constraint(ALLOC_IN_RC(R2_regI)); + match(iRegI); + + format %{ %} + interface(REG_INTER); +%} + +operand R3RegI() %{ + constraint(ALLOC_IN_RC(R3_regI)); + match(iRegI); + + format %{ %} + interface(REG_INTER); +%} + +#ifndef AARCH64 +operand R12RegI() %{ + constraint(ALLOC_IN_RC(R12_regI)); + match(iRegI); + + format %{ %} + interface(REG_INTER); +%} +#endif + +// Long Register +operand iRegL() %{ + constraint(ALLOC_IN_RC(long_reg)); + match(RegL); +#ifdef AARCH64 + match(iRegLd); +#else + match(R0R1RegL); + match(R2R3RegL); +#endif +//match(iRegLex); + + format %{ %} + interface(REG_INTER); +%} + +operand iRegLd() %{ + constraint(ALLOC_IN_RC(long_reg_align)); + match(iRegL); // FIXME: allows unaligned R11/R12? + + format %{ %} + interface(REG_INTER); +%} + +#ifndef AARCH64 +// first long arg, or return value +operand R0R1RegL() %{ + constraint(ALLOC_IN_RC(R0R1_regL)); + match(iRegL); + + format %{ %} + interface(REG_INTER); +%} + +operand R2R3RegL() %{ + constraint(ALLOC_IN_RC(R2R3_regL)); + match(iRegL); + + format %{ %} + interface(REG_INTER); +%} +#endif + +// Condition Code Flag Register +operand flagsReg() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr" %} + interface(REG_INTER); +%} + +// Result of compare to 0 (TST) +operand flagsReg_EQNELTGE() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr_EQNELTGE" %} + interface(REG_INTER); +%} + +// Condition Code Register, unsigned comparisons. +operand flagsRegU() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); +#ifdef TODO + match(RegFlagsP); +#endif + + format %{ "apsr_U" %} + interface(REG_INTER); +%} + +// Condition Code Register, pointer comparisons. +operand flagsRegP() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr_P" %} + interface(REG_INTER); +%} + +// Condition Code Register, long comparisons. +#ifndef AARCH64 +operand flagsRegL_LTGE() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr_L_LTGE" %} + interface(REG_INTER); +%} + +operand flagsRegL_EQNE() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr_L_EQNE" %} + interface(REG_INTER); +%} + +operand flagsRegL_LEGT() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "apsr_L_LEGT" %} + interface(REG_INTER); +%} +#endif + +// Condition Code Register, floating comparisons, unordered same as "less". +operand flagsRegF() %{ + constraint(ALLOC_IN_RC(float_flags)); + match(RegFlags); + + format %{ "fpscr_F" %} + interface(REG_INTER); +%} + +// Vectors +operand vecD() %{ + constraint(ALLOC_IN_RC(actual_dflt_reg)); + match(VecD); + + format %{ %} + interface(REG_INTER); +%} + +operand vecX() %{ + constraint(ALLOC_IN_RC(vectorx_reg)); + match(VecX); + + format %{ %} + interface(REG_INTER); +%} + +operand regD() %{ + constraint(ALLOC_IN_RC(actual_dflt_reg)); + match(RegD); + match(regD_low); + + format %{ %} + interface(REG_INTER); +%} + +operand regF() %{ + constraint(ALLOC_IN_RC(sflt_reg)); + match(RegF); + + format %{ %} + interface(REG_INTER); +%} + +operand regD_low() %{ + constraint(ALLOC_IN_RC(dflt_low_reg)); + match(RegD); + + format %{ %} + interface(REG_INTER); +%} + +// Special Registers + +// Method Register +operand inline_cache_regP(iRegP reg) %{ + constraint(ALLOC_IN_RC(Ricklass_regP)); + match(reg); + format %{ %} + interface(REG_INTER); +%} + +operand interpreter_method_oop_regP(iRegP reg) %{ + constraint(ALLOC_IN_RC(Rmethod_regP)); + match(reg); + format %{ %} + interface(REG_INTER); +%} + + +//----------Complex Operands--------------------------------------------------- +// Indirect Memory Reference +operand indirect(sp_ptr_RegP reg) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(reg); + + op_cost(100); + format %{ "[$reg]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp(0x0); + %} +%} + +#ifdef AARCH64 +// Indirect with scaled*1 uimm12 offset +operand indOffsetU12ScaleB(sp_ptr_RegP reg, immUL12 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with scaled*2 uimm12 offset +operand indOffsetU12ScaleS(sp_ptr_RegP reg, immUL12x2 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with scaled*4 uimm12 offset +operand indOffsetU12ScaleI(sp_ptr_RegP reg, immUL12x4 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with scaled*8 uimm12 offset +operand indOffsetU12ScaleL(sp_ptr_RegP reg, immUL12x8 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with scaled*16 uimm12 offset +operand indOffsetU12ScaleQ(sp_ptr_RegP reg, immUL12x16 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +#else // ! AARCH64 + +// Indirect with Offset in ]-4096, 4096[ +operand indOffset12(sp_ptr_RegP reg, immI12 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with offset for float load/store +operand indOffsetFP(sp_ptr_RegP reg, immIFP offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with Offset for half and double words +operand indOffsetHD(sp_ptr_RegP reg, immIHD offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with Offset and Offset+4 in ]-1024, 1024[ +operand indOffsetFPx2(sp_ptr_RegP reg, immX10x2 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} + +// Indirect with Offset and Offset+4 in ]-4096, 4096[ +operand indOffset12x2(sp_ptr_RegP reg, immI12x2 offset) %{ + constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(AddP reg offset); + + op_cost(100); + format %{ "[$reg + $offset]" %} + interface(MEMORY_INTER) %{ + base($reg); +#ifdef AARCH64 + index(0xff); // 0xff => no index +#else + index(0xf); // PC => no index +#endif + scale(0x0); + disp($offset); + %} +%} +#endif // !AARCH64 + +// Indirect with Register Index +operand indIndex(iRegP addr, iRegX index) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr index); + + op_cost(100); + format %{ "[$addr + $index]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale(0x0); + disp(0x0); + %} +%} + +#ifdef AARCH64 +// Indirect Memory Times Scale Plus Index Register +operand indIndexScaleS(iRegP addr, iRegX index, immI_1 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX index scale)); + + op_cost(100); + format %{"[$addr + $index << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x0); + %} +%} + +// Indirect Memory Times Scale Plus 32-bit Index Register +operand indIndexIScaleS(iRegP addr, iRegI index, immI_1 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX (ConvI2L index) scale)); + + op_cost(100); + format %{"[$addr + $index.w << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x7fffffff); // sxtw + %} +%} + +// Indirect Memory Times Scale Plus Index Register +operand indIndexScaleI(iRegP addr, iRegX index, immI_2 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX index scale)); + + op_cost(100); + format %{"[$addr + $index << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x0); + %} +%} + +// Indirect Memory Times Scale Plus 32-bit Index Register +operand indIndexIScaleI(iRegP addr, iRegI index, immI_2 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX (ConvI2L index) scale)); + + op_cost(100); + format %{"[$addr + $index.w << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x7fffffff); // sxtw + %} +%} + +// Indirect Memory Times Scale Plus Index Register +operand indIndexScaleL(iRegP addr, iRegX index, immI_3 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX index scale)); + + op_cost(100); + format %{"[$addr + $index << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x0); + %} +%} + +// Indirect Memory Times Scale Plus 32-bit Index Register +operand indIndexIScaleL(iRegP addr, iRegI index, immI_3 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX (ConvI2L index) scale)); + + op_cost(100); + format %{"[$addr + $index.w << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x7fffffff); // sxtw + %} +%} + +// Indirect Memory Times Scale Plus Index Register +operand indIndexScaleQ(iRegP addr, iRegX index, immI_4 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX index scale)); + + op_cost(100); + format %{"[$addr + $index << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x0); + %} +%} + +// Indirect Memory Times Scale Plus 32-bit Index Register +operand indIndexIScaleQ(iRegP addr, iRegI index, immI_4 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX (ConvI2L index) scale)); + + op_cost(100); + format %{"[$addr + $index.w << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x7fffffff); // sxtw + %} +%} +#else +// Indirect Memory Times Scale Plus Index Register +operand indIndexScale(iRegP addr, iRegX index, immU5 scale) %{ + constraint(ALLOC_IN_RC(ptr_reg)); + match(AddP addr (LShiftX index scale)); + + op_cost(100); + format %{"[$addr + $index << $scale]" %} + interface(MEMORY_INTER) %{ + base($addr); + index($index); + scale($scale); + disp(0x0); + %} +%} +#endif + +// Operands for expressing Control Flow +// NOTE: Label is a predefined operand which should not be redefined in +// the AD file. It is generically handled within the ADLC. + +//----------Conditional Branch Operands---------------------------------------- +// Comparison Op - This is the operation of the comparison, and is limited to +// the following set of codes: +// L (<), LE (<=), G (>), GE (>=), E (==), NE (!=) +// +// Other attributes of the comparison, such as unsignedness, are specified +// by the comparison instruction that sets a condition code flags register. +// That result is represented by a flags operand whose subtype is appropriate +// to the unsignedness (etc.) of the comparison. +// +// Later, the instruction which matches both the Comparison Op (a Bool) and +// the flags (produced by the Cmp) specifies the coding of the comparison op +// by matching a specific subtype of Bool operand below, such as cmpOpU. + +operand cmpOp() %{ + match(Bool); + + format %{ "" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0xb); + greater_equal(0xa); + less_equal(0xd); + greater(0xc); + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +// integer comparison with 0, signed +operand cmpOp0() %{ + match(Bool); + + format %{ "" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0x4); + greater_equal(0x5); + less_equal(0xd); // unsupported + greater(0xc); // unsupported + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +// Comparison Op, unsigned +operand cmpOpU() %{ + match(Bool); + + format %{ "u" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0x3); + greater_equal(0x2); + less_equal(0x9); + greater(0x8); + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +// Comparison Op, pointer (same as unsigned) +operand cmpOpP() %{ + match(Bool); + + format %{ "p" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0x3); + greater_equal(0x2); + less_equal(0x9); + greater(0x8); + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +operand cmpOpL() %{ + match(Bool); + + format %{ "L" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0xb); + greater_equal(0xa); + less_equal(0xd); + greater(0xc); + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +operand cmpOpL_commute() %{ + match(Bool); + + format %{ "L" %} + interface(COND_INTER) %{ + equal(0x0); + not_equal(0x1); + less(0xc); + greater_equal(0xd); + less_equal(0xa); + greater(0xb); + overflow(0x0); // unsupported/unimplemented + no_overflow(0x0); // unsupported/unimplemented + %} +%} + +//----------OPERAND CLASSES---------------------------------------------------- +// Operand Classes are groups of operands that are used to simplify +// instruction definitions by not requiring the AD writer to specify separate +// instructions for every form of operand when the instruction accepts +// multiple operand types with the same basic encoding and format. The classic +// case of this is memory operands. +#ifdef AARCH64 +opclass memoryB(indirect, indIndex, indOffsetU12ScaleB); +opclass memoryS(indirect, indIndex, indIndexScaleS, indIndexIScaleS, indOffsetU12ScaleS); +opclass memoryI(indirect, indIndex, indIndexScaleI, indIndexIScaleI, indOffsetU12ScaleI); +opclass memoryL(indirect, indIndex, indIndexScaleL, indIndexIScaleL, indOffsetU12ScaleL); +opclass memoryP(indirect, indIndex, indIndexScaleL, indIndexIScaleL, indOffsetU12ScaleL); +opclass memoryQ(indirect, indIndex, indIndexScaleQ, indIndexIScaleQ, indOffsetU12ScaleQ); +opclass memoryF(indirect, indIndex, indIndexScaleI, indIndexIScaleI, indOffsetU12ScaleI); +opclass memoryD(indirect, indIndex, indIndexScaleL, indIndexIScaleL, indOffsetU12ScaleL); + +opclass memoryScaledS(indIndexScaleS, indIndexIScaleS); +opclass memoryScaledI(indIndexScaleI, indIndexIScaleI); +opclass memoryScaledL(indIndexScaleL, indIndexIScaleL); +opclass memoryScaledP(indIndexScaleL, indIndexIScaleL); +opclass memoryScaledQ(indIndexScaleQ, indIndexIScaleQ); +opclass memoryScaledF(indIndexScaleI, indIndexIScaleI); +opclass memoryScaledD(indIndexScaleL, indIndexIScaleL); +// when ldrex/strex is used: +opclass memoryex ( indirect ); +opclass indIndexMemory( indIndex ); +opclass memoryvld ( indirect /* , write back mode not implemented */ ); + +#else + +opclass memoryI ( indirect, indOffset12, indIndex, indIndexScale ); +opclass memoryP ( indirect, indOffset12, indIndex, indIndexScale ); +opclass memoryF ( indirect, indOffsetFP ); +opclass memoryF2 ( indirect, indOffsetFPx2 ); +opclass memoryD ( indirect, indOffsetFP ); +opclass memoryfp( indirect, indOffsetFP ); +opclass memoryB ( indirect, indIndex, indOffsetHD ); +opclass memoryS ( indirect, indIndex, indOffsetHD ); +opclass memoryL ( indirect, indIndex, indOffsetHD ); + +opclass memoryScaledI(indIndexScale); +opclass memoryScaledP(indIndexScale); + +// when ldrex/strex is used: +opclass memoryex ( indirect ); +opclass indIndexMemory( indIndex ); +opclass memorylong ( indirect, indOffset12x2 ); +opclass memoryvld ( indirect /* , write back mode not implemented */ ); +#endif + +//----------PIPELINE----------------------------------------------------------- +pipeline %{ + +//----------ATTRIBUTES--------------------------------------------------------- +attributes %{ + fixed_size_instructions; // Fixed size instructions + max_instructions_per_bundle = 4; // Up to 4 instructions per bundle + instruction_unit_size = 4; // An instruction is 4 bytes long + instruction_fetch_unit_size = 16; // The processor fetches one line + instruction_fetch_units = 1; // of 16 bytes + + // List of nop instructions + nops( Nop_A0, Nop_A1, Nop_MS, Nop_FA, Nop_BR ); +%} + +//----------RESOURCES---------------------------------------------------------- +// Resources are the functional units available to the machine +resources(A0, A1, MS, BR, FA, FM, IDIV, FDIV, IALU = A0 | A1); + +//----------PIPELINE DESCRIPTION----------------------------------------------- +// Pipeline Description specifies the stages in the machine's pipeline + +pipe_desc(A, P, F, B, I, J, S, R, E, C, M, W, X, T, D); + +//----------PIPELINE CLASSES--------------------------------------------------- +// Pipeline Classes describe the stages in which input and output are +// referenced by the hardware pipeline. + +// Integer ALU reg-reg operation +pipe_class ialu_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + single_instruction; + dst : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +// Integer ALU reg-reg long operation +pipe_class ialu_reg_reg_2(iRegL dst, iRegL src1, iRegL src2) %{ + instruction_count(2); + dst : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; + IALU : R; +%} + +// Integer ALU reg-reg long dependent operation +pipe_class ialu_reg_reg_2_dep(iRegL dst, iRegL src1, iRegL src2, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : E(write); + src1 : R(read); + src2 : R(read); + cr : E(write); + IALU : R(2); +%} + +// Integer ALU reg-imm operaion +pipe_class ialu_reg_imm(iRegI dst, iRegI src1) %{ + single_instruction; + dst : E(write); + src1 : R(read); + IALU : R; +%} + +// Integer ALU reg-reg operation with condition code +pipe_class ialu_cc_reg_reg(iRegI dst, iRegI src1, iRegI src2, flagsReg cr) %{ + single_instruction; + dst : E(write); + cr : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +// Integer ALU zero-reg operation +pipe_class ialu_zero_reg(iRegI dst, immI0 zero, iRegI src2) %{ + single_instruction; + dst : E(write); + src2 : R(read); + IALU : R; +%} + +// Integer ALU zero-reg operation with condition code only +pipe_class ialu_cconly_zero_reg(flagsReg cr, iRegI src) %{ + single_instruction; + cr : E(write); + src : R(read); + IALU : R; +%} + +// Integer ALU reg-reg operation with condition code only +pipe_class ialu_cconly_reg_reg(flagsReg cr, iRegI src1, iRegI src2) %{ + single_instruction; + cr : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +// Integer ALU reg-imm operation with condition code only +pipe_class ialu_cconly_reg_imm(flagsReg cr, iRegI src1) %{ + single_instruction; + cr : E(write); + src1 : R(read); + IALU : R; +%} + +// Integer ALU reg-reg-zero operation with condition code only +pipe_class ialu_cconly_reg_reg_zero(flagsReg cr, iRegI src1, iRegI src2, immI0 zero) %{ + single_instruction; + cr : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +// Integer ALU reg-imm-zero operation with condition code only +pipe_class ialu_cconly_reg_imm_zero(flagsReg cr, iRegI src1, immI0 zero) %{ + single_instruction; + cr : E(write); + src1 : R(read); + IALU : R; +%} + +// Integer ALU reg-reg operation with condition code, src1 modified +pipe_class ialu_cc_rwreg_reg(flagsReg cr, iRegI src1, iRegI src2) %{ + single_instruction; + cr : E(write); + src1 : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +pipe_class cmpL_reg(iRegI dst, iRegL src1, iRegL src2, flagsReg cr ) %{ + multiple_bundles; + dst : E(write)+4; + cr : E(write); + src1 : R(read); + src2 : R(read); + IALU : R(3); + BR : R(2); +%} + +// Integer ALU operation +pipe_class ialu_none(iRegI dst) %{ + single_instruction; + dst : E(write); + IALU : R; +%} + +// Integer ALU reg operation +pipe_class ialu_reg(iRegI dst, iRegI src) %{ + single_instruction; may_have_no_code; + dst : E(write); + src : R(read); + IALU : R; +%} + +// Integer ALU reg conditional operation +// This instruction has a 1 cycle stall, and cannot execute +// in the same cycle as the instruction setting the condition +// code. We kludge this by pretending to read the condition code +// 1 cycle earlier, and by marking the functional units as busy +// for 2 cycles with the result available 1 cycle later than +// is really the case. +pipe_class ialu_reg_flags( iRegI op2_out, iRegI op2_in, iRegI op1, flagsReg cr ) %{ + single_instruction; + op2_out : C(write); + op1 : R(read); + cr : R(read); // This is really E, with a 1 cycle stall + BR : R(2); + MS : R(2); +%} + +// Integer ALU reg operation +pipe_class ialu_move_reg_L_to_I(iRegI dst, iRegL src) %{ + single_instruction; may_have_no_code; + dst : E(write); + src : R(read); + IALU : R; +%} +pipe_class ialu_move_reg_I_to_L(iRegL dst, iRegI src) %{ + single_instruction; may_have_no_code; + dst : E(write); + src : R(read); + IALU : R; +%} + +// Two integer ALU reg operations +pipe_class ialu_reg_2(iRegL dst, iRegL src) %{ + instruction_count(2); + dst : E(write); + src : R(read); + A0 : R; + A1 : R; +%} + +// Two integer ALU reg operations +pipe_class ialu_move_reg_L_to_L(iRegL dst, iRegL src) %{ + instruction_count(2); may_have_no_code; + dst : E(write); + src : R(read); + A0 : R; + A1 : R; +%} + +// Integer ALU imm operation +pipe_class ialu_imm(iRegI dst) %{ + single_instruction; + dst : E(write); + IALU : R; +%} + +pipe_class ialu_imm_n(iRegI dst) %{ + single_instruction; + dst : E(write); + IALU : R; +%} + +// Integer ALU reg-reg with carry operation +pipe_class ialu_reg_reg_cy(iRegI dst, iRegI src1, iRegI src2, iRegI cy) %{ + single_instruction; + dst : E(write); + src1 : R(read); + src2 : R(read); + IALU : R; +%} + +// Integer ALU cc operation +pipe_class ialu_cc(iRegI dst, flagsReg cc) %{ + single_instruction; + dst : E(write); + cc : R(read); + IALU : R; +%} + +// Integer ALU cc / second IALU operation +pipe_class ialu_reg_ialu( iRegI dst, iRegI src ) %{ + instruction_count(1); multiple_bundles; + dst : E(write)+1; + src : R(read); + IALU : R; +%} + +// Integer ALU cc / second IALU operation +pipe_class ialu_reg_reg_ialu( iRegI dst, iRegI p, iRegI q ) %{ + instruction_count(1); multiple_bundles; + dst : E(write)+1; + p : R(read); + q : R(read); + IALU : R; +%} + +// Integer ALU hi-lo-reg operation +pipe_class ialu_hi_lo_reg(iRegI dst, immI src) %{ + instruction_count(1); multiple_bundles; + dst : E(write)+1; + IALU : R(2); +%} + +// Long Constant +pipe_class loadConL( iRegL dst, immL src ) %{ + instruction_count(2); multiple_bundles; + dst : E(write)+1; + IALU : R(2); + IALU : R(2); +%} + +// Pointer Constant +pipe_class loadConP( iRegP dst, immP src ) %{ + instruction_count(0); multiple_bundles; + fixed_latency(6); +%} + +// Polling Address +pipe_class loadConP_poll( iRegP dst, immP_poll src ) %{ + dst : E(write); + IALU : R; +%} + +// Long Constant small +pipe_class loadConLlo( iRegL dst, immL src ) %{ + instruction_count(2); + dst : E(write); + IALU : R; + IALU : R; +%} + +// [PHH] This is wrong for 64-bit. See LdImmF/D. +pipe_class loadConFD(regF dst, immF src, iRegP tmp) %{ + instruction_count(1); multiple_bundles; + src : R(read); + dst : M(write)+1; + IALU : R; + MS : E; +%} + +// Integer ALU nop operation +pipe_class ialu_nop() %{ + single_instruction; + IALU : R; +%} + +// Integer ALU nop operation +pipe_class ialu_nop_A0() %{ + single_instruction; + A0 : R; +%} + +// Integer ALU nop operation +pipe_class ialu_nop_A1() %{ + single_instruction; + A1 : R; +%} + +// Integer Multiply reg-reg operation +pipe_class imul_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + single_instruction; + dst : E(write); + src1 : R(read); + src2 : R(read); + MS : R(5); +%} + +pipe_class mulL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + single_instruction; + dst : E(write)+4; + src1 : R(read); + src2 : R(read); + MS : R(6); +%} + +// Integer Divide reg-reg +pipe_class sdiv_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI temp, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : E(write); + temp : E(write); + src1 : R(read); + src2 : R(read); + temp : R(read); + MS : R(38); +%} + +// Long Divide +pipe_class divL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + dst : E(write)+71; + src1 : R(read); + src2 : R(read)+1; + MS : R(70); +%} + +// Floating Point Add Float +pipe_class faddF_reg_reg(regF dst, regF src1, regF src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FA : R; +%} + +// Floating Point Add Double +pipe_class faddD_reg_reg(regD dst, regD src1, regD src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FA : R; +%} + +// Floating Point Conditional Move based on integer flags +pipe_class int_conditional_float_move (cmpOp cmp, flagsReg cr, regF dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + cr : R(read); + FA : R(2); + BR : R(2); +%} + +// Floating Point Conditional Move based on integer flags +pipe_class int_conditional_double_move (cmpOp cmp, flagsReg cr, regD dst, regD src) %{ + single_instruction; + dst : X(write); + src : E(read); + cr : R(read); + FA : R(2); + BR : R(2); +%} + +// Floating Point Multiply Float +pipe_class fmulF_reg_reg(regF dst, regF src1, regF src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FM : R; +%} + +// Floating Point Multiply Double +pipe_class fmulD_reg_reg(regD dst, regD src1, regD src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FM : R; +%} + +// Floating Point Divide Float +pipe_class fdivF_reg_reg(regF dst, regF src1, regF src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FM : R; + FDIV : C(14); +%} + +// Floating Point Divide Double +pipe_class fdivD_reg_reg(regD dst, regD src1, regD src2) %{ + single_instruction; + dst : X(write); + src1 : E(read); + src2 : E(read); + FM : R; + FDIV : C(17); +%} + +// Floating Point Move/Negate/Abs Float +pipe_class faddF_reg(regF dst, regF src) %{ + single_instruction; + dst : W(write); + src : E(read); + FA : R(1); +%} + +// Floating Point Move/Negate/Abs Double +pipe_class faddD_reg(regD dst, regD src) %{ + single_instruction; + dst : W(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert F->D +pipe_class fcvtF2D(regD dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert I->D +pipe_class fcvtI2D(regD dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert LHi->D +pipe_class fcvtLHi2D(regD dst, regD src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert L->D +pipe_class fcvtL2D(regD dst, iRegL src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert L->F +pipe_class fcvtL2F(regF dst, iRegL src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert D->F +pipe_class fcvtD2F(regD dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert I->L +pipe_class fcvtI2L(regD dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Convert D->F +pipe_class fcvtD2I(iRegI dst, regD src, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : X(write)+6; + src : E(read); + FA : R; +%} + +// Floating Point Convert D->L +pipe_class fcvtD2L(regD dst, regD src, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : X(write)+6; + src : E(read); + FA : R; +%} + +// Floating Point Convert F->I +pipe_class fcvtF2I(regF dst, regF src, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : X(write)+6; + src : E(read); + FA : R; +%} + +// Floating Point Convert F->L +pipe_class fcvtF2L(regD dst, regF src, flagsReg cr) %{ + instruction_count(1); multiple_bundles; + dst : X(write)+6; + src : E(read); + FA : R; +%} + +// Floating Point Convert I->F +pipe_class fcvtI2F(regF dst, regF src) %{ + single_instruction; + dst : X(write); + src : E(read); + FA : R; +%} + +// Floating Point Compare +pipe_class faddF_fcc_reg_reg_zero(flagsRegF cr, regF src1, regF src2, immI0 zero) %{ + single_instruction; + cr : X(write); + src1 : E(read); + src2 : E(read); + FA : R; +%} + +// Floating Point Compare +pipe_class faddD_fcc_reg_reg_zero(flagsRegF cr, regD src1, regD src2, immI0 zero) %{ + single_instruction; + cr : X(write); + src1 : E(read); + src2 : E(read); + FA : R; +%} + +// Floating Add Nop +pipe_class fadd_nop() %{ + single_instruction; + FA : R; +%} + +// Integer Store to Memory +pipe_class istore_mem_reg(memoryI mem, iRegI src) %{ + single_instruction; + mem : R(read); + src : C(read); + MS : R; +%} + +// Integer Store to Memory +pipe_class istore_mem_spORreg(memoryI mem, sp_ptr_RegP src) %{ + single_instruction; + mem : R(read); + src : C(read); + MS : R; +%} + +// Float Store +pipe_class fstoreF_mem_reg(memoryF mem, RegF src) %{ + single_instruction; + mem : R(read); + src : C(read); + MS : R; +%} + +// Float Store +pipe_class fstoreF_mem_zero(memoryF mem, immF0 src) %{ + single_instruction; + mem : R(read); + MS : R; +%} + +// Double Store +pipe_class fstoreD_mem_reg(memoryD mem, RegD src) %{ + instruction_count(1); + mem : R(read); + src : C(read); + MS : R; +%} + +// Double Store +pipe_class fstoreD_mem_zero(memoryD mem, immD0 src) %{ + single_instruction; + mem : R(read); + MS : R; +%} + +// Integer Load (when sign bit propagation not needed) +pipe_class iload_mem(iRegI dst, memoryI mem) %{ + single_instruction; + mem : R(read); + dst : C(write); + MS : R; +%} + +// Integer Load (when sign bit propagation or masking is needed) +pipe_class iload_mask_mem(iRegI dst, memoryI mem) %{ + single_instruction; + mem : R(read); + dst : M(write); + MS : R; +%} + +// Float Load +pipe_class floadF_mem(regF dst, memoryF mem) %{ + single_instruction; + mem : R(read); + dst : M(write); + MS : R; +%} + +// Float Load +pipe_class floadD_mem(regD dst, memoryD mem) %{ + instruction_count(1); multiple_bundles; // Again, unaligned argument is only multiple case + mem : R(read); + dst : M(write); + MS : R; +%} + +// Memory Nop +pipe_class mem_nop() %{ + single_instruction; + MS : R; +%} + +pipe_class sethi(iRegP dst, immI src) %{ + single_instruction; + dst : E(write); + IALU : R; +%} + +pipe_class loadPollP(iRegP poll) %{ + single_instruction; + poll : R(read); + MS : R; +%} + +pipe_class br(Universe br, label labl) %{ + single_instruction_with_delay_slot; + BR : R; +%} + +pipe_class br_cc(Universe br, cmpOp cmp, flagsReg cr, label labl) %{ + single_instruction_with_delay_slot; + cr : E(read); + BR : R; +%} + +pipe_class br_reg(Universe br, cmpOp cmp, iRegI op1, label labl) %{ + single_instruction_with_delay_slot; + op1 : E(read); + BR : R; + MS : R; +%} + +pipe_class br_nop() %{ + single_instruction; + BR : R; +%} + +pipe_class simple_call(method meth) %{ + instruction_count(2); multiple_bundles; force_serialization; + fixed_latency(100); + BR : R(1); + MS : R(1); + A0 : R(1); +%} + +pipe_class compiled_call(method meth) %{ + instruction_count(1); multiple_bundles; force_serialization; + fixed_latency(100); + MS : R(1); +%} + +pipe_class call(method meth) %{ + instruction_count(0); multiple_bundles; force_serialization; + fixed_latency(100); +%} + +pipe_class tail_call(Universe ignore, label labl) %{ + single_instruction; has_delay_slot; + fixed_latency(100); + BR : R(1); + MS : R(1); +%} + +pipe_class ret(Universe ignore) %{ + single_instruction; has_delay_slot; + BR : R(1); + MS : R(1); +%} + +// The real do-nothing guy +pipe_class empty( ) %{ + instruction_count(0); +%} + +pipe_class long_memory_op() %{ + instruction_count(0); multiple_bundles; force_serialization; + fixed_latency(25); + MS : R(1); +%} + +// Check-cast +pipe_class partial_subtype_check_pipe(Universe ignore, iRegP array, iRegP match ) %{ + array : R(read); + match : R(read); + IALU : R(2); + BR : R(2); + MS : R; +%} + +// Convert FPU flags into +1,0,-1 +pipe_class floating_cmp( iRegI dst, regF src1, regF src2 ) %{ + src1 : E(read); + src2 : E(read); + dst : E(write); + FA : R; + MS : R(2); + BR : R(2); +%} + +// Compare for p < q, and conditionally add y +pipe_class cadd_cmpltmask( iRegI p, iRegI q, iRegI y ) %{ + p : E(read); + q : E(read); + y : E(read); + IALU : R(3) +%} + +// Perform a compare, then move conditionally in a branch delay slot. +pipe_class min_max( iRegI src2, iRegI srcdst ) %{ + src2 : E(read); + srcdst : E(read); + IALU : R; + BR : R; +%} + +// Define the class for the Nop node +define %{ + MachNop = ialu_nop; +%} + +%} + +//----------INSTRUCTIONS------------------------------------------------------- + +//------------Special Nop instructions for bundling - no match rules----------- +// Nop using the A0 functional unit +instruct Nop_A0() %{ + ins_pipe(ialu_nop_A0); +%} + +// Nop using the A1 functional unit +instruct Nop_A1( ) %{ + ins_pipe(ialu_nop_A1); +%} + +// Nop using the memory functional unit +instruct Nop_MS( ) %{ + ins_pipe(mem_nop); +%} + +// Nop using the floating add functional unit +instruct Nop_FA( ) %{ + ins_pipe(fadd_nop); +%} + +// Nop using the branch functional unit +instruct Nop_BR( ) %{ + ins_pipe(br_nop); +%} + +//----------Load/Store/Move Instructions--------------------------------------- +//----------Load Instructions-------------------------------------------------- +// Load Byte (8bit signed) +instruct loadB(iRegI dst, memoryB mem) %{ + match(Set dst (LoadB mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRSB $dst,$mem\t! byte -> int" %} + ins_encode %{ + // High 32 bits are harmlessly set on Aarch64 + __ ldrsb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Byte (8bit signed) into a Long Register +instruct loadB2L(iRegL dst, memoryB mem) %{ + match(Set dst (ConvI2L (LoadB mem))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRSB $dst,$mem\t! byte -> long" %} + ins_encode %{ + __ ldrsb($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRSB $dst.lo,$mem\t! byte -> long\n\t" + "ASR $dst.hi,$dst.lo,31" %} + ins_encode %{ + __ ldrsb($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), AsmOperand($dst$$Register, asr, 31)); + %} +#endif + ins_pipe(iload_mask_mem); +%} + +// Load Unsigned Byte (8bit UNsigned) into an int reg +instruct loadUB(iRegI dst, memoryB mem) %{ + match(Set dst (LoadUB mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRB $dst,$mem\t! ubyte -> int" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +// Load Unsigned Byte (8bit UNsigned) into a Long Register +instruct loadUB2L(iRegL dst, memoryB mem) %{ + match(Set dst (ConvI2L (LoadUB mem))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRB $dst,$mem\t! ubyte -> long" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRB $dst.lo,$mem\t! ubyte -> long\n\t" + "MOV $dst.hi,0" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Unsigned Byte (8 bit UNsigned) with immediate mask into Long Register +instruct loadUB2L_limmI(iRegL dst, memoryB mem, limmIlow8 mask) %{ + match(Set dst (ConvI2L (AndI (LoadUB mem) mask))); + +#ifdef AARCH64 + ins_cost(MEMORY_REF_COST + DEFAULT_COST); + size(8); + format %{ "LDRB $dst,$mem\t! ubyte -> long\n\t" + "AND $dst,$dst,$mask" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + __ andr($dst$$Register, $dst$$Register, limmI_low($mask$$constant, 8)); + %} +#else + ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST); + size(12); + format %{ "LDRB $dst.lo,$mem\t! ubyte -> long\n\t" + "MOV $dst.hi,0\n\t" + "AND $dst.lo,$dst.lo,$mask" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + __ andr($dst$$Register, $dst$$Register, limmI_low($mask$$constant, 8)); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Short (16bit signed) +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadSoff(iRegI dst, memoryScaledS mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadS (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "LDRSH $dst,$mem+$off\t! short temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldrsh($dst$$Register, nmem); + %} + ins_pipe(iload_mask_mem); +%} +#endif + +instruct loadS(iRegI dst, memoryS mem) %{ + match(Set dst (LoadS mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRSH $dst,$mem\t! short" %} + ins_encode %{ + __ ldrsh($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Short (16 bit signed) to Byte (8 bit signed) +instruct loadS2B(iRegI dst, memoryS mem, immI_24 twentyfour) %{ + match(Set dst (RShiftI (LShiftI (LoadS mem) twentyfour) twentyfour)); + ins_cost(MEMORY_REF_COST); + + size(4); + + format %{ "LDRSB $dst,$mem\t! short -> byte" %} + ins_encode %{ + // High 32 bits are harmlessly set on Aarch64 + __ ldrsb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Short (16bit signed) into a Long Register +instruct loadS2L(iRegL dst, memoryS mem) %{ + match(Set dst (ConvI2L (LoadS mem))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRSH $dst,$mem\t! short -> long" %} + ins_encode %{ + __ ldrsh($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRSH $dst.lo,$mem\t! short -> long\n\t" + "ASR $dst.hi,$dst.lo,31" %} + ins_encode %{ + __ ldrsh($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), AsmOperand($dst$$Register, asr, 31)); + %} +#endif + ins_pipe(iload_mask_mem); +%} + +// Load Unsigned Short/Char (16bit UNsigned) + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadUSoff(iRegI dst, memoryScaledS mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadUS (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "LDRH $dst,$mem+$off\t! ushort/char temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldrh($dst$$Register, nmem); + %} + ins_pipe(iload_mem); +%} +#endif + +instruct loadUS(iRegI dst, memoryS mem) %{ + match(Set dst (LoadUS mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRH $dst,$mem\t! ushort/char" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +// Load Unsigned Short/Char (16 bit UNsigned) to Byte (8 bit signed) +instruct loadUS2B(iRegI dst, memoryB mem, immI_24 twentyfour) %{ + match(Set dst (RShiftI (LShiftI (LoadUS mem) twentyfour) twentyfour)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRSB $dst,$mem\t! ushort -> byte" %} + ins_encode %{ + __ ldrsb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Unsigned Short/Char (16bit UNsigned) into a Long Register +instruct loadUS2L(iRegL dst, memoryS mem) %{ + match(Set dst (ConvI2L (LoadUS mem))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRH $dst,$mem\t! short -> long" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRH $dst.lo,$mem\t! short -> long\n\t" + "MOV $dst.hi, 0" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Unsigned Short/Char (16bit UNsigned) with mask 0xFF into a Long Register +instruct loadUS2L_immI_255(iRegL dst, memoryB mem, immI_255 mask) %{ + match(Set dst (ConvI2L (AndI (LoadUS mem) mask))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRB $dst,$mem" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRB $dst.lo,$mem\t! \n\t" + "MOV $dst.hi, 0" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Unsigned Short/Char (16bit UNsigned) with a immediate mask into a Long Register +instruct loadUS2L_limmI(iRegL dst, memoryS mem, limmI mask) %{ + match(Set dst (ConvI2L (AndI (LoadUS mem) mask))); +#ifdef AARCH64 + ins_cost(MEMORY_REF_COST + 1*DEFAULT_COST); + + size(8); + format %{ "LDRH $dst,$mem\t! ushort/char & mask -> long\n\t" + "AND $dst,$dst,$mask" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + __ andr($dst$$Register, $dst$$Register, (uintx)$mask$$constant); + %} +#else + ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST); + + size(12); + format %{ "LDRH $dst,$mem\t! ushort/char & mask -> long\n\t" + "MOV $dst.hi, 0\n\t" + "AND $dst,$dst,$mask" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + __ andr($dst$$Register, $dst$$Register, $mask$$constant); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Integer + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadIoff(iRegI dst, memoryScaledI mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadI (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "ldr_s32 $dst,$mem+$off\t! int temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr_s32($dst$$Register, nmem); + %} + ins_pipe(iload_mem); +%} +#endif + +instruct loadI(iRegI dst, memoryI mem) %{ + match(Set dst (LoadI mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "ldr_s32 $dst,$mem\t! int" %} + ins_encode %{ + __ ldr_s32($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +// Load Integer to Byte (8 bit signed) +instruct loadI2B(iRegI dst, memoryS mem, immI_24 twentyfour) %{ + match(Set dst (RShiftI (LShiftI (LoadI mem) twentyfour) twentyfour)); + ins_cost(MEMORY_REF_COST); + + size(4); + + format %{ "LDRSB $dst,$mem\t! int -> byte" %} + ins_encode %{ + __ ldrsb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Integer to Unsigned Byte (8 bit UNsigned) +instruct loadI2UB(iRegI dst, memoryB mem, immI_255 mask) %{ + match(Set dst (AndI (LoadI mem) mask)); + ins_cost(MEMORY_REF_COST); + + size(4); + + format %{ "LDRB $dst,$mem\t! int -> ubyte" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Integer to Short (16 bit signed) +instruct loadI2S(iRegI dst, memoryS mem, immI_16 sixteen) %{ + match(Set dst (RShiftI (LShiftI (LoadI mem) sixteen) sixteen)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRSH $dst,$mem\t! int -> short" %} + ins_encode %{ + __ ldrsh($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Integer to Unsigned Short (16 bit UNsigned) +instruct loadI2US(iRegI dst, memoryS mem, immI_65535 mask) %{ + match(Set dst (AndI (LoadI mem) mask)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRH $dst,$mem\t! int -> ushort/char" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mask_mem); +%} + +// Load Integer into a Long Register +instruct loadI2L(iRegL dst, memoryI mem) %{ + match(Set dst (ConvI2L (LoadI mem))); +#ifdef AARCH64 + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRSW $dst.lo,$mem\t! int -> long" %} + ins_encode %{ + __ ldr_s32($dst$$Register, $mem$$Address); + %} +#else + ins_cost(MEMORY_REF_COST); + + size(8); + format %{ "LDR $dst.lo,$mem\t! int -> long\n\t" + "ASR $dst.hi,$dst.lo,31\t! int->long" %} + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), AsmOperand($dst$$Register, asr, 31)); + %} +#endif + ins_pipe(iload_mask_mem); +%} + +// Load Integer with mask 0xFF into a Long Register +instruct loadI2L_immI_255(iRegL dst, memoryB mem, immI_255 mask) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); +#ifdef AARCH64 + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDRB $dst.lo,$mem\t! int & 0xFF -> long" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + %} +#else + ins_cost(MEMORY_REF_COST); + + size(8); + format %{ "LDRB $dst.lo,$mem\t! int & 0xFF -> long\n\t" + "MOV $dst.hi, 0" %} + ins_encode %{ + __ ldrb($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Integer with mask 0xFFFF into a Long Register +instruct loadI2L_immI_65535(iRegL dst, memoryS mem, immI_65535 mask) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 + size(4); + format %{ "LDRH $dst,$mem\t! int & 0xFFFF -> long" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDRH $dst,$mem\t! int & 0xFFFF -> long\n\t" + "MOV $dst.hi, 0" %} + ins_encode %{ + __ ldrh($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mask_mem); +%} + +#ifdef AARCH64 +// Load Integer with an immediate mask into a Long Register +instruct loadI2L_limmI(iRegL dst, memoryI mem, limmI mask) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); + ins_cost(MEMORY_REF_COST + 1*DEFAULT_COST); + + size(8); + format %{ "LDRSW $dst,$mem\t! int -> long\n\t" + "AND $dst,$dst,$mask" %} + + ins_encode %{ + __ ldr_s32($dst$$Register, $mem$$Address); + __ andr($dst$$Register, $dst$$Register, (uintx)$mask$$constant); + %} + ins_pipe(iload_mem); +%} +#else +// Load Integer with a 31-bit immediate mask into a Long Register +instruct loadI2L_limmU31(iRegL dst, memoryI mem, limmU31 mask) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); + ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST); + + size(12); + format %{ "LDR $dst.lo,$mem\t! int -> long\n\t" + "MOV $dst.hi, 0\n\t" + "AND $dst,$dst,$mask" %} + + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + __ andr($dst$$Register, $dst$$Register, $mask$$constant); + %} + ins_pipe(iload_mem); +%} +#endif + +#ifdef AARCH64 +// Load Integer with mask into a Long Register +// FIXME: use signedRegI mask, remove tmp? +instruct loadI2L_immI(iRegL dst, memoryI mem, immI mask, iRegI tmp) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); + effect(TEMP dst, TEMP tmp); + + ins_cost(MEMORY_REF_COST + 3*DEFAULT_COST); + format %{ "LDRSW $mem,$dst\t! int & 31-bit mask -> long\n\t" + "MOV_SLOW $tmp,$mask\n\t" + "AND $dst,$tmp,$dst" %} + ins_encode %{ + __ ldrsw($dst$$Register, $mem$$Address); + __ mov_slow($tmp$$Register, $mask$$constant); + __ andr($dst$$Register, $dst$$Register, $tmp$$Register); + %} + ins_pipe(iload_mem); +%} +#else +// Load Integer with a 31-bit mask into a Long Register +// FIXME: use iRegI mask, remove tmp? +instruct loadI2L_immU31(iRegL dst, memoryI mem, immU31 mask, iRegI tmp) %{ + match(Set dst (ConvI2L (AndI (LoadI mem) mask))); + effect(TEMP dst, TEMP tmp); + + ins_cost(MEMORY_REF_COST + 4*DEFAULT_COST); + size(20); + format %{ "LDR $mem,$dst\t! int & 31-bit mask -> long\n\t" + "MOV $dst.hi, 0\n\t" + "MOV_SLOW $tmp,$mask\n\t" + "AND $dst,$tmp,$dst" %} + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + __ mov_slow($tmp$$Register, $mask$$constant); + __ andr($dst$$Register, $dst$$Register, $tmp$$Register); + %} + ins_pipe(iload_mem); +%} +#endif + +// Load Unsigned Integer into a Long Register +instruct loadUI2L(iRegL dst, memoryI mem, immL_32bits mask) %{ + match(Set dst (AndL (ConvI2L (LoadI mem)) mask)); + ins_cost(MEMORY_REF_COST); + +#ifdef AARCH64 +//size(4); + format %{ "LDR_w $dst,$mem\t! uint -> long" %} + ins_encode %{ + __ ldr_w($dst$$Register, $mem$$Address); + %} +#else + size(8); + format %{ "LDR $dst.lo,$mem\t! uint -> long\n\t" + "MOV $dst.hi,0" %} + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(iload_mem); +%} + +// Load Long + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadLoff(iRegLd dst, memoryScaledL mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadL (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "LDR $dst,$mem+$off\t! long temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr($dst$$Register, nmem); + %} + ins_pipe(iload_mem); +%} +#endif + +instruct loadL(iRegLd dst, memoryL mem ) %{ +#ifdef AARCH64 + // already atomic for Aarch64 +#else + predicate(!((LoadLNode*)n)->require_atomic_access()); +#endif + match(Set dst (LoadL mem)); + effect(TEMP dst); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "ldr_64 $dst,$mem\t! long" %} + ins_encode %{ + __ ldr_64($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +#ifndef AARCH64 +instruct loadL_2instr(iRegL dst, memorylong mem ) %{ + predicate(!((LoadLNode*)n)->require_atomic_access()); + match(Set dst (LoadL mem)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); + + size(8); + format %{ "LDR $dst.lo,$mem \t! long order of instrs reversed if $dst.lo == base($mem)\n\t" + "LDR $dst.hi,$mem+4 or $mem" %} + ins_encode %{ + Address Amemlo = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + Address Amemhi = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none); + + if ($dst$$Register == reg_to_register_object($mem$$base)) { + __ ldr($dst$$Register->successor(), Amemhi); + __ ldr($dst$$Register, Amemlo); + } else { + __ ldr($dst$$Register, Amemlo); + __ ldr($dst$$Register->successor(), Amemhi); + } + %} + ins_pipe(iload_mem); +%} + +instruct loadL_volatile(iRegL dst, indirect mem ) %{ + predicate(((LoadLNode*)n)->require_atomic_access()); + match(Set dst (LoadL mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDMIA $dst,$mem\t! long" %} + ins_encode %{ + // FIXME: why is ldmia considered atomic? Should be ldrexd + RegisterSet set($dst$$Register); + set = set | reg_to_register_object($dst$$reg + 1); + __ ldmia(reg_to_register_object($mem$$base), set); + %} + ins_pipe(iload_mem); +%} + +instruct loadL_volatile_fp(iRegL dst, memoryD mem ) %{ + predicate(((LoadLNode*)n)->require_atomic_access()); + match(Set dst (LoadL mem)); + ins_cost(MEMORY_REF_COST); + + size(8); + format %{ "FLDD S14, $mem" + "FMRRD $dst, S14\t! long \n't" %} + ins_encode %{ + __ fldd(S14, $mem$$Address); + __ fmrrd($dst$$Register, $dst$$Register->successor(), S14); + %} + ins_pipe(iload_mem); +%} + +instruct loadL_unaligned(iRegL dst, memorylong mem ) %{ + match(Set dst (LoadL_unaligned mem)); + ins_cost(MEMORY_REF_COST); + + size(8); + format %{ "LDR $dst.lo,$mem\t! long order of instrs reversed if $dst.lo == base($mem)\n\t" + "LDR $dst.hi,$mem+4" %} + ins_encode %{ + Address Amemlo = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + Address Amemhi = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none); + + if ($dst$$Register == reg_to_register_object($mem$$base)) { + __ ldr($dst$$Register->successor(), Amemhi); + __ ldr($dst$$Register, Amemlo); + } else { + __ ldr($dst$$Register, Amemlo); + __ ldr($dst$$Register->successor(), Amemhi); + } + %} + ins_pipe(iload_mem); +%} +#endif // !AARCH64 + +// Load Range +instruct loadRange(iRegI dst, memoryI mem) %{ + match(Set dst (LoadRange mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "LDR_u32 $dst,$mem\t! range" %} + ins_encode %{ + __ ldr_u32($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +// Load Pointer + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadPoff(iRegP dst, memoryScaledP mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadP (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "LDR $dst,$mem+$off\t! ptr temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr($dst$$Register, nmem); + %} + ins_pipe(iload_mem); +%} +#endif + +instruct loadP(iRegP dst, memoryP mem) %{ + match(Set dst (LoadP mem)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "LDR $dst,$mem\t! ptr" %} + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +#ifdef XXX +// FIXME XXXX +//instruct loadSP(iRegP dst, memoryP mem) %{ +instruct loadSP(SPRegP dst, memoryP mem, iRegP tmp) %{ + match(Set dst (LoadP mem)); + effect(TEMP tmp); + ins_cost(MEMORY_REF_COST+1); + size(8); + + format %{ "LDR $tmp,$mem\t! ptr\n\t" + "MOV $dst,$tmp\t! ptr" %} + ins_encode %{ + __ ldr($tmp$$Register, $mem$$Address); + __ mov($dst$$Register, $tmp$$Register); + %} + ins_pipe(iload_mem); +%} +#endif + +#ifdef _LP64 +// Load Compressed Pointer + +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadNoff(iRegN dst, memoryScaledI mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadN (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "ldr_u32 $dst,$mem+$off\t! compressed ptr temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr_u32($dst$$Register, nmem); + %} + ins_pipe(iload_mem); +%} + +instruct loadN(iRegN dst, memoryI mem) %{ + match(Set dst (LoadN mem)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "ldr_u32 $dst,$mem\t! compressed ptr" %} + ins_encode %{ + __ ldr_u32($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} +#endif + +// Load Klass Pointer +instruct loadKlass(iRegP dst, memoryI mem) %{ + match(Set dst (LoadKlass mem)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "LDR $dst,$mem\t! klass ptr" %} + ins_encode %{ + __ ldr($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} + +#ifdef _LP64 +// Load narrow Klass Pointer +instruct loadNKlass(iRegN dst, memoryI mem) %{ + match(Set dst (LoadNKlass mem)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "ldr_u32 $dst,$mem\t! compressed klass ptr" %} + ins_encode %{ + __ ldr_u32($dst$$Register, $mem$$Address); + %} + ins_pipe(iload_mem); +%} +#endif + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadDoff(regD dst, memoryScaledD mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadD (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "ldr $dst,$mem+$off\t! double temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr_d($dst$$FloatRegister, nmem); + %} + ins_pipe(floadD_mem); +%} +#endif + +instruct loadD(regD dst, memoryD mem) %{ + match(Set dst (LoadD mem)); + ins_cost(MEMORY_REF_COST); + + size(4); + // FIXME: needs to be atomic, but ARMv7 A.R.M. guarantees + // only LDREXD and STREXD are 64-bit single-copy atomic + format %{ "FLDD $dst,$mem" %} + ins_encode %{ + __ ldr_double($dst$$FloatRegister, $mem$$Address); + %} + ins_pipe(floadD_mem); +%} + +#ifndef AARCH64 +// Load Double - UNaligned +instruct loadD_unaligned(regD_low dst, memoryF2 mem ) %{ + match(Set dst (LoadD_unaligned mem)); + ins_cost(MEMORY_REF_COST*2+DEFAULT_COST); + size(8); + format %{ "FLDS $dst.lo,$mem\t! misaligned double\n" + "\tFLDS $dst.hi,$mem+4\t!" %} + ins_encode %{ + Address Amemlo = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + Address Amemhi = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none); + __ flds($dst$$FloatRegister, Amemlo); + __ flds($dst$$FloatRegister->successor(), Amemhi); + %} + ins_pipe(iload_mem); +%} +#endif + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct loadFoff(regF dst, memoryScaledF mem, aimmX off, iRegP tmp) %{ + match(Set dst (LoadF (AddP mem off))); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "ldr $dst,$mem+$off\t! float temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ ldr_s($dst$$FloatRegister, nmem); + %} + ins_pipe(floadF_mem); +%} +#endif + +instruct loadF(regF dst, memoryF mem) %{ + match(Set dst (LoadF mem)); + + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "FLDS $dst,$mem" %} + ins_encode %{ + __ ldr_float($dst$$FloatRegister, $mem$$Address); + %} + ins_pipe(floadF_mem); +%} + +#ifdef AARCH64 +instruct load_limmI(iRegI dst, limmI src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST + 1); // + 1 because MOV is preferred + format %{ "ORR_w $dst, ZR, $src\t! int" %} + ins_encode %{ + __ orr_w($dst$$Register, ZR, (uintx)$src$$constant); + %} + ins_pipe(ialu_imm); +%} +#endif + +// // Load Constant +instruct loadConI( iRegI dst, immI src ) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 3/2); + format %{ "MOV_SLOW $dst, $src" %} + ins_encode %{ + __ mov_slow($dst$$Register, $src$$constant); + %} + ins_pipe(ialu_hi_lo_reg); +%} + +instruct loadConIMov( iRegI dst, immIMov src ) %{ + match(Set dst src); + size(4); + format %{ "MOV $dst, $src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant); + %} + ins_pipe(ialu_imm); +%} + +#ifndef AARCH64 +instruct loadConIMovn( iRegI dst, immIRotn src ) %{ + match(Set dst src); + size(4); + format %{ "MVN $dst, ~$src" %} + ins_encode %{ + __ mvn($dst$$Register, ~$src$$constant); + %} + ins_pipe(ialu_imm_n); +%} +#endif + +instruct loadConI16( iRegI dst, immI16 src ) %{ + match(Set dst src); + size(4); +#ifdef AARCH64 + format %{ "MOVZ_w $dst, $src" %} +#else + format %{ "MOVW $dst, $src" %} +#endif + ins_encode %{ +#ifdef AARCH64 + __ mov_w($dst$$Register, $src$$constant); +#else + __ movw($dst$$Register, $src$$constant); +#endif + %} + ins_pipe(ialu_imm_n); +%} + +instruct loadConP(iRegP dst, immP src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 3/2); + format %{ "MOV_SLOW $dst,$src\t!ptr" %} + ins_encode %{ + relocInfo::relocType constant_reloc = _opnds[1]->constant_reloc(); + intptr_t val = $src$$constant; + if (constant_reloc == relocInfo::oop_type) { + __ mov_oop($dst$$Register, (jobject)val); + } else if (constant_reloc == relocInfo::metadata_type) { + __ mov_metadata($dst$$Register, (Metadata*)val); + } else { + __ mov_slow($dst$$Register, val); + } + %} + ins_pipe(loadConP); +%} + + +instruct loadConP_poll(iRegP dst, immP_poll src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + format %{ "MOV_SLOW $dst,$src\t!ptr" %} + ins_encode %{ + __ mov_slow($dst$$Register, $src$$constant); + %} + ins_pipe(loadConP_poll); +%} + +#ifdef AARCH64 +instruct loadConP0(iRegP dst, immP0 src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + format %{ "MOV $dst,ZR\t!ptr" %} + ins_encode %{ + __ mov($dst$$Register, ZR); + %} + ins_pipe(ialu_none); +%} + +instruct loadConN(iRegN dst, immN src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 3/2); + format %{ "SET $dst,$src\t! compressed ptr" %} + ins_encode %{ + Register dst = $dst$$Register; + // FIXME: use $constanttablebase? + __ set_narrow_oop(dst, (jobject)$src$$constant); + %} + ins_pipe(ialu_hi_lo_reg); +%} + +instruct loadConN0(iRegN dst, immN0 src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + format %{ "MOV $dst,ZR\t! compressed ptr" %} + ins_encode %{ + __ mov($dst$$Register, ZR); + %} + ins_pipe(ialu_none); +%} + +instruct loadConNKlass(iRegN dst, immNKlass src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 3/2); + format %{ "SET $dst,$src\t! compressed klass ptr" %} + ins_encode %{ + Register dst = $dst$$Register; + // FIXME: use $constanttablebase? + __ set_narrow_klass(dst, (Klass*)$src$$constant); + %} + ins_pipe(ialu_hi_lo_reg); +%} + +instruct load_limmL(iRegL dst, limmL src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + format %{ "ORR $dst, ZR, $src\t! long" %} + ins_encode %{ + __ orr($dst$$Register, ZR, (uintx)$src$$constant); + %} + ins_pipe(loadConL); +%} +instruct load_immLMov(iRegL dst, immLMov src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + format %{ "MOV $dst, $src\t! long" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant); + %} + ins_pipe(loadConL); +%} +instruct loadConL(iRegL dst, immL src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 4); // worst case + format %{ "mov_slow $dst, $src\t! long" %} + ins_encode %{ + // FIXME: use $constanttablebase? + __ mov_slow($dst$$Register, $src$$constant); + %} + ins_pipe(loadConL); +%} +#else +instruct loadConL(iRegL dst, immL src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 4); + format %{ "MOV_SLOW $dst.lo, $src & 0x0FFFFFFFFL \t! long\n\t" + "MOV_SLOW $dst.hi, $src >> 32" %} + ins_encode %{ + __ mov_slow(reg_to_register_object($dst$$reg), $src$$constant & 0x0FFFFFFFFL); + __ mov_slow(reg_to_register_object($dst$$reg + 1), ((julong)($src$$constant)) >> 32); + %} + ins_pipe(loadConL); +%} + +instruct loadConL16( iRegL dst, immL16 src ) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 2); + + size(8); + format %{ "MOVW $dst.lo, $src \n\t" + "MOVW $dst.hi, 0 \n\t" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant); + __ movw($dst$$Register->successor(), 0); + %} + ins_pipe(ialu_imm); +%} +#endif + +instruct loadConF_imm8(regF dst, imm8F src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + size(4); + + format %{ "FCONSTS $dst, $src"%} + + ins_encode %{ + __ fconsts($dst$$FloatRegister, Assembler::float_num($src$$constant).imm8()); + %} + ins_pipe(loadConFD); // FIXME +%} + +#ifdef AARCH64 +instruct loadIConF(iRegI dst, immF src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 2); + + format %{ "MOV_SLOW $dst, $src\t! loadIConF" %} + + ins_encode %{ + // FIXME revisit once 6961697 is in + union { + jfloat f; + int i; + } v; + v.f = $src$$constant; + __ mov_slow($dst$$Register, v.i); + %} + ins_pipe(ialu_imm); +%} +#endif + +instruct loadConF(regF dst, immF src, iRegI tmp) %{ + match(Set dst src); + ins_cost(DEFAULT_COST * 2); + effect(TEMP tmp); + size(3*4); + + format %{ "MOV_SLOW $tmp, $src\n\t" + "FMSR $dst, $tmp"%} + + ins_encode %{ + // FIXME revisit once 6961697 is in + union { + jfloat f; + int i; + } v; + v.f = $src$$constant; + __ mov_slow($tmp$$Register, v.i); + __ fmsr($dst$$FloatRegister, $tmp$$Register); + %} + ins_pipe(loadConFD); // FIXME +%} + +instruct loadConD_imm8(regD dst, imm8D src) %{ + match(Set dst src); + ins_cost(DEFAULT_COST); + size(4); + + format %{ "FCONSTD $dst, $src"%} + + ins_encode %{ + __ fconstd($dst$$FloatRegister, Assembler::double_num($src$$constant).imm8()); + %} + ins_pipe(loadConFD); // FIXME +%} + +instruct loadConD(regD dst, immD src, iRegP tmp) %{ + match(Set dst src); + effect(TEMP tmp); + ins_cost(MEMORY_REF_COST); + format %{ "FLDD $dst, [$constanttablebase + $constantoffset]\t! load from constant table: double=$src" %} + + ins_encode %{ + Register r = $constanttablebase; + int offset = $constantoffset($src); + if (!is_memoryD(offset)) { // can't use a predicate + // in load constant instructs + __ add_slow($tmp$$Register, r, offset); + r = $tmp$$Register; + offset = 0; + } + __ ldr_double($dst$$FloatRegister, Address(r, offset)); + %} + ins_pipe(loadConFD); +%} + +// Prefetch instructions. +// Must be safe to execute with invalid address (cannot fault). + +instruct prefetchAlloc_mp( memoryP mem ) %{ + predicate(os::is_MP()); + match( PrefetchAllocation mem ); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "PLDW $mem\t! Prefetch allocation" %} + ins_encode %{ +#ifdef AARCH64 + __ prfm(pstl1keep, $mem$$Address); +#else + __ pldw($mem$$Address); +#endif + %} + ins_pipe(iload_mem); +%} + +instruct prefetchAlloc_sp( memoryP mem ) %{ + predicate(!os::is_MP()); + match( PrefetchAllocation mem ); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "PLD $mem\t! Prefetch allocation" %} + ins_encode %{ +#ifdef AARCH64 + __ prfm(pstl1keep, $mem$$Address); +#else + __ pld($mem$$Address); +#endif + %} + ins_pipe(iload_mem); +%} + +//----------Store Instructions------------------------------------------------- +// Store Byte +instruct storeB(memoryB mem, store_RegI src) %{ + match(Set mem (StoreB mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "STRB $src,$mem\t! byte" %} + ins_encode %{ + __ strb($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +instruct storeCM(memoryB mem, store_RegI src) %{ + match(Set mem (StoreCM mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "STRB $src,$mem\t! CMS card-mark byte" %} + ins_encode %{ + __ strb($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +// Store Char/Short + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeCoff(store_RegI src, memoryScaledS mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreC (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "STRH $src,$mem+$off\t! short temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ strh($src$$Register, nmem); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +instruct storeC(memoryS mem, store_RegI src) %{ + match(Set mem (StoreC mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "STRH $src,$mem\t! short" %} + ins_encode %{ + __ strh($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +// Store Integer + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeIoff(store_RegI src, memoryScaledI mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreI (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "str_32 $src,$mem+$off\t! int temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str_32($src$$Register, nmem); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +instruct storeI(memoryI mem, store_RegI src) %{ + match(Set mem (StoreI mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "str_32 $src,$mem" %} + ins_encode %{ + __ str_32($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +// Store Long + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeLoff(store_RegLd src, memoryScaledL mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreL (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "str_64 $src,$mem+$off\t! long temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str_64($src$$Register, nmem); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +instruct storeL(memoryL mem, store_RegLd src) %{ +#ifdef AARCH64 + // already atomic for Aarch64 +#else + predicate(!((StoreLNode*)n)->require_atomic_access()); +#endif + match(Set mem (StoreL mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "str_64 $src,$mem\t! long\n\t" %} + + ins_encode %{ + __ str_64($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +#ifndef AARCH64 +instruct storeL_2instr(memorylong mem, iRegL src) %{ + predicate(!((StoreLNode*)n)->require_atomic_access()); + match(Set mem (StoreL mem src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); + + size(8); + format %{ "STR $src.lo,$mem\t! long\n\t" + "STR $src.hi,$mem+4" %} + + ins_encode %{ + Address Amemlo = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + Address Amemhi = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none); + __ str($src$$Register, Amemlo); + __ str($src$$Register->successor(), Amemhi); + %} + ins_pipe(istore_mem_reg); +%} + +instruct storeL_volatile(indirect mem, iRegL src) %{ + predicate(((StoreLNode*)n)->require_atomic_access()); + match(Set mem (StoreL mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "STMIA $src,$mem\t! long" %} + ins_encode %{ + // FIXME: why is stmia considered atomic? Should be strexd + RegisterSet set($src$$Register); + set = set | reg_to_register_object($src$$reg + 1); + __ stmia(reg_to_register_object($mem$$base), set); + %} + ins_pipe(istore_mem_reg); +%} +#endif // !AARCH64 + +#ifndef AARCH64 +instruct storeL_volatile_fp(memoryD mem, iRegL src) %{ + predicate(((StoreLNode*)n)->require_atomic_access()); + match(Set mem (StoreL mem src)); + ins_cost(MEMORY_REF_COST); + size(8); + format %{ "FMDRR S14, $src\t! long \n\t" + "FSTD S14, $mem" %} + ins_encode %{ + __ fmdrr(S14, $src$$Register, $src$$Register->successor()); + __ fstd(S14, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +#ifdef XXX +// Move SP Pointer +//instruct movSP(sp_ptr_RegP dst, SPRegP src) %{ +//instruct movSP(iRegP dst, SPRegP src) %{ +instruct movSP(store_ptr_RegP dst, SPRegP src) %{ + match(Set dst src); +//predicate(!_kids[1]->_leaf->is_Proj() || _kids[1]->_leaf->as_Proj()->_con == TypeFunc::FramePtr); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "MOV $dst,$src\t! SP ptr\n\t" %} + ins_encode %{ + assert(false, "XXX1 got here"); + __ mov($dst$$Register, SP); + __ mov($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} +#endif + +#ifdef AARCH64 +// FIXME +// Store SP Pointer +instruct storeSP(memoryP mem, SPRegP src, iRegP tmp) %{ + match(Set mem (StoreP mem src)); + predicate(_kids[1]->_leaf->is_Proj() && _kids[1]->_leaf->as_Proj()->_con == TypeFunc::FramePtr); + // Multiple StoreP rules, different only in register mask. + // Matcher makes the last always valid. The others will + // only be valid if they cost less than the last valid + // rule. So cost(rule1) < cost(rule2) < cost(last) + // Unlike immediates, register constraints are not checked + // at match time. + ins_cost(MEMORY_REF_COST+DEFAULT_COST+4); + effect(TEMP tmp); + size(8); + + format %{ "MOV $tmp,$src\t! SP ptr\n\t" + "STR $tmp,$mem\t! SP ptr" %} + ins_encode %{ + assert($src$$Register == SP, "SP expected"); + __ mov($tmp$$Register, $src$$Register); + __ str($tmp$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_spORreg); // FIXME +%} +#endif // AARCH64 + +// Store Pointer + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storePoff(store_ptr_RegP src, memoryScaledP mem, aimmX off, iRegP tmp) %{ + predicate(!_kids[1]->_leaf->is_Proj() || _kids[1]->_leaf->as_Proj()->_con != TypeFunc::FramePtr); + match(Set mem (StoreP (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "STR $src,$mem+$off\t! ptr temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str($src$$Register, nmem); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +instruct storeP(memoryP mem, store_ptr_RegP src) %{ + match(Set mem (StoreP mem src)); +#ifdef AARCH64 + predicate(!_kids[1]->_leaf->is_Proj() || _kids[1]->_leaf->as_Proj()->_con != TypeFunc::FramePtr); +#endif + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "STR $src,$mem\t! ptr" %} + ins_encode %{ + __ str($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_spORreg); +%} + +#ifdef AARCH64 +// Store NULL Pointer +instruct storeP0(memoryP mem, immP0 src) %{ + match(Set mem (StoreP mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "STR ZR,$mem\t! ptr" %} + ins_encode %{ + __ str(ZR, $mem$$Address); + %} + ins_pipe(istore_mem_spORreg); +%} +#endif // AARCH64 + +#ifdef _LP64 +// Store Compressed Pointer + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeNoff(store_RegN src, memoryScaledI mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreN (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "str_32 $src,$mem+$off\t! compressed ptr temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str_32($src$$Register, nmem); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +instruct storeN(memoryI mem, store_RegN src) %{ + match(Set mem (StoreN mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "str_32 $src,$mem\t! compressed ptr" %} + ins_encode %{ + __ str_32($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} + +#ifdef AARCH64 +// Store NULL Pointer +instruct storeN0(memoryI mem, immN0 src) %{ + match(Set mem (StoreN mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "str_32 ZR,$mem\t! compressed ptr" %} + ins_encode %{ + __ str_32(ZR, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +// Store Compressed Klass Pointer +instruct storeNKlass(memoryI mem, store_RegN src) %{ + match(Set mem (StoreNKlass mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + + format %{ "str_32 $src,$mem\t! compressed klass ptr" %} + ins_encode %{ + __ str_32($src$$Register, $mem$$Address); + %} + ins_pipe(istore_mem_reg); +%} +#endif + +// Store Double + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeDoff(regD src, memoryScaledD mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreD (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "STR $src,$mem+$off\t! double temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str_d($src$$FloatRegister, nmem); + %} + ins_pipe(fstoreD_mem_reg); +%} +#endif + +instruct storeD(memoryD mem, regD src) %{ + match(Set mem (StoreD mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + // FIXME: needs to be atomic, but ARMv7 A.R.M. guarantees + // only LDREXD and STREXD are 64-bit single-copy atomic + format %{ "FSTD $src,$mem" %} + ins_encode %{ + __ str_double($src$$FloatRegister, $mem$$Address); + %} + ins_pipe(fstoreD_mem_reg); +%} + +#ifdef AARCH64 +instruct movI2F(regF dst, iRegI src) %{ + match(Set dst src); + size(4); + + format %{ "FMOV_sw $dst,$src\t! movI2F" %} + ins_encode %{ + __ fmov_sw($dst$$FloatRegister, $src$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} + +instruct movF2I(iRegI dst, regF src) %{ + match(Set dst src); + size(4); + + format %{ "FMOV_ws $dst,$src\t! movF2I" %} + ins_encode %{ + __ fmov_ws($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif + +// Store Float + +#ifdef AARCH64 +// XXX This variant shouldn't be necessary if 6217251 is implemented +instruct storeFoff(regF src, memoryScaledF mem, aimmX off, iRegP tmp) %{ + match(Set mem (StoreF (AddP mem off) src)); + ins_cost(MEMORY_REF_COST + DEFAULT_COST); // assume shift/sign-extend is free + effect(TEMP tmp); + size(4 * 2); + + format %{ "str_s $src,$mem+$off\t! float temp=$tmp" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + __ add($tmp$$Register, base, $off$$constant); + Address nmem = Address::make_raw($tmp$$reg, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none); + __ str_s($src$$FloatRegister, nmem); + %} + ins_pipe(fstoreF_mem_reg); +%} +#endif + +instruct storeF( memoryF mem, regF src) %{ + match(Set mem (StoreF mem src)); + ins_cost(MEMORY_REF_COST); + + size(4); + format %{ "FSTS $src,$mem" %} + ins_encode %{ + __ str_float($src$$FloatRegister, $mem$$Address); + %} + ins_pipe(fstoreF_mem_reg); +%} + +#ifdef AARCH64 +// Convert oop pointer into compressed form +instruct encodeHeapOop(iRegN dst, iRegP src, flagsReg ccr) %{ + predicate(n->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull); + match(Set dst (EncodeP src)); + effect(KILL ccr); + format %{ "encode_heap_oop $dst, $src" %} + ins_encode %{ + __ encode_heap_oop($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +instruct encodeHeapOop_not_null(iRegN dst, iRegP src) %{ + predicate(n->bottom_type()->make_ptr()->ptr() == TypePtr::NotNull); + match(Set dst (EncodeP src)); + format %{ "encode_heap_oop_not_null $dst, $src" %} + ins_encode %{ + __ encode_heap_oop_not_null($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +instruct decodeHeapOop(iRegP dst, iRegN src, flagsReg ccr) %{ + predicate(n->bottom_type()->is_oopptr()->ptr() != TypePtr::NotNull && + n->bottom_type()->is_oopptr()->ptr() != TypePtr::Constant); + match(Set dst (DecodeN src)); + effect(KILL ccr); + format %{ "decode_heap_oop $dst, $src" %} + ins_encode %{ + __ decode_heap_oop($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +instruct decodeHeapOop_not_null(iRegP dst, iRegN src) %{ + predicate(n->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull || + n->bottom_type()->is_oopptr()->ptr() == TypePtr::Constant); + match(Set dst (DecodeN src)); + format %{ "decode_heap_oop_not_null $dst, $src" %} + ins_encode %{ + __ decode_heap_oop_not_null($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +instruct encodeKlass_not_null(iRegN dst, iRegP src) %{ + match(Set dst (EncodePKlass src)); + format %{ "encode_klass_not_null $dst, $src" %} + ins_encode %{ + __ encode_klass_not_null($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +instruct decodeKlass_not_null(iRegP dst, iRegN src) %{ + match(Set dst (DecodeNKlass src)); + format %{ "decode_klass_not_null $dst, $src" %} + ins_encode %{ + __ decode_klass_not_null($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} +#endif // AARCH64 + +//----------MemBar Instructions----------------------------------------------- +// Memory barrier flavors + +// TODO: take advantage of Aarch64 load-acquire, store-release, etc +// pattern-match out unnecessary membars +instruct membar_storestore() %{ + match(MemBarStoreStore); + ins_cost(4*MEMORY_REF_COST); + + size(4); + format %{ "MEMBAR-storestore" %} + ins_encode %{ + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg); + %} + ins_pipe(long_memory_op); +%} + +instruct membar_acquire() %{ + match(MemBarAcquire); + match(LoadFence); + ins_cost(4*MEMORY_REF_COST); + + size(4); + format %{ "MEMBAR-acquire" %} + ins_encode %{ + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::LoadLoad | MacroAssembler::LoadStore), noreg); + %} + ins_pipe(long_memory_op); +%} + +instruct membar_acquire_lock() %{ + match(MemBarAcquireLock); + ins_cost(0); + + size(0); + format %{ "!MEMBAR-acquire (CAS in prior FastLock so empty encoding)" %} + ins_encode( ); + ins_pipe(empty); +%} + +instruct membar_release() %{ + match(MemBarRelease); + match(StoreFence); + ins_cost(4*MEMORY_REF_COST); + + size(4); + format %{ "MEMBAR-release" %} + ins_encode %{ + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore | MacroAssembler::LoadStore), noreg); + %} + ins_pipe(long_memory_op); +%} + +instruct membar_release_lock() %{ + match(MemBarReleaseLock); + ins_cost(0); + + size(0); + format %{ "!MEMBAR-release (CAS in succeeding FastUnlock so empty encoding)" %} + ins_encode( ); + ins_pipe(empty); +%} + +instruct membar_volatile() %{ + match(MemBarVolatile); + ins_cost(4*MEMORY_REF_COST); + + size(4); + format %{ "MEMBAR-volatile" %} + ins_encode %{ + __ membar(MacroAssembler::StoreLoad, noreg); + %} + ins_pipe(long_memory_op); +%} + +instruct unnecessary_membar_volatile() %{ + match(MemBarVolatile); + predicate(Matcher::post_store_load_barrier(n)); + ins_cost(0); + + size(0); + format %{ "!MEMBAR-volatile (unnecessary so empty encoding)" %} + ins_encode( ); + ins_pipe(empty); +%} + +//----------Register Move Instructions----------------------------------------- +// instruct roundDouble_nop(regD dst) %{ +// match(Set dst (RoundDouble dst)); +// ins_pipe(empty); +// %} + + +// instruct roundFloat_nop(regF dst) %{ +// match(Set dst (RoundFloat dst)); +// ins_pipe(empty); +// %} + + +#ifdef AARCH64 +// 0 constant in register +instruct zrImmI0(ZRRegI dst, immI0 imm) %{ + match(Set dst imm); + size(0); + ins_cost(0); + + format %{ "! ZR (int 0)" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(ialu_none); +%} + +// 0 constant in register +instruct zrImmL0(ZRRegL dst, immL0 imm) %{ + match(Set dst imm); + size(0); + ins_cost(0); + + format %{ "! ZR (long 0)" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(ialu_none); +%} + +#ifdef XXX +// 0 constant in register +instruct zrImmN0(ZRRegN dst, immN0 imm) %{ + match(Set dst imm); + size(0); + ins_cost(0); + + format %{ "! ZR (compressed pointer NULL)" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(ialu_none); +%} + +// 0 constant in register +instruct zrImmP0(ZRRegP dst, immP0 imm) %{ + match(Set dst imm); + size(0); + ins_cost(0); + + format %{ "! ZR (NULL)" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(ialu_none); +%} +#endif +#endif // AARCH64 + +// Cast Index to Pointer for unsafe natives +instruct castX2P(iRegX src, iRegP dst) %{ + match(Set dst (CastX2P src)); + + format %{ "MOV $dst,$src\t! IntX->Ptr if $dst != $src" %} + ins_encode %{ + if ($dst$$Register != $src$$Register) { + __ mov($dst$$Register, $src$$Register); + } + %} + ins_pipe(ialu_reg); +%} + +// Cast Pointer to Index for unsafe natives +instruct castP2X(iRegP src, iRegX dst) %{ + match(Set dst (CastP2X src)); + + format %{ "MOV $dst,$src\t! Ptr->IntX if $dst != $src" %} + ins_encode %{ + if ($dst$$Register != $src$$Register) { + __ mov($dst$$Register, $src$$Register); + } + %} + ins_pipe(ialu_reg); +%} + +#ifndef AARCH64 +//----------Conditional Move--------------------------------------------------- +// Conditional move +instruct cmovIP_reg(cmpOpP cmp, flagsRegP pcc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp pcc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src\t! int" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} +#endif + +#ifdef AARCH64 +instruct cmovI_reg3(cmpOp cmp, flagsReg icc, iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! int" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovL_reg3(cmpOp cmp, flagsReg icc, iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! long" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovP_reg3(cmpOp cmp, flagsReg icc, iRegP dst, iRegP src1, iRegP src2) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovN_reg3(cmpOp cmp, flagsReg icc, iRegN dst, iRegN src1, iRegN src2) %{ + match(Set dst (CMoveN (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! compressed ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovIP_reg3(cmpOpP cmp, flagsRegP icc, iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! int" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLP_reg3(cmpOpP cmp, flagsRegP icc, iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! long" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPP_reg3(cmpOpP cmp, flagsRegP icc, iRegP dst, iRegP src1, iRegP src2) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovNP_reg3(cmpOpP cmp, flagsRegP icc, iRegN dst, iRegN src1, iRegN src2) %{ + match(Set dst (CMoveN (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! compressed ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovIU_reg3(cmpOpU cmp, flagsRegU icc, iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! int" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLU_reg3(cmpOpU cmp, flagsRegU icc, iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! long" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPU_reg3(cmpOpU cmp, flagsRegU icc, iRegP dst, iRegP src1, iRegP src2) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovNU_reg3(cmpOpU cmp, flagsRegU icc, iRegN dst, iRegN src1, iRegN src2) %{ + match(Set dst (CMoveN (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! compressed ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovIZ_reg3(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! int" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLZ_reg3(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! long" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPZ_reg3(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegP dst, iRegP src1, iRegP src2) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovNZ_reg3(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegN dst, iRegN src1, iRegN src2) %{ + match(Set dst (CMoveN (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "CSEL $dst,$src1,$src2,$cmp\t! compressed ptr" %} + ins_encode %{ + __ csel($dst$$Register, $src1$$Register, $src2$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} +#endif // AARCH64 + +#ifndef AARCH64 +instruct cmovIP_immMov(cmpOpP cmp, flagsRegP pcc, iRegI dst, immIMov src) %{ + match(Set dst (CMoveI (Binary cmp pcc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovIP_imm16(cmpOpP cmp, flagsRegP pcc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp pcc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOVw$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} +#endif + +instruct cmovI_reg(cmpOp cmp, flagsReg icc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +#ifdef AARCH64 +instruct cmovL_reg(cmpOp cmp, flagsReg icc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src\t! long" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} +#endif + +#ifndef AARCH64 +instruct cmovI_immMov(cmpOp cmp, flagsReg icc, iRegI dst, immIMov src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovII_imm16(cmpOp cmp, flagsReg icc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOVw$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} +#endif + +instruct cmovII_reg_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +#ifndef AARCH64 +instruct cmovII_immMov_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegI dst, immIMov src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(140); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovII_imm16_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(140); + size(4); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} +#endif + +instruct cmovIIu_reg(cmpOpU cmp, flagsRegU icc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +#ifndef AARCH64 +instruct cmovIIu_immMov(cmpOpU cmp, flagsRegU icc, iRegI dst, immIMov src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovIIu_imm16(cmpOpU cmp, flagsRegU icc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp icc) (Binary dst src))); + ins_cost(140); + size(4); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} +#endif + +// Conditional move +instruct cmovPP_reg(cmpOpP cmp, flagsRegP pcc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp pcc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPP_imm(cmpOpP cmp, flagsRegP pcc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp pcc) (Binary dst src))); + ins_cost(140); + size(4); +#ifdef AARCH64 + format %{ "MOV$cmp $dst,ZR" %} +#else + format %{ "MOV$cmp $dst,$src" %} +#endif + ins_encode %{ +#ifdef AARCH64 + __ mov($dst$$Register, ZR, (AsmCondition)($cmp$$cmpcode)); +#else + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); +#endif + %} + ins_pipe(ialu_imm); +%} + +// This instruction also works with CmpN so we don't need cmovPN_reg. +instruct cmovPI_reg(cmpOp cmp, flagsReg icc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "MOV$cmp $dst,$src\t! ptr" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPI_reg_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(150); + + size(4); + format %{ "MOV$cmp $dst,$src\t! ptr" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPIu_reg(cmpOpU cmp, flagsRegU icc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "MOV$cmp $dst,$src\t! ptr" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPI_imm(cmpOp cmp, flagsReg icc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + ins_cost(140); + + size(4); +#ifdef AARCH64 + format %{ "MOV$cmp $dst,ZR\t! ptr" %} +#else + format %{ "MOV$cmp $dst,$src\t! ptr" %} +#endif + ins_encode %{ +#ifdef AARCH64 + __ mov($dst$$Register, ZR, (AsmCondition)($cmp$$cmpcode)); +#else + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); +#endif + %} + ins_pipe(ialu_imm); +%} + +instruct cmovPI_imm_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(140); + + size(4); +#ifdef AARCH64 + format %{ "MOV$cmp $dst,ZR\t! ptr" %} +#else + format %{ "MOV$cmp $dst,$src\t! ptr" %} +#endif + ins_encode %{ +#ifdef AARCH64 + __ mov($dst$$Register, ZR, (AsmCondition)($cmp$$cmpcode)); +#else + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); +#endif + %} + ins_pipe(ialu_imm); +%} + +instruct cmovPIu_imm(cmpOpU cmp, flagsRegU icc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp icc) (Binary dst src))); + ins_cost(140); + + size(4); +#ifdef AARCH64 + format %{ "MOV$cmp $dst,ZR\t! ptr" %} +#else + format %{ "MOV$cmp $dst,$src\t! ptr" %} +#endif + ins_encode %{ +#ifdef AARCH64 + __ mov($dst$$Register, ZR, (AsmCondition)($cmp$$cmpcode)); +#else + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); +#endif + %} + ins_pipe(ialu_imm); +%} + +#ifdef AARCH64 +// Conditional move +instruct cmovF_reg(cmpOp cmp, flagsReg icc, regF dst, regF src1, regF src2) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_s $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_s($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovD_reg(cmpOp cmp, flagsReg icc, regD dst, regD src1, regD src2) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_d $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_d($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFP_reg(cmpOpP cmp, flagsRegP icc, regF dst, regF src1, regF src2) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_s $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_s($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDP_reg(cmpOpP cmp, flagsRegP icc, regD dst, regD src1, regD src2) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_d $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_d($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFU_reg(cmpOpU cmp, flagsRegU icc, regF dst, regF src1, regF src2) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_s $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_s($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDU_reg(cmpOpU cmp, flagsRegU icc, regD dst, regD src1, regD src2) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_d $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_d($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFZ_reg(cmpOp0 cmp, flagsReg_EQNELTGE icc, regF dst, regF src1, regF src2) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_s $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_s($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDZ_reg(cmpOp0 cmp, flagsReg_EQNELTGE icc, regD dst, regD src1, regD src2) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary src2 src1))); + ins_cost(150); + size(4); + format %{ "FCSEL_d $dst,$src1,$src2,$cmp" %} + ins_encode %{ + __ fcsel_d($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +#else // !AARCH64 + +// Conditional move +instruct cmovFP_reg(cmpOpP cmp, flagsRegP pcc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp pcc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFI_reg(cmpOp cmp, flagsReg icc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFI_reg_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(150); + + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFIu_reg(cmpOpU cmp, flagsRegU icc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +// Conditional move +instruct cmovDP_reg(cmpOpP cmp, flagsRegP pcc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp pcc) (Binary dst src))); + ins_cost(150); + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_double_move); +%} + +instruct cmovDI_reg(cmpOp cmp, flagsReg icc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_double_move); +%} + +instruct cmovDI_reg_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(150); + + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_double_move); +%} + +instruct cmovDIu_reg(cmpOpU cmp, flagsRegU icc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_double_move); +%} + +// Conditional move +instruct cmovLP_reg(cmpOpP cmp, flagsRegP pcc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp pcc) (Binary dst src))); + ins_cost(150); + + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst.hi,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct cmovLP_immRot(cmpOpP cmp, flagsRegP pcc, iRegL dst, immLlowRot src) %{ + match(Set dst (CMoveL (Binary cmp pcc) (Binary dst src))); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLP_imm16(cmpOpP cmp, flagsRegP pcc, iRegL dst, immL16 src) %{ + match(Set dst (CMoveL (Binary cmp pcc) (Binary dst src))); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLI_reg(cmpOp cmp, flagsReg icc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst.hi,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLI_reg_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(150); + + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst.hi,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct cmovLI_immRot(cmpOp cmp, flagsReg icc, iRegL dst, immLlowRot src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct cmovLI_immRot_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegL dst, immLlowRot src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ mov($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLI_imm16(cmpOp cmp, flagsReg icc, iRegL dst, immL16 src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ movw($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLI_imm16_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, iRegL dst, immL16 src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || + _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + ins_cost(140); + + size(8); + format %{ "MOV$cmp $dst.lo,$src\t! long\n\t" + "MOV$cmp $dst.hi,0" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + __ movw($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLIu_reg(cmpOpU cmp, flagsRegU icc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp icc) (Binary dst src))); + ins_cost(150); + + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst.hi,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} +#endif // !AARCH64 + + +//----------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(RthreadRegP dst) %{ + match(Set dst (ThreadLocal)); + + size(0); + ins_cost(0); + format %{ "! TLS is in $dst" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(ialu_none); +%} + +instruct checkCastPP( iRegP dst ) %{ + match(Set dst (CheckCastPP dst)); + + size(0); + format %{ "! checkcastPP of $dst" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(empty); +%} + + +instruct castPP( iRegP dst ) %{ + match(Set dst (CastPP dst)); + format %{ "! castPP of $dst" %} + ins_encode( /*empty encoding*/ ); + ins_pipe(empty); +%} + +instruct castII( iRegI dst ) %{ + match(Set dst (CastII dst)); + format %{ "! castII of $dst" %} + ins_encode( /*empty encoding*/ ); + ins_cost(0); + ins_pipe(empty); +%} + +//----------Arithmetic Instructions-------------------------------------------- +// Addition Instructions +// Register Addition +instruct addI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (AddI src1 src2)); + + size(4); + format %{ "add_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct addshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AddI (LShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1<<$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsl, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +#ifdef AARCH64 +#ifdef TODO +instruct addshlL_reg_imm_reg(iRegL dst, iRegL src1, immU6 src2, iRegL src3) %{ + match(Set dst (AddL (LShiftL src1 src2) src3)); + + size(4); + format %{ "ADD $dst,$src3,$src1<<$src2\t! long" %} + ins_encode %{ + __ add($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsl, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif +#endif + +instruct addshlI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (AddI (LShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1<<$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsl, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct addsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AddI (RShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1>>$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, asr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct addsarI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (AddI (RShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1>>$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, asr, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct addshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AddI (URShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1>>>$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct addshrI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (AddI (URShiftI src1 src2) src3)); + + size(4); + format %{ "add_32 $dst,$src3,$src1>>>$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsr, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +// Immediate Addition +instruct addI_reg_aimmI(iRegI dst, iRegI src1, aimmI src2) %{ + match(Set dst (AddI src1 src2)); + + size(4); + format %{ "add_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ add_32($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +// Pointer Register Addition +instruct addP_reg_reg(iRegP dst, iRegP src1, iRegX src2) %{ + match(Set dst (AddP src1 src2)); + + size(4); + format %{ "ADD $dst,$src1,$src2\t! ptr" %} + ins_encode %{ + __ add($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifdef AARCH64 +// unshifted I2L operand +operand unshiftedI2L(iRegI src2) %{ +//constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(ConvI2L src2); + + op_cost(1); + format %{ "$src2.w" %} + interface(MEMORY_INTER) %{ + base($src2); + index(0xff); + scale(0x0); + disp(0x0); + %} +%} + +// shifted I2L operand +operand shiftedI2L(iRegI src2, immI_0_4 src3) %{ +//constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(LShiftX (ConvI2L src2) src3); + + op_cost(1); + format %{ "$src2.w << $src3" %} + interface(MEMORY_INTER) %{ + base($src2); + index(0xff); + scale($src3); + disp(0x0); + %} +%} + +opclass shiftedRegI(shiftedI2L, unshiftedI2L); + +instruct shlL_reg_regI(iRegL dst, iRegI src1, immU6 src2) %{ + match(Set dst (LShiftL (ConvI2L src1) src2)); + + size(4); + format %{ "LSL $dst,$src1.w,$src2\t! ptr" %} + ins_encode %{ + int c = $src2$$constant; + int r = 64 - c; + int s = 31; + if (s >= r) { + s = r - 1; + } + __ sbfm($dst$$Register, $src1$$Register, r, s); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct addP_reg_regI(iRegP dst, iRegP src1, shiftedRegI src2) %{ + match(Set dst (AddP src1 src2)); + + ins_cost(DEFAULT_COST * 3/2); + size(4); + format %{ "ADD $dst,$src1,$src2, sxtw\t! ptr" %} + ins_encode %{ + Register base = reg_to_register_object($src2$$base); + __ add($dst$$Register, $src1$$Register, base, ex_sxtw, $src2$$scale); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +// shifted iRegX operand +operand shiftedX(iRegX src2, shimmX src3) %{ +//constraint(ALLOC_IN_RC(sp_ptr_reg)); + match(LShiftX src2 src3); + + op_cost(1); + format %{ "$src2 << $src3" %} + interface(MEMORY_INTER) %{ + base($src2); + index(0xff); + scale($src3); + disp(0x0); + %} +%} + +instruct addshlP_reg_reg_imm(iRegP dst, iRegP src1, shiftedX src2) %{ + match(Set dst (AddP src1 src2)); + + ins_cost(DEFAULT_COST * 3/2); + size(4); + format %{ "ADD $dst,$src1,$src2\t! ptr" %} + ins_encode %{ + Register base = reg_to_register_object($src2$$base); + __ add($dst$$Register, $src1$$Register, AsmOperand(base, lsl, $src2$$scale)); + %} + ins_pipe(ialu_reg_reg); +%} + +// Pointer Immediate Addition +instruct addP_reg_aimmX(iRegP dst, iRegP src1, aimmX src2) %{ + match(Set dst (AddP src1 src2)); + + size(4); + format %{ "ADD $dst,$src1,$src2\t! ptr" %} + ins_encode %{ + __ add($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +// Long Addition +#ifdef AARCH64 +instruct addL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (AddL src1 src2)); + size(4); + format %{ "ADD $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ add($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct addL_reg_regI(iRegL dst, iRegL src1, shiftedRegI src2) %{ + match(Set dst (AddL src1 src2)); + + ins_cost(DEFAULT_COST * 3/2); + size(4); + format %{ "ADD $dst,$src1,$src2, sxtw\t! long" %} + ins_encode %{ + Register base = reg_to_register_object($src2$$base); + __ add($dst$$Register, $src1$$Register, base, ex_sxtw, $src2$$scale); + %} + ins_pipe(ialu_reg_reg); +%} +#else +instruct addL_reg_reg(iRegL dst, iRegL src1, iRegL src2, flagsReg ccr) %{ + match(Set dst (AddL src1 src2)); + effect(KILL ccr); + size(8); + format %{ "ADDS $dst.lo,$src1.lo,$src2.lo\t! long\n\t" + "ADC $dst.hi,$src1.hi,$src2.hi" %} + ins_encode %{ + __ adds($dst$$Register, $src1$$Register, $src2$$Register); + __ adc($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register->successor()); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +#ifdef AARCH64 +// Immediate Addition +instruct addL_reg_aimm(iRegL dst, iRegL src1, aimmL src2) %{ + match(Set dst (AddL src1 src2)); + + size(4); + format %{ "ADD $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ add($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +instruct addL_reg_immLneg(iRegL dst, iRegL src1, aimmLneg src2) %{ + match(Set dst (SubL src1 src2)); + + size(4); + format %{ "ADD $dst,$src1,-($src2)\t! long" %} + ins_encode %{ + __ add($dst$$Register, $src1$$Register, -$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// TODO +#endif + +#ifndef AARCH64 +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct addL_reg_immRot(iRegL dst, iRegL src1, immLlowRot con, flagsReg ccr) %{ + match(Set dst (AddL src1 con)); + effect(KILL ccr); + size(8); + format %{ "ADDS $dst.lo,$src1.lo,$con\t! long\n\t" + "ADC $dst.hi,$src1.hi,0" %} + ins_encode %{ + __ adds($dst$$Register, $src1$$Register, $con$$constant); + __ adc($dst$$Register->successor(), $src1$$Register->successor(), 0); + %} + ins_pipe(ialu_reg_imm); +%} +#endif + +//----------Conditional_store-------------------------------------------------- +// Conditional-store of the updated heap-top. +// Used during allocation of the shared heap. +// Sets flags (EQ) on success. + +// TODO: optimize out barriers with AArch64 load-acquire/store-release +// LoadP-locked. +instruct loadPLocked(iRegP dst, memoryex mem) %{ + match(Set dst (LoadPLocked mem)); + size(4); + format %{ "LDREX $dst,$mem" %} + ins_encode %{ +#ifdef AARCH64 + Register base = reg_to_register_object($mem$$base); + __ ldxr($dst$$Register, base); +#else + __ ldrex($dst$$Register,$mem$$Address); +#endif + %} + ins_pipe(iload_mem); +%} + +instruct storePConditional( memoryex heap_top_ptr, iRegP oldval, iRegP newval, iRegI tmp, flagsRegP pcc ) %{ + predicate(_kids[1]->_kids[0]->_leaf->Opcode() == Op_LoadPLocked); // only works in conjunction with a LoadPLocked node + match(Set pcc (StorePConditional heap_top_ptr (Binary oldval newval))); + effect( TEMP tmp ); + size(8); + format %{ "STREX $tmp,$newval,$heap_top_ptr\n\t" + "CMP $tmp, 0" %} + ins_encode %{ +#ifdef AARCH64 + Register base = reg_to_register_object($heap_top_ptr$$base); + __ stxr($tmp$$Register, $newval$$Register, base); +#else + __ strex($tmp$$Register, $newval$$Register, $heap_top_ptr$$Address); +#endif + __ cmp($tmp$$Register, 0); + %} + ins_pipe( long_memory_op ); +%} + +// Conditional-store of an intx value. +instruct storeXConditional( memoryex mem, iRegX oldval, iRegX newval, iRegX tmp, flagsReg icc ) %{ +#ifdef AARCH64 + match(Set icc (StoreLConditional mem (Binary oldval newval))); + effect( TEMP tmp ); + size(28); + format %{ "loop:\n\t" + "LDXR $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem], DOESN'T set $newval=[$mem] in any case\n\t" + "SUBS $tmp, $tmp, $oldval\n\t" + "B.ne done\n\t" + "STXR $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop\n\t" + "CMP $tmp, 0\n\t" + "done:\n\t" + "membar LoadStore|LoadLoad" %} +#else + match(Set icc (StoreIConditional mem (Binary oldval newval))); + effect( TEMP tmp ); + size(28); + format %{ "loop: \n\t" + "LDREX $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem], DOESN'T set $newval=[$mem] in any case\n\t" + "XORS $tmp,$tmp, $oldval\n\t" + "STREX.eq $tmp, $newval, $mem\n\t" + "CMP.eq $tmp, 1 \n\t" + "B.eq loop \n\t" + "TEQ $tmp, 0\n\t" + "membar LoadStore|LoadLoad" %} +#endif + ins_encode %{ + Label loop; + __ bind(loop); +#ifdef AARCH64 +// FIXME: use load-acquire/store-release, remove membar? + Label done; + Register base = reg_to_register_object($mem$$base); + __ ldxr($tmp$$Register, base); + __ subs($tmp$$Register, $tmp$$Register, $oldval$$Register); + __ b(done, ne); + __ stxr($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + __ cmp($tmp$$Register, 0); + __ bind(done); +#else + __ ldrex($tmp$$Register, $mem$$Address); + __ eors($tmp$$Register, $tmp$$Register, $oldval$$Register); + __ strex($tmp$$Register, $newval$$Register, $mem$$Address, eq); + __ cmp($tmp$$Register, 1, eq); + __ b(loop, eq); + __ teq($tmp$$Register, 0); +#endif + // used by biased locking only. Requires a membar. + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::LoadStore | MacroAssembler::LoadLoad), noreg); + %} + ins_pipe( long_memory_op ); +%} + +// No flag versions for CompareAndSwap{P,I,L} because matcher can't match them + +#ifdef AARCH64 +// TODO: if combined with membar, elide membar and use +// load-acquire/store-release if appropriate +instruct compareAndSwapL_bool(memoryex mem, iRegL oldval, iRegL newval, iRegI res, iRegI tmp, flagsReg ccr) %{ + match(Set res (CompareAndSwapL mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(24); + format %{ "loop:\n\t" + "LDXR $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP $tmp, $oldval\n\t" + "B.ne done\n\t" + "STXR $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop\n\t" + "done:\n\t" + "CSET_w $res, eq" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + Label loop, done; + __ bind(loop); + __ ldxr($tmp$$Register, base); + __ cmp($tmp$$Register, $oldval$$Register); + __ b(done, ne); + __ stxr($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + __ bind(done); + __ cset_w($res$$Register, eq); + %} + ins_pipe( long_memory_op ); +%} + +instruct compareAndSwapI_bool(memoryex mem, iRegI oldval, iRegI newval, iRegI res, iRegI tmp, flagsReg ccr) %{ + match(Set res (CompareAndSwapI mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(24); + format %{ "loop:\n\t" + "LDXR_w $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP_w $tmp, $oldval\n\t" + "B.ne done\n\t" + "STXR_w $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop\n\t" + "done:\n\t" + "CSET_w $res, eq" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + Label loop, done; + __ bind(loop); + __ ldxr_w($tmp$$Register, base); + __ cmp_w($tmp$$Register, $oldval$$Register); + __ b(done, ne); + __ stxr_w($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + __ bind(done); + __ cset_w($res$$Register, eq); + %} + ins_pipe( long_memory_op ); +%} + +// tmp must use iRegI instead of iRegN until 8051805 is fixed. +instruct compareAndSwapN_bool(memoryex mem, iRegN oldval, iRegN newval, iRegI res, iRegI tmp, flagsReg ccr) %{ + match(Set res (CompareAndSwapN mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(24); + format %{ "loop:\n\t" + "LDXR_w $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP_w $tmp, $oldval\n\t" + "B.ne done\n\t" + "STXR_w $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop\n\t" + "done:\n\t" + "CSET_w $res, eq" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + Label loop, done; + __ bind(loop); + __ ldxr_w($tmp$$Register, base); + __ cmp_w($tmp$$Register, $oldval$$Register); + __ b(done, ne); + __ stxr_w($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + __ bind(done); + __ cset_w($res$$Register, eq); + %} + ins_pipe( long_memory_op ); +%} + +instruct compareAndSwapP_bool(memoryex mem, iRegP oldval, iRegP newval, iRegI res, iRegI tmp, flagsReg ccr) %{ + match(Set res (CompareAndSwapP mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(24); + format %{ "loop:\n\t" + "LDXR $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP $tmp, $oldval\n\t" + "B.ne done\n\t" + "STXR $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop\n\t" + "done:\n\t" + "CSET_w $res, eq" %} + ins_encode %{ + Register base = reg_to_register_object($mem$$base); + Label loop, done; + __ bind(loop); + __ ldxr($tmp$$Register, base); + __ cmp($tmp$$Register, $oldval$$Register); + __ b(done, ne); + __ stxr($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + __ bind(done); + __ cset_w($res$$Register, eq); + %} + ins_pipe( long_memory_op ); +%} +#else // !AARCH64 +instruct compareAndSwapL_bool(memoryex mem, iRegL oldval, iRegLd newval, iRegI res, iRegLd tmp, flagsReg ccr ) %{ + match(Set res (CompareAndSwapL mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(32); + format %{ "loop: \n\t" + "LDREXD $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP $tmp.lo, $oldval.lo\n\t" + "CMP.eq $tmp.hi, $oldval.hi\n\t" + "STREXD.eq $tmp, $newval, $mem\n\t" + "MOV.ne $tmp, 0 \n\t" + "XORS.eq $tmp,$tmp, 1 \n\t" + "B.eq loop \n\t" + "MOV $res, $tmp" %} + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($tmp$$Register, $mem$$Address); + __ cmp($tmp$$Register, $oldval$$Register); + __ cmp($tmp$$Register->successor(), $oldval$$Register->successor(), eq); + __ strexd($tmp$$Register, $newval$$Register, $mem$$Address, eq); + __ mov($tmp$$Register, 0, ne); + __ eors($tmp$$Register, $tmp$$Register, 1, eq); + __ b(loop, eq); + __ mov($res$$Register, $tmp$$Register); + %} + ins_pipe( long_memory_op ); +%} + + +instruct compareAndSwapI_bool(memoryex mem, iRegI oldval, iRegI newval, iRegI res, iRegI tmp, flagsReg ccr ) %{ + match(Set res (CompareAndSwapI mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(28); + format %{ "loop: \n\t" + "LDREX $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP $tmp, $oldval\n\t" + "STREX.eq $tmp, $newval, $mem\n\t" + "MOV.ne $tmp, 0 \n\t" + "XORS.eq $tmp,$tmp, 1 \n\t" + "B.eq loop \n\t" + "MOV $res, $tmp" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($tmp$$Register,$mem$$Address); + __ cmp($tmp$$Register, $oldval$$Register); + __ strex($tmp$$Register, $newval$$Register, $mem$$Address, eq); + __ mov($tmp$$Register, 0, ne); + __ eors($tmp$$Register, $tmp$$Register, 1, eq); + __ b(loop, eq); + __ mov($res$$Register, $tmp$$Register); + %} + ins_pipe( long_memory_op ); +%} + +instruct compareAndSwapP_bool(memoryex mem, iRegP oldval, iRegP newval, iRegI res, iRegI tmp, flagsReg ccr ) %{ + match(Set res (CompareAndSwapP mem (Binary oldval newval))); + effect( KILL ccr, TEMP tmp); + size(28); + format %{ "loop: \n\t" + "LDREX $tmp, $mem\t! If $oldval==[$mem] Then store $newval into [$mem]\n\t" + "CMP $tmp, $oldval\n\t" + "STREX.eq $tmp, $newval, $mem\n\t" + "MOV.ne $tmp, 0 \n\t" + "EORS.eq $tmp,$tmp, 1 \n\t" + "B.eq loop \n\t" + "MOV $res, $tmp" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($tmp$$Register,$mem$$Address); + __ cmp($tmp$$Register, $oldval$$Register); + __ strex($tmp$$Register, $newval$$Register, $mem$$Address, eq); + __ mov($tmp$$Register, 0, ne); + __ eors($tmp$$Register, $tmp$$Register, 1, eq); + __ b(loop, eq); + __ mov($res$$Register, $tmp$$Register); + %} + ins_pipe( long_memory_op ); +%} +#endif // !AARCH64 + +#ifdef AARCH64 +instruct xaddI_aimmI_no_res(memoryex mem, aimmI add, Universe dummy, iRegI tmp1, iRegI tmp2) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddI mem add)); + effect(TEMP tmp1, TEMP tmp2); + size(16); + format %{ "loop:\n\t" + "LDXR_w $tmp1, $mem\n\t" + "ADD_w $tmp1, $tmp1, $add\n\t" + "STXR_w $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($tmp1$$Register, base); + __ add_w($tmp1$$Register, $tmp1$$Register, $add$$constant); + __ stxr_w($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddI_aimmI_no_res(memoryex mem, aimmI add, Universe dummy, iRegI tmp1, iRegI tmp2, flagsReg ccr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddI mem add)); + effect(KILL ccr, TEMP tmp1, TEMP tmp2); + size(20); + format %{ "loop: \n\t" + "LDREX $tmp1, $mem\n\t" + "ADD $tmp1, $tmp1, $add\n\t" + "STREX $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($tmp1$$Register,$mem$$Address); + __ add($tmp1$$Register, $tmp1$$Register, $add$$constant); + __ strex($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddI_reg_no_res(memoryex mem, iRegI add, Universe dummy, iRegI tmp1, iRegI tmp2) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddI mem add)); + effect(TEMP tmp1, TEMP tmp2); + size(16); + format %{ "loop:\n\t" + "LDXR_w $tmp1, $mem\n\t" + "ADD_w $tmp1, $tmp1, $add\n\t" + "STXR_w $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($tmp1$$Register, base); + __ add_w($tmp1$$Register, $tmp1$$Register, $add$$Register); + __ stxr_w($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddI_reg_no_res(memoryex mem, iRegI add, Universe dummy, iRegI tmp1, iRegI tmp2, flagsReg ccr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddI mem add)); + effect(KILL ccr, TEMP tmp1, TEMP tmp2); + size(20); + format %{ "loop: \n\t" + "LDREX $tmp1, $mem\n\t" + "ADD $tmp1, $tmp1, $add\n\t" + "STREX $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($tmp1$$Register,$mem$$Address); + __ add($tmp1$$Register, $tmp1$$Register, $add$$Register); + __ strex($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddI_aimmI(memoryex mem, aimmI add, iRegI res, iRegI tmp1, iRegI tmp2) %{ + match(Set res (GetAndAddI mem add)); + effect(TEMP tmp1, TEMP tmp2, TEMP res); + size(16); + format %{ "loop:\n\t" + "LDXR_w $res, $mem\n\t" + "ADD_w $tmp1, $res, $add\n\t" + "STXR_w $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($res$$Register, base); + __ add_w($tmp1$$Register, $res$$Register, $add$$constant); + __ stxr_w($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddI_aimmI(memoryex mem, aimmI add, iRegI res, iRegI tmp1, iRegI tmp2, flagsReg ccr) %{ + match(Set res (GetAndAddI mem add)); + effect(KILL ccr, TEMP tmp1, TEMP tmp2, TEMP res); + size(20); + format %{ "loop: \n\t" + "LDREX $res, $mem\n\t" + "ADD $tmp1, $res, $add\n\t" + "STREX $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($res$$Register,$mem$$Address); + __ add($tmp1$$Register, $res$$Register, $add$$constant); + __ strex($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddI_reg(memoryex mem, iRegI add, iRegI res, iRegI tmp1, iRegI tmp2) %{ + match(Set res (GetAndAddI mem add)); + effect(TEMP tmp1, TEMP tmp2, TEMP res); + size(16); + format %{ "loop:\n\t" + "LDXR_w $res, $mem\n\t" + "ADD_w $tmp1, $res, $add\n\t" + "STXR_w $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($res$$Register, base); + __ add_w($tmp1$$Register, $res$$Register, $add$$Register); + __ stxr_w($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddI_reg(memoryex mem, iRegI add, iRegI res, iRegI tmp1, iRegI tmp2, flagsReg ccr) %{ + match(Set res (GetAndAddI mem add)); + effect(KILL ccr, TEMP tmp1, TEMP tmp2, TEMP res); + size(20); + format %{ "loop: \n\t" + "LDREX $res, $mem\n\t" + "ADD $tmp1, $res, $add\n\t" + "STREX $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($res$$Register,$mem$$Address); + __ add($tmp1$$Register, $res$$Register, $add$$Register); + __ strex($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddL_reg_no_res(memoryex mem, iRegL add, Universe dummy, iRegL tmp1, iRegI tmp2) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddL mem add)); + effect(TEMP tmp1, TEMP tmp2); + size(16); + format %{ "loop:\n\t" + "LDXR $tmp1, $mem\n\t" + "ADD $tmp1, $tmp1, $add\n\t" + "STXR $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr($tmp1$$Register, base); + __ add($tmp1$$Register, $tmp1$$Register, $add$$Register); + __ stxr($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddL_reg_no_res(memoryex mem, iRegL add, Universe dummy, iRegLd tmp1, iRegI tmp2, flagsReg ccr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddL mem add)); + effect( KILL ccr, TEMP tmp1, TEMP tmp2); + size(24); + format %{ "loop: \n\t" + "LDREXD $tmp1, $mem\n\t" + "ADDS $tmp1.lo, $tmp1.lo, $add.lo\n\t" + "ADC $tmp1.hi, $tmp1.hi, $add.hi\n\t" + "STREXD $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($tmp1$$Register, $mem$$Address); + __ adds($tmp1$$Register, $tmp1$$Register, $add$$Register); + __ adc($tmp1$$Register->successor(), $tmp1$$Register->successor(), $add$$Register->successor()); + __ strexd($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddL_imm_no_res(memoryex mem, aimmL add, Universe dummy, iRegL tmp1, iRegI tmp2) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddL mem add)); + effect(TEMP tmp1, TEMP tmp2); + size(16); + format %{ "loop:\n\t" + "LDXR $tmp1, $mem\n\t" + "ADD $tmp1, $tmp1, $add\n\t" + "STXR $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr($tmp1$$Register, base); + __ add($tmp1$$Register, $tmp1$$Register, $add$$constant); + __ stxr($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct xaddL_immRot_no_res(memoryex mem, immLlowRot add, Universe dummy, iRegLd tmp1, iRegI tmp2, flagsReg ccr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddL mem add)); + effect( KILL ccr, TEMP tmp1, TEMP tmp2); + size(24); + format %{ "loop: \n\t" + "LDREXD $tmp1, $mem\n\t" + "ADDS $tmp1.lo, $tmp1.lo, $add\n\t" + "ADC $tmp1.hi, $tmp1.hi, 0\n\t" + "STREXD $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($tmp1$$Register, $mem$$Address); + __ adds($tmp1$$Register, $tmp1$$Register, $add$$constant); + __ adc($tmp1$$Register->successor(), $tmp1$$Register->successor(), 0); + __ strexd($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddL_reg(memoryex mem, iRegL add, iRegL res, iRegL tmp1, iRegI tmp2) %{ + match(Set res (GetAndAddL mem add)); + effect(TEMP tmp1, TEMP tmp2, TEMP res); + size(16); + format %{ "loop:\n\t" + "LDXR $res, $mem\n\t" + "ADD $tmp1, $res, $add\n\t" + "STXR $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr($res$$Register, base); + __ add($tmp1$$Register, $res$$Register, $add$$Register); + __ stxr($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xaddL_reg(memoryex mem, iRegL add, iRegLd res, iRegLd tmp1, iRegI tmp2, flagsReg ccr) %{ + match(Set res (GetAndAddL mem add)); + effect( KILL ccr, TEMP tmp1, TEMP tmp2, TEMP res); + size(24); + format %{ "loop: \n\t" + "LDREXD $res, $mem\n\t" + "ADDS $tmp1.lo, $res.lo, $add.lo\n\t" + "ADC $tmp1.hi, $res.hi, $add.hi\n\t" + "STREXD $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($res$$Register, $mem$$Address); + __ adds($tmp1$$Register, $res$$Register, $add$$Register); + __ adc($tmp1$$Register->successor(), $res$$Register->successor(), $add$$Register->successor()); + __ strexd($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xaddL_imm(memoryex mem, aimmL add, iRegL res, iRegL tmp1, iRegI tmp2) %{ + match(Set res (GetAndAddL mem add)); + effect(TEMP tmp1, TEMP tmp2, TEMP res); + size(16); + format %{ "loop:\n\t" + "LDXR $res, $mem\n\t" + "ADD $tmp1, $res, $add\n\t" + "STXR $tmp2, $tmp1, $mem\n\t" + "CBNZ_w $tmp2, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr($res$$Register, base); + __ add($tmp1$$Register, $res$$Register, $add$$constant); + __ stxr($tmp2$$Register, $tmp1$$Register, base); + __ cbnz_w($tmp2$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct xaddL_immRot(memoryex mem, immLlowRot add, iRegLd res, iRegLd tmp1, iRegI tmp2, flagsReg ccr) %{ + match(Set res (GetAndAddL mem add)); + effect( KILL ccr, TEMP tmp1, TEMP tmp2, TEMP res); + size(24); + format %{ "loop: \n\t" + "LDREXD $res, $mem\n\t" + "ADDS $tmp1.lo, $res.lo, $add\n\t" + "ADC $tmp1.hi, $res.hi, 0\n\t" + "STREXD $tmp2, $tmp1, $mem\n\t" + "CMP $tmp2, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($res$$Register, $mem$$Address); + __ adds($tmp1$$Register, $res$$Register, $add$$constant); + __ adc($tmp1$$Register->successor(), $res$$Register->successor(), 0); + __ strexd($tmp2$$Register, $tmp1$$Register, $mem$$Address); + __ cmp($tmp2$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xchgI(memoryex mem, iRegI newval, iRegI res, iRegI tmp) %{ + match(Set res (GetAndSetI mem newval)); + effect(TEMP tmp, TEMP res); + size(12); + format %{ "loop:\n\t" + "LDXR_w $res, $mem\n\t" + "STXR_w $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($res$$Register, base); + __ stxr_w($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} + +#ifdef XXX +// Disabled until 8051805 is fixed. +instruct xchgN(memoryex mem, iRegN newval, iRegN res, iRegN tmp) %{ + match(Set res (GetAndSetN mem newval)); + effect(TEMP tmp, TEMP res); + size(12); + format %{ "loop:\n\t" + "LDXR_w $res, $mem\n\t" + "STXR_w $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr_w($res$$Register, base); + __ stxr_w($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#endif +#else +instruct xchgI(memoryex mem, iRegI newval, iRegI res, iRegI tmp, flagsReg ccr) %{ + match(Set res (GetAndSetI mem newval)); + effect(KILL ccr, TEMP tmp, TEMP res); + size(16); + format %{ "loop: \n\t" + "LDREX $res, $mem\n\t" + "STREX $tmp, $newval, $mem\n\t" + "CMP $tmp, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($res$$Register,$mem$$Address); + __ strex($tmp$$Register, $newval$$Register, $mem$$Address); + __ cmp($tmp$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif + +#ifdef AARCH64 +instruct xchgL(memoryex mem, iRegL newval, iRegL res, iRegI tmp) %{ + match(Set res (GetAndSetL mem newval)); + effect(TEMP tmp, TEMP res); + size(12); + format %{ "loop:\n\t" + "LDXR $res, $mem\n\t" + "STXR $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldxr($res$$Register, base); + __ stxr($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xchgL(memoryex mem, iRegLd newval, iRegLd res, iRegI tmp, flagsReg ccr) %{ + match(Set res (GetAndSetL mem newval)); + effect( KILL ccr, TEMP tmp, TEMP res); + size(16); + format %{ "loop: \n\t" + "LDREXD $res, $mem\n\t" + "STREXD $tmp, $newval, $mem\n\t" + "CMP $tmp, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrexd($res$$Register, $mem$$Address); + __ strexd($tmp$$Register, $newval$$Register, $mem$$Address); + __ cmp($tmp$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif // !AARCH64 + +#ifdef AARCH64 +instruct xchgP(memoryex mem, iRegP newval, iRegP res, iRegI tmp) %{ + match(Set res (GetAndSetP mem newval)); + effect(TEMP tmp, TEMP res); + size(12); + format %{ "loop:\n\t" + "LDREX $res, $mem\n\t" + "STREX $tmp, $newval, $mem\n\t" + "CBNZ_w $tmp, loop" %} + + ins_encode %{ + Label loop; + Register base = reg_to_register_object($mem$$base); + __ bind(loop); + __ ldrex($res$$Register, base); + __ strex($tmp$$Register, $newval$$Register, base); + __ cbnz_w($tmp$$Register, loop); + %} + ins_pipe( long_memory_op ); +%} +#else +instruct xchgP(memoryex mem, iRegP newval, iRegP res, iRegI tmp, flagsReg ccr) %{ + match(Set res (GetAndSetP mem newval)); + effect(KILL ccr, TEMP tmp, TEMP res); + size(16); + format %{ "loop: \n\t" + "LDREX $res, $mem\n\t" + "STREX $tmp, $newval, $mem\n\t" + "CMP $tmp, 0 \n\t" + "B.ne loop \n\t" %} + + ins_encode %{ + Label loop; + __ bind(loop); + __ ldrex($res$$Register,$mem$$Address); + __ strex($tmp$$Register, $newval$$Register, $mem$$Address); + __ cmp($tmp$$Register, 0); + __ b(loop, ne); + %} + ins_pipe( long_memory_op ); +%} +#endif // !AARCH64 + +//--------------------- +// Subtraction Instructions +// Register Subtraction +instruct subI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (SubI src1 src2)); + + size(4); + format %{ "sub_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct subshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI src1 (LShiftI src2 src3))); + + size(4); + format %{ "SUB $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct subshlI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (SubI src1 (LShiftI src2 src3))); + + size(4); + format %{ "sub_32 $dst,$src1,$src2<<$src3\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct subsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI src1 (RShiftI src2 src3))); + + size(4); + format %{ "SUB $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct subsarI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (SubI src1 (RShiftI src2 src3))); + + size(4); + format %{ "sub_32 $dst,$src1,$src2>>$src3\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct subshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI src1 (URShiftI src2 src3))); + + size(4); + format %{ "SUB $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct subshrI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (SubI src1 (URShiftI src2 src3))); + + size(4); + format %{ "sub_32 $dst,$src1,$src2>>>$src3\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct rsbshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI (LShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1<<$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsl, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct rsbshlI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (SubI (LShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1<<$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsl, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct rsbsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI (RShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1>>$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, asr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct rsbsarI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (SubI (RShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1>>$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, asr, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct rsbshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI (URShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1>>>$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct rsbshrI_reg_imm_reg(iRegI dst, iRegI src1, immU5 src2, iRegI src3) %{ + match(Set dst (SubI (URShiftI src1 src2) src3)); + + size(4); + format %{ "RSB $dst,$src3,$src1>>>$src2" %} + ins_encode %{ + __ rsb($dst$$Register, $src3$$Register, AsmOperand($src1$$Register, lsr, $src2$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +// Immediate Subtraction +instruct subI_reg_aimmI(iRegI dst, iRegI src1, aimmI src2) %{ + match(Set dst (SubI src1 src2)); + + size(4); + format %{ "sub_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +instruct subI_reg_immRotneg(iRegI dst, iRegI src1, aimmIneg src2) %{ + match(Set dst (AddI src1 src2)); + + size(4); + format %{ "sub_32 $dst,$src1,-($src2)\t! int" %} + ins_encode %{ + __ sub_32($dst$$Register, $src1$$Register, -$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +#ifndef AARCH64 +instruct subI_immRot_reg(iRegI dst, immIRot src1, iRegI src2) %{ + match(Set dst (SubI src1 src2)); + + size(4); + format %{ "RSB $dst,$src2,src1" %} + ins_encode %{ + __ rsb($dst$$Register, $src2$$Register, $src1$$constant); + %} + ins_pipe(ialu_zero_reg); +%} +#endif + +// Register Subtraction +#ifdef AARCH64 +instruct subL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (SubL src1 src2)); + + size(4); + format %{ "SUB $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} +#else +instruct subL_reg_reg(iRegL dst, iRegL src1, iRegL src2, flagsReg icc ) %{ + match(Set dst (SubL src1 src2)); + effect (KILL icc); + + size(8); + format %{ "SUBS $dst.lo,$src1.lo,$src2.lo\t! long\n\t" + "SBC $dst.hi,$src1.hi,$src2.hi" %} + ins_encode %{ + __ subs($dst$$Register, $src1$$Register, $src2$$Register); + __ sbc($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register->successor()); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +#ifdef AARCH64 +// Immediate Subtraction +instruct subL_reg_aimm(iRegL dst, iRegL src1, aimmL src2) %{ + match(Set dst (SubL src1 src2)); + + size(4); + format %{ "SUB $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +instruct subL_reg_immLneg(iRegL dst, iRegL src1, aimmLneg src2) %{ + match(Set dst (AddL src1 src2)); + + size(4); + format %{ "SUB $dst,$src1,-($src2)\t! long" %} + ins_encode %{ + __ sub($dst$$Register, $src1$$Register, -$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// TODO +#endif + +#ifndef AARCH64 +// Immediate Subtraction +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct subL_reg_immRot(iRegL dst, iRegL src1, immLlowRot con, flagsReg icc) %{ + match(Set dst (SubL src1 con)); + effect (KILL icc); + + size(8); + format %{ "SUB $dst.lo,$src1.lo,$con\t! long\n\t" + "SBC $dst.hi,$src1.hi,0" %} + ins_encode %{ + __ subs($dst$$Register, $src1$$Register, $con$$constant); + __ sbc($dst$$Register->successor(), $src1$$Register->successor(), 0); + %} + ins_pipe(ialu_reg_imm); +%} + +// Long negation +instruct negL_reg_reg(iRegL dst, immL0 zero, iRegL src2, flagsReg icc) %{ + match(Set dst (SubL zero src2)); + effect (KILL icc); + + size(8); + format %{ "RSBS $dst.lo,$src2.lo,0\t! long\n\t" + "RSC $dst.hi,$src2.hi,0" %} + ins_encode %{ + __ rsbs($dst$$Register, $src2$$Register, 0); + __ rsc($dst$$Register->successor(), $src2$$Register->successor(), 0); + %} + ins_pipe(ialu_zero_reg); +%} +#endif // !AARCH64 + +// Multiplication Instructions +// Integer Multiplication +// Register Multiplication +instruct mulI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (MulI src1 src2)); + + size(4); + format %{ "mul_32 $dst,$src1,$src2" %} + ins_encode %{ + __ mul_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(imul_reg_reg); +%} + +#ifdef AARCH64 +instruct mulL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (MulL src1 src2)); + size(4); + format %{ "MUL $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ mul($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(imul_reg_reg); +%} +#else +instruct mulL_lo1_hi2(iRegL dst, iRegL src1, iRegL src2) %{ + effect(DEF dst, USE src1, USE src2); + size(4); + format %{ "MUL $dst.hi,$src1.lo,$src2.hi\t! long" %} + ins_encode %{ + __ mul($dst$$Register->successor(), $src1$$Register, $src2$$Register->successor()); + %} + ins_pipe(imul_reg_reg); +%} + +instruct mulL_hi1_lo2(iRegL dst, iRegL src1, iRegL src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(8); + format %{ "MLA $dst.hi,$src1.hi,$src2.lo,$dst.hi\t! long\n\t" + "MOV $dst.lo, 0"%} + ins_encode %{ + __ mla($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register, $dst$$Register->successor()); + __ mov($dst$$Register, 0); + %} + ins_pipe(imul_reg_reg); +%} + +instruct mulL_lo1_lo2(iRegL dst, iRegL src1, iRegL src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "UMLAL $dst.lo,$dst.hi,$src1,$src2\t! long" %} + ins_encode %{ + __ umlal($dst$$Register, $dst$$Register->successor(), $src1$$Register, $src2$$Register); + %} + ins_pipe(imul_reg_reg); +%} + +instruct mulL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (MulL src1 src2)); + + expand %{ + mulL_lo1_hi2(dst, src1, src2); + mulL_hi1_lo2(dst, src1, src2); + mulL_lo1_lo2(dst, src1, src2); + %} +%} +#endif // !AARCH64 + +// Integer Division +// Register Division +#ifdef AARCH64 +instruct divI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (DivI src1 src2)); + + size(4); + format %{ "SDIV $dst,$src1,$src2\t! 32-bit" %} + ins_encode %{ + __ sdiv_w($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} +#else +instruct divI_reg_reg(R1RegI dst, R0RegI src1, R2RegI src2, LRRegP lr, flagsReg ccr) %{ + match(Set dst (DivI src1 src2)); + effect( KILL ccr, KILL src1, KILL src2, KILL lr); + ins_cost((2+71)*DEFAULT_COST); + + format %{ "DIV $dst,$src1,$src2 ! call to StubRoutines::Arm::idiv_irem_entry()" %} + ins_encode %{ + __ call(StubRoutines::Arm::idiv_irem_entry(), relocInfo::runtime_call_type); + %} + ins_pipe(sdiv_reg_reg); +%} +#endif + +// Register Long Division +#ifdef AARCH64 +instruct divL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (DivL src1 src2)); + + size(4); + format %{ "SDIV $dst,$src1,$src2" %} + ins_encode %{ + __ sdiv($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} +#else +instruct divL_reg_reg(R0R1RegL dst, R2R3RegL src1, R0R1RegL src2) %{ + match(Set dst (DivL src1 src2)); + effect(CALL); + ins_cost(DEFAULT_COST*71); + format %{ "DIVL $src1,$src2,$dst\t! long ! call to SharedRuntime::ldiv" %} + ins_encode %{ + address target = CAST_FROM_FN_PTR(address, SharedRuntime::ldiv); + __ call(target, relocInfo::runtime_call_type); + %} + ins_pipe(divL_reg_reg); +%} +#endif + +// Integer Remainder +// Register Remainder +#ifdef AARCH64 +#ifdef TODO +instruct msubI_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (SubI src1 (MulI src2 src3))); + + size(4); + format %{ "MSUB $dst,$src2,$src3,$src1\t! 32-bit\n\t" %} + ins_encode %{ + __ msub_w($dst$$Register, $src2$$Register, $src3$$Register, $src1$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} +#endif + +instruct modI_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI temp) %{ + match(Set dst (ModI src1 src2)); + effect(TEMP temp); + + size(8); + format %{ "SDIV $temp,$src1,$src2\t! 32-bit\n\t" + "MSUB $dst,$src2,$temp,$src1\t! 32-bit\n\t" %} + ins_encode %{ + __ sdiv_w($temp$$Register, $src1$$Register, $src2$$Register); + __ msub_w($dst$$Register, $src2$$Register, $temp$$Register, $src1$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} +#else +instruct modI_reg_reg(R0RegI dst, R0RegI src1, R2RegI src2, R1RegI temp, LRRegP lr, flagsReg ccr ) %{ + match(Set dst (ModI src1 src2)); + effect( KILL ccr, KILL temp, KILL src2, KILL lr); + + format %{ "MODI $dst,$src1,$src2\t ! call to StubRoutines::Arm::idiv_irem_entry" %} + ins_encode %{ + __ call(StubRoutines::Arm::idiv_irem_entry(), relocInfo::runtime_call_type); + %} + ins_pipe(sdiv_reg_reg); +%} +#endif + +// Register Long Remainder +#ifdef AARCH64 +instruct modL_reg_reg(iRegL dst, iRegL src1, iRegL src2, iRegL temp) %{ + match(Set dst (ModL src1 src2)); + effect(TEMP temp); + + size(8); + format %{ "SDIV $temp,$src1,$src2\n\t" + "MSUB $dst,$src2,$temp,$src1" %} + ins_encode %{ + __ sdiv($temp$$Register, $src1$$Register, $src2$$Register); + __ msub($dst$$Register, $src2$$Register, $temp$$Register, $src1$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} +#else +instruct modL_reg_reg(R0R1RegL dst, R2R3RegL src1, R0R1RegL src2) %{ + match(Set dst (ModL src1 src2)); + effect(CALL); + ins_cost(MEMORY_REF_COST); // FIXME + format %{ "modL $dst,$src1,$src2\t ! call to SharedRuntime::lrem" %} + ins_encode %{ + address target = CAST_FROM_FN_PTR(address, SharedRuntime::lrem); + __ call(target, relocInfo::runtime_call_type); + %} + ins_pipe(divL_reg_reg); +%} +#endif + +// Integer Shift Instructions + +// Register Shift Left +instruct shlI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (LShiftI src1 src2)); + + size(4); +#ifdef AARCH64 + format %{ "LSLV $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ lslv_w($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + format %{ "LSL $dst,$src1,$src2 \n\t" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, lsl, $src2$$Register)); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +// Register Shift Left Immediate +instruct shlI_reg_imm5(iRegI dst, iRegI src1, immU5 src2) %{ + match(Set dst (LShiftI src1 src2)); + + size(4); +#ifdef AARCH64 + format %{ "LSL_w $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ _lsl($dst$$Register, $src1$$Register, $src2$$constant); + %} +#else + format %{ "LSL $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ logical_shift_left($dst$$Register, $src1$$Register, $src2$$constant); + %} +#endif + ins_pipe(ialu_reg_imm); +%} + +#ifndef AARCH64 +instruct shlL_reg_reg_merge_hi(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{"OR $dst.hi,$dst.hi,($src1.hi << $src2)" %} + ins_encode %{ + __ orr($dst$$Register->successor(), $dst$$Register->successor(), AsmOperand($src1$$Register->successor(), lsl, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct shlL_reg_reg_merge_lo(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "LSL $dst.lo,$src1.lo,$src2 \n\t" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, lsl, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct shlL_reg_reg_overlap(iRegL dst, iRegL src1, iRegI src2, flagsReg ccr) %{ + effect(DEF dst, USE src1, USE src2, KILL ccr); + size(16); + format %{ "SUBS $dst.hi,$src2,32 \n\t" + "LSLpl $dst.hi,$src1.lo,$dst.hi \n\t" + "RSBmi $dst.hi,$dst.hi,0 \n\t" + "LSRmi $dst.hi,$src1.lo,$dst.hi" %} + + ins_encode %{ + // $src1$$Register and $dst$$Register->successor() can't be the same + __ subs($dst$$Register->successor(), $src2$$Register, 32); + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register, lsl, $dst$$Register->successor()), pl); + __ rsb($dst$$Register->successor(), $dst$$Register->successor(), 0, mi); + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register, lsr, $dst$$Register->successor()), mi); + %} + ins_pipe(ialu_reg_reg); +%} +#endif // !AARCH64 + +instruct shlL_reg_reg(iRegL dst, iRegL src1, iRegI src2) %{ + match(Set dst (LShiftL src1 src2)); + +#ifdef AARCH64 + size(4); + format %{ "LSLV $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ lslv($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +#else + expand %{ + flagsReg ccr; + shlL_reg_reg_overlap(dst, src1, src2, ccr); + shlL_reg_reg_merge_hi(dst, src1, src2); + shlL_reg_reg_merge_lo(dst, src1, src2); + %} +#endif +%} + +#ifdef AARCH64 +instruct shlL_reg_imm6(iRegL dst, iRegL src1, immU6 src2) %{ + match(Set dst (LShiftL src1 src2)); + + size(4); + format %{ "LSL $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ logical_shift_left($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// Register Shift Left Immediate +instruct shlL_reg_imm6(iRegL dst, iRegL src1, immU6Big src2) %{ + match(Set dst (LShiftL src1 src2)); + + size(8); + format %{ "LSL $dst.hi,$src1.lo,$src2-32\t! or mov if $src2==32\n\t" + "MOV $dst.lo, 0" %} + ins_encode %{ + if ($src2$$constant == 32) { + __ mov($dst$$Register->successor(), $src1$$Register); + } else { + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register, lsl, $src2$$constant-32)); + } + __ mov($dst$$Register, 0); + %} + ins_pipe(ialu_reg_imm); +%} + +instruct shlL_reg_imm5(iRegL dst, iRegL src1, immU5 src2) %{ + match(Set dst (LShiftL src1 src2)); + + size(12); + format %{ "LSL $dst.hi,$src1.lo,$src2\n\t" + "OR $dst.hi, $dst.hi, $src1.lo >> 32-$src2\n\t" + "LSL $dst.lo,$src1.lo,$src2" %} + ins_encode %{ + // The order of the following 3 instructions matters: src1.lo and + // dst.hi can't overlap but src.hi and dst.hi can. + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), lsl, $src2$$constant)); + __ orr($dst$$Register->successor(), $dst$$Register->successor(), AsmOperand($src1$$Register, lsr, 32-$src2$$constant)); + __ mov($dst$$Register, AsmOperand($src1$$Register, lsl, $src2$$constant)); + %} + ins_pipe(ialu_reg_imm); +%} +#endif // !AARCH64 + +// Register Arithmetic Shift Right +instruct sarI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (RShiftI src1 src2)); + size(4); +#ifdef AARCH64 + format %{ "ASRV $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ asrv_w($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + format %{ "ASR $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, asr, $src2$$Register)); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +// Register Arithmetic Shift Right Immediate +instruct sarI_reg_imm5(iRegI dst, iRegI src1, immU5 src2) %{ + match(Set dst (RShiftI src1 src2)); + + size(4); +#ifdef AARCH64 + format %{ "ASR_w $dst,$src1,$src2" %} + ins_encode %{ + __ _asr_w($dst$$Register, $src1$$Register, $src2$$constant); + %} +#else + format %{ "ASR $dst,$src1,$src2" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, asr, $src2$$constant)); + %} +#endif + ins_pipe(ialu_reg_imm); +%} + +#ifndef AARCH64 +// Register Shift Right Arithmetic Long +instruct sarL_reg_reg_merge_lo(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "OR $dst.lo,$dst.lo,($src1.lo >> $src2)" %} + ins_encode %{ + __ orr($dst$$Register, $dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct sarL_reg_reg_merge_hi(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "ASR $dst.hi,$src1.hi,$src2 \n\t" %} + ins_encode %{ + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), asr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct sarL_reg_reg_overlap(iRegL dst, iRegL src1, iRegI src2, flagsReg ccr) %{ + effect(DEF dst, USE src1, USE src2, KILL ccr); + size(16); + format %{ "SUBS $dst.lo,$src2,32 \n\t" + "ASRpl $dst.lo,$src1.hi,$dst.lo \n\t" + "RSBmi $dst.lo,$dst.lo,0 \n\t" + "LSLmi $dst.lo,$src1.hi,$dst.lo" %} + + ins_encode %{ + // $src1$$Register->successor() and $dst$$Register can't be the same + __ subs($dst$$Register, $src2$$Register, 32); + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), asr, $dst$$Register), pl); + __ rsb($dst$$Register, $dst$$Register, 0, mi); + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), lsl, $dst$$Register), mi); + %} + ins_pipe(ialu_reg_reg); +%} +#endif // !AARCH64 + +instruct sarL_reg_reg(iRegL dst, iRegL src1, iRegI src2) %{ + match(Set dst (RShiftL src1 src2)); + +#ifdef AARCH64 + size(4); + format %{ "ASRV $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ asrv($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +#else + expand %{ + flagsReg ccr; + sarL_reg_reg_overlap(dst, src1, src2, ccr); + sarL_reg_reg_merge_lo(dst, src1, src2); + sarL_reg_reg_merge_hi(dst, src1, src2); + %} +#endif +%} + +// Register Shift Left Immediate +#ifdef AARCH64 +instruct sarL_reg_imm6(iRegL dst, iRegL src1, immU6 src2) %{ + match(Set dst (RShiftL src1 src2)); + + size(4); + format %{ "ASR $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ _asr($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +instruct sarL_reg_imm6(iRegL dst, iRegL src1, immU6Big src2) %{ + match(Set dst (RShiftL src1 src2)); + + size(8); + format %{ "ASR $dst.lo,$src1.hi,$src2-32\t! or mov if $src2==32\n\t" + "ASR $dst.hi,$src1.hi, $src2" %} + ins_encode %{ + if ($src2$$constant == 32) { + __ mov($dst$$Register, $src1$$Register->successor()); + } else{ + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), asr, $src2$$constant-32)); + } + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), asr, 0)); + %} + + ins_pipe(ialu_reg_imm); +%} + +instruct sarL_reg_imm5(iRegL dst, iRegL src1, immU5 src2) %{ + match(Set dst (RShiftL src1 src2)); + size(12); + format %{ "LSR $dst.lo,$src1.lo,$src2\n\t" + "OR $dst.lo, $dst.lo, $src1.hi << 32-$src2\n\t" + "ASR $dst.hi,$src1.hi,$src2" %} + ins_encode %{ + // The order of the following 3 instructions matters: src1.lo and + // dst.hi can't overlap but src.hi and dst.hi can. + __ mov($dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$constant)); + __ orr($dst$$Register, $dst$$Register, AsmOperand($src1$$Register->successor(), lsl, 32-$src2$$constant)); + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), asr, $src2$$constant)); + %} + ins_pipe(ialu_reg_imm); +%} +#endif + +// Register Shift Right +instruct shrI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (URShiftI src1 src2)); + size(4); +#ifdef AARCH64 + format %{ "LSRV $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ lsrv_w($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + format %{ "LSR $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$Register)); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +// Register Shift Right Immediate +instruct shrI_reg_imm5(iRegI dst, iRegI src1, immU5 src2) %{ + match(Set dst (URShiftI src1 src2)); + + size(4); +#ifdef AARCH64 + format %{ "LSR_w $dst,$src1,$src2" %} + ins_encode %{ + __ _lsr_w($dst$$Register, $src1$$Register, $src2$$constant); + %} +#else + format %{ "LSR $dst,$src1,$src2" %} + ins_encode %{ + __ mov($dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$constant)); + %} +#endif + ins_pipe(ialu_reg_imm); +%} + +#ifndef AARCH64 +// Register Shift Right +instruct shrL_reg_reg_merge_lo(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "OR $dst.lo,$dst,($src1.lo >>> $src2)" %} + ins_encode %{ + __ orr($dst$$Register, $dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct shrL_reg_reg_merge_hi(iRegL dst, iRegL src1, iRegI src2) %{ + effect(USE_DEF dst, USE src1, USE src2); + size(4); + format %{ "LSR $dst.hi,$src1.hi,$src2 \n\t" %} + ins_encode %{ + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), lsr, $src2$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct shrL_reg_reg_overlap(iRegL dst, iRegL src1, iRegI src2, flagsReg ccr) %{ + effect(DEF dst, USE src1, USE src2, KILL ccr); + size(16); + format %{ "SUBS $dst,$src2,32 \n\t" + "LSRpl $dst,$src1.hi,$dst \n\t" + "RSBmi $dst,$dst,0 \n\t" + "LSLmi $dst,$src1.hi,$dst" %} + + ins_encode %{ + // $src1$$Register->successor() and $dst$$Register can't be the same + __ subs($dst$$Register, $src2$$Register, 32); + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), lsr, $dst$$Register), pl); + __ rsb($dst$$Register, $dst$$Register, 0, mi); + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), lsl, $dst$$Register), mi); + %} + ins_pipe(ialu_reg_reg); +%} +#endif // !AARCH64 + +instruct shrL_reg_reg(iRegL dst, iRegL src1, iRegI src2) %{ + match(Set dst (URShiftL src1 src2)); + +#ifdef AARCH64 + size(4); + format %{ "LSRV $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ lsrv($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +#else + expand %{ + flagsReg ccr; + shrL_reg_reg_overlap(dst, src1, src2, ccr); + shrL_reg_reg_merge_lo(dst, src1, src2); + shrL_reg_reg_merge_hi(dst, src1, src2); + %} +#endif +%} + +// Register Shift Right Immediate +#ifdef AARCH64 +instruct shrL_reg_imm6(iRegL dst, iRegL src1, immU6 src2) %{ + match(Set dst (URShiftL src1 src2)); + + size(4); + format %{ "LSR $dst,$src1,$src2" %} + ins_encode %{ + __ _lsr($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +instruct shrL_reg_imm6(iRegL dst, iRegL src1, immU6Big src2) %{ + match(Set dst (URShiftL src1 src2)); + + size(8); + format %{ "LSR $dst.lo,$src1.hi,$src2-32\t! or mov if $src2==32\n\t" + "MOV $dst.hi, 0" %} + ins_encode %{ + if ($src2$$constant == 32) { + __ mov($dst$$Register, $src1$$Register->successor()); + } else { + __ mov($dst$$Register, AsmOperand($src1$$Register->successor(), lsr, $src2$$constant-32)); + } + __ mov($dst$$Register->successor(), 0); + %} + + ins_pipe(ialu_reg_imm); +%} + +instruct shrL_reg_imm5(iRegL dst, iRegL src1, immU5 src2) %{ + match(Set dst (URShiftL src1 src2)); + + size(12); + format %{ "LSR $dst.lo,$src1.lo,$src2\n\t" + "OR $dst.lo, $dst.lo, $src1.hi << 32-$src2\n\t" + "LSR $dst.hi,$src1.hi,$src2" %} + ins_encode %{ + // The order of the following 3 instructions matters: src1.lo and + // dst.hi can't overlap but src.hi and dst.hi can. + __ mov($dst$$Register, AsmOperand($src1$$Register, lsr, $src2$$constant)); + __ orr($dst$$Register, $dst$$Register, AsmOperand($src1$$Register->successor(), lsl, 32-$src2$$constant)); + __ mov($dst$$Register->successor(), AsmOperand($src1$$Register->successor(), lsr, $src2$$constant)); + %} + ins_pipe(ialu_reg_imm); +%} +#endif // !AARCH64 + + +instruct shrP_reg_imm5(iRegX dst, iRegP src1, immU5 src2) %{ + match(Set dst (URShiftI (CastP2X src1) src2)); + size(4); + format %{ "LSR $dst,$src1,$src2\t! Cast ptr $src1 to int and shift" %} + ins_encode %{ + __ logical_shift_right($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +//----------Floating Point Arithmetic Instructions----------------------------- + +// Add float single precision +instruct addF_reg_reg(regF dst, regF src1, regF src2) %{ + match(Set dst (AddF src1 src2)); + + size(4); + format %{ "FADDS $dst,$src1,$src2" %} + ins_encode %{ + __ add_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(faddF_reg_reg); +%} + +// Add float double precision +instruct addD_reg_reg(regD dst, regD src1, regD src2) %{ + match(Set dst (AddD src1 src2)); + + size(4); + format %{ "FADDD $dst,$src1,$src2" %} + ins_encode %{ + __ add_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(faddD_reg_reg); +%} + +// Sub float single precision +instruct subF_reg_reg(regF dst, regF src1, regF src2) %{ + match(Set dst (SubF src1 src2)); + + size(4); + format %{ "FSUBS $dst,$src1,$src2" %} + ins_encode %{ + __ sub_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(faddF_reg_reg); +%} + +// Sub float double precision +instruct subD_reg_reg(regD dst, regD src1, regD src2) %{ + match(Set dst (SubD src1 src2)); + + size(4); + format %{ "FSUBD $dst,$src1,$src2" %} + ins_encode %{ + __ sub_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(faddD_reg_reg); +%} + +// Mul float single precision +instruct mulF_reg_reg(regF dst, regF src1, regF src2) %{ + match(Set dst (MulF src1 src2)); + + size(4); + format %{ "FMULS $dst,$src1,$src2" %} + ins_encode %{ + __ mul_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(fmulF_reg_reg); +%} + +// Mul float double precision +instruct mulD_reg_reg(regD dst, regD src1, regD src2) %{ + match(Set dst (MulD src1 src2)); + + size(4); + format %{ "FMULD $dst,$src1,$src2" %} + ins_encode %{ + __ mul_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(fmulD_reg_reg); +%} + +// Div float single precision +instruct divF_reg_reg(regF dst, regF src1, regF src2) %{ + match(Set dst (DivF src1 src2)); + + size(4); + format %{ "FDIVS $dst,$src1,$src2" %} + ins_encode %{ + __ div_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(fdivF_reg_reg); +%} + +// Div float double precision +instruct divD_reg_reg(regD dst, regD src1, regD src2) %{ + match(Set dst (DivD src1 src2)); + + size(4); + format %{ "FDIVD $dst,$src1,$src2" %} + ins_encode %{ + __ div_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + + ins_pipe(fdivD_reg_reg); +%} + +// Absolute float double precision +instruct absD_reg(regD dst, regD src) %{ + match(Set dst (AbsD src)); + + size(4); + format %{ "FABSd $dst,$src" %} + ins_encode %{ + __ abs_double($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(faddD_reg); +%} + +// Absolute float single precision +instruct absF_reg(regF dst, regF src) %{ + match(Set dst (AbsF src)); + format %{ "FABSs $dst,$src" %} + ins_encode %{ + __ abs_float($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(faddF_reg); +%} + +instruct negF_reg(regF dst, regF src) %{ + match(Set dst (NegF src)); + + size(4); + format %{ "FNEGs $dst,$src" %} + ins_encode %{ + __ neg_float($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(faddF_reg); +%} + +instruct negD_reg(regD dst, regD src) %{ + match(Set dst (NegD src)); + + format %{ "FNEGd $dst,$src" %} + ins_encode %{ + __ neg_double($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(faddD_reg); +%} + +// Sqrt float double precision +instruct sqrtF_reg_reg(regF dst, regF src) %{ + match(Set dst (ConvD2F (SqrtD (ConvF2D src)))); + + size(4); + format %{ "FSQRTS $dst,$src" %} + ins_encode %{ + __ sqrt_float($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(fdivF_reg_reg); +%} + +// Sqrt float double precision +instruct sqrtD_reg_reg(regD dst, regD src) %{ + match(Set dst (SqrtD src)); + + size(4); + format %{ "FSQRTD $dst,$src" %} + ins_encode %{ + __ sqrt_double($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(fdivD_reg_reg); +%} + +//----------Logical Instructions----------------------------------------------- +// And Instructions +// Register And +instruct andI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (AndI src1 src2)); + + size(4); + format %{ "and_32 $dst,$src1,$src2" %} + ins_encode %{ + __ and_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct andshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AndI src1 (LShiftI src2 src3))); + + size(4); + format %{ "AND $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct andshlI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (AndI src1 (LShiftI src2 src3))); + + size(4); + format %{ "and_32 $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ and_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct andsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AndI src1 (RShiftI src2 src3))); + + size(4); + format %{ "AND $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct andsarI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (AndI src1 (RShiftI src2 src3))); + + size(4); + format %{ "and_32 $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ and_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct andshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (AndI src1 (URShiftI src2 src3))); + + size(4); + format %{ "AND $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct andshrI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (AndI src1 (URShiftI src2 src3))); + + size(4); + format %{ "and_32 $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ and_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +// Immediate And +instruct andI_reg_limm(iRegI dst, iRegI src1, limmI src2) %{ + match(Set dst (AndI src1 src2)); + + size(4); + format %{ "and_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ and_32($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +#ifndef AARCH64 +instruct andI_reg_limmn(iRegI dst, iRegI src1, limmIn src2) %{ + match(Set dst (AndI src1 src2)); + + size(4); + format %{ "bic $dst,$src1,~$src2\t! int" %} + ins_encode %{ + __ bic($dst$$Register, $src1$$Register, ~$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#endif + +// Register And Long +instruct andL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (AndL src1 src2)); + + ins_cost(DEFAULT_COST); +#ifdef AARCH64 + size(4); + format %{ "AND $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + size(8); + format %{ "AND $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, $src2$$Register); + __ andr($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register->successor()); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +#ifdef AARCH64 +// Immediate And +instruct andL_reg_limm(iRegL dst, iRegL src1, limmL src2) %{ + match(Set dst (AndL src1 src2)); + + size(4); + format %{ "AND $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, (uintx)$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct andL_reg_immRot(iRegL dst, iRegL src1, immLlowRot con) %{ + match(Set dst (AndL src1 con)); + ins_cost(DEFAULT_COST); + size(8); + format %{ "AND $dst,$src1,$con\t! long" %} + ins_encode %{ + __ andr($dst$$Register, $src1$$Register, $con$$constant); + __ andr($dst$$Register->successor(), $src1$$Register->successor(), 0); + %} + ins_pipe(ialu_reg_imm); +%} +#endif + +// Or Instructions +// Register Or +instruct orI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (OrI src1 src2)); + + size(4); + format %{ "orr_32 $dst,$src1,$src2\t! int" %} + ins_encode %{ + __ orr_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct orshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (OrI src1 (LShiftI src2 src3))); + + size(4); + format %{ "OR $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct orshlI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (OrI src1 (LShiftI src2 src3))); + + size(4); + format %{ "orr_32 $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ orr_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct orsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (OrI src1 (RShiftI src2 src3))); + + size(4); + format %{ "OR $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct orsarI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (OrI src1 (RShiftI src2 src3))); + + size(4); + format %{ "orr_32 $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ orr_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct orshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (OrI src1 (URShiftI src2 src3))); + + size(4); + format %{ "OR $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct orshrI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (OrI src1 (URShiftI src2 src3))); + + size(4); + format %{ "orr_32 $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ orr_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +// Immediate Or +instruct orI_reg_limm(iRegI dst, iRegI src1, limmI src2) %{ + match(Set dst (OrI src1 src2)); + + size(4); + format %{ "orr_32 $dst,$src1,$src2" %} + ins_encode %{ + __ orr_32($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +// TODO: orn_32 with limmIn + +// Register Or Long +instruct orL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (OrL src1 src2)); + + ins_cost(DEFAULT_COST); +#ifdef AARCH64 + size(4); + format %{ "OR $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + size(8); + format %{ "OR $dst.lo,$src1.lo,$src2.lo\t! long\n\t" + "OR $dst.hi,$src1.hi,$src2.hi" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, $src2$$Register); + __ orr($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register->successor()); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +#ifdef AARCH64 +instruct orL_reg_limm(iRegL dst, iRegL src1, limmL src2) %{ + match(Set dst (OrL src1 src2)); + + size(4); + format %{ "ORR $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, (uintx)$src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct orL_reg_immRot(iRegL dst, iRegL src1, immLlowRot con) %{ + match(Set dst (OrL src1 con)); + ins_cost(DEFAULT_COST); + size(8); + format %{ "OR $dst.lo,$src1.lo,$con\t! long\n\t" + "OR $dst.hi,$src1.hi,$con" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, $con$$constant); + __ orr($dst$$Register->successor(), $src1$$Register->successor(), 0); + %} + ins_pipe(ialu_reg_imm); +%} +#endif + +#ifdef TODO +// Use SPRegP to match Rthread (TLS register) without spilling. +// Use store_ptr_RegP to match Rthread (TLS register) without spilling. +// Use sp_ptr_RegP to match Rthread (TLS register) without spilling. +instruct orI_reg_castP2X(iRegI dst, iRegI src1, sp_ptr_RegP src2) %{ + match(Set dst (OrI src1 (CastP2X src2))); + size(4); + format %{ "OR $dst,$src1,$src2" %} + ins_encode %{ + __ orr($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +// Xor Instructions +// Register Xor +instruct xorI_reg_reg(iRegI dst, iRegI src1, iRegI src2) %{ + match(Set dst (XorI src1 src2)); + + size(4); + format %{ "eor_32 $dst,$src1,$src2" %} + ins_encode %{ + __ eor_32($dst$$Register, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct xorshlI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (XorI src1 (LShiftI src2 src3))); + + size(4); + format %{ "XOR $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct xorshlI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (XorI src1 (LShiftI src2 src3))); + + size(4); + format %{ "eor_32 $dst,$src1,$src2<<$src3" %} + ins_encode %{ + __ eor_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsl, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct xorsarI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (XorI src1 (RShiftI src2 src3))); + + size(4); + format %{ "XOR $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct xorsarI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (XorI src1 (RShiftI src2 src3))); + + size(4); + format %{ "eor_32 $dst,$src1,$src2>>$src3" %} + ins_encode %{ + __ eor_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, asr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +#ifndef AARCH64 +instruct xorshrI_reg_reg_reg(iRegI dst, iRegI src1, iRegI src2, iRegI src3) %{ + match(Set dst (XorI src1 (URShiftI src2 src3))); + + size(4); + format %{ "XOR $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} +#endif + +instruct xorshrI_reg_reg_imm(iRegI dst, iRegI src1, iRegI src2, immU5 src3) %{ + match(Set dst (XorI src1 (URShiftI src2 src3))); + + size(4); + format %{ "eor_32 $dst,$src1,$src2>>>$src3" %} + ins_encode %{ + __ eor_32($dst$$Register, $src1$$Register, AsmOperand($src2$$Register, lsr, $src3$$constant)); + %} + ins_pipe(ialu_reg_reg); +%} + +// Immediate Xor +instruct xorI_reg_imm(iRegI dst, iRegI src1, limmI src2) %{ + match(Set dst (XorI src1 src2)); + + size(4); + format %{ "eor_32 $dst,$src1,$src2" %} + ins_encode %{ + __ eor_32($dst$$Register, $src1$$Register, $src2$$constant); + %} + ins_pipe(ialu_reg_imm); +%} + +// Register Xor Long +instruct xorL_reg_reg(iRegL dst, iRegL src1, iRegL src2) %{ + match(Set dst (XorL src1 src2)); + ins_cost(DEFAULT_COST); +#ifdef AARCH64 + size(4); + format %{ "XOR $dst,$src1,$src2\t! long" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, $src2$$Register); + %} +#else + size(8); + format %{ "XOR $dst.hi,$src1.hi,$src2.hi\t! long\n\t" + "XOR $dst.lo,$src1.lo,$src2.lo\t! long" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, $src2$$Register); + __ eor($dst$$Register->successor(), $src1$$Register->successor(), $src2$$Register->successor()); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +#ifdef AARCH64 +instruct xorL_reg_limmL(iRegL dst, iRegL src1, limmL con) %{ + match(Set dst (XorL src1 con)); + ins_cost(DEFAULT_COST); + size(4); + format %{ "EOR $dst,$src1,$con\t! long" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, (uintx)$con$$constant); + %} + ins_pipe(ialu_reg_imm); +%} +#else +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct xorL_reg_immRot(iRegL dst, iRegL src1, immLlowRot con) %{ + match(Set dst (XorL src1 con)); + ins_cost(DEFAULT_COST); + size(8); + format %{ "XOR $dst.hi,$src1.hi,$con\t! long\n\t" + "XOR $dst.lo,$src1.lo,0\t! long" %} + ins_encode %{ + __ eor($dst$$Register, $src1$$Register, $con$$constant); + __ eor($dst$$Register->successor(), $src1$$Register->successor(), 0); + %} + ins_pipe(ialu_reg_imm); +%} +#endif // AARCH64 + +//----------Convert to Boolean------------------------------------------------- +instruct convI2B( iRegI dst, iRegI src, flagsReg ccr ) %{ + match(Set dst (Conv2B src)); + effect(KILL ccr); +#ifdef AARCH64 + size(8); + ins_cost(DEFAULT_COST*2); + format %{ "cmp_32 $src,ZR\n\t" + "cset_w $dst, ne" %} + ins_encode %{ + __ cmp_32($src$$Register, ZR); + __ cset_w($dst$$Register, ne); + %} +#else + size(12); + ins_cost(DEFAULT_COST*2); + format %{ "TST $src,$src \n\t" + "MOV $dst, 0 \n\t" + "MOV.ne $dst, 1" %} + ins_encode %{ // FIXME: can do better? + __ tst($src$$Register, $src$$Register); + __ mov($dst$$Register, 0); + __ mov($dst$$Register, 1, ne); + %} +#endif + ins_pipe(ialu_reg_ialu); +%} + +instruct convP2B( iRegI dst, iRegP src, flagsReg ccr ) %{ + match(Set dst (Conv2B src)); + effect(KILL ccr); +#ifdef AARCH64 + size(8); + ins_cost(DEFAULT_COST*2); + format %{ "CMP $src,ZR\n\t" + "cset $dst, ne" %} + ins_encode %{ + __ cmp($src$$Register, ZR); + __ cset($dst$$Register, ne); + %} +#else + size(12); + ins_cost(DEFAULT_COST*2); + format %{ "TST $src,$src \n\t" + "MOV $dst, 0 \n\t" + "MOV.ne $dst, 1" %} + ins_encode %{ + __ tst($src$$Register, $src$$Register); + __ mov($dst$$Register, 0); + __ mov($dst$$Register, 1, ne); + %} +#endif + ins_pipe(ialu_reg_ialu); +%} + +instruct cmpLTMask_reg_reg( iRegI dst, iRegI p, iRegI q, flagsReg ccr ) %{ + match(Set dst (CmpLTMask p q)); + effect( KILL ccr ); +#ifdef AARCH64 + size(8); + ins_cost(DEFAULT_COST*2); + format %{ "CMP_w $p,$q\n\t" + "CSETM_w $dst, lt" %} + ins_encode %{ + __ cmp_w($p$$Register, $q$$Register); + __ csetm_w($dst$$Register, lt); + %} +#else + ins_cost(DEFAULT_COST*3); + format %{ "CMP $p,$q\n\t" + "MOV $dst, #0\n\t" + "MOV.lt $dst, #-1" %} + ins_encode %{ + __ cmp($p$$Register, $q$$Register); + __ mov($dst$$Register, 0); + __ mvn($dst$$Register, 0, lt); + %} +#endif + ins_pipe(ialu_reg_reg_ialu); +%} + +instruct cmpLTMask_reg_imm( iRegI dst, iRegI p, aimmI q, flagsReg ccr ) %{ + match(Set dst (CmpLTMask p q)); + effect( KILL ccr ); +#ifdef AARCH64 + size(8); + ins_cost(DEFAULT_COST*2); + format %{ "CMP_w $p,$q\n\t" + "CSETM_w $dst, lt" %} + ins_encode %{ + __ cmp_w($p$$Register, $q$$constant); + __ csetm_w($dst$$Register, lt); + %} +#else + ins_cost(DEFAULT_COST*3); + format %{ "CMP $p,$q\n\t" + "MOV $dst, #0\n\t" + "MOV.lt $dst, #-1" %} + ins_encode %{ + __ cmp($p$$Register, $q$$constant); + __ mov($dst$$Register, 0); + __ mvn($dst$$Register, 0, lt); + %} +#endif + ins_pipe(ialu_reg_reg_ialu); +%} + +#ifdef AARCH64 +instruct cadd_cmpLTMask3( iRegI dst, iRegI p, iRegI q, iRegI y, iRegI x, flagsReg ccr ) %{ + match(Set dst (AddI (AndI (CmpLTMask p q) y) x)); + effect( TEMP dst, KILL ccr ); + size(12); + ins_cost(DEFAULT_COST*3); + format %{ "CMP_w $p,$q\n\t" + "ADD_w $dst,$y,$x\n\t" + "CSEL_w $dst,$dst,$x,lt" %} + ins_encode %{ + __ cmp_w($p$$Register, $q$$Register); + __ add_w($dst$$Register, $y$$Register, $x$$Register); + __ csel_w($dst$$Register, $dst$$Register, $x$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); +%} +#else +instruct cadd_cmpLTMask3( iRegI p, iRegI q, iRegI y, iRegI z, flagsReg ccr ) %{ + match(Set z (AddI (AndI (CmpLTMask p q) y) z)); + effect( KILL ccr ); + ins_cost(DEFAULT_COST*2); + format %{ "CMP $p,$q\n\t" + "ADD.lt $z,$y,$z" %} + ins_encode %{ + __ cmp($p$$Register, $q$$Register); + __ add($z$$Register, $y$$Register, $z$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); +%} +#endif + +#ifdef AARCH64 +instruct cadd_cmpLTMask4( iRegI dst, iRegI p, aimmI q, iRegI y, iRegI x, flagsReg ccr ) %{ + match(Set dst (AddI (AndI (CmpLTMask p q) y) x)); + effect( TEMP dst, KILL ccr ); + size(12); + ins_cost(DEFAULT_COST*3); + format %{ "CMP_w $p,$q\n\t" + "ADD_w $dst,$y,$x\n\t" + "CSEL_w $dst,$dst,$x,lt" %} + ins_encode %{ + __ cmp_w($p$$Register, $q$$constant); + __ add_w($dst$$Register, $y$$Register, $x$$Register); + __ csel_w($dst$$Register, $dst$$Register, $x$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); +%} +#else +// FIXME: remove unused "dst" +instruct cadd_cmpLTMask4( iRegI dst, iRegI p, aimmI q, iRegI y, iRegI z, flagsReg ccr ) %{ + match(Set z (AddI (AndI (CmpLTMask p q) y) z)); + effect( KILL ccr ); + ins_cost(DEFAULT_COST*2); + format %{ "CMP $p,$q\n\t" + "ADD.lt $z,$y,$z" %} + ins_encode %{ + __ cmp($p$$Register, $q$$constant); + __ add($z$$Register, $y$$Register, $z$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); +%} +#endif // !AARCH64 + +#ifdef AARCH64 +instruct cadd_cmpLTMask( iRegI dst, iRegI p, iRegI q, iRegI y, flagsReg ccr ) %{ + match(Set dst (AddI (AndI (CmpLTMask p q) y) (SubI p q))); + effect( TEMP dst, KILL ccr ); + size(12); + ins_cost(DEFAULT_COST*3); + format %{ "SUBS_w $p,$p,$q\n\t" + "ADD_w $dst,$y,$p\n\t" + "CSEL_w $dst,$dst,$p,lt" %} + ins_encode %{ + __ subs_w($p$$Register, $p$$Register, $q$$Register); + __ add_w($dst$$Register, $y$$Register, $p$$Register); + __ csel_w($dst$$Register, $dst$$Register, $p$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); // FIXME +%} +#else +instruct cadd_cmpLTMask( iRegI p, iRegI q, iRegI y, flagsReg ccr ) %{ + match(Set p (AddI (AndI (CmpLTMask p q) y) (SubI p q))); + effect( KILL ccr ); + ins_cost(DEFAULT_COST*2); + format %{ "SUBS $p,$p,$q\n\t" + "ADD.lt $p,$y,$p" %} + ins_encode %{ + __ subs($p$$Register, $p$$Register, $q$$Register); + __ add($p$$Register, $y$$Register, $p$$Register, lt); + %} + ins_pipe( cadd_cmpltmask ); +%} +#endif + +//----------Arithmetic Conversion Instructions--------------------------------- +// The conversions operations are all Alpha sorted. Please keep it that way! + +instruct convD2F_reg(regF dst, regD src) %{ + match(Set dst (ConvD2F src)); + size(4); + format %{ "FCVTSD $dst,$src" %} + ins_encode %{ + __ convert_d2f($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(fcvtD2F); +%} + +// Convert a double to an int in a float register. +// If the double is a NAN, stuff a zero in instead. + +#ifdef AARCH64 +instruct convD2I_reg_reg(iRegI dst, regD src) %{ + match(Set dst (ConvD2I src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + format %{ "FCVTZS_wd $dst, $src" %} + ins_encode %{ + __ fcvtzs_wd($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(fcvtD2I); +%} + +instruct convD2L_reg_reg(iRegL dst, regD src) %{ + match(Set dst (ConvD2L src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + format %{ "FCVTZS_xd $dst, $src" %} + ins_encode %{ + __ fcvtzs_xd($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(fcvtD2L); +%} +#else +instruct convD2I_reg_reg(iRegI dst, regD src, regF tmp) %{ + match(Set dst (ConvD2I src)); + effect( TEMP tmp ); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + format %{ "FTOSIZD $tmp,$src\n\t" + "FMRS $dst, $tmp" %} + ins_encode %{ + __ ftosizd($tmp$$FloatRegister, $src$$FloatRegister); + __ fmrs($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(fcvtD2I); +%} +#endif + +// Convert a double to a long in a double register. +// If the double is a NAN, stuff a zero in instead. + +#ifndef AARCH64 +// Double to Long conversion +instruct convD2L_reg(R0R1RegL dst, regD src) %{ + match(Set dst (ConvD2L src)); + effect(CALL); + ins_cost(MEMORY_REF_COST); // FIXME + format %{ "convD2L $dst,$src\t ! call to SharedRuntime::d2l" %} + ins_encode %{ +#ifndef __ABI_HARD__ + __ fmrrd($dst$$Register, $dst$$Register->successor(), $src$$FloatRegister); +#else + if ($src$$FloatRegister != D0) { + __ mov_double(D0, $src$$FloatRegister); + } +#endif + address target = CAST_FROM_FN_PTR(address, SharedRuntime::d2l); + __ call(target, relocInfo::runtime_call_type); + %} + ins_pipe(fcvtD2L); +%} +#endif + +instruct convF2D_reg(regD dst, regF src) %{ + match(Set dst (ConvF2D src)); + size(4); + format %{ "FCVTDS $dst,$src" %} + ins_encode %{ + __ convert_f2d($dst$$FloatRegister, $src$$FloatRegister); + %} + ins_pipe(fcvtF2D); +%} + +#ifdef AARCH64 +instruct convF2I_reg_reg(iRegI dst, regF src) %{ + match(Set dst (ConvF2I src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + size(4); + format %{ "FCVTZS_ws $dst, $src" %} + ins_encode %{ + __ fcvtzs_ws($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(fcvtF2I); +%} + +instruct convF2L_reg_reg(iRegL dst, regF src) %{ + match(Set dst (ConvF2L src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + size(4); + format %{ "FCVTZS_xs $dst, $src" %} + ins_encode %{ + __ fcvtzs_xs($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(fcvtF2L); +%} +#else +instruct convF2I_reg_reg(iRegI dst, regF src, regF tmp) %{ + match(Set dst (ConvF2I src)); + effect( TEMP tmp ); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + size(8); + format %{ "FTOSIZS $tmp,$src\n\t" + "FMRS $dst, $tmp" %} + ins_encode %{ + __ ftosizs($tmp$$FloatRegister, $src$$FloatRegister); + __ fmrs($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(fcvtF2I); +%} + +// Float to Long conversion +instruct convF2L_reg(R0R1RegL dst, regF src, R0RegI arg1) %{ + match(Set dst (ConvF2L src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + effect(CALL); + format %{ "convF2L $dst,$src\t! call to SharedRuntime::f2l" %} + ins_encode %{ +#ifndef __ABI_HARD__ + __ fmrs($arg1$$Register, $src$$FloatRegister); +#else + if($src$$FloatRegister != S0) { + __ mov_float(S0, $src$$FloatRegister); + } +#endif + address target = CAST_FROM_FN_PTR(address, SharedRuntime::f2l); + __ call(target, relocInfo::runtime_call_type); + %} + ins_pipe(fcvtF2L); +%} +#endif + +#ifdef AARCH64 +instruct convI2D_reg_reg(iRegI src, regD dst) %{ + match(Set dst (ConvI2D src)); + ins_cost(DEFAULT_COST + MEMORY_REF_COST); // FIXME + size(4); + format %{ "SCVTF_dw $dst,$src" %} + ins_encode %{ + __ scvtf_dw($dst$$FloatRegister, $src$$Register); + %} + ins_pipe(fcvtI2D); +%} +#else +instruct convI2D_reg_reg(iRegI src, regD_low dst) %{ + match(Set dst (ConvI2D src)); + ins_cost(DEFAULT_COST + MEMORY_REF_COST); // FIXME + size(8); + format %{ "FMSR $dst,$src \n\t" + "FSITOD $dst $dst"%} + ins_encode %{ + __ fmsr($dst$$FloatRegister, $src$$Register); + __ fsitod($dst$$FloatRegister, $dst$$FloatRegister); + %} + ins_pipe(fcvtI2D); +%} +#endif + +instruct convI2F_reg_reg( regF dst, iRegI src ) %{ + match(Set dst (ConvI2F src)); + ins_cost(DEFAULT_COST + MEMORY_REF_COST); // FIXME +#ifdef AARCH64 + size(4); + format %{ "SCVTF_sw $dst,$src" %} + ins_encode %{ + __ scvtf_sw($dst$$FloatRegister, $src$$Register); + %} +#else + size(8); + format %{ "FMSR $dst,$src \n\t" + "FSITOS $dst, $dst"%} + ins_encode %{ + __ fmsr($dst$$FloatRegister, $src$$Register); + __ fsitos($dst$$FloatRegister, $dst$$FloatRegister); + %} +#endif + ins_pipe(fcvtI2F); +%} + +instruct convI2L_reg(iRegL dst, iRegI src) %{ + match(Set dst (ConvI2L src)); +#ifdef AARCH64 + size(4); + format %{ "SXTW $dst,$src\t! int->long" %} + ins_encode %{ + __ sxtw($dst$$Register, $src$$Register); + %} +#else + size(8); + format %{ "MOV $dst.lo, $src \n\t" + "ASR $dst.hi,$src,31\t! int->long" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register); + __ mov($dst$$Register->successor(), AsmOperand($src$$Register, asr, 31)); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +// Zero-extend convert int to long +instruct convI2L_reg_zex(iRegL dst, iRegI src, immL_32bits mask ) %{ + match(Set dst (AndL (ConvI2L src) mask) ); +#ifdef AARCH64 + size(4); + format %{ "mov_w $dst,$src\t! zero-extend int to long" %} + ins_encode %{ + __ mov_w($dst$$Register, $src$$Register); + %} +#else + size(8); + format %{ "MOV $dst.lo,$src.lo\t! zero-extend int to long\n\t" + "MOV $dst.hi, 0"%} + ins_encode %{ + __ mov($dst$$Register, $src$$Register); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +// Zero-extend long +instruct zerox_long(iRegL dst, iRegL src, immL_32bits mask ) %{ + match(Set dst (AndL src mask) ); +#ifdef AARCH64 + size(4); + format %{ "mov_w $dst,$src\t! zero-extend long" %} + ins_encode %{ + __ mov_w($dst$$Register, $src$$Register); + %} +#else + size(8); + format %{ "MOV $dst.lo,$src.lo\t! zero-extend long\n\t" + "MOV $dst.hi, 0"%} + ins_encode %{ + __ mov($dst$$Register, $src$$Register); + __ mov($dst$$Register->successor(), 0); + %} +#endif + ins_pipe(ialu_reg_reg); +%} + +instruct MoveF2I_reg_reg(iRegI dst, regF src) %{ + match(Set dst (MoveF2I src)); + effect(DEF dst, USE src); + ins_cost(MEMORY_REF_COST); // FIXME + + size(4); + format %{ "FMRS $dst,$src\t! MoveF2I" %} + ins_encode %{ + __ fmrs($dst$$Register, $src$$FloatRegister); + %} + ins_pipe(iload_mem); // FIXME +%} + +instruct MoveI2F_reg_reg(regF dst, iRegI src) %{ + match(Set dst (MoveI2F src)); + ins_cost(MEMORY_REF_COST); // FIXME + + size(4); + format %{ "FMSR $dst,$src\t! MoveI2F" %} + ins_encode %{ + __ fmsr($dst$$FloatRegister, $src$$Register); + %} + ins_pipe(iload_mem); // FIXME +%} + +instruct MoveD2L_reg_reg(iRegL dst, regD src) %{ + match(Set dst (MoveD2L src)); + effect(DEF dst, USE src); + ins_cost(MEMORY_REF_COST); // FIXME + + size(4); +#ifdef AARCH64 + format %{ "FMOV_xd $dst,$src\t! MoveD2L" %} + ins_encode %{ + __ fmov_xd($dst$$Register, $src$$FloatRegister); + %} +#else + format %{ "FMRRD $dst,$src\t! MoveD2L" %} + ins_encode %{ + __ fmrrd($dst$$Register, $dst$$Register->successor(), $src$$FloatRegister); + %} +#endif + ins_pipe(iload_mem); // FIXME +%} + +instruct MoveL2D_reg_reg(regD dst, iRegL src) %{ + match(Set dst (MoveL2D src)); + effect(DEF dst, USE src); + ins_cost(MEMORY_REF_COST); // FIXME + + size(4); +#ifdef AARCH64 + format %{ "FMOV_dx $dst,$src\t! MoveL2D" %} + ins_encode %{ + __ fmov_dx($dst$$FloatRegister, $src$$Register); + %} +#else + format %{ "FMDRR $dst,$src\t! MoveL2D" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register->successor()); + %} +#endif + ins_pipe(ialu_reg_reg); // FIXME +%} + +//----------- +// Long to Double conversion + +#ifdef AARCH64 +instruct convL2D(regD dst, iRegL src) %{ + match(Set dst (ConvL2D src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + size(4); + format %{ "SCVTF_dx $dst, $src" %} + ins_encode %{ + __ scvtf_dx($dst$$FloatRegister, $src$$Register); + %} + ins_pipe(fcvtL2D); +%} + +instruct convL2F(regF dst, iRegL src) %{ + match(Set dst (ConvL2F src)); + ins_cost(DEFAULT_COST*2 + MEMORY_REF_COST*2 + BRANCH_COST); // FIXME + size(4); + format %{ "SCVTF_sx $dst, $src" %} + ins_encode %{ + __ scvtf_sx($dst$$FloatRegister, $src$$Register); + %} + ins_pipe(fcvtL2F); +%} +#else +// Magic constant, 0x43300000 +instruct loadConI_x43300000(iRegI dst) %{ + effect(DEF dst); + size(8); + format %{ "MOV_SLOW $dst,0x43300000\t! 2^52" %} + ins_encode %{ + __ mov_slow($dst$$Register, 0x43300000); + %} + ins_pipe(ialu_none); +%} + +// Magic constant, 0x41f00000 +instruct loadConI_x41f00000(iRegI dst) %{ + effect(DEF dst); + size(8); + format %{ "MOV_SLOW $dst, 0x41f00000\t! 2^32" %} + ins_encode %{ + __ mov_slow($dst$$Register, 0x41f00000); + %} + ins_pipe(ialu_none); +%} + +instruct loadConI_x0(iRegI dst) %{ + effect(DEF dst); + size(4); + format %{ "MOV $dst, 0x0\t! 0" %} + ins_encode %{ + __ mov($dst$$Register, 0); + %} + ins_pipe(ialu_none); +%} + +// Construct a double from two float halves +instruct regDHi_regDLo_to_regD(regD_low dst, regD_low src1, regD_low src2) %{ + effect(DEF dst, USE src1, USE src2); + size(8); + format %{ "FCPYS $dst.hi,$src1.hi\n\t" + "FCPYS $dst.lo,$src2.lo" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister->successor(), $src1$$FloatRegister->successor()); + __ fcpys($dst$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(faddD_reg_reg); +%} + +#ifndef AARCH64 +// Convert integer in high half of a double register (in the lower half of +// the double register file) to double +instruct convI2D_regDHi_regD(regD dst, regD_low src) %{ + effect(DEF dst, USE src); + size(4); + format %{ "FSITOD $dst,$src" %} + ins_encode %{ + __ fsitod($dst$$FloatRegister, $src$$FloatRegister->successor()); + %} + ins_pipe(fcvtLHi2D); +%} +#endif + +// Add float double precision +instruct addD_regD_regD(regD dst, regD src1, regD src2) %{ + effect(DEF dst, USE src1, USE src2); + size(4); + format %{ "FADDD $dst,$src1,$src2" %} + ins_encode %{ + __ add_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(faddD_reg_reg); +%} + +// Sub float double precision +instruct subD_regD_regD(regD dst, regD src1, regD src2) %{ + effect(DEF dst, USE src1, USE src2); + size(4); + format %{ "FSUBD $dst,$src1,$src2" %} + ins_encode %{ + __ sub_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(faddD_reg_reg); +%} + +// Mul float double precision +instruct mulD_regD_regD(regD dst, regD src1, regD src2) %{ + effect(DEF dst, USE src1, USE src2); + size(4); + format %{ "FMULD $dst,$src1,$src2" %} + ins_encode %{ + __ mul_double($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + %} + ins_pipe(fmulD_reg_reg); +%} + +instruct regL_to_regD(regD dst, iRegL src) %{ + // No match rule to avoid chain rule match. + effect(DEF dst, USE src); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "FMDRR $dst,$src\t! regL to regD" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register->successor()); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} + +instruct regI_regI_to_regD(regD dst, iRegI src1, iRegI src2) %{ + // No match rule to avoid chain rule match. + effect(DEF dst, USE src1, USE src2); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "FMDRR $dst,$src1,$src2\t! regI,regI to regD" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src1$$Register, $src2$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +%} + +instruct convL2D_reg_slow_fxtof(regD dst, iRegL src) %{ + match(Set dst (ConvL2D src)); + ins_cost(DEFAULT_COST*8 + MEMORY_REF_COST*6); // FIXME + + expand %{ + regD_low tmpsrc; + iRegI ix43300000; + iRegI ix41f00000; + iRegI ix0; + regD_low dx43300000; + regD dx41f00000; + regD tmp1; + regD_low tmp2; + regD tmp3; + regD tmp4; + + regL_to_regD(tmpsrc, src); + + loadConI_x43300000(ix43300000); + loadConI_x41f00000(ix41f00000); + loadConI_x0(ix0); + + regI_regI_to_regD(dx43300000, ix0, ix43300000); + regI_regI_to_regD(dx41f00000, ix0, ix41f00000); + + convI2D_regDHi_regD(tmp1, tmpsrc); + regDHi_regDLo_to_regD(tmp2, dx43300000, tmpsrc); + subD_regD_regD(tmp3, tmp2, dx43300000); + mulD_regD_regD(tmp4, tmp1, dx41f00000); + addD_regD_regD(dst, tmp3, tmp4); + %} +%} +#endif // !AARCH64 + +instruct convL2I_reg(iRegI dst, iRegL src) %{ + match(Set dst (ConvL2I src)); + size(4); +#ifdef AARCH64 + format %{ "MOV_w $dst,$src\t! long->int" %} + ins_encode %{ + __ mov_w($dst$$Register, $src$$Register); + %} +#else + format %{ "MOV $dst,$src.lo\t! long->int" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register); + %} +#endif + ins_pipe(ialu_move_reg_I_to_L); +%} + +#ifndef AARCH64 +// Register Shift Right Immediate +instruct shrL_reg_imm6_L2I(iRegI dst, iRegL src, immI_32_63 cnt) %{ + match(Set dst (ConvL2I (RShiftL src cnt))); + size(4); + format %{ "ASR $dst,$src.hi,($cnt - 32)\t! long->int or mov if $cnt==32" %} + ins_encode %{ + if ($cnt$$constant == 32) { + __ mov($dst$$Register, $src$$Register->successor()); + } else { + __ mov($dst$$Register, AsmOperand($src$$Register->successor(), asr, $cnt$$constant - 32)); + } + %} + ins_pipe(ialu_reg_imm); +%} +#endif + + +//----------Control Flow Instructions------------------------------------------ +// Compare Instructions +// Compare Integers +instruct compI_iReg(flagsReg icc, iRegI op1, iRegI op2) %{ + match(Set icc (CmpI op1 op2)); + effect( DEF icc, USE op1, USE op2 ); + + size(4); + format %{ "cmp_32 $op1,$op2\t! int" %} + ins_encode %{ + __ cmp_32($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg); +%} + +#ifdef _LP64 +// Compare compressed pointers +instruct compN_reg2(flagsRegU icc, iRegN op1, iRegN op2) %{ + match(Set icc (CmpN op1 op2)); + effect( DEF icc, USE op1, USE op2 ); + + size(4); + format %{ "cmp_32 $op1,$op2\t! int" %} + ins_encode %{ + __ cmp_32($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg); +%} +#endif + +instruct compU_iReg(flagsRegU icc, iRegI op1, iRegI op2) %{ + match(Set icc (CmpU op1 op2)); + + size(4); + format %{ "cmp_32 $op1,$op2\t! unsigned int" %} + ins_encode %{ + __ cmp_32($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg); +%} + +instruct compI_iReg_immneg(flagsReg icc, iRegI op1, aimmIneg op2) %{ + match(Set icc (CmpI op1 op2)); + effect( DEF icc, USE op1 ); + + size(4); + format %{ "cmn_32 $op1,-$op2\t! int" %} + ins_encode %{ + __ cmn_32($op1$$Register, -$op2$$constant); + %} + ins_pipe(ialu_cconly_reg_imm); +%} + +instruct compI_iReg_imm(flagsReg icc, iRegI op1, aimmI op2) %{ + match(Set icc (CmpI op1 op2)); + effect( DEF icc, USE op1 ); + + size(4); + format %{ "cmp_32 $op1,$op2\t! int" %} + ins_encode %{ + __ cmp_32($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_cconly_reg_imm); +%} + +instruct testI_reg_reg( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 op2) zero)); + size(4); + format %{ "tst_32 $op2,$op1" %} + + ins_encode %{ + __ tst_32($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} + +#ifndef AARCH64 +instruct testshlI_reg_reg_reg( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, iRegI op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (LShiftI op2 op3)) zero)); + size(4); + format %{ "TST $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst($op1$$Register, AsmOperand($op2$$Register, lsl, $op3$$Register)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} +#endif + +instruct testshlI_reg_reg_imm( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, immU5 op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (LShiftI op2 op3)) zero)); + size(4); + format %{ "tst_32 $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst_32($op1$$Register, AsmOperand($op2$$Register, lsl, $op3$$constant)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} + +#ifndef AARCH64 +instruct testsarI_reg_reg_reg( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, iRegI op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (RShiftI op2 op3)) zero)); + size(4); + format %{ "TST $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst($op1$$Register, AsmOperand($op2$$Register, asr, $op3$$Register)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} +#endif + +instruct testsarI_reg_reg_imm( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, immU5 op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (RShiftI op2 op3)) zero)); + size(4); + format %{ "tst_32 $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst_32($op1$$Register, AsmOperand($op2$$Register, asr, $op3$$constant)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} + +#ifndef AARCH64 +instruct testshrI_reg_reg_reg( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, iRegI op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (URShiftI op2 op3)) zero)); + size(4); + format %{ "TST $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst($op1$$Register, AsmOperand($op2$$Register, lsr, $op3$$Register)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} +#endif + +instruct testshrI_reg_reg_imm( flagsReg_EQNELTGE icc, iRegI op1, iRegI op2, immU5 op3, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 (URShiftI op2 op3)) zero)); + size(4); + format %{ "tst_32 $op2,$op1<<$op3" %} + + ins_encode %{ + __ tst_32($op1$$Register, AsmOperand($op2$$Register, lsr, $op3$$constant)); + %} + ins_pipe(ialu_cconly_reg_reg_zero); +%} + +instruct testI_reg_imm( flagsReg_EQNELTGE icc, iRegI op1, limmI op2, immI0 zero ) %{ + match(Set icc (CmpI (AndI op1 op2) zero)); + size(4); + format %{ "tst_32 $op2,$op1" %} + + ins_encode %{ + __ tst_32($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_cconly_reg_imm_zero); +%} + +#ifdef AARCH64 +instruct compL_reg_reg(flagsReg xcc, iRegL op1, iRegL op2) +%{ + match(Set xcc (CmpL op1 op2)); + effect( DEF xcc, USE op1, USE op2 ); + + size(4); + format %{ "CMP $op1,$op2\t! long" %} + ins_encode %{ + __ cmp($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg); +%} +#else +instruct compL_reg_reg_LTGE(flagsRegL_LTGE xcc, iRegL op1, iRegL op2, iRegL tmp) %{ + match(Set xcc (CmpL op1 op2)); + effect( DEF xcc, USE op1, USE op2, TEMP tmp ); + + size(8); + format %{ "SUBS $tmp,$op1.low,$op2.low\t\t! long\n\t" + "SBCS $tmp,$op1.hi,$op2.hi" %} + ins_encode %{ + __ subs($tmp$$Register, $op1$$Register, $op2$$Register); + __ sbcs($tmp$$Register->successor(), $op1$$Register->successor(), $op2$$Register->successor()); + %} + ins_pipe(ialu_cconly_reg_reg); +%} +#endif + +#ifdef AARCH64 +instruct compL_reg_con(flagsReg xcc, iRegL op1, aimmL con) %{ + match(Set xcc (CmpL op1 con)); + effect( DEF xcc, USE op1, USE con ); + + size(8); + format %{ "CMP $op1,$con\t\t! long" %} + ins_encode %{ + __ cmp($op1$$Register, $con$$constant); + %} + + ins_pipe(ialu_cconly_reg_imm); +%} +#else +instruct compL_reg_reg_EQNE(flagsRegL_EQNE xcc, iRegL op1, iRegL op2) %{ + match(Set xcc (CmpL op1 op2)); + effect( DEF xcc, USE op1, USE op2 ); + + size(8); + format %{ "TEQ $op1.hi,$op2.hi\t\t! long\n\t" + "TEQ.eq $op1.lo,$op2.lo" %} + ins_encode %{ + __ teq($op1$$Register->successor(), $op2$$Register->successor()); + __ teq($op1$$Register, $op2$$Register, eq); + %} + ins_pipe(ialu_cconly_reg_reg); +%} + +instruct compL_reg_reg_LEGT(flagsRegL_LEGT xcc, iRegL op1, iRegL op2, iRegL tmp) %{ + match(Set xcc (CmpL op1 op2)); + effect( DEF xcc, USE op1, USE op2, TEMP tmp ); + + size(8); + format %{ "SUBS $tmp,$op2.low,$op1.low\t\t! long\n\t" + "SBCS $tmp,$op2.hi,$op1.hi" %} + ins_encode %{ + __ subs($tmp$$Register, $op2$$Register, $op1$$Register); + __ sbcs($tmp$$Register->successor(), $op2$$Register->successor(), $op1$$Register->successor()); + %} + ins_pipe(ialu_cconly_reg_reg); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct compL_reg_con_LTGE(flagsRegL_LTGE xcc, iRegL op1, immLlowRot con, iRegL tmp) %{ + match(Set xcc (CmpL op1 con)); + effect( DEF xcc, USE op1, USE con, TEMP tmp ); + + size(8); + format %{ "SUBS $tmp,$op1.low,$con\t\t! long\n\t" + "SBCS $tmp,$op1.hi,0" %} + ins_encode %{ + __ subs($tmp$$Register, $op1$$Register, $con$$constant); + __ sbcs($tmp$$Register->successor(), $op1$$Register->successor(), 0); + %} + + ins_pipe(ialu_cconly_reg_reg); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct compL_reg_con_EQNE(flagsRegL_EQNE xcc, iRegL op1, immLlowRot con) %{ + match(Set xcc (CmpL op1 con)); + effect( DEF xcc, USE op1, USE con ); + + size(8); + format %{ "TEQ $op1.hi,0\t\t! long\n\t" + "TEQ.eq $op1.lo,$con" %} + ins_encode %{ + __ teq($op1$$Register->successor(), 0); + __ teq($op1$$Register, $con$$constant, eq); + %} + + ins_pipe(ialu_cconly_reg_reg); +%} + +// TODO: try immLRot2 instead, (0, $con$$constant) becomes +// (hi($con$$constant), lo($con$$constant)) becomes +instruct compL_reg_con_LEGT(flagsRegL_LEGT xcc, iRegL op1, immLlowRot con, iRegL tmp) %{ + match(Set xcc (CmpL op1 con)); + effect( DEF xcc, USE op1, USE con, TEMP tmp ); + + size(8); + format %{ "RSBS $tmp,$op1.low,$con\t\t! long\n\t" + "RSCS $tmp,$op1.hi,0" %} + ins_encode %{ + __ rsbs($tmp$$Register, $op1$$Register, $con$$constant); + __ rscs($tmp$$Register->successor(), $op1$$Register->successor(), 0); + %} + + ins_pipe(ialu_cconly_reg_reg); +%} +#endif + +/* instruct testL_reg_reg(flagsRegL xcc, iRegL op1, iRegL op2, immL0 zero) %{ */ +/* match(Set xcc (CmpL (AndL op1 op2) zero)); */ +/* ins_encode %{ */ +/* __ stop("testL_reg_reg unimplemented"); */ +/* %} */ +/* ins_pipe(ialu_cconly_reg_reg); */ +/* %} */ + +/* // useful for checking the alignment of a pointer: */ +/* instruct testL_reg_con(flagsRegL xcc, iRegL op1, immLlowRot con, immL0 zero) %{ */ +/* match(Set xcc (CmpL (AndL op1 con) zero)); */ +/* ins_encode %{ */ +/* __ stop("testL_reg_con unimplemented"); */ +/* %} */ +/* ins_pipe(ialu_cconly_reg_reg); */ +/* %} */ + +instruct compU_iReg_imm(flagsRegU icc, iRegI op1, aimmU31 op2 ) %{ + match(Set icc (CmpU op1 op2)); + + size(4); + format %{ "cmp_32 $op1,$op2\t! unsigned" %} + ins_encode %{ + __ cmp_32($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_cconly_reg_imm); +%} + +// Compare Pointers +instruct compP_iRegP(flagsRegP pcc, iRegP op1, iRegP op2 ) %{ + match(Set pcc (CmpP op1 op2)); + + size(4); + format %{ "CMP $op1,$op2\t! ptr" %} + ins_encode %{ + __ cmp($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_cconly_reg_reg); +%} + +instruct compP_iRegP_imm(flagsRegP pcc, iRegP op1, aimmP op2 ) %{ + match(Set pcc (CmpP op1 op2)); + + size(4); + format %{ "CMP $op1,$op2\t! ptr" %} + ins_encode %{ + assert($op2$$constant == 0 || _opnds[2]->constant_reloc() == relocInfo::none, "reloc in cmp?"); + __ cmp($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_cconly_reg_imm); +%} + +//----------Max and Min-------------------------------------------------------- +// Min Instructions +// Conditional move for min +instruct cmovI_reg_lt( iRegI op2, iRegI op1, flagsReg icc ) %{ + effect( USE_DEF op2, USE op1, USE icc ); + + size(4); + format %{ "MOV.lt $op2,$op1\t! min" %} + ins_encode %{ + __ mov($op2$$Register, $op1$$Register, lt); + %} + ins_pipe(ialu_reg_flags); +%} + +// Min Register with Register. +instruct minI_eReg(iRegI op1, iRegI op2) %{ + match(Set op2 (MinI op1 op2)); + ins_cost(DEFAULT_COST*2); + expand %{ + flagsReg icc; + compI_iReg(icc,op1,op2); + cmovI_reg_lt(op2,op1,icc); + %} +%} + +// Max Instructions +// Conditional move for max +instruct cmovI_reg_gt( iRegI op2, iRegI op1, flagsReg icc ) %{ + effect( USE_DEF op2, USE op1, USE icc ); + format %{ "MOV.gt $op2,$op1\t! max" %} + ins_encode %{ + __ mov($op2$$Register, $op1$$Register, gt); + %} + ins_pipe(ialu_reg_flags); +%} + +// Max Register with Register +instruct maxI_eReg(iRegI op1, iRegI op2) %{ + match(Set op2 (MaxI op1 op2)); + ins_cost(DEFAULT_COST*2); + expand %{ + flagsReg icc; + compI_iReg(icc,op1,op2); + cmovI_reg_gt(op2,op1,icc); + %} +%} + + +//----------Float Compares---------------------------------------------------- +// Compare floating, generate condition code +instruct cmpF_cc(flagsRegF fcc, flagsReg icc, regF src1, regF src2) %{ + match(Set icc (CmpF src1 src2)); + effect(KILL fcc); + +#ifdef AARCH64 + size(4); + format %{ "FCMP_s $src1,$src2" %} + ins_encode %{ + __ fcmp_s($src1$$FloatRegister, $src2$$FloatRegister); + %} +#else + size(8); + format %{ "FCMPs $src1,$src2\n\t" + "FMSTAT" %} + ins_encode %{ + __ fcmps($src1$$FloatRegister, $src2$$FloatRegister); + __ fmstat(); + %} +#endif + ins_pipe(faddF_fcc_reg_reg_zero); +%} + +instruct cmpF0_cc(flagsRegF fcc, flagsReg icc, regF src1, immF0 src2) %{ + match(Set icc (CmpF src1 src2)); + effect(KILL fcc); + +#ifdef AARCH64 + size(4); + format %{ "FCMP0_s $src1" %} + ins_encode %{ + __ fcmp0_s($src1$$FloatRegister); + %} +#else + size(8); + format %{ "FCMPs $src1,$src2\n\t" + "FMSTAT" %} + ins_encode %{ + __ fcmpzs($src1$$FloatRegister); + __ fmstat(); + %} +#endif + ins_pipe(faddF_fcc_reg_reg_zero); +%} + +instruct cmpD_cc(flagsRegF fcc, flagsReg icc, regD src1, regD src2) %{ + match(Set icc (CmpD src1 src2)); + effect(KILL fcc); + +#ifdef AARCH64 + size(4); + format %{ "FCMP_d $src1,$src2" %} + ins_encode %{ + __ fcmp_d($src1$$FloatRegister, $src2$$FloatRegister); + %} +#else + size(8); + format %{ "FCMPd $src1,$src2 \n\t" + "FMSTAT" %} + ins_encode %{ + __ fcmpd($src1$$FloatRegister, $src2$$FloatRegister); + __ fmstat(); + %} +#endif + ins_pipe(faddD_fcc_reg_reg_zero); +%} + +instruct cmpD0_cc(flagsRegF fcc, flagsReg icc, regD src1, immD0 src2) %{ + match(Set icc (CmpD src1 src2)); + effect(KILL fcc); + +#ifdef AARCH64 + size(8); + format %{ "FCMP0_d $src1" %} + ins_encode %{ + __ fcmp0_d($src1$$FloatRegister); + %} +#else + size(8); + format %{ "FCMPZd $src1,$src2 \n\t" + "FMSTAT" %} + ins_encode %{ + __ fcmpzd($src1$$FloatRegister); + __ fmstat(); + %} +#endif + ins_pipe(faddD_fcc_reg_reg_zero); +%} + +#ifdef AARCH64 +// Compare floating, generate -1,0,1 +instruct cmpF_reg(iRegI dst, regF src1, regF src2, flagsReg icc) %{ + match(Set dst (CmpF3 src1 src2)); + // effect(KILL fcc); // nobody cares if flagsRegF is killed + effect(KILL icc); + ins_cost(DEFAULT_COST*3); // FIXME + size(12); + format %{ "FCMP_s $src1,$src2\n\t" + "CSET $dst, gt\n\t" + "CSINV $dst, $dst, ZR, ge" %} + ins_encode %{ + Register dst = $dst$$Register; + __ fcmp_s($src1$$FloatRegister, $src2$$FloatRegister); + __ cset(dst, gt); // 1 if '>', else 0 + __ csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 + %} + ins_pipe( floating_cmp ); // FIXME +%} + +// Compare floating, generate -1,0,1 +instruct cmpD_reg(iRegI dst, regD src1, regD src2, flagsReg icc) %{ + match(Set dst (CmpD3 src1 src2)); + // effect(KILL fcc); // nobody cares if flagsRegF is killed + effect(KILL icc); + ins_cost(DEFAULT_COST*3); // FIXME + size(12); + format %{ "FCMP_d $src1,$src2\n\t" + "CSET $dst, gt\n\t" + "CSINV $dst, $dst, ZR, ge" %} + ins_encode %{ + Register dst = $dst$$Register; + __ fcmp_d($src1$$FloatRegister, $src2$$FloatRegister); + __ cset(dst, gt); // 1 if '>', else 0 + __ csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 + %} + ins_pipe( floating_cmp ); // FIXME +%} + +// Compare floating, generate -1,0,1 +instruct cmpF0_reg(iRegI dst, regF src1, immF0 src2, flagsReg icc) %{ + match(Set dst (CmpF3 src1 src2)); + // effect(KILL fcc); // nobody cares if flagsRegF is killed + effect(KILL icc); + ins_cost(DEFAULT_COST*3); // FIXME + size(12); + format %{ "FCMP0_s $src1\n\t" + "CSET $dst, gt\n\t" + "CSINV $dst, $dst, ZR, ge" %} + ins_encode %{ + Register dst = $dst$$Register; + __ fcmp0_s($src1$$FloatRegister); + __ cset(dst, gt); // 1 if '>', else 0 + __ csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 + %} + ins_pipe( floating_cmp ); // FIXME +%} + +// Compare floating, generate -1,0,1 +instruct cmpD0_reg(iRegI dst, regD src1, immD0 src2, flagsReg icc) %{ + match(Set dst (CmpD3 src1 src2)); + // effect(KILL fcc); // nobody cares if flagsRegF is killed + effect(KILL icc); + ins_cost(DEFAULT_COST*3); // FIXME + size(12); + format %{ "FCMP0_d $src1\n\t" + "CSET $dst, gt\n\t" + "CSINV $dst, $dst, ZR, ge" %} + ins_encode %{ + Register dst = $dst$$Register; + __ fcmp0_d($src1$$FloatRegister); + __ cset(dst, gt); // 1 if '>', else 0 + __ csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 + %} + ins_pipe( floating_cmp ); // FIXME +%} +#else +// Compare floating, generate -1,0,1 +instruct cmpF_reg(iRegI dst, regF src1, regF src2, flagsRegF fcc) %{ + match(Set dst (CmpF3 src1 src2)); + effect(KILL fcc); + ins_cost(DEFAULT_COST*3+BRANCH_COST*3); // FIXME + size(20); + // same number of instructions as code using conditional moves but + // doesn't kill integer condition register + format %{ "FCMPs $dst,$src1,$src2 \n\t" + "VMRS $dst, FPSCR \n\t" + "OR $dst, $dst, 0x08000000 \n\t" + "EOR $dst, $dst, $dst << 3 \n\t" + "MOV $dst, $dst >> 30" %} + ins_encode %{ + __ fcmps($src1$$FloatRegister, $src2$$FloatRegister); + __ floating_cmp($dst$$Register); + %} + ins_pipe( floating_cmp ); +%} + +instruct cmpF0_reg(iRegI dst, regF src1, immF0 src2, flagsRegF fcc) %{ + match(Set dst (CmpF3 src1 src2)); + effect(KILL fcc); + ins_cost(DEFAULT_COST*3+BRANCH_COST*3); // FIXME + size(20); + // same number of instructions as code using conditional moves but + // doesn't kill integer condition register + format %{ "FCMPZs $dst,$src1,$src2 \n\t" + "VMRS $dst, FPSCR \n\t" + "OR $dst, $dst, 0x08000000 \n\t" + "EOR $dst, $dst, $dst << 3 \n\t" + "MOV $dst, $dst >> 30" %} + ins_encode %{ + __ fcmpzs($src1$$FloatRegister); + __ floating_cmp($dst$$Register); + %} + ins_pipe( floating_cmp ); +%} + +instruct cmpD_reg(iRegI dst, regD src1, regD src2, flagsRegF fcc) %{ + match(Set dst (CmpD3 src1 src2)); + effect(KILL fcc); + ins_cost(DEFAULT_COST*3+BRANCH_COST*3); // FIXME + size(20); + // same number of instructions as code using conditional moves but + // doesn't kill integer condition register + format %{ "FCMPd $dst,$src1,$src2 \n\t" + "VMRS $dst, FPSCR \n\t" + "OR $dst, $dst, 0x08000000 \n\t" + "EOR $dst, $dst, $dst << 3 \n\t" + "MOV $dst, $dst >> 30" %} + ins_encode %{ + __ fcmpd($src1$$FloatRegister, $src2$$FloatRegister); + __ floating_cmp($dst$$Register); + %} + ins_pipe( floating_cmp ); +%} + +instruct cmpD0_reg(iRegI dst, regD src1, immD0 src2, flagsRegF fcc) %{ + match(Set dst (CmpD3 src1 src2)); + effect(KILL fcc); + ins_cost(DEFAULT_COST*3+BRANCH_COST*3); // FIXME + size(20); + // same number of instructions as code using conditional moves but + // doesn't kill integer condition register + format %{ "FCMPZd $dst,$src1,$src2 \n\t" + "VMRS $dst, FPSCR \n\t" + "OR $dst, $dst, 0x08000000 \n\t" + "EOR $dst, $dst, $dst << 3 \n\t" + "MOV $dst, $dst >> 30" %} + ins_encode %{ + __ fcmpzd($src1$$FloatRegister); + __ floating_cmp($dst$$Register); + %} + ins_pipe( floating_cmp ); +%} +#endif // !AARCH64 + +//----------Branches--------------------------------------------------------- +// Jump +// (compare 'operand indIndex' and 'instruct addP_reg_reg' above) +// FIXME +instruct jumpXtnd(iRegX switch_val, iRegP tmp) %{ + match(Jump switch_val); + effect(TEMP tmp); + ins_cost(350); + format %{ "ADD $tmp, $constanttablebase, $switch_val\n\t" + "LDR $tmp,[$tmp + $constantoffset]\n\t" + "BX $tmp" %} + size(20); + ins_encode %{ + Register table_reg; + Register label_reg = $tmp$$Register; + if (constant_offset() == 0) { + table_reg = $constanttablebase; + __ ldr(label_reg, Address(table_reg, $switch_val$$Register)); + } else { + table_reg = $tmp$$Register; + int offset = $constantoffset; + if (is_memoryP(offset)) { + __ add(table_reg, $constanttablebase, $switch_val$$Register); + __ ldr(label_reg, Address(table_reg, offset)); + } else { + __ mov_slow(table_reg, $constantoffset); + __ add(table_reg, $constanttablebase, table_reg); + __ ldr(label_reg, Address(table_reg, $switch_val$$Register)); + } + } + __ jump(label_reg); // ldr + b better than ldr to PC for branch predictor? + // __ ldr(PC, Address($table$$Register, $switch_val$$Register)); + %} + ins_pipe(ialu_reg_reg); +%} + +// // Direct Branch. +instruct branch(label labl) %{ + match(Goto); + effect(USE labl); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B $labl" %} + ins_encode %{ + __ b(*($labl$$label)); + %} + ins_pipe(br); +%} + +// Conditional Direct Branch +instruct branchCon(cmpOp cmp, flagsReg icc, label labl) %{ + match(If cmp icc); + effect(USE labl); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $icc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +#ifdef ARM +instruct branchCon_EQNELTGE(cmpOp0 cmp, flagsReg_EQNELTGE icc, label labl) %{ + match(If cmp icc); + effect(USE labl); + predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $icc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} +#endif + +#ifdef AARCH64 +instruct cbzI(cmpOp cmp, iRegI op1, immI0 op2, label labl) %{ + match(If cmp (CmpI op1 op2)); + effect(USE labl); + predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne); + size(4); + ins_cost(BRANCH_COST); + format %{ "CB{N}Z $op1, $labl\t! int $cmp" %} + ins_encode %{ + if ($cmp$$cmpcode == eq) { + __ cbz_w($op1$$Register, *($labl$$label)); + } else { + __ cbnz_w($op1$$Register, *($labl$$label)); + } + %} + ins_pipe(br_cc); // FIXME +%} + +instruct cbzP(cmpOpP cmp, iRegP op1, immP0 op2, label labl) %{ + match(If cmp (CmpP op1 op2)); + effect(USE labl); + predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne); + size(4); + ins_cost(BRANCH_COST); + format %{ "CB{N}Z $op1, $labl\t! ptr $cmp" %} + ins_encode %{ + if ($cmp$$cmpcode == eq) { + __ cbz($op1$$Register, *($labl$$label)); + } else { + __ cbnz($op1$$Register, *($labl$$label)); + } + %} + ins_pipe(br_cc); // FIXME +%} + +instruct cbzL(cmpOpL cmp, iRegL op1, immL0 op2, label labl) %{ + match(If cmp (CmpL op1 op2)); + effect(USE labl); + predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || + _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne); + size(4); + ins_cost(BRANCH_COST); + format %{ "CB{N}Z $op1, $labl\t! long $cmp" %} + ins_encode %{ + if ($cmp$$cmpcode == eq) { + __ cbz($op1$$Register, *($labl$$label)); + } else { + __ cbnz($op1$$Register, *($labl$$label)); + } + %} + ins_pipe(br_cc); // FIXME +%} +#endif + +instruct branchConU(cmpOpU cmp, flagsRegU icc, label labl) %{ + match(If cmp icc); + effect(USE labl); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $icc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +instruct branchConP(cmpOpP cmp, flagsRegP pcc, label labl) %{ + match(If cmp pcc); + effect(USE labl); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $pcc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +#ifndef AARCH64 +instruct branchConL_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, label labl) %{ + match(If cmp xcc); + effect(USE labl); + predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $xcc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +instruct branchConL_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, label labl) %{ + match(If cmp xcc); + effect(USE labl); + predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $xcc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +instruct branchConL_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, label labl) %{ + match(If cmp xcc); + effect(USE labl); + predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le ); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $xcc,$labl" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} +#endif + +instruct branchLoopEnd(cmpOp cmp, flagsReg icc, label labl) %{ + match(CountedLoopEnd cmp icc); + effect(USE labl); + + size(4); + ins_cost(BRANCH_COST); + format %{ "B$cmp $icc,$labl\t! Loop end" %} + ins_encode %{ + __ b(*($labl$$label), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(br_cc); +%} + +// instruct branchLoopEndU(cmpOpU cmp, flagsRegU icc, label labl) %{ +// match(CountedLoopEnd cmp icc); +// ins_pipe(br_cc); +// %} + +// ============================================================================ +// Long Compare +// +// Currently we hold longs in 2 registers. Comparing such values efficiently +// is tricky. The flavor of compare used depends on whether we are testing +// for LT, LE, or EQ. For a simple LT test we can check just the sign bit. +// The GE test is the negated LT test. The LE test can be had by commuting +// the operands (yielding a GE test) and then negating; negate again for the +// GT test. The EQ test is done by ORcc'ing the high and low halves, and the +// NE test is negated from that. + +// Due to a shortcoming in the ADLC, it mixes up expressions like: +// (foo (CmpI (CmpL X Y) 0)) and (bar (CmpI (CmpL X 0L) 0)). Note the +// difference between 'Y' and '0L'. The tree-matches for the CmpI sections +// are collapsed internally in the ADLC's dfa-gen code. The match for +// (CmpI (CmpL X Y) 0) is silently replaced with (CmpI (CmpL X 0L) 0) and the +// foo match ends up with the wrong leaf. One fix is to not match both +// reg-reg and reg-zero forms of long-compare. This is unfortunate because +// both forms beat the trinary form of long-compare and both are very useful +// on Intel which has so few registers. + +// instruct branchCon_long(cmpOp cmp, flagsRegL xcc, label labl) %{ +// match(If cmp xcc); +// ins_pipe(br_cc); +// %} + +// Manifest a CmpL3 result in an integer register. Very painful. +// This is the test to avoid. +#ifdef AARCH64 +instruct cmpL3_reg_reg(iRegI dst, iRegL src1, iRegL src2, flagsReg ccr) %{ + match(Set dst (CmpL3 src1 src2)); + // effect(KILL fcc); // nobody cares if flagsRegF is killed + effect(KILL ccr); + ins_cost(DEFAULT_COST*3); // FIXME + size(12); + format %{ "CMP $src1,$src2\n\t" + "CSET $dst, gt\n\t" + "CSINV $dst, $dst, ZR, ge" %} + ins_encode %{ + Register dst = $dst$$Register; + __ cmp($src1$$Register, $src2$$Register); + __ cset(dst, gt); // 1 if '>', else 0 + __ csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 + %} + ins_pipe( ialu_cconly_reg_reg ); // FIXME +%} +// TODO cmpL3_reg_imm +#else +instruct cmpL3_reg_reg(iRegI dst, iRegL src1, iRegL src2, flagsReg ccr ) %{ + match(Set dst (CmpL3 src1 src2) ); + effect( KILL ccr ); + ins_cost(6*DEFAULT_COST); // FIXME + size(32); + format %{ + "CMP $src1.hi, $src2.hi\t\t! long\n" + "\tMOV.gt $dst, 1\n" + "\tmvn.lt $dst, 0\n" + "\tB.ne done\n" + "\tSUBS $dst, $src1.lo, $src2.lo\n" + "\tMOV.hi $dst, 1\n" + "\tmvn.lo $dst, 0\n" + "done:" %} + ins_encode %{ + Label done; + __ cmp($src1$$Register->successor(), $src2$$Register->successor()); + __ mov($dst$$Register, 1, gt); + __ mvn($dst$$Register, 0, lt); + __ b(done, ne); + __ subs($dst$$Register, $src1$$Register, $src2$$Register); + __ mov($dst$$Register, 1, hi); + __ mvn($dst$$Register, 0, lo); + __ bind(done); + %} + ins_pipe(cmpL_reg); +%} +#endif + +#ifndef AARCH64 +// Conditional move +instruct cmovLL_reg_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(150); + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLL_reg_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(150); + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLL_reg_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegL dst, iRegL src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(150); + size(8); + format %{ "MOV$cmp $dst.lo,$src.lo\t! long\n\t" + "MOV$cmp $dst,$src.hi" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), $src$$Register->successor(), (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovLL_imm_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegL dst, immL0 src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + ins_cost(140); + size(8); + format %{ "MOV$cmp $dst.lo,0\t! long\n\t" + "MOV$cmp $dst,0" %} + ins_encode %{ + __ mov($dst$$Register, 0, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLL_imm_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegL dst, immL0 src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + ins_cost(140); + size(8); + format %{ "MOV$cmp $dst.lo,0\t! long\n\t" + "MOV$cmp $dst,0" %} + ins_encode %{ + __ mov($dst$$Register, 0, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovLL_imm_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegL dst, immL0 src) %{ + match(Set dst (CMoveL (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + ins_cost(140); + size(8); + format %{ "MOV$cmp $dst.lo,0\t! long\n\t" + "MOV$cmp $dst,0" %} + ins_encode %{ + __ mov($dst$$Register, 0, (AsmCondition)($cmp$$cmpcode)); + __ mov($dst$$Register->successor(), 0, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} +#endif // !AARCH64 + +#ifndef AARCH64 +instruct cmovIL_reg_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovIL_reg_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovIL_reg_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegI dst, iRegI src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} +#endif // !AARCH64 + +#ifndef AARCH64 +instruct cmovIL_imm_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovIL_imm_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovIL_imm_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegI dst, immI16 src) %{ + match(Set dst (CMoveI (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovPL_reg_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPL_reg_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPL_reg_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegP dst, iRegP src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(150); + size(4); + format %{ "MOV$cmp $dst,$src" %} + ins_encode %{ + __ mov($dst$$Register, $src$$Register, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_reg); +%} + +instruct cmovPL_imm_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovPL_imm_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovPL_imm_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, iRegP dst, immP0 src) %{ + match(Set dst (CMoveP (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(140); + format %{ "MOVW$cmp $dst,$src" %} + ins_encode %{ + __ movw($dst$$Register, $src$$constant, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(ialu_imm); +%} + +instruct cmovFL_reg_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + ins_cost(150); + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFL_reg_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + ins_cost(150); + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovFL_reg_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, regF dst, regF src) %{ + match(Set dst (CMoveF (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + ins_cost(150); + size(4); + format %{ "FCPYS$cmp $dst,$src" %} + ins_encode %{ + __ fcpys($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDL_reg_LTGE(cmpOpL cmp, flagsRegL_LTGE xcc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ); + + ins_cost(150); + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDL_reg_EQNE(cmpOpL cmp, flagsRegL_EQNE xcc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ); + + ins_cost(150); + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} + +instruct cmovDL_reg_LEGT(cmpOpL_commute cmp, flagsRegL_LEGT xcc, regD dst, regD src) %{ + match(Set dst (CMoveD (Binary cmp xcc) (Binary dst src))); + predicate(_kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ); + + ins_cost(150); + size(4); + format %{ "FCPYD$cmp $dst,$src" %} + ins_encode %{ + __ fcpyd($dst$$FloatRegister, $src$$FloatRegister, (AsmCondition)($cmp$$cmpcode)); + %} + ins_pipe(int_conditional_float_move); +%} +#endif // !AARCH64 + +// ============================================================================ +// Safepoint Instruction +#ifdef AARCH64 +instruct safePoint_poll(iRegP poll, flagsReg icc, RtempRegP tmp) %{ + match(SafePoint poll); + // The handler stub kills Rtemp + effect(USE poll, KILL tmp, KILL icc); + + size(4); + format %{ "LDR ZR,[$poll]\t! Safepoint: poll for GC" %} + ins_encode %{ + __ relocate(relocInfo::poll_type); + __ ldr(ZR, Address($poll$$Register)); + %} + ins_pipe(loadPollP); +%} +#else +// rather than KILL R12, it would be better to use any reg as +// TEMP. Can't do that at this point because it crashes the compiler +instruct safePoint_poll(iRegP poll, R12RegI tmp, flagsReg icc) %{ + match(SafePoint poll); + effect(USE poll, KILL tmp, KILL icc); + + size(4); + format %{ "LDR $tmp,[$poll]\t! Safepoint: poll for GC" %} + ins_encode %{ + __ relocate(relocInfo::poll_type); + __ ldr($tmp$$Register, Address($poll$$Register)); + %} + ins_pipe(loadPollP); +%} +#endif + + +// ============================================================================ +// Call Instructions +// Call Java Static Instruction +instruct CallStaticJavaDirect( method meth ) %{ + match(CallStaticJava); + predicate(! ((CallStaticJavaNode*)n)->is_method_handle_invoke()); + effect(USE meth); + + ins_cost(CALL_COST); + format %{ "CALL,static ==> " %} + ins_encode( Java_Static_Call( meth ), call_epilog ); + ins_pipe(simple_call); +%} + +// Call Java Static Instruction (method handle version) +instruct CallStaticJavaHandle( method meth ) %{ + match(CallStaticJava); + predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke()); + effect(USE meth); + // FP is saved by all callees (for interpreter stack correction). + // We use it here for a similar purpose, in {preserve,restore}_FP. + + ins_cost(CALL_COST); + format %{ "CALL,static/MethodHandle ==> " %} + ins_encode( preserve_SP, Java_Static_Call( meth ), restore_SP, call_epilog ); + ins_pipe(simple_call); +%} + +// Call Java Dynamic Instruction +instruct CallDynamicJavaDirect( method meth ) %{ + match(CallDynamicJava); + effect(USE meth); + + ins_cost(CALL_COST); + format %{ "MOV_OOP (empty),R_R8\n\t" + "CALL,dynamic ; NOP ==> " %} + ins_encode( Java_Dynamic_Call( meth ), call_epilog ); + ins_pipe(call); +%} + +// Call Runtime Instruction +instruct CallRuntimeDirect(method meth) %{ + match(CallRuntime); + effect(USE meth); + ins_cost(CALL_COST); + format %{ "CALL,runtime" %} +#ifdef AARCH64 + ins_encode( save_last_PC, Java_To_Runtime( meth ), + call_epilog ); +#else + ins_encode( Java_To_Runtime( meth ), + call_epilog ); +#endif + ins_pipe(simple_call); +%} + +// Call runtime without safepoint - same as CallRuntime +instruct CallLeafDirect(method meth) %{ + match(CallLeaf); + effect(USE meth); + ins_cost(CALL_COST); + format %{ "CALL,runtime leaf" %} + // TODO: ned save_last_PC here? + ins_encode( Java_To_Runtime( meth ), + call_epilog ); + ins_pipe(simple_call); +%} + +// Call runtime without safepoint - same as CallLeaf +instruct CallLeafNoFPDirect(method meth) %{ + match(CallLeafNoFP); + effect(USE meth); + ins_cost(CALL_COST); + format %{ "CALL,runtime leaf nofp" %} + // TODO: ned save_last_PC here? + ins_encode( Java_To_Runtime( meth ), + call_epilog ); + ins_pipe(simple_call); +%} + +// Tail Call; Jump from runtime stub to Java code. +// Also known as an 'interprocedural jump'. +// Target of jump will eventually return to caller. +// TailJump below removes the return address. +instruct TailCalljmpInd(IPRegP jump_target, inline_cache_regP method_oop) %{ + match(TailCall jump_target method_oop ); + + ins_cost(CALL_COST); + format %{ "MOV Rexception_pc, LR\n\t" + "jump $jump_target \t! $method_oop holds method oop" %} + ins_encode %{ + __ mov(Rexception_pc, LR); // this is used only to call + // StubRoutines::forward_exception_entry() + // which expects PC of exception in + // R5. FIXME? + __ jump($jump_target$$Register); + %} + ins_pipe(tail_call); +%} + + +// Return Instruction +instruct Ret() %{ + match(Return); + + format %{ "ret LR" %} + + ins_encode %{ + __ ret(LR); + %} + + ins_pipe(br); +%} + + +// Tail Jump; remove the return address; jump to target. +// TailCall above leaves the return address around. +// TailJump is used in only one place, the rethrow_Java stub (fancy_jump=2). +// ex_oop (Exception Oop) is needed in %o0 at the jump. As there would be a +// "restore" before this instruction (in Epilogue), we need to materialize it +// in %i0. +instruct tailjmpInd(IPRegP jump_target, RExceptionRegP ex_oop) %{ + match( TailJump jump_target ex_oop ); + ins_cost(CALL_COST); + format %{ "MOV Rexception_pc, LR\n\t" + "jump $jump_target \t! $ex_oop holds exc. oop" %} + ins_encode %{ + __ mov(Rexception_pc, LR); + __ jump($jump_target$$Register); + %} + ins_pipe(tail_call); +%} + +// Create exception oop: created by stack-crawling runtime code. +// Created exception is now available to this handler, and is setup +// just prior to jumping to this handler. No code emitted. +instruct CreateException( RExceptionRegP ex_oop ) +%{ + match(Set ex_oop (CreateEx)); + ins_cost(0); + + size(0); + // use the following format syntax + format %{ "! exception oop is in Rexception_obj; no code emitted" %} + ins_encode(); + ins_pipe(empty); +%} + + +// Rethrow exception: +// The exception oop will come in the first argument position. +// Then JUMP (not call) to the rethrow stub code. +instruct RethrowException() +%{ + match(Rethrow); + ins_cost(CALL_COST); + + // use the following format syntax + format %{ "b rethrow_stub" %} + ins_encode %{ + Register scratch = R1_tmp; + assert_different_registers(scratch, c_rarg0, LR); + __ jump(OptoRuntime::rethrow_stub(), relocInfo::runtime_call_type, scratch); + %} + ins_pipe(tail_call); +%} + + +// Die now +instruct ShouldNotReachHere( ) +%{ + match(Halt); + ins_cost(CALL_COST); + + size(4); + // Use the following format syntax + format %{ "breakpoint ; ShouldNotReachHere" %} + ins_encode %{ + __ breakpoint(); + %} + ins_pipe(tail_call); +%} + +// ============================================================================ +// The 2nd slow-half of a subtype check. Scan the subklass's 2ndary superklass +// array for an instance of the superklass. Set a hidden internal cache on a +// hit (cache is checked with exposed code in gen_subtype_check()). Return +// not zero for a miss or zero for a hit. The encoding ALSO sets flags. +instruct partialSubtypeCheck( R0RegP index, R1RegP sub, R2RegP super, flagsRegP pcc, LRRegP lr ) %{ + match(Set index (PartialSubtypeCheck sub super)); + effect( KILL pcc, KILL lr ); + ins_cost(DEFAULT_COST*10); + format %{ "CALL PartialSubtypeCheck" %} + ins_encode %{ + __ call(StubRoutines::Arm::partial_subtype_check(), relocInfo::runtime_call_type); + %} + ins_pipe(partial_subtype_check_pipe); +%} + +/* instruct partialSubtypeCheck_vs_zero( flagsRegP pcc, o1RegP sub, o2RegP super, immP0 zero, o0RegP idx, o7RegP o7 ) %{ */ +/* match(Set pcc (CmpP (PartialSubtypeCheck sub super) zero)); */ +/* ins_pipe(partial_subtype_check_pipe); */ +/* %} */ + + +// ============================================================================ +// inlined locking and unlocking + +#ifdef AARCH64 +instruct cmpFastLock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, iRegP scratch, iRegP scratch3 ) +#else +instruct cmpFastLock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, iRegP scratch ) +#endif +%{ + match(Set pcc (FastLock object box)); + +#ifdef AARCH64 + effect(TEMP scratch, TEMP scratch2, TEMP scratch3); +#else + effect(TEMP scratch, TEMP scratch2); +#endif + ins_cost(100); + +#ifdef AARCH64 + format %{ "FASTLOCK $object, $box; KILL $scratch, $scratch2, $scratch3" %} + ins_encode %{ + __ fast_lock($object$$Register, $box$$Register, $scratch$$Register, $scratch2$$Register, $scratch3$$Register); + %} +#else + format %{ "FASTLOCK $object, $box; KILL $scratch, $scratch2" %} + ins_encode %{ + __ fast_lock($object$$Register, $box$$Register, $scratch$$Register, $scratch2$$Register); + %} +#endif + ins_pipe(long_memory_op); +%} + + +#ifdef AARCH64 +instruct cmpFastUnlock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, iRegP scratch, iRegP scratch3 ) %{ + match(Set pcc (FastUnlock object box)); + effect(TEMP scratch, TEMP scratch2, TEMP scratch3); + ins_cost(100); + + format %{ "FASTUNLOCK $object, $box; KILL $scratch, $scratch2, $scratch3" %} + ins_encode %{ + __ fast_unlock($object$$Register, $box$$Register, $scratch$$Register, $scratch2$$Register, $scratch3$$Register); + %} + ins_pipe(long_memory_op); +%} +#else +instruct cmpFastUnlock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, iRegP scratch ) %{ + match(Set pcc (FastUnlock object box)); + effect(TEMP scratch, TEMP scratch2); + ins_cost(100); + + format %{ "FASTUNLOCK $object, $box; KILL $scratch, $scratch2" %} + ins_encode %{ + __ fast_unlock($object$$Register, $box$$Register, $scratch$$Register, $scratch2$$Register); + %} + ins_pipe(long_memory_op); +%} +#endif + +#ifdef AARCH64 +// TODO: add version that takes immI cnt? +instruct clear_array(iRegX cnt, iRegP base, iRegP ptr, iRegX temp, Universe dummy, flagsReg cpsr) %{ + match(Set dummy (ClearArray cnt base)); + effect(TEMP temp, TEMP ptr, KILL cpsr); + ins_cost(300); + format %{ + " MOV $temp,$cnt\n" + " ADD $ptr,$base,$cnt\n" + " SUBS $temp,$temp,16\t! Count down dword pair in bytes\n" + " B.lt done16\n" + "loop: STP ZR,ZR,[$ptr,-16]!\n" + " SUBS $temp,$temp,16\t! Count down dword pair in bytes\n" + " B.ge loop\t! Clearing loop\n" + "done16: ADDS $temp,$temp,8\t! Room for 1 more long?\n" + " B.lt done\n" + " STR ZR,[$base+$temp]\n" + "done:" + %} + ins_encode %{ + // TODO: preload? + __ mov($temp$$Register, $cnt$$Register); + __ add($ptr$$Register, $base$$Register, $cnt$$Register); + Label loop, done, done16; + __ subs($temp$$Register, $temp$$Register, 16); + __ b(done16, lt); + __ bind(loop); + __ stp(ZR, ZR, Address($ptr$$Register, -16, pre_indexed)); + __ subs($temp$$Register, $temp$$Register, 16); + __ b(loop, ge); + __ bind(done16); + __ adds($temp$$Register, $temp$$Register, 8); + __ b(done, lt); + // $temp should be 0 here + __ str(ZR, Address($base$$Register, $temp$$Register)); + __ bind(done); + %} + ins_pipe(long_memory_op); +%} +#else +// Count and Base registers are fixed because the allocator cannot +// kill unknown registers. The encodings are generic. +instruct clear_array(iRegX cnt, iRegP base, iRegI temp, iRegX zero, Universe dummy, flagsReg cpsr) %{ + match(Set dummy (ClearArray cnt base)); + effect(TEMP temp, TEMP zero, KILL cpsr); + ins_cost(300); + format %{ "MOV $zero,0\n" + " MOV $temp,$cnt\n" + "loop: SUBS $temp,$temp,4\t! Count down a dword of bytes\n" + " STR.ge $zero,[$base+$temp]\t! delay slot" + " B.gt loop\t\t! Clearing loop\n" %} + ins_encode %{ + __ mov($zero$$Register, 0); + __ mov($temp$$Register, $cnt$$Register); + Label(loop); + __ bind(loop); + __ subs($temp$$Register, $temp$$Register, 4); + __ str($zero$$Register, Address($base$$Register, $temp$$Register), ge); + __ b(loop, gt); + %} + ins_pipe(long_memory_op); +%} +#endif + +#ifdef XXX +// FIXME: Why R0/R1/R2/R3? +instruct string_compare(R0RegP str1, R1RegP str2, R2RegI cnt1, R3RegI cnt2, iRegI result, + iRegI tmp1, iRegI tmp2, flagsReg ccr) %{ + predicate(!CompactStrings); + match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2))); + effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL ccr, TEMP tmp1, TEMP tmp2); + ins_cost(300); + format %{ "String Compare $str1,$cnt1,$str2,$cnt2 -> $result // TEMP $tmp1, $tmp2" %} + ins_encode( enc_String_Compare(str1, str2, cnt1, cnt2, result, tmp1, tmp2) ); + + ins_pipe(long_memory_op); +%} + +// FIXME: Why R0/R1/R2? +instruct string_equals(R0RegP str1, R1RegP str2, R2RegI cnt, iRegI result, iRegI tmp1, iRegI tmp2, + flagsReg ccr) %{ + predicate(!CompactStrings); + match(Set result (StrEquals (Binary str1 str2) cnt)); + effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, TEMP tmp1, TEMP tmp2, TEMP result, KILL ccr); + + ins_cost(300); + format %{ "String Equals $str1,$str2,$cnt -> $result // TEMP $tmp1, $tmp2" %} + ins_encode( enc_String_Equals(str1, str2, cnt, result, tmp1, tmp2) ); + ins_pipe(long_memory_op); +%} + +// FIXME: Why R0/R1? +instruct array_equals(R0RegP ary1, R1RegP ary2, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI result, + flagsReg ccr) %{ + predicate(((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU); + match(Set result (AryEq ary1 ary2)); + effect(USE_KILL ary1, USE_KILL ary2, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP result, KILL ccr); + + ins_cost(300); + format %{ "Array Equals $ary1,$ary2 -> $result // TEMP $tmp1,$tmp2,$tmp3" %} + ins_encode( enc_Array_Equals(ary1, ary2, tmp1, tmp2, tmp3, result)); + ins_pipe(long_memory_op); +%} +#endif + +//---------- Zeros Count Instructions ------------------------------------------ + +instruct countLeadingZerosI(iRegI dst, iRegI src) %{ + match(Set dst (CountLeadingZerosI src)); + size(4); + format %{ "CLZ_32 $dst,$src" %} + ins_encode %{ + __ clz_32($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} + +#ifdef AARCH64 +instruct countLeadingZerosL(iRegI dst, iRegL src) %{ + match(Set dst (CountLeadingZerosL src)); + size(4); + format %{ "CLZ $dst,$src" %} + ins_encode %{ + __ clz($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); +%} +#else +instruct countLeadingZerosL(iRegI dst, iRegL src, iRegI tmp, flagsReg ccr) %{ + match(Set dst (CountLeadingZerosL src)); + effect(TEMP tmp, TEMP dst, KILL ccr); + size(16); + format %{ "CLZ $dst,$src.hi\n\t" + "TEQ $dst,32\n\t" + "CLZ.eq $tmp,$src.lo\n\t" + "ADD.eq $dst, $dst, $tmp\n\t" %} + ins_encode %{ + __ clz($dst$$Register, $src$$Register->successor()); + __ teq($dst$$Register, 32); + __ clz($tmp$$Register, $src$$Register, eq); + __ add($dst$$Register, $dst$$Register, $tmp$$Register, eq); + %} + ins_pipe(ialu_reg); +%} +#endif + +instruct countTrailingZerosI(iRegI dst, iRegI src, iRegI tmp) %{ + match(Set dst (CountTrailingZerosI src)); + effect(TEMP tmp); + size(8); + format %{ "RBIT_32 $tmp, $src\n\t" + "CLZ_32 $dst,$tmp" %} + ins_encode %{ + __ rbit_32($tmp$$Register, $src$$Register); + __ clz_32($dst$$Register, $tmp$$Register); + %} + ins_pipe(ialu_reg); +%} + +#ifdef AARCH64 +instruct countTrailingZerosL(iRegI dst, iRegL src, iRegL tmp) %{ + match(Set dst (CountTrailingZerosL src)); + effect(TEMP tmp); + size(8); + format %{ "RBIT $tmp, $src\n\t" + "CLZ $dst,$tmp" %} + ins_encode %{ + __ rbit($tmp$$Register, $src$$Register); + __ clz($dst$$Register, $tmp$$Register); + %} + ins_pipe(ialu_reg); +%} +#else +instruct countTrailingZerosL(iRegI dst, iRegL src, iRegI tmp, flagsReg ccr) %{ + match(Set dst (CountTrailingZerosL src)); + effect(TEMP tmp, TEMP dst, KILL ccr); + size(24); + format %{ "RBIT $tmp,$src.lo\n\t" + "CLZ $dst,$tmp\n\t" + "TEQ $dst,32\n\t" + "RBIT $tmp,$src.hi\n\t" + "CLZ.eq $tmp,$tmp\n\t" + "ADD.eq $dst,$dst,$tmp\n\t" %} + ins_encode %{ + __ rbit($tmp$$Register, $src$$Register); + __ clz($dst$$Register, $tmp$$Register); + __ teq($dst$$Register, 32); + __ rbit($tmp$$Register, $src$$Register->successor()); + __ clz($tmp$$Register, $tmp$$Register, eq); + __ add($dst$$Register, $dst$$Register, $tmp$$Register, eq); + %} + ins_pipe(ialu_reg); +%} +#endif + + +//---------- Population Count Instructions ------------------------------------- + +#ifdef AARCH64 +instruct popCountI(iRegI dst, iRegI src, regD_low tmp) %{ + predicate(UsePopCountInstruction); + match(Set dst (PopCountI src)); + effect(TEMP tmp); + size(20); + + format %{ "MOV_W $dst,$src\n\t" + "FMOV_dx $tmp,$dst\n\t" + "VCNT $tmp.8B,$tmp.8B\n\t" + "ADDV $tmp.B,$tmp.8B\n\t" + "FMRS $dst,$tmp" %} + + ins_encode %{ + __ mov_w($dst$$Register, $src$$Register); + __ fmov_dx($tmp$$FloatRegister, $dst$$Register); + int quad = 0; + int cnt_size = 0; // VELEM_SIZE_8 + __ vcnt($tmp$$FloatRegister, $tmp$$FloatRegister, quad, cnt_size); + int add_size = 0; // VELEM_SIZE_8 + __ addv($tmp$$FloatRegister, $tmp$$FloatRegister, quad, add_size); + __ fmrs($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(ialu_reg); // FIXME +%} +#else +instruct popCountI(iRegI dst, iRegI src, regD_low tmp) %{ + predicate(UsePopCountInstruction); + match(Set dst (PopCountI src)); + effect(TEMP tmp); + + format %{ "FMSR $tmp,$src\n\t" + "VCNT.8 $tmp,$tmp\n\t" + "VPADDL.U8 $tmp,$tmp\n\t" + "VPADDL.U16 $tmp,$tmp\n\t" + "FMRS $dst,$tmp" %} + size(20); + + ins_encode %{ + __ fmsr($tmp$$FloatRegister, $src$$Register); + __ vcnt($tmp$$FloatRegister, $tmp$$FloatRegister); + __ vpaddl($tmp$$FloatRegister, $tmp$$FloatRegister, 8, 0); + __ vpaddl($tmp$$FloatRegister, $tmp$$FloatRegister, 16, 0); + __ fmrs($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif + +#ifdef AARCH64 +instruct popCountL(iRegI dst, iRegL src, regD tmp) %{ + predicate(UsePopCountInstruction); + match(Set dst (PopCountL src)); + effect(TEMP tmp); + size(16); + + format %{ "FMOV_dx $tmp,$src\n\t" + "VCNT $tmp.8B,$tmp.8B\n\t" + "ADDV $tmp.B,$tmp.8B\n\t" + "FMOV_ws $dst,$tmp" %} + + ins_encode %{ + __ fmov_dx($tmp$$FloatRegister, $src$$Register); + int quad = 0; + int cnt_size = 0; + __ vcnt($tmp$$FloatRegister, $tmp$$FloatRegister, quad, cnt_size); + int add_size = 0; + __ addv($tmp$$FloatRegister, $tmp$$FloatRegister, quad, add_size); + __ fmov_ws($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(ialu_reg); // FIXME +%} +#else +// Note: Long.bitCount(long) returns an int. +instruct popCountL(iRegI dst, iRegL src, regD_low tmp) %{ + predicate(UsePopCountInstruction); + match(Set dst (PopCountL src)); + effect(TEMP tmp); + + format %{ "FMDRR $tmp,$src.lo,$src.hi\n\t" + "VCNT.8 $tmp,$tmp\n\t" + "VPADDL.U8 $tmp,$tmp\n\t" + "VPADDL.U16 $tmp,$tmp\n\t" + "VPADDL.U32 $tmp,$tmp\n\t" + "FMRS $dst,$tmp" %} + + size(32); + + ins_encode %{ + __ fmdrr($tmp$$FloatRegister, $src$$Register, $src$$Register->successor()); + __ vcnt($tmp$$FloatRegister, $tmp$$FloatRegister); + __ vpaddl($tmp$$FloatRegister, $tmp$$FloatRegister, 8, 0); + __ vpaddl($tmp$$FloatRegister, $tmp$$FloatRegister, 16, 0); + __ vpaddl($tmp$$FloatRegister, $tmp$$FloatRegister, 32, 0); + __ fmrs($dst$$Register, $tmp$$FloatRegister); + %} + ins_pipe(ialu_reg); +%} +#endif + + +// ============================================================================ +//------------Bytes reverse-------------------------------------------------- + +instruct bytes_reverse_int(iRegI dst, iRegI src) %{ + match(Set dst (ReverseBytesI src)); + + size(4); + format %{ "REV32 $dst,$src" %} + ins_encode %{ +#ifdef AARCH64 + __ rev_w($dst$$Register, $src$$Register); + // high 32 bits zeroed, not sign extended +#else + __ rev($dst$$Register, $src$$Register); +#endif + %} + ins_pipe( iload_mem ); // FIXME +%} + +instruct bytes_reverse_long(iRegL dst, iRegL src) %{ + match(Set dst (ReverseBytesL src)); +#ifdef AARCH64 +//size(4); + format %{ "REV $dst,$src" %} + ins_encode %{ + __ rev($dst$$Register, $src$$Register); + %} + ins_pipe(ialu_reg_reg); // FIXME +#else + effect(TEMP dst); + size(8); + format %{ "REV $dst.lo,$src.lo\n\t" + "REV $dst.hi,$src.hi" %} + ins_encode %{ + __ rev($dst$$Register, $src$$Register->successor()); + __ rev($dst$$Register->successor(), $src$$Register); + %} + ins_pipe( iload_mem ); // FIXME +#endif +%} + +instruct bytes_reverse_unsigned_short(iRegI dst, iRegI src) %{ + match(Set dst (ReverseBytesUS src)); +#ifdef AARCH64 + size(4); + format %{ "REV16_W $dst,$src" %} + ins_encode %{ + __ rev16_w($dst$$Register, $src$$Register); + // high 32 bits zeroed + %} +#else + size(4); + format %{ "REV16 $dst,$src" %} + ins_encode %{ + __ rev16($dst$$Register, $src$$Register); + %} +#endif + ins_pipe( iload_mem ); // FIXME +%} + +instruct bytes_reverse_short(iRegI dst, iRegI src) %{ + match(Set dst (ReverseBytesS src)); +#ifdef AARCH64 + size(8); + format %{ "REV16_W $dst,$src\n\t" + "SIGN_EXT16 $dst" %} + ins_encode %{ + __ rev16_w($dst$$Register, $src$$Register); + __ sign_extend($dst$$Register, $dst$$Register, 16); + %} +#else + size(4); + format %{ "REVSH $dst,$src" %} + ins_encode %{ + __ revsh($dst$$Register, $src$$Register); + %} +#endif + ins_pipe( iload_mem ); // FIXME +%} + + +// ====================VECTOR INSTRUCTIONS===================================== + +// Load Aligned Packed values into a Double Register +instruct loadV8(vecD dst, memoryD mem) %{ + predicate(n->as_LoadVector()->memory_size() == 8); + match(Set dst (LoadVector mem)); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "FLDD $mem,$dst\t! load vector (8 bytes)" %} + ins_encode %{ + __ ldr_double($dst$$FloatRegister, $mem$$Address); + %} + ins_pipe(floadD_mem); +%} + +// Load Aligned Packed values into a Double Register Pair +instruct loadV16(vecX dst, memoryvld mem) %{ + predicate(n->as_LoadVector()->memory_size() == 16); + match(Set dst (LoadVector mem)); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "VLD1 $mem,$dst.Q\t! load vector (16 bytes)" %} + ins_encode %{ + __ vld1($dst$$FloatRegister, $mem$$Address, MacroAssembler::VELEM_SIZE_16, 128); + %} + ins_pipe(floadD_mem); // FIXME +%} + +// Store Vector in Double register to memory +instruct storeV8(memoryD mem, vecD src) %{ + predicate(n->as_StoreVector()->memory_size() == 8); + match(Set mem (StoreVector mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "FSTD $src,$mem\t! store vector (8 bytes)" %} + ins_encode %{ + __ str_double($src$$FloatRegister, $mem$$Address); + %} + ins_pipe(fstoreD_mem_reg); +%} + +// Store Vector in Double Register Pair to memory +instruct storeV16(memoryvld mem, vecX src) %{ + predicate(n->as_StoreVector()->memory_size() == 16); + match(Set mem (StoreVector mem src)); + ins_cost(MEMORY_REF_COST); + size(4); + format %{ "VST1 $src,$mem\t! store vector (16 bytes)" %} + ins_encode %{ + __ vst1($src$$FloatRegister, $mem$$Address, MacroAssembler::VELEM_SIZE_16, 128); + %} + ins_pipe(fstoreD_mem_reg); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar to packed byte values in Double register +instruct Repl8B_reg(vecD dst, iRegI src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (ReplicateB src)); + ins_cost(DEFAULT_COST*4); + effect(TEMP tmp); + size(16); + + // FIXME: could use PKH instruction instead? + format %{ "LSL $tmp, $src, 24 \n\t" + "OR $tmp, $tmp, ($tmp >> 8) \n\t" + "OR $tmp, $tmp, ($tmp >> 16) \n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode %{ + __ mov($tmp$$Register, AsmOperand($src$$Register, lsl, 24)); + __ orr($tmp$$Register, $tmp$$Register, AsmOperand($tmp$$Register, lsr, 8)); + __ orr($tmp$$Register, $tmp$$Register, AsmOperand($tmp$$Register, lsr, 16)); + __ fmdrr($dst$$FloatRegister, $tmp$$Register, $tmp$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar to packed byte values in Double register +instruct Repl8B_reg_simd(vecD dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateB src)); + size(4); + + format %{ "VDUP.8 $dst,$src\t" %} + ins_encode %{ + bool quad = false; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +// Replicate scalar to packed byte values in Double register pair +instruct Repl16B_reg(vecX dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16); + match(Set dst (ReplicateB src)); + size(4); + + format %{ "VDUP.8 $dst.Q,$src\t" %} + ins_encode %{ + bool quad = true; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar constant to packed byte values in Double register +instruct Repl8B_immI(vecD dst, immI src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (ReplicateB src)); + ins_cost(DEFAULT_COST*2); + effect(TEMP tmp); + size(12); + + format %{ "MOV $tmp, Repl4($src))\n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode( LdReplImmI(src, dst, tmp, (4), (1)) ); + ins_pipe(loadConFD); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar constant to packed byte values in Double register +// TODO: support negative constants with MVNI? +instruct Repl8B_immU8(vecD dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateB src)); + size(4); + + format %{ "VMOV.U8 $dst,$src" %} + ins_encode %{ + bool quad = false; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +// Replicate scalar constant to packed byte values in Double register pair +instruct Repl16B_immU8(vecX dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateB src)); + size(4); + + format %{ "VMOV.U8 $dst.Q,$src" %} + ins_encode %{ + bool quad = true; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar to packed short/char values into Double register +instruct Repl4S_reg(vecD dst, iRegI src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (ReplicateS src)); + ins_cost(DEFAULT_COST*3); + effect(TEMP tmp); + size(12); + + // FIXME: could use PKH instruction instead? + format %{ "LSL $tmp, $src, 16 \n\t" + "OR $tmp, $tmp, ($tmp >> 16) \n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode %{ + __ mov($tmp$$Register, AsmOperand($src$$Register, lsl, 16)); + __ orr($tmp$$Register, $tmp$$Register, AsmOperand($tmp$$Register, lsr, 16)); + __ fmdrr($dst$$FloatRegister, $tmp$$Register, $tmp$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar to packed byte values in Double register +instruct Repl4S_reg_simd(vecD dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateS src)); + size(4); + + format %{ "VDUP.16 $dst,$src\t" %} + ins_encode %{ + bool quad = false; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +// Replicate scalar to packed byte values in Double register pair +instruct Repl8S_reg(vecX dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateS src)); + size(4); + + format %{ "VDUP.16 $dst.Q,$src\t" %} + ins_encode %{ + bool quad = true; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + + +#ifndef AARCH64 +// Replicate scalar constant to packed short/char values in Double register +instruct Repl4S_immI(vecD dst, immI src, iRegP tmp) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (ReplicateS src)); + effect(TEMP tmp); + size(12); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "MOV $tmp, Repl2($src))\n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode( LdReplImmI(src, dst, tmp, (2), (2)) ); + ins_pipe(loadConFD); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar constant to packed byte values in Double register +instruct Repl4S_immU8(vecD dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateS src)); + size(4); + + format %{ "VMOV.U16 $dst,$src" %} + ins_encode %{ + bool quad = false; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +// Replicate scalar constant to packed byte values in Double register pair +instruct Repl8S_immU8(vecX dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateS src)); + size(4); + + format %{ "VMOV.U16 $dst.Q,$src" %} + ins_encode %{ + bool quad = true; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar to packed int values in Double register +instruct Repl2I_reg(vecD dst, iRegI src) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateI src)); + size(4); + + format %{ "FMDRR $dst,$src,$src\t" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} + +// Replicate scalar to packed int values in Double register pair +instruct Repl4I_reg(vecX dst, iRegI src) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (ReplicateI src)); + ins_cost(DEFAULT_COST*2); + size(8); + + format %{ "FMDRR $dst.lo,$src,$src\n\t" + "FMDRR $dst.hi,$src,$src" %} + + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register); + __ fmdrr($dst$$FloatRegister->successor()->successor(), + $src$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar to packed int values in Double register +instruct Repl2I_reg_simd(vecD dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateI src)); + size(4); + + format %{ "VDUP.32 $dst.D,$src\t" %} + ins_encode %{ + bool quad = false; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +// Replicate scalar to packed int values in Double register pair +instruct Repl4I_reg_simd(vecX dst, iRegI src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateI src)); + size(4); + + format %{ "VDUP.32 $dst.Q,$src\t" %} + ins_encode %{ + bool quad = true; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + + +#ifndef AARCH64 +// Replicate scalar zero constant to packed int values in Double register +instruct Repl2I_immI(vecD dst, immI src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateI src)); + effect(TEMP tmp); + size(12); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "MOV $tmp, Repl1($src))\n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode( LdReplImmI(src, dst, tmp, (1), (4)) ); + ins_pipe(loadConFD); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar constant to packed byte values in Double register +instruct Repl2I_immU8(vecD dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateI src)); + size(4); + + format %{ "VMOV.I32 $dst.D,$src" %} + ins_encode %{ + bool quad = false; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +// Replicate scalar constant to packed byte values in Double register pair +instruct Repl4I_immU8(vecX dst, immU8 src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateI src)); + size(4); + + format %{ "VMOV.I32 $dst.Q,$src" %} + ins_encode %{ + bool quad = true; + __ vmovI($dst$$FloatRegister, $src$$constant, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(loadConFD); // FIXME +%} + +#ifdef AARCH64 +// Replicate scalar to packed byte values in Double register pair +instruct Repl2L_reg(vecX dst, iRegL src) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateL src)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "VDUP.2D $dst.Q,$src\t" %} + ins_encode %{ + bool quad = true; + __ vdupI($dst$$FloatRegister, $src$$Register, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} +#else /* !AARCH64 */ +// Replicate scalar to packed byte values in Double register pair +instruct Repl2L_reg(vecX dst, iRegL src) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateL src)); + size(8); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FMDRR $dst.D,$src.lo,$src.hi\t\n" + "FMDRR $dst.D.next,$src.lo,$src.hi" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register->successor()); + __ fmdrr($dst$$FloatRegister->successor()->successor(), + $src$$Register, $src$$Register->successor()); + %} + ins_pipe(ialu_reg); // FIXME +%} + + +// Replicate scalar to packed float values in Double register +instruct Repl2F_regI(vecD dst, iRegI src) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateF src)); + size(4); + + format %{ "FMDRR $dst.D,$src,$src\t" %} + ins_encode %{ + __ fmdrr($dst$$FloatRegister, $src$$Register, $src$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} + +// Replicate scalar to packed float values in Double register +instruct Repl2F_reg_vfp(vecD dst, regF src) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateF src)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + expand %{ + iRegI tmp; + MoveF2I_reg_reg(tmp, src); + Repl2F_regI(dst,tmp); + %} +%} +#endif /* !AARCH64 */ + +// Replicate scalar to packed float values in Double register +instruct Repl2F_reg_simd(vecD dst, regF src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (ReplicateF src)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + + format %{ "VDUP.32 $dst.D,$src.D\t" %} + ins_encode %{ + bool quad = false; + __ vdupF($dst$$FloatRegister, $src$$FloatRegister, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar to packed float values in Double register pair +instruct Repl4F_reg(vecX dst, regF src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (ReplicateF src)); + effect(TEMP tmp); + size(4*3); + ins_cost(DEFAULT_COST*3); // FIXME + + format %{ "FMRS $tmp,$src\n\t" + "FMDRR $dst.D,$tmp,$tmp\n\t" + "FMDRR $dst.D.next,$tmp,$tmp\t" %} + ins_encode %{ + __ fmrs($tmp$$Register, $src$$FloatRegister); + __ fmdrr($dst$$FloatRegister, $tmp$$Register, $tmp$$Register); + __ fmdrr($dst$$FloatRegister->successor()->successor(), + $tmp$$Register, $tmp$$Register); + %} + ins_pipe(ialu_reg); // FIXME +%} +#endif /* !AARCH64 */ + +// Replicate scalar to packed float values in Double register pair +instruct Repl4F_reg_simd(vecX dst, regF src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (ReplicateF src)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + + format %{ "VDUP.32 $dst.Q,$src.D\t" %} + ins_encode %{ + bool quad = true; + __ vdupF($dst$$FloatRegister, $src$$FloatRegister, quad); + %} + ins_pipe(ialu_reg); // FIXME +%} + +#ifndef AARCH64 +// Replicate scalar zero constant to packed float values in Double register +instruct Repl2F_immI(vecD dst, immF src, iRegI tmp) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateF src)); + effect(TEMP tmp); + size(12); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "MOV $tmp, Repl1($src))\n\t" + "FMDRR $dst,$tmp,$tmp\t" %} + ins_encode( LdReplImmF(src, dst, tmp) ); + ins_pipe(loadConFD); // FIXME +%} +#endif /* !AAARCH64 */ + +// Replicate scalar to packed double float values in Double register pair +instruct Repl2D_reg(vecX dst, regD src) %{ +#ifdef AARCH64 + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (ReplicateD src)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "VDUP $dst.2D,$src\t" %} + ins_encode %{ + bool quad = true; + __ vdupD($dst$$FloatRegister, $src$$FloatRegister, quad); + %} +#else + predicate(n->as_Vector()->length() == 2); + match(Set dst (ReplicateD src)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FCPYD $dst.D.a,$src\n\t" + "FCPYD $dst.D.b,$src\t" %} + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src = $src$$FloatRegister; + __ fcpyd(dsta, src); + FloatRegister dstb = dsta->successor()->successor(); + __ fcpyd(dstb, src); + %} +#endif + ins_pipe(ialu_reg); // FIXME +%} + +// ====================VECTOR ARITHMETIC======================================= + +// --------------------------------- ADD -------------------------------------- + +// Bytes vector add +instruct vadd8B_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (AddVB src1 src2)); + format %{ "VADD.I8 $dst,$src1,$src2\t! add packed8B" %} + size(4); + ins_encode %{ + bool quad = false; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vadd16B_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (AddVB src1 src2)); + size(4); + format %{ "VADD.I8 $dst.Q,$src1.Q,$src2.Q\t! add packed16B" %} + ins_encode %{ + bool quad = true; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts/Chars vector add +instruct vadd4S_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (AddVS src1 src2)); + size(4); + format %{ "VADD.I16 $dst,$src1,$src2\t! add packed4S" %} + ins_encode %{ + bool quad = false; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vadd8S_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (AddVS src1 src2)); + size(4); + format %{ "VADD.I16 $dst.Q,$src1.Q,$src2.Q\t! add packed8S" %} + ins_encode %{ + bool quad = true; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector add +instruct vadd2I_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (AddVI src1 src2)); + size(4); + format %{ "VADD.I32 $dst.D,$src1.D,$src2.D\t! add packed2I" %} + ins_encode %{ + bool quad = false; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vadd4I_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (AddVI src1 src2)); + size(4); + format %{ "VADD.I32 $dst.Q,$src1.Q,$src2.Q\t! add packed4I" %} + ins_encode %{ + bool quad = true; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector add +instruct vadd2L_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (AddVL src1 src2)); + size(4); + format %{ "VADD.I64 $dst.Q,$src1.Q,$src2.Q\t! add packed2L" %} + ins_encode %{ + bool quad = true; + __ vaddI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Floats vector add +instruct vadd2F_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::simd_math_is_compliant()); + match(Set dst (AddVF src1 src2)); + size(4); + format %{ "VADD.F32 $dst,$src1,$src2\t! add packed2F" %} + ins_encode %{ + bool quad = false; + __ vaddF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + ins_pipe( faddD_reg_reg ); // FIXME +%} + +#ifndef AARCH64 +instruct vadd2F_reg_vfp(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && !VM_Version::simd_math_is_compliant()); + match(Set dst (AddVF src1 src2)); + ins_cost(DEFAULT_COST*2); // FIXME + + size(4*2); + format %{ "FADDS $dst.a,$src1.a,$src2.a\n\t" + "FADDS $dst.b,$src1.b,$src2.b" %} + ins_encode %{ + __ add_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + __ add_float($dst$$FloatRegister->successor(), + $src1$$FloatRegister->successor(), + $src2$$FloatRegister->successor()); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} +#endif + +instruct vadd4F_reg_simd(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::simd_math_is_compliant()); + match(Set dst (AddVF src1 src2)); + size(4); + format %{ "VADD.F32 $dst.Q,$src1.Q,$src2.Q\t! add packed4F" %} + ins_encode %{ + bool quad = true; + __ vaddF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + ins_pipe( faddD_reg_reg ); // FIXME +%} + +#ifdef AARCH64 +instruct vadd2D_reg_simd(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::simd_math_is_compliant()); + match(Set dst (AddVD src1 src2)); + size(4); + format %{ "VADD.F64 $dst.Q,$src1.Q,$src2.Q\t! add packed2D" %} + ins_encode %{ + bool quad = true; + __ vaddF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F64, quad); + %} + ins_pipe( faddD_reg_reg ); // FIXME +%} +#else +instruct vadd4F_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && !VM_Version::simd_math_is_compliant()); + match(Set dst (AddVF src1 src2)); + size(4*4); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "FADDS $dst.a,$src1.a,$src2.a\n\t" + "FADDS $dst.b,$src1.b,$src2.b\n\t" + "FADDS $dst.c,$src1.c,$src2.c\n\t" + "FADDS $dst.d,$src1.d,$src2.d" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ add_float(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor(); + FloatRegister src1b = src1a->successor(); + FloatRegister src2b = src2a->successor(); + __ add_float(dstb, src1b, src2b); + FloatRegister dstc = dstb->successor(); + FloatRegister src1c = src1b->successor(); + FloatRegister src2c = src2b->successor(); + __ add_float(dstc, src1c, src2c); + FloatRegister dstd = dstc->successor(); + FloatRegister src1d = src1c->successor(); + FloatRegister src2d = src2c->successor(); + __ add_float(dstd, src1d, src2d); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} + +instruct vadd2D_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (AddVD src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FADDD $dst.a,$src1.a,$src2.a\n\t" + "FADDD $dst.b,$src1.b,$src2.b" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ add_double(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor()->successor(); + FloatRegister src1b = src1a->successor()->successor(); + FloatRegister src2b = src2a->successor()->successor(); + __ add_double(dstb, src1b, src2b); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} +#endif + + +// Bytes vector sub +instruct vsub8B_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (SubVB src1 src2)); + size(4); + format %{ "VSUB.I8 $dst,$src1,$src2\t! sub packed8B" %} + ins_encode %{ + bool quad = false; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsub16B_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (SubVB src1 src2)); + size(4); + format %{ "VSUB.I8 $dst.Q,$src1.Q,$src2.Q\t! sub packed16B" %} + ins_encode %{ + bool quad = true; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts/Chars vector sub +instruct vsub4S_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (SubVS src1 src2)); + size(4); + format %{ "VSUB.I16 $dst,$src1,$src2\t! sub packed4S" %} + ins_encode %{ + bool quad = false; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsub16S_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (SubVS src1 src2)); + size(4); + format %{ "VSUB.I16 $dst.Q,$src1.Q,$src2.Q\t! sub packed8S" %} + ins_encode %{ + bool quad = true; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector sub +instruct vsub2I_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (SubVI src1 src2)); + size(4); + format %{ "VSUB.I32 $dst,$src1,$src2\t! sub packed2I" %} + ins_encode %{ + bool quad = false; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsub4I_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (SubVI src1 src2)); + size(4); + format %{ "VSUB.I32 $dst.Q,$src1.Q,$src2.Q\t! sub packed4I" %} + ins_encode %{ + bool quad = true; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector sub +instruct vsub2L_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (SubVL src1 src2)); + size(4); + format %{ "VSUB.I64 $dst.Q,$src1.Q,$src2.Q\t! sub packed2L" %} + ins_encode %{ + bool quad = true; + __ vsubI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Floats vector sub +instruct vsub2F_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::simd_math_is_compliant()); + match(Set dst (SubVF src1 src2)); + size(4); + format %{ "VSUB.F32 $dst,$src1,$src2\t! sub packed2F" %} + ins_encode %{ + bool quad = false; + __ vsubF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + ins_pipe( faddF_reg_reg ); // FIXME +%} + +#ifndef AARCH64 +instruct vsub2F_reg_vfp(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && !VM_Version::simd_math_is_compliant()); + match(Set dst (SubVF src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FSUBS $dst.a,$src1.a,$src2.a\n\t" + "FSUBS $dst.b,$src1.b,$src2.b" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ sub_float(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor(); + FloatRegister src1b = src1a->successor(); + FloatRegister src2b = src2a->successor(); + __ sub_float(dstb, src1b, src2b); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} +#endif + + +instruct vsub4F_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::simd_math_is_compliant()); + match(Set dst (SubVF src1 src2)); + size(4); + format %{ "VSUB.F32 $dst.Q,$src1.Q,$src2.Q\t! sub packed4F" %} + ins_encode %{ + bool quad = true; + __ vsubF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + ins_pipe( faddF_reg_reg ); // FIXME +%} + +#ifdef AARCH64 +instruct vsub2D_reg_simd(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::simd_math_is_compliant()); + match(Set dst (SubVD src1 src2)); + size(4); + format %{ "VSUB.F64 $dst.Q,$src1.Q,$src2.Q\t! add packed2D" %} + ins_encode %{ + bool quad = true; + __ vsubF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F64, quad); + %} + ins_pipe( faddD_reg_reg ); // FIXME +%} +#else +instruct vsub4F_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && !VM_Version::simd_math_is_compliant()); + match(Set dst (SubVF src1 src2)); + size(4*4); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "FSUBS $dst.a,$src1.a,$src2.a\n\t" + "FSUBS $dst.b,$src1.b,$src2.b\n\t" + "FSUBS $dst.c,$src1.c,$src2.c\n\t" + "FSUBS $dst.d,$src1.d,$src2.d" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ sub_float(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor(); + FloatRegister src1b = src1a->successor(); + FloatRegister src2b = src2a->successor(); + __ sub_float(dstb, src1b, src2b); + FloatRegister dstc = dstb->successor(); + FloatRegister src1c = src1b->successor(); + FloatRegister src2c = src2b->successor(); + __ sub_float(dstc, src1c, src2c); + FloatRegister dstd = dstc->successor(); + FloatRegister src1d = src1c->successor(); + FloatRegister src2d = src2c->successor(); + __ sub_float(dstd, src1d, src2d); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} + +instruct vsub2D_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (SubVD src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FSUBD $dst.a,$src1.a,$src2.a\n\t" + "FSUBD $dst.b,$src1.b,$src2.b" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ sub_double(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor()->successor(); + FloatRegister src1b = src1a->successor()->successor(); + FloatRegister src2b = src2a->successor()->successor(); + __ sub_double(dstb, src1b, src2b); + %} + + ins_pipe(faddF_reg_reg); // FIXME +%} +#endif + +// Shorts/Chars vector mul +instruct vmul4S_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (MulVS src1 src2)); + size(4); + format %{ "VMUL.I16 $dst,$src1,$src2\t! mul packed4S" %} + ins_encode %{ + __ vmulI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, 0); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vmul8S_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (MulVS src1 src2)); + size(4); + format %{ "VMUL.I16 $dst.Q,$src1.Q,$src2.Q\t! mul packed8S" %} + ins_encode %{ + __ vmulI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, 1); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector mul +instruct vmul2I_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (MulVI src1 src2)); + size(4); + format %{ "VMUL.I32 $dst,$src1,$src2\t! mul packed2I" %} + ins_encode %{ + __ vmulI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, 0); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vmul4I_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (MulVI src1 src2)); + size(4); + format %{ "VMUL.I32 $dst.Q,$src1.Q,$src2.Q\t! mul packed4I" %} + ins_encode %{ + __ vmulI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, 1); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Floats vector mul +instruct vmul2F_reg(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::simd_math_is_compliant()); + match(Set dst (MulVF src1 src2)); + size(4); + format %{ "VMUL.F32 $dst,$src1,$src2\t! mul packed2F" %} + ins_encode %{ + __ vmulF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, 0); + %} + ins_pipe( fmulF_reg_reg ); // FIXME +%} + +#ifndef AARCH64 +instruct vmul2F_reg_vfp(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2 && !VM_Version::simd_math_is_compliant()); + match(Set dst (MulVF src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FMULS $dst.a,$src1.a,$src2.a\n\t" + "FMULS $dst.b,$src1.b,$src2.b" %} + ins_encode %{ + __ mul_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + __ mul_float($dst$$FloatRegister->successor(), + $src1$$FloatRegister->successor(), + $src2$$FloatRegister->successor()); + %} + + ins_pipe(fmulF_reg_reg); // FIXME +%} +#endif + +instruct vmul4F_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::simd_math_is_compliant()); + match(Set dst (MulVF src1 src2)); + size(4); + format %{ "VMUL.F32 $dst.Q,$src1.Q,$src2.Q\t! mul packed4F" %} + ins_encode %{ + __ vmulF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, 1); + %} + ins_pipe( fmulF_reg_reg ); // FIXME +%} + +#ifndef AARCH64 +instruct vmul4F_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4 && !VM_Version::simd_math_is_compliant()); + match(Set dst (MulVF src1 src2)); + size(4*4); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "FMULS $dst.a,$src1.a,$src2.a\n\t" + "FMULS $dst.b,$src1.b,$src2.b\n\t" + "FMULS $dst.c,$src1.c,$src2.c\n\t" + "FMULS $dst.d,$src1.d,$src2.d" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ mul_float(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor(); + FloatRegister src1b = src1a->successor(); + FloatRegister src2b = src2a->successor(); + __ mul_float(dstb, src1b, src2b); + FloatRegister dstc = dstb->successor(); + FloatRegister src1c = src1b->successor(); + FloatRegister src2c = src2b->successor(); + __ mul_float(dstc, src1c, src2c); + FloatRegister dstd = dstc->successor(); + FloatRegister src1d = src1c->successor(); + FloatRegister src2d = src2c->successor(); + __ mul_float(dstd, src1d, src2d); + %} + + ins_pipe(fmulF_reg_reg); // FIXME +%} +#endif + +#ifdef AARCH64 +instruct vmul2D_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (MulVD src1 src2)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "FMUL.2D $dst,$src1,$src2\t! double[2]" %} + ins_encode %{ + int quad = 1; + __ vmulF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F64, quad); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +%} +#else +instruct vmul2D_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (MulVD src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FMULD $dst.D.a,$src1.D.a,$src2.D.a\n\t" + "FMULD $dst.D.b,$src1.D.b,$src2.D.b" %} + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ mul_double(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor()->successor(); + FloatRegister src1b = src1a->successor()->successor(); + FloatRegister src2b = src2a->successor()->successor(); + __ mul_double(dstb, src1b, src2b); + %} + + ins_pipe(fmulD_reg_reg); // FIXME +%} +#endif + + +// Floats vector div +instruct vdiv2F_reg_vfp(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (DivVF src1 src2)); +#ifdef AARCH64 + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "FDIV.2S $dst,$src1,$src2\t! float[2]" %} + ins_encode %{ + int quad = 0; + __ vdivF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +#else + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FDIVS $dst.a,$src1.a,$src2.a\n\t" + "FDIVS $dst.b,$src1.b,$src2.b" %} + ins_encode %{ + __ div_float($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); + __ div_float($dst$$FloatRegister->successor(), + $src1$$FloatRegister->successor(), + $src2$$FloatRegister->successor()); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +#endif +%} + +instruct vdiv4F_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (DivVF src1 src2)); +#ifdef AARCH64 + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "FDIV.4S $dst,$src1,$src2\t! float[4]" %} + ins_encode %{ + int quad = 1; + __ vdivF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F32, quad); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +#else + size(4*4); + ins_cost(DEFAULT_COST*4); // FIXME + + format %{ "FDIVS $dst.a,$src1.a,$src2.a\n\t" + "FDIVS $dst.b,$src1.b,$src2.b\n\t" + "FDIVS $dst.c,$src1.c,$src2.c\n\t" + "FDIVS $dst.d,$src1.d,$src2.d" %} + + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ div_float(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor(); + FloatRegister src1b = src1a->successor(); + FloatRegister src2b = src2a->successor(); + __ div_float(dstb, src1b, src2b); + FloatRegister dstc = dstb->successor(); + FloatRegister src1c = src1b->successor(); + FloatRegister src2c = src2b->successor(); + __ div_float(dstc, src1c, src2c); + FloatRegister dstd = dstc->successor(); + FloatRegister src1d = src1c->successor(); + FloatRegister src2d = src2c->successor(); + __ div_float(dstd, src1d, src2d); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +#endif +%} + +#ifdef AARCH64 +instruct vdiv2D_reg(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (DivVD src1 src2)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + + format %{ "FDIV.2D $dst,$src1,$src2\t! double[2]" %} + ins_encode %{ + int quad = 1; + __ vdivF($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + MacroAssembler::VFA_SIZE_F64, quad); + %} + + ins_pipe(fdivF_reg_reg); // FIXME +%} +#else +instruct vdiv2D_reg_vfp(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (DivVD src1 src2)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "FDIVD $dst.D.a,$src1.D.a,$src2.D.a\n\t" + "FDIVD $dst.D.b,$src1.D.b,$src2.D.b" %} + ins_encode %{ + FloatRegister dsta = $dst$$FloatRegister; + FloatRegister src1a = $src1$$FloatRegister; + FloatRegister src2a = $src2$$FloatRegister; + __ div_double(dsta, src1a, src2a); + FloatRegister dstb = dsta->successor()->successor(); + FloatRegister src1b = src1a->successor()->successor(); + FloatRegister src2b = src2a->successor()->successor(); + __ div_double(dstb, src1b, src2b); + %} + + ins_pipe(fdivD_reg_reg); // FIXME +%} +#endif + +// --------------------------------- NEG -------------------------------------- + +instruct vneg8B_reg(vecD dst, vecD src) %{ + predicate(n->as_Vector()->length_in_bytes() == 8); + effect(DEF dst, USE src); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ "VNEG.S8 $dst.D,$src.D\t! neg packed8B" %} + ins_encode %{ + bool quad = false; + __ vnegI($dst$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vneg16B_reg(vecX dst, vecX src) %{ + predicate(n->as_Vector()->length_in_bytes() == 16); + effect(DEF dst, USE src); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ "VNEG.S8 $dst.Q,$src.Q\t! neg0 packed16B" %} + ins_encode %{ + bool _float = false; + bool quad = true; + __ vnegI($dst$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// ------------------------------ Shift --------------------------------------- + +instruct vslcntD(vecD dst, iRegI cnt) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (LShiftCntV cnt)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + Repl8B_reg_simd(dst, cnt); + %} +%} + +instruct vslcntX(vecX dst, iRegI cnt) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (LShiftCntV cnt)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + Repl16B_reg(dst, cnt); + %} +%} + +// Low bits of vector "shift" elements are used, so it +// doesn't matter if we treat it as ints or bytes here. +instruct vsrcntD(vecD dst, iRegI cnt) %{ + predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); + match(Set dst (RShiftCntV cnt)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + + format %{ "VDUP.8 $dst.D,$cnt\n\t" + "VNEG.S8 $dst.D,$dst.D\t! neg packed8B" %} + ins_encode %{ + bool quad = false; + __ vdupI($dst$$FloatRegister, $cnt$$Register, + MacroAssembler::VELEM_SIZE_8, quad); + __ vnegI($dst$$FloatRegister, $dst$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsrcntX(vecX dst, iRegI cnt) %{ + predicate(n->as_Vector()->length_in_bytes() == 16 && VM_Version::has_simd()); + match(Set dst (RShiftCntV cnt)); + size(4*2); + ins_cost(DEFAULT_COST*2); // FIXME + format %{ "VDUP.8 $dst.Q,$cnt\n\t" + "VNEG.S8 $dst.Q,$dst.Q\t! neg packed16B" %} + ins_encode %{ + bool quad = true; + __ vdupI($dst$$FloatRegister, $cnt$$Register, + MacroAssembler::VELEM_SIZE_8, quad); + __ vnegI($dst$$FloatRegister, $dst$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Byte vector logical left/right shift based on sign +instruct vsh8B_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 8); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U8 $dst.D,$src.D,$shift.D\t! logical left/right shift packed8B" + %} + ins_encode %{ + bool quad = false; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsh16B_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 16); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U8 $dst.Q,$src.Q,$shift.Q\t! logical left/right shift packed16B" + %} + ins_encode %{ + bool quad = true; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts/Char vector logical left/right shift based on sign +instruct vsh4S_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 4); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U16 $dst.D,$src.D,$shift.D\t! logical left/right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsh8S_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 8); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U16 $dst.Q,$src.Q,$shift.Q\t! logical left/right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector logical left/right shift based on sign +instruct vsh2I_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 2); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U32 $dst.D,$src.D,$shift.D\t! logical left/right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsh4I_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 4); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U32 $dst.Q,$src.Q,$shift.Q\t! logical left/right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector logical left/right shift based on sign +instruct vsh2L_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 2); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.U64 $dst.Q,$src.Q,$shift.Q\t! logical left/right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vshlUI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// ------------------------------ LeftShift ----------------------------------- + +// Byte vector left shift +instruct vsl8B_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (LShiftVB src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh8B_reg(dst, src, shift); + %} +%} + +instruct vsl16B_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (LShiftVB src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh16B_reg(dst, src, shift); + %} +%} + +instruct vsl8B_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (LShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I8 $dst.D,$src.D,$shift\t! logical left shift packed8B" + %} + ins_encode %{ + bool quad = false; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 8, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsl16B_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (LShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I8 $dst.Q,$src.Q,$shift\t! logical left shift packed16B" + %} + ins_encode %{ + bool quad = true; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 8, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts/Chars vector logical left/right shift +instruct vsl4S_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (LShiftVS src shift)); + match(Set dst (URShiftVS src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh4S_reg(dst, src, shift); + %} +%} + +instruct vsl8S_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (LShiftVS src shift)); + match(Set dst (URShiftVS src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh8S_reg(dst, src, shift); + %} +%} + +instruct vsl4S_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (LShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I16 $dst.D,$src.D,$shift\t! logical left shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsl8S_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (LShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I16 $dst.Q,$src.Q,$shift\t! logical left shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector logical left/right shift +instruct vsl2I_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (LShiftVI src shift)); + match(Set dst (URShiftVI src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh2I_reg(dst, src, shift); + %} +%} + +instruct vsl4I_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); + match(Set dst (LShiftVI src shift)); + match(Set dst (URShiftVI src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh4I_reg(dst, src, shift); + %} +%} + +instruct vsl2I_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (LShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I32 $dst.D,$src.D,$shift\t! logical left shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsl4I_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); + match(Set dst (LShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I32 $dst.Q,$src.Q,$shift\t! logical left shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector logical left/right shift +instruct vsl2L_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (LShiftVL src shift)); + match(Set dst (URShiftVL src shift)); + size(4*1); + ins_cost(DEFAULT_COST*1); // FIXME + expand %{ + vsh2L_reg(dst, src, shift); + %} +%} + +instruct vsl2L_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (LShiftVL src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.I64 $dst.Q,$src.Q,$shift\t! logical left shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vshli($dst$$FloatRegister, $src$$FloatRegister, 64, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// ----------------------- LogicalRightShift ----------------------------------- + +// Bytes/Shorts vector logical right shift produces incorrect Java result +// for negative data because java code convert short value into int with +// sign extension before a shift. + +// Chars vector logical right shift +instruct vsrl4S_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (URShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.U16 $dst.D,$src.D,$shift\t! logical right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vshrUI($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsrl8S_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (URShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.U16 $dst.Q,$src.Q,$shift\t! logical right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vshrUI($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector logical right shift +instruct vsrl2I_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + match(Set dst (URShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.U32 $dst.D,$src.D,$shift\t! logical right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vshrUI($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsrl4I_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); + match(Set dst (URShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.U32 $dst.Q,$src.Q,$shift\t! logical right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vshrUI($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector logical right shift +instruct vsrl2L_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (URShiftVL src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.U64 $dst.Q,$src.Q,$shift\t! logical right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vshrUI($dst$$FloatRegister, $src$$FloatRegister, 64, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// ------------------- ArithmeticRightShift ----------------------------------- + +// Bytes vector arithmetic left/right shift based on sign +instruct vsha8B_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 8); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S8 $dst.D,$src.D,$shift.D\t! arithmetic right shift packed8B" + %} + ins_encode %{ + bool quad = false; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsha16B_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 16); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S8 $dst.Q,$src.Q,$shift.Q\t! arithmetic right shift packed16B" + %} + ins_encode %{ + bool quad = true; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts vector arithmetic left/right shift based on sign +instruct vsha4S_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 4); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S16 $dst.D,$src.D,$shift.D\t! arithmetic right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsha8S_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 8); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S16 $dst.Q,$src.Q,$shift.Q\t! arithmetic right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector arithmetic left/right shift based on sign +instruct vsha2I_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 2); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S32 $dst.D,$src.D,$shift.D\t! arithmetic right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsha4I_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 4); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S32 $dst.Q,$src.Q,$shift.Q\t! arithmetic right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector arithmetic left/right shift based on sign +instruct vsha2L_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 2); + effect(DEF dst, USE src, USE shift); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHL.S64 $dst.Q,$src.Q,$shift.Q\t! arithmetic right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vshlSI($dst$$FloatRegister, $shift$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Byte vector arithmetic right shift + +instruct vsra8B_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (RShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha8B_reg(dst, src, shift); + %} +%} + +instruct vsrl16B_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (RShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha16B_reg(dst, src, shift); + %} +%} + +instruct vsrl8B_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (RShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S8 $dst.D,$src.D,$shift\t! logical right shift packed8B" + %} + ins_encode %{ + bool quad = false; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 8, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsrl16B_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 16); + match(Set dst (RShiftVB src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S8 $dst.Q,$src.Q,$shift\t! logical right shift packed16B" + %} + ins_encode %{ + bool quad = true; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 8, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Shorts vector arithmetic right shift +instruct vsra4S_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (RShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha4S_reg(dst, src, shift); + %} +%} + +instruct vsra8S_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (RShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha8S_reg(dst, src, shift); + %} +%} + +instruct vsra4S_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (RShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S16 $dst.D,$src.D,$shift\t! logical right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsra8S_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 8); + match(Set dst (RShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S16 $dst.Q,$src.Q,$shift\t! logical right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 16, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Integers vector arithmetic right shift +instruct vsra2I_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (RShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha2I_reg(dst, src, shift); + %} +%} + +instruct vsra4I_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (RShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha4I_reg(dst, src, shift); + %} +%} + +instruct vsra2I_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (RShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S32 $dst.D,$src.D,$shift\t! logical right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vsra4I_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 4); + match(Set dst (RShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S32 $dst.Q,$src.Q,$shift\t! logical right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 32, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// Longs vector arithmetic right shift +instruct vsra2L_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (RShiftVL src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + expand %{ + vsha2L_reg(dst, src, shift); + %} +%} + +instruct vsra2L_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 2); + match(Set dst (RShiftVL src shift)); + size(4); + ins_cost(DEFAULT_COST); // FIXME + format %{ + "VSHR.S64 $dst.Q,$src.Q,$shift\t! logical right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vshrSI($dst$$FloatRegister, $src$$FloatRegister, 64, $shift$$constant, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// --------------------------------- AND -------------------------------------- + +instruct vandD(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 8); + match(Set dst (AndV src1 src2)); + format %{ "VAND $dst.D,$src1.D,$src2.D\t! and vectors (8 bytes)" %} + ins_encode %{ + bool quad = false; + __ vandI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vandX(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 16); + match(Set dst (AndV src1 src2)); + format %{ "VAND $dst.Q,$src1.Q,$src2.Q\t! and vectors (16 bytes)" %} + ins_encode %{ + bool quad = true; + __ vandI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// --------------------------------- OR --------------------------------------- + +instruct vorD(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 8); + match(Set dst (OrV src1 src2)); + format %{ "VOR $dst.D,$src1.D,$src2.D\t! and vectors (8 bytes)" %} + ins_encode %{ + bool quad = false; + __ vorI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vorX(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 16); + match(Set dst (OrV src1 src2)); + format %{ "VOR $dst.Q,$src1.Q,$src2.Q\t! and vectors (16 bytes)" %} + ins_encode %{ + bool quad = true; + __ vorI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +// --------------------------------- XOR -------------------------------------- + +instruct vxorD(vecD dst, vecD src1, vecD src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 8); + match(Set dst (XorV src1 src2)); + format %{ "VXOR $dst.D,$src1.D,$src2.D\t! and vectors (8 bytes)" %} + ins_encode %{ + bool quad = false; + __ vxorI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + +instruct vxorX(vecX dst, vecX src1, vecX src2) %{ + predicate(n->as_Vector()->length_in_bytes() == 16); + match(Set dst (XorV src1 src2)); + format %{ "VXOR $dst.Q,$src1.Q,$src2.Q\t! and vectors (16 bytes)" %} + ins_encode %{ + bool quad = true; + __ vxorI($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, + quad); + %} + ins_pipe( ialu_reg_reg ); // FIXME +%} + + +//----------PEEPHOLE RULES----------------------------------------------------- +// These must follow all instruction definitions as they use the names +// defined in the instructions definitions. +// +// peepmatch ( root_instr_name [preceding_instruction]* ); +// +// peepconstraint %{ +// (instruction_number.operand_name relational_op instruction_number.operand_name +// [, ...] ); +// // instruction numbers are zero-based using left to right order in peepmatch +// +// peepreplace ( instr_name ( [instruction_number.operand_name]* ) ); +// // provide an instruction_number.operand_name for each operand that appears +// // in the replacement instruction's match rule +// +// ---------VM FLAGS--------------------------------------------------------- +// +// All peephole optimizations can be turned off using -XX:-OptoPeephole +// +// Each peephole rule is given an identifying number starting with zero and +// increasing by one in the order seen by the parser. An individual peephole +// can be enabled, and all others disabled, by using -XX:OptoPeepholeAt=# +// on the command-line. +// +// ---------CURRENT LIMITATIONS---------------------------------------------- +// +// Only match adjacent instructions in same basic block +// Only equality constraints +// Only constraints between operands, not (0.dest_reg == EAX_enc) +// Only one replacement instruction +// +// ---------EXAMPLE---------------------------------------------------------- +// +// // pertinent parts of existing instructions in architecture description +// instruct movI(eRegI dst, eRegI src) %{ +// match(Set dst (CopyI src)); +// %} +// +// instruct incI_eReg(eRegI dst, immI1 src, eFlagsReg cr) %{ +// match(Set dst (AddI dst src)); +// effect(KILL cr); +// %} +// +// // Change (inc mov) to lea +// peephole %{ +// // increment preceeded by register-register move +// peepmatch ( incI_eReg movI ); +// // require that the destination register of the increment +// // match the destination register of the move +// peepconstraint ( 0.dst == 1.dst ); +// // construct a replacement instruction that sets +// // the destination to ( move's source register + one ) +// peepreplace ( incI_eReg_immI1( 0.dst 1.src 0.src ) ); +// %} +// + +// // Change load of spilled value to only a spill +// instruct storeI(memory mem, eRegI src) %{ +// match(Set mem (StoreI mem src)); +// %} +// +// instruct loadI(eRegI dst, memory mem) %{ +// match(Set dst (LoadI mem)); +// %} +// +// peephole %{ +// peepmatch ( loadI storeI ); +// peepconstraint ( 1.src == 0.dst, 1.mem == 0.mem ); +// peepreplace ( storeI( 1.mem 1.mem 1.src ) ); +// %} + +//----------SMARTSPILL RULES--------------------------------------------------- +// These must follow all instruction definitions as they use the names +// defined in the instructions definitions. +// +// ARM will probably not have any of these rules due to RISC instruction set. + +//----------PIPELINE----------------------------------------------------------- +// Rules which define the behavior of the target architectures pipeline. diff --git a/hotspot/src/cpu/arm/vm/arm_32.ad b/hotspot/src/cpu/arm/vm/arm_32.ad new file mode 100644 index 00000000000..d8131ff8c78 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/arm_32.ad @@ -0,0 +1,586 @@ +// +// Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. +// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +// +// This code is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License version 2 only, as +// published by the Free Software Foundation. +// +// This code is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// version 2 for more details (a copy is included in the LICENSE file that +// accompanied this code). +// +// You should have received a copy of the GNU General Public License version +// 2 along with this work; if not, write to the Free Software Foundation, +// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. +// + +// ARM Architecture Description File + +//----------REGISTER DEFINITION BLOCK------------------------------------------ +// This information is used by the matcher and the register allocator to +// describe individual registers and classes of registers within the target +// archtecture. +register %{ +//----------Architecture Description Register Definitions---------------------- +// General Registers +// "reg_def" name ( register save type, C convention save type, +// ideal register type, encoding, vm name ); +// Register Save Types: +// +// NS = No-Save: The register allocator assumes that these registers +// can be used without saving upon entry to the method, & +// that they do not need to be saved at call sites. +// +// SOC = Save-On-Call: The register allocator assumes that these registers +// can be used without saving upon entry to the method, +// but that they must be saved at call sites. +// +// SOE = Save-On-Entry: The register allocator assumes that these registers +// must be saved before using them upon entry to the +// method, but they do not need to be saved at call +// sites. +// +// AS = Always-Save: The register allocator assumes that these registers +// must be saved before using them upon entry to the +// method, & that they must be saved at call sites. +// +// Ideal Register Type is used to determine how to save & restore a +// register. Op_RegI will get spilled with LoadI/StoreI, Op_RegP will get +// spilled with LoadP/StoreP. If the register supports both, use Op_RegI. +// +// The encoding number is the actual bit-pattern placed into the opcodes. + + +// ---------------------------- +// Integer/Long Registers +// ---------------------------- + +reg_def R_R0 (SOC, SOC, Op_RegI, 0, R(0)->as_VMReg()); +reg_def R_R1 (SOC, SOC, Op_RegI, 1, R(1)->as_VMReg()); +reg_def R_R2 (SOC, SOC, Op_RegI, 2, R(2)->as_VMReg()); +reg_def R_R3 (SOC, SOC, Op_RegI, 3, R(3)->as_VMReg()); +reg_def R_R4 (SOC, SOE, Op_RegI, 4, R(4)->as_VMReg()); +reg_def R_R5 (SOC, SOE, Op_RegI, 5, R(5)->as_VMReg()); +reg_def R_R6 (SOC, SOE, Op_RegI, 6, R(6)->as_VMReg()); +reg_def R_R7 (SOC, SOE, Op_RegI, 7, R(7)->as_VMReg()); +reg_def R_R8 (SOC, SOE, Op_RegI, 8, R(8)->as_VMReg()); +reg_def R_R9 (SOC, SOE, Op_RegI, 9, R(9)->as_VMReg()); +reg_def R_R10(NS, SOE, Op_RegI, 10, R(10)->as_VMReg()); +reg_def R_R11(NS, SOE, Op_RegI, 11, R(11)->as_VMReg()); +reg_def R_R12(SOC, SOC, Op_RegI, 12, R(12)->as_VMReg()); +reg_def R_R13(NS, NS, Op_RegI, 13, R(13)->as_VMReg()); +reg_def R_R14(SOC, SOC, Op_RegI, 14, R(14)->as_VMReg()); +reg_def R_R15(NS, NS, Op_RegI, 15, R(15)->as_VMReg()); + +// ---------------------------- +// Float/Double Registers +// ---------------------------- + +// Float Registers + +reg_def R_S0 ( SOC, SOC, Op_RegF, 0, S0->as_VMReg()); +reg_def R_S1 ( SOC, SOC, Op_RegF, 1, S1_reg->as_VMReg()); +reg_def R_S2 ( SOC, SOC, Op_RegF, 2, S2_reg->as_VMReg()); +reg_def R_S3 ( SOC, SOC, Op_RegF, 3, S3_reg->as_VMReg()); +reg_def R_S4 ( SOC, SOC, Op_RegF, 4, S4_reg->as_VMReg()); +reg_def R_S5 ( SOC, SOC, Op_RegF, 5, S5_reg->as_VMReg()); +reg_def R_S6 ( SOC, SOC, Op_RegF, 6, S6_reg->as_VMReg()); +reg_def R_S7 ( SOC, SOC, Op_RegF, 7, S7->as_VMReg()); +reg_def R_S8 ( SOC, SOC, Op_RegF, 8, S8->as_VMReg()); +reg_def R_S9 ( SOC, SOC, Op_RegF, 9, S9->as_VMReg()); +reg_def R_S10( SOC, SOC, Op_RegF, 10,S10->as_VMReg()); +reg_def R_S11( SOC, SOC, Op_RegF, 11,S11->as_VMReg()); +reg_def R_S12( SOC, SOC, Op_RegF, 12,S12->as_VMReg()); +reg_def R_S13( SOC, SOC, Op_RegF, 13,S13->as_VMReg()); +reg_def R_S14( SOC, SOC, Op_RegF, 14,S14->as_VMReg()); +reg_def R_S15( SOC, SOC, Op_RegF, 15,S15->as_VMReg()); +reg_def R_S16( SOC, SOE, Op_RegF, 16,S16->as_VMReg()); +reg_def R_S17( SOC, SOE, Op_RegF, 17,S17->as_VMReg()); +reg_def R_S18( SOC, SOE, Op_RegF, 18,S18->as_VMReg()); +reg_def R_S19( SOC, SOE, Op_RegF, 19,S19->as_VMReg()); +reg_def R_S20( SOC, SOE, Op_RegF, 20,S20->as_VMReg()); +reg_def R_S21( SOC, SOE, Op_RegF, 21,S21->as_VMReg()); +reg_def R_S22( SOC, SOE, Op_RegF, 22,S22->as_VMReg()); +reg_def R_S23( SOC, SOE, Op_RegF, 23,S23->as_VMReg()); +reg_def R_S24( SOC, SOE, Op_RegF, 24,S24->as_VMReg()); +reg_def R_S25( SOC, SOE, Op_RegF, 25,S25->as_VMReg()); +reg_def R_S26( SOC, SOE, Op_RegF, 26,S26->as_VMReg()); +reg_def R_S27( SOC, SOE, Op_RegF, 27,S27->as_VMReg()); +reg_def R_S28( SOC, SOE, Op_RegF, 28,S28->as_VMReg()); +reg_def R_S29( SOC, SOE, Op_RegF, 29,S29->as_VMReg()); +reg_def R_S30( SOC, SOE, Op_RegF, 30,S30->as_VMReg()); +reg_def R_S31( SOC, SOE, Op_RegF, 31,S31->as_VMReg()); + +// Double Registers +// The rules of ADL require that double registers be defined in pairs. +// Each pair must be two 32-bit values, but not necessarily a pair of +// single float registers. In each pair, ADLC-assigned register numbers +// must be adjacent, with the lower number even. Finally, when the +// CPU stores such a register pair to memory, the word associated with +// the lower ADLC-assigned number must be stored to the lower address. + +reg_def R_D16 (SOC, SOC, Op_RegD, 32, D16->as_VMReg()); +reg_def R_D16x(SOC, SOC, Op_RegD,255, D16->as_VMReg()->next()); +reg_def R_D17 (SOC, SOC, Op_RegD, 34, D17->as_VMReg()); +reg_def R_D17x(SOC, SOC, Op_RegD,255, D17->as_VMReg()->next()); +reg_def R_D18 (SOC, SOC, Op_RegD, 36, D18->as_VMReg()); +reg_def R_D18x(SOC, SOC, Op_RegD,255, D18->as_VMReg()->next()); +reg_def R_D19 (SOC, SOC, Op_RegD, 38, D19->as_VMReg()); +reg_def R_D19x(SOC, SOC, Op_RegD,255, D19->as_VMReg()->next()); +reg_def R_D20 (SOC, SOC, Op_RegD, 40, D20->as_VMReg()); +reg_def R_D20x(SOC, SOC, Op_RegD,255, D20->as_VMReg()->next()); +reg_def R_D21 (SOC, SOC, Op_RegD, 42, D21->as_VMReg()); +reg_def R_D21x(SOC, SOC, Op_RegD,255, D21->as_VMReg()->next()); +reg_def R_D22 (SOC, SOC, Op_RegD, 44, D22->as_VMReg()); +reg_def R_D22x(SOC, SOC, Op_RegD,255, D22->as_VMReg()->next()); +reg_def R_D23 (SOC, SOC, Op_RegD, 46, D23->as_VMReg()); +reg_def R_D23x(SOC, SOC, Op_RegD,255, D23->as_VMReg()->next()); +reg_def R_D24 (SOC, SOC, Op_RegD, 48, D24->as_VMReg()); +reg_def R_D24x(SOC, SOC, Op_RegD,255, D24->as_VMReg()->next()); +reg_def R_D25 (SOC, SOC, Op_RegD, 50, D25->as_VMReg()); +reg_def R_D25x(SOC, SOC, Op_RegD,255, D25->as_VMReg()->next()); +reg_def R_D26 (SOC, SOC, Op_RegD, 52, D26->as_VMReg()); +reg_def R_D26x(SOC, SOC, Op_RegD,255, D26->as_VMReg()->next()); +reg_def R_D27 (SOC, SOC, Op_RegD, 54, D27->as_VMReg()); +reg_def R_D27x(SOC, SOC, Op_RegD,255, D27->as_VMReg()->next()); +reg_def R_D28 (SOC, SOC, Op_RegD, 56, D28->as_VMReg()); +reg_def R_D28x(SOC, SOC, Op_RegD,255, D28->as_VMReg()->next()); +reg_def R_D29 (SOC, SOC, Op_RegD, 58, D29->as_VMReg()); +reg_def R_D29x(SOC, SOC, Op_RegD,255, D29->as_VMReg()->next()); +reg_def R_D30 (SOC, SOC, Op_RegD, 60, D30->as_VMReg()); +reg_def R_D30x(SOC, SOC, Op_RegD,255, D30->as_VMReg()->next()); +reg_def R_D31 (SOC, SOC, Op_RegD, 62, D31->as_VMReg()); +reg_def R_D31x(SOC, SOC, Op_RegD,255, D31->as_VMReg()->next()); + +// ---------------------------- +// Special Registers +// Condition Codes Flag Registers +reg_def APSR (SOC, SOC, Op_RegFlags, 0, VMRegImpl::Bad()); +reg_def FPSCR(SOC, SOC, Op_RegFlags, 0, VMRegImpl::Bad()); + +// ---------------------------- +// Specify the enum values for the registers. These enums are only used by the +// OptoReg "class". We can convert these enum values at will to VMReg when needed +// for visibility to the rest of the vm. The order of this enum influences the +// register allocator so having the freedom to set this order and not be stuck +// with the order that is natural for the rest of the vm is worth it. + +// registers in that order so that R11/R12 is an aligned pair that can be used for longs +alloc_class chunk0( + R_R4, R_R5, R_R6, R_R7, R_R8, R_R9, R_R11, R_R12, R_R10, R_R13, R_R14, R_R15, R_R0, R_R1, R_R2, R_R3); + +// Note that a register is not allocatable unless it is also mentioned +// in a widely-used reg_class below. + +alloc_class chunk1( + R_S16, R_S17, R_S18, R_S19, R_S20, R_S21, R_S22, R_S23, + R_S24, R_S25, R_S26, R_S27, R_S28, R_S29, R_S30, R_S31, + R_S0, R_S1, R_S2, R_S3, R_S4, R_S5, R_S6, R_S7, + R_S8, R_S9, R_S10, R_S11, R_S12, R_S13, R_S14, R_S15, + R_D16, R_D16x,R_D17, R_D17x,R_D18, R_D18x,R_D19, R_D19x, + R_D20, R_D20x,R_D21, R_D21x,R_D22, R_D22x,R_D23, R_D23x, + R_D24, R_D24x,R_D25, R_D25x,R_D26, R_D26x,R_D27, R_D27x, + R_D28, R_D28x,R_D29, R_D29x,R_D30, R_D30x,R_D31, R_D31x +); + +alloc_class chunk2(APSR, FPSCR); + +//----------Architecture Description Register Classes-------------------------- +// Several register classes are automatically defined based upon information in +// this architecture description. +// 1) reg_class inline_cache_reg ( as defined in frame section ) +// 2) reg_class interpreter_method_oop_reg ( as defined in frame section ) +// 3) reg_class stack_slots( /* one chunk of stack-based "registers" */ ) +// + +// ---------------------------- +// Integer Register Classes +// ---------------------------- +// Exclusions from i_reg: +// SP (R13), PC (R15) +// R10: reserved by HotSpot to the TLS register (invariant within Java) +reg_class int_reg(R_R0, R_R1, R_R2, R_R3, R_R4, R_R5, R_R6, R_R7, R_R8, R_R9, R_R11, R_R12, R_R14); + +reg_class R0_regI(R_R0); +reg_class R1_regI(R_R1); +reg_class R2_regI(R_R2); +reg_class R3_regI(R_R3); +reg_class R12_regI(R_R12); + +// ---------------------------- +// Pointer Register Classes +// ---------------------------- +reg_class ptr_reg(R_R0, R_R1, R_R2, R_R3, R_R4, R_R5, R_R6, R_R7, R_R8, R_R9, R_R11, R_R12, R_R14); +// Special class for storeP instructions, which can store SP or RPC to TLS. +// It is also used for memory addressing, allowing direct TLS addressing. +reg_class sp_ptr_reg(R_R0, R_R1, R_R2, R_R3, R_R4, R_R5, R_R6, R_R7, R_R8, R_R9, R_R11, R_R12, R_R14, R_R10 /* TLS*/, R_R13 /* SP*/); + +#define R_Ricklass R_R8 +#define R_Rmethod R_R9 +#define R_Rthread R_R10 +#define R_Rexception_obj R_R4 + +// Other special pointer regs +reg_class R0_regP(R_R0); +reg_class R1_regP(R_R1); +reg_class R2_regP(R_R2); +reg_class R4_regP(R_R4); +reg_class Rexception_regP(R_Rexception_obj); +reg_class Ricklass_regP(R_Ricklass); +reg_class Rmethod_regP(R_Rmethod); +reg_class Rthread_regP(R_Rthread); +reg_class IP_regP(R_R12); +reg_class LR_regP(R_R14); + +reg_class FP_regP(R_R11); + +// ---------------------------- +// Long Register Classes +// ---------------------------- +reg_class long_reg ( R_R0,R_R1, R_R2,R_R3, R_R4,R_R5, R_R6,R_R7, R_R8,R_R9, R_R11,R_R12); +// for ldrexd, strexd: first reg of pair must be even +reg_class long_reg_align ( R_R0,R_R1, R_R2,R_R3, R_R4,R_R5, R_R6,R_R7, R_R8,R_R9); + +reg_class R0R1_regL(R_R0,R_R1); +reg_class R2R3_regL(R_R2,R_R3); + +// ---------------------------- +// Special Class for Condition Code Flags Register +reg_class int_flags(APSR); +reg_class float_flags(FPSCR); + + +// ---------------------------- +// Float Point Register Classes +// ---------------------------- +// Skip S14/S15, they are reserved for mem-mem copies +reg_class sflt_reg(R_S0, R_S1, R_S2, R_S3, R_S4, R_S5, R_S6, R_S7, R_S8, R_S9, R_S10, R_S11, R_S12, R_S13, + R_S16, R_S17, R_S18, R_S19, R_S20, R_S21, R_S22, R_S23, R_S24, R_S25, R_S26, R_S27, R_S28, R_S29, R_S30, R_S31); + +// Paired floating point registers--they show up in the same order as the floats, +// but they are used with the "Op_RegD" type, and always occur in even/odd pairs. +reg_class dflt_reg(R_S0,R_S1, R_S2,R_S3, R_S4,R_S5, R_S6,R_S7, R_S8,R_S9, R_S10,R_S11, R_S12,R_S13, + R_S16,R_S17, R_S18,R_S19, R_S20,R_S21, R_S22,R_S23, R_S24,R_S25, R_S26,R_S27, R_S28,R_S29, R_S30,R_S31, + R_D16,R_D16x, R_D17,R_D17x, R_D18,R_D18x, R_D19,R_D19x, R_D20,R_D20x, R_D21,R_D21x, R_D22,R_D22x, + R_D23,R_D23x, R_D24,R_D24x, R_D25,R_D25x, R_D26,R_D26x, R_D27,R_D27x, R_D28,R_D28x, R_D29,R_D29x, + R_D30,R_D30x, R_D31,R_D31x); + +reg_class dflt_low_reg(R_S0,R_S1, R_S2,R_S3, R_S4,R_S5, R_S6,R_S7, R_S8,R_S9, R_S10,R_S11, R_S12,R_S13, + R_S16,R_S17, R_S18,R_S19, R_S20,R_S21, R_S22,R_S23, R_S24,R_S25, R_S26,R_S27, R_S28,R_S29, R_S30,R_S31); + + +reg_class actual_dflt_reg %{ + if (VM_Version::has_vfp3_32()) { + return DFLT_REG_mask(); + } else { + return DFLT_LOW_REG_mask(); + } +%} + +reg_class S0_regF(R_S0); +reg_class D0_regD(R_S0,R_S1); +reg_class D1_regD(R_S2,R_S3); +reg_class D2_regD(R_S4,R_S5); +reg_class D3_regD(R_S6,R_S7); +reg_class D4_regD(R_S8,R_S9); +reg_class D5_regD(R_S10,R_S11); +reg_class D6_regD(R_S12,R_S13); +reg_class D7_regD(R_S14,R_S15); + +reg_class D16_regD(R_D16,R_D16x); +reg_class D17_regD(R_D17,R_D17x); +reg_class D18_regD(R_D18,R_D18x); +reg_class D19_regD(R_D19,R_D19x); +reg_class D20_regD(R_D20,R_D20x); +reg_class D21_regD(R_D21,R_D21x); +reg_class D22_regD(R_D22,R_D22x); +reg_class D23_regD(R_D23,R_D23x); +reg_class D24_regD(R_D24,R_D24x); +reg_class D25_regD(R_D25,R_D25x); +reg_class D26_regD(R_D26,R_D26x); +reg_class D27_regD(R_D27,R_D27x); +reg_class D28_regD(R_D28,R_D28x); +reg_class D29_regD(R_D29,R_D29x); +reg_class D30_regD(R_D30,R_D30x); +reg_class D31_regD(R_D31,R_D31x); + +reg_class vectorx_reg(R_S0,R_S1,R_S2,R_S3, R_S4,R_S5,R_S6,R_S7, + R_S8,R_S9,R_S10,R_S11, /* skip S14/S15 */ + R_S16,R_S17,R_S18,R_S19, R_S20,R_S21,R_S22,R_S23, + R_S24,R_S25,R_S26,R_S27, R_S28,R_S29,R_S30,R_S31, + R_D16,R_D16x,R_D17,R_D17x, R_D18,R_D18x,R_D19,R_D19x, + R_D20,R_D20x,R_D21,R_D21x, R_D22,R_D22x,R_D23,R_D23x, + R_D24,R_D24x,R_D25,R_D25x, R_D26,R_D26x,R_D27,R_D27x, + R_D28,R_D28x,R_D29,R_D29x, R_D30,R_D30x,R_D31,R_D31x); + +%} + +source_hpp %{ +// FIXME +const MachRegisterNumbers R_mem_copy_lo_num = R_S14_num; +const MachRegisterNumbers R_mem_copy_hi_num = R_S15_num; +const FloatRegister Rmemcopy = S14; +const MachRegisterNumbers R_hf_ret_lo_num = R_S0_num; +const MachRegisterNumbers R_hf_ret_hi_num = R_S1_num; + +const MachRegisterNumbers R_Ricklass_num = R_R8_num; +const MachRegisterNumbers R_Rmethod_num = R_R9_num; + +#define LDR_DOUBLE "FLDD" +#define LDR_FLOAT "FLDS" +#define STR_DOUBLE "FSTD" +#define STR_FLOAT "FSTS" +#define LDR_64 "LDRD" +#define STR_64 "STRD" +#define LDR_32 "LDR" +#define STR_32 "STR" +#define MOV_DOUBLE "FCPYD" +#define MOV_FLOAT "FCPYS" +#define FMSR "FMSR" +#define FMRS "FMRS" +#define LDREX "ldrex " +#define STREX "strex " + +#define str_64 strd +#define ldr_64 ldrd +#define ldr_32 ldr +#define ldrex ldrex +#define strex strex + +static inline bool is_memoryD(int offset) { + return offset < 1024 && offset > -1024; +} + +static inline bool is_memoryfp(int offset) { + return offset < 1024 && offset > -1024; +} + +static inline bool is_memoryI(int offset) { + return offset < 4096 && offset > -4096; +} + +static inline bool is_memoryP(int offset) { + return offset < 4096 && offset > -4096; +} + +static inline bool is_memoryHD(int offset) { + return offset < 256 && offset > -256; +} + +static inline bool is_aimm(int imm) { + return AsmOperand::is_rotated_imm(imm); +} + +static inline bool is_limmI(jint imm) { + return AsmOperand::is_rotated_imm(imm); +} + +static inline bool is_limmI_low(jint imm, int n) { + int imml = imm & right_n_bits(n); + return is_limmI(imml) || is_limmI(imm); +} + +static inline int limmI_low(jint imm, int n) { + int imml = imm & right_n_bits(n); + return is_limmI(imml) ? imml : imm; +} + +%} + +source %{ + +// Given a register encoding, produce a Integer Register object +static Register reg_to_register_object(int register_encoding) { + assert(R0->encoding() == R_R0_enc && R15->encoding() == R_R15_enc, "right coding"); + return as_Register(register_encoding); +} + +// Given a register encoding, produce a single-precision Float Register object +static FloatRegister reg_to_FloatRegister_object(int register_encoding) { + assert(S0->encoding() == R_S0_enc && S31->encoding() == R_S31_enc, "right coding"); + return as_FloatRegister(register_encoding); +} + +void Compile::pd_compiler2_init() { + // Umimplemented +} + +// Location of compiled Java return values. Same as C +OptoRegPair c2::return_value(int ideal_reg) { + assert( ideal_reg >= Op_RegI && ideal_reg <= Op_RegL, "only return normal values" ); +#ifndef __ABI_HARD__ + static int lo[Op_RegL+1] = { 0, 0, OptoReg::Bad, R_R0_num, R_R0_num, R_R0_num, R_R0_num, R_R0_num }; + static int hi[Op_RegL+1] = { 0, 0, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, R_R1_num, R_R1_num }; +#else + static int lo[Op_RegL+1] = { 0, 0, OptoReg::Bad, R_R0_num, R_R0_num, R_hf_ret_lo_num, R_hf_ret_lo_num, R_R0_num }; + static int hi[Op_RegL+1] = { 0, 0, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, R_hf_ret_hi_num, R_R1_num }; +#endif + return OptoRegPair( hi[ideal_reg], lo[ideal_reg]); +} + +// !!!!! Special hack to get all type of calls to specify the byte offset +// from the start of the call to the point where the return address +// will point. + +int MachCallStaticJavaNode::ret_addr_offset() { + bool far = (_method == NULL) ? maybe_far_call(this) : !cache_reachable(); + return ((far ? 3 : 1) + (_method_handle_invoke ? 1 : 0)) * + NativeInstruction::instruction_size; +} + +int MachCallDynamicJavaNode::ret_addr_offset() { + bool far = !cache_reachable(); + // mov_oop is always 2 words + return (2 + (far ? 3 : 1)) * NativeInstruction::instruction_size; +} + +int MachCallRuntimeNode::ret_addr_offset() { + // bl or movw; movt; blx + bool far = maybe_far_call(this); + return (far ? 3 : 1) * NativeInstruction::instruction_size; +} +%} + +// The intptr_t operand types, defined by textual substitution. +// (Cf. opto/type.hpp. This lets us avoid many, many other ifdefs.) +#define immX immI +#define immXRot immIRot +#define iRegX iRegI +#define aimmX aimmI +#define limmX limmI +#define immX10x2 immI10x2 +#define LShiftX LShiftI +#define shimmX immU5 + +// Compatibility interface +#define aimmP immPRot +#define immIMov immIRot + +#define store_RegL iRegL +#define store_RegLd iRegLd +#define store_RegI iRegI +#define store_ptr_RegP iRegP + +//----------ATTRIBUTES--------------------------------------------------------- +//----------Operand Attributes------------------------------------------------- +op_attrib op_cost(1); // Required cost attribute + +//----------OPERANDS----------------------------------------------------------- +// Operand definitions must precede instruction definitions for correct parsing +// in the ADLC because operands constitute user defined types which are used in +// instruction definitions. + +//----------Simple Operands---------------------------------------------------- +// Immediate Operands + +operand immIRot() %{ + predicate(AsmOperand::is_rotated_imm(n->get_int())); + match(ConI); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immIRotn() %{ + predicate(n->get_int() != 0 && AsmOperand::is_rotated_imm(~n->get_int())); + match(ConI); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immIRotneg() %{ + // if AsmOperand::is_rotated_imm() is true for this constant, it is + // a immIRot and an optimal instruction combination exists to handle the + // constant as an immIRot + predicate(!AsmOperand::is_rotated_imm(n->get_int()) && AsmOperand::is_rotated_imm(-n->get_int())); + match(ConI); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +// Non-negative integer immediate that is encodable using the rotation scheme, +// and that when expanded fits in 31 bits. +operand immU31Rot() %{ + predicate((0 <= n->get_int()) && AsmOperand::is_rotated_imm(n->get_int())); + match(ConI); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immPRot() %{ + predicate(n->get_ptr() == 0 || (AsmOperand::is_rotated_imm(n->get_ptr()) && ((ConPNode*)n)->type()->reloc() == relocInfo::none)); + + match(ConP); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +operand immLlowRot() %{ + predicate(n->get_long() >> 32 == 0 && AsmOperand::is_rotated_imm((int)n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immLRot2() %{ + predicate(AsmOperand::is_rotated_imm((int)(n->get_long() >> 32)) && + AsmOperand::is_rotated_imm((int)(n->get_long()))); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 12-bit - for addressing mode +operand immI12() %{ + predicate((-4096 < n->get_int()) && (n->get_int() < 4096)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 10-bit disp and disp+4 - for addressing float pair +operand immI10x2() %{ + predicate((-1024 < n->get_int()) && (n->get_int() < 1024 - 4)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Integer Immediate: 12-bit disp and disp+4 - for addressing word pair +operand immI12x2() %{ + predicate((-4096 < n->get_int()) && (n->get_int() < 4096 - 4)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} diff --git a/hotspot/src/cpu/arm/vm/arm_64.ad b/hotspot/src/cpu/arm/vm/arm_64.ad new file mode 100644 index 00000000000..5d5a6c871b3 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/arm_64.ad @@ -0,0 +1,998 @@ +// +// Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. +// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +// +// This code is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License version 2 only, as +// published by the Free Software Foundation. +// +// This code is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// version 2 for more details (a copy is included in the LICENSE file that +// accompanied this code). +// +// You should have received a copy of the GNU General Public License version +// 2 along with this work; if not, write to the Free Software Foundation, +// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. +// + +// ARM Architecture Description File + +//----------REGISTER DEFINITION BLOCK------------------------------------------ +// This information is used by the matcher and the register allocator to +// describe individual registers and classes of registers within the target +// archtecture. +register %{ +//----------Architecture Description Register Definitions---------------------- +// General Registers +// "reg_def" name ( register save type, C convention save type, +// ideal register type, encoding, vm name ); +// Register Save Types: +// +// NS = No-Save: The register allocator assumes that these registers +// can be used without saving upon entry to the method, & +// that they do not need to be saved at call sites. +// +// SOC = Save-On-Call: The register allocator assumes that these registers +// can be used without saving upon entry to the method, +// but that they must be saved at call sites. +// +// SOE = Save-On-Entry: The register allocator assumes that these registers +// must be saved before using them upon entry to the +// method, but they do not need to be saved at call +// sites. +// +// AS = Always-Save: The register allocator assumes that these registers +// must be saved before using them upon entry to the +// method, & that they must be saved at call sites. +// +// Ideal Register Type is used to determine how to save & restore a +// register. Op_RegI will get spilled with LoadI/StoreI, Op_RegP will get +// spilled with LoadP/StoreP. If the register supports both, use Op_RegI. +// FIXME: above comment seems wrong. Spill done through MachSpillCopyNode +// +// The encoding number is the actual bit-pattern placed into the opcodes. + + +// ---------------------------- +// Integer/Long Registers +// ---------------------------- + +// TODO: would be nice to keep track of high-word state: +// zeroRegI --> RegL +// signedRegI --> RegL +// junkRegI --> RegL +// how to tell C2 to treak RegI as RegL, or RegL as RegI? +reg_def R_R0 (SOC, SOC, Op_RegI, 0, R0->as_VMReg()); +reg_def R_R0x (SOC, SOC, Op_RegI, 255, R0->as_VMReg()->next()); +reg_def R_R1 (SOC, SOC, Op_RegI, 1, R1->as_VMReg()); +reg_def R_R1x (SOC, SOC, Op_RegI, 255, R1->as_VMReg()->next()); +reg_def R_R2 (SOC, SOC, Op_RegI, 2, R2->as_VMReg()); +reg_def R_R2x (SOC, SOC, Op_RegI, 255, R2->as_VMReg()->next()); +reg_def R_R3 (SOC, SOC, Op_RegI, 3, R3->as_VMReg()); +reg_def R_R3x (SOC, SOC, Op_RegI, 255, R3->as_VMReg()->next()); +reg_def R_R4 (SOC, SOC, Op_RegI, 4, R4->as_VMReg()); +reg_def R_R4x (SOC, SOC, Op_RegI, 255, R4->as_VMReg()->next()); +reg_def R_R5 (SOC, SOC, Op_RegI, 5, R5->as_VMReg()); +reg_def R_R5x (SOC, SOC, Op_RegI, 255, R5->as_VMReg()->next()); +reg_def R_R6 (SOC, SOC, Op_RegI, 6, R6->as_VMReg()); +reg_def R_R6x (SOC, SOC, Op_RegI, 255, R6->as_VMReg()->next()); +reg_def R_R7 (SOC, SOC, Op_RegI, 7, R7->as_VMReg()); +reg_def R_R7x (SOC, SOC, Op_RegI, 255, R7->as_VMReg()->next()); + +reg_def R_R8 (SOC, SOC, Op_RegI, 8, R8->as_VMReg()); +reg_def R_R8x (SOC, SOC, Op_RegI, 255, R8->as_VMReg()->next()); +reg_def R_R9 (SOC, SOC, Op_RegI, 9, R9->as_VMReg()); +reg_def R_R9x (SOC, SOC, Op_RegI, 255, R9->as_VMReg()->next()); +reg_def R_R10 (SOC, SOC, Op_RegI, 10, R10->as_VMReg()); +reg_def R_R10x(SOC, SOC, Op_RegI, 255, R10->as_VMReg()->next()); +reg_def R_R11 (SOC, SOC, Op_RegI, 11, R11->as_VMReg()); +reg_def R_R11x(SOC, SOC, Op_RegI, 255, R11->as_VMReg()->next()); +reg_def R_R12 (SOC, SOC, Op_RegI, 12, R12->as_VMReg()); +reg_def R_R12x(SOC, SOC, Op_RegI, 255, R12->as_VMReg()->next()); +reg_def R_R13 (SOC, SOC, Op_RegI, 13, R13->as_VMReg()); +reg_def R_R13x(SOC, SOC, Op_RegI, 255, R13->as_VMReg()->next()); +reg_def R_R14 (SOC, SOC, Op_RegI, 14, R14->as_VMReg()); +reg_def R_R14x(SOC, SOC, Op_RegI, 255, R14->as_VMReg()->next()); +reg_def R_R15 (SOC, SOC, Op_RegI, 15, R15->as_VMReg()); +reg_def R_R15x(SOC, SOC, Op_RegI, 255, R15->as_VMReg()->next()); + +reg_def R_R16 (SOC, SOC, Op_RegI, 16, R16->as_VMReg()); // IP0 +reg_def R_R16x(SOC, SOC, Op_RegI, 255, R16->as_VMReg()->next()); +reg_def R_R17 (SOC, SOC, Op_RegI, 17, R17->as_VMReg()); // IP1 +reg_def R_R17x(SOC, SOC, Op_RegI, 255, R17->as_VMReg()->next()); +reg_def R_R18 (SOC, SOC, Op_RegI, 18, R18->as_VMReg()); // Platform Register +reg_def R_R18x(SOC, SOC, Op_RegI, 255, R18->as_VMReg()->next()); + +reg_def R_R19 (SOC, SOE, Op_RegI, 19, R19->as_VMReg()); +reg_def R_R19x(SOC, SOE, Op_RegI, 255, R19->as_VMReg()->next()); +reg_def R_R20 (SOC, SOE, Op_RegI, 20, R20->as_VMReg()); +reg_def R_R20x(SOC, SOE, Op_RegI, 255, R20->as_VMReg()->next()); +reg_def R_R21 (SOC, SOE, Op_RegI, 21, R21->as_VMReg()); +reg_def R_R21x(SOC, SOE, Op_RegI, 255, R21->as_VMReg()->next()); +reg_def R_R22 (SOC, SOE, Op_RegI, 22, R22->as_VMReg()); +reg_def R_R22x(SOC, SOE, Op_RegI, 255, R22->as_VMReg()->next()); +reg_def R_R23 (SOC, SOE, Op_RegI, 23, R23->as_VMReg()); +reg_def R_R23x(SOC, SOE, Op_RegI, 255, R23->as_VMReg()->next()); +reg_def R_R24 (SOC, SOE, Op_RegI, 24, R24->as_VMReg()); +reg_def R_R24x(SOC, SOE, Op_RegI, 255, R24->as_VMReg()->next()); +reg_def R_R25 (SOC, SOE, Op_RegI, 25, R25->as_VMReg()); +reg_def R_R25x(SOC, SOE, Op_RegI, 255, R25->as_VMReg()->next()); +reg_def R_R26 (SOC, SOE, Op_RegI, 26, R26->as_VMReg()); +reg_def R_R26x(SOC, SOE, Op_RegI, 255, R26->as_VMReg()->next()); +reg_def R_R27 (SOC, SOE, Op_RegI, 27, R27->as_VMReg()); // Rheap_base +reg_def R_R27x(SOC, SOE, Op_RegI, 255, R27->as_VMReg()->next()); // Rheap_base +reg_def R_R28 ( NS, SOE, Op_RegI, 28, R28->as_VMReg()); // TLS +reg_def R_R28x( NS, SOE, Op_RegI, 255, R28->as_VMReg()->next()); // TLS + +reg_def R_R29 ( NS, SOE, Op_RegI, 29, R29->as_VMReg()); // FP +reg_def R_R29x( NS, SOE, Op_RegI, 255, R29->as_VMReg()->next()); // FP +reg_def R_R30 (SOC, SOC, Op_RegI, 30, R30->as_VMReg()); // LR +reg_def R_R30x(SOC, SOC, Op_RegI, 255, R30->as_VMReg()->next()); // LR + +reg_def R_ZR ( NS, NS, Op_RegI, 31, ZR->as_VMReg()); // ZR +reg_def R_ZRx( NS, NS, Op_RegI, 255, ZR->as_VMReg()->next()); // ZR + +// FIXME +//reg_def R_SP ( NS, NS, Op_RegP, 32, SP->as_VMReg()); +reg_def R_SP ( NS, NS, Op_RegI, 32, SP->as_VMReg()); +//reg_def R_SPx( NS, NS, Op_RegP, 255, SP->as_VMReg()->next()); +reg_def R_SPx( NS, NS, Op_RegI, 255, SP->as_VMReg()->next()); + +// ---------------------------- +// Float/Double/Vector Registers +// ---------------------------- + +reg_def R_V0(SOC, SOC, Op_RegF, 0, V0->as_VMReg()); +reg_def R_V1(SOC, SOC, Op_RegF, 1, V1->as_VMReg()); +reg_def R_V2(SOC, SOC, Op_RegF, 2, V2->as_VMReg()); +reg_def R_V3(SOC, SOC, Op_RegF, 3, V3->as_VMReg()); +reg_def R_V4(SOC, SOC, Op_RegF, 4, V4->as_VMReg()); +reg_def R_V5(SOC, SOC, Op_RegF, 5, V5->as_VMReg()); +reg_def R_V6(SOC, SOC, Op_RegF, 6, V6->as_VMReg()); +reg_def R_V7(SOC, SOC, Op_RegF, 7, V7->as_VMReg()); +reg_def R_V8(SOC, SOC, Op_RegF, 8, V8->as_VMReg()); +reg_def R_V9(SOC, SOC, Op_RegF, 9, V9->as_VMReg()); +reg_def R_V10(SOC, SOC, Op_RegF, 10, V10->as_VMReg()); +reg_def R_V11(SOC, SOC, Op_RegF, 11, V11->as_VMReg()); +reg_def R_V12(SOC, SOC, Op_RegF, 12, V12->as_VMReg()); +reg_def R_V13(SOC, SOC, Op_RegF, 13, V13->as_VMReg()); +reg_def R_V14(SOC, SOC, Op_RegF, 14, V14->as_VMReg()); +reg_def R_V15(SOC, SOC, Op_RegF, 15, V15->as_VMReg()); +reg_def R_V16(SOC, SOC, Op_RegF, 16, V16->as_VMReg()); +reg_def R_V17(SOC, SOC, Op_RegF, 17, V17->as_VMReg()); +reg_def R_V18(SOC, SOC, Op_RegF, 18, V18->as_VMReg()); +reg_def R_V19(SOC, SOC, Op_RegF, 19, V19->as_VMReg()); +reg_def R_V20(SOC, SOC, Op_RegF, 20, V20->as_VMReg()); +reg_def R_V21(SOC, SOC, Op_RegF, 21, V21->as_VMReg()); +reg_def R_V22(SOC, SOC, Op_RegF, 22, V22->as_VMReg()); +reg_def R_V23(SOC, SOC, Op_RegF, 23, V23->as_VMReg()); +reg_def R_V24(SOC, SOC, Op_RegF, 24, V24->as_VMReg()); +reg_def R_V25(SOC, SOC, Op_RegF, 25, V25->as_VMReg()); +reg_def R_V26(SOC, SOC, Op_RegF, 26, V26->as_VMReg()); +reg_def R_V27(SOC, SOC, Op_RegF, 27, V27->as_VMReg()); +reg_def R_V28(SOC, SOC, Op_RegF, 28, V28->as_VMReg()); +reg_def R_V29(SOC, SOC, Op_RegF, 29, V29->as_VMReg()); +reg_def R_V30(SOC, SOC, Op_RegF, 30, V30->as_VMReg()); +reg_def R_V31(SOC, SOC, Op_RegF, 31, V31->as_VMReg()); + +reg_def R_V0b(SOC, SOC, Op_RegF, 255, V0->as_VMReg()->next(1)); +reg_def R_V1b(SOC, SOC, Op_RegF, 255, V1->as_VMReg()->next(1)); +reg_def R_V2b(SOC, SOC, Op_RegF, 255, V2->as_VMReg()->next(1)); +reg_def R_V3b(SOC, SOC, Op_RegF, 3, V3->as_VMReg()->next(1)); +reg_def R_V4b(SOC, SOC, Op_RegF, 4, V4->as_VMReg()->next(1)); +reg_def R_V5b(SOC, SOC, Op_RegF, 5, V5->as_VMReg()->next(1)); +reg_def R_V6b(SOC, SOC, Op_RegF, 6, V6->as_VMReg()->next(1)); +reg_def R_V7b(SOC, SOC, Op_RegF, 7, V7->as_VMReg()->next(1)); +reg_def R_V8b(SOC, SOC, Op_RegF, 255, V8->as_VMReg()->next(1)); +reg_def R_V9b(SOC, SOC, Op_RegF, 9, V9->as_VMReg()->next(1)); +reg_def R_V10b(SOC, SOC, Op_RegF, 10, V10->as_VMReg()->next(1)); +reg_def R_V11b(SOC, SOC, Op_RegF, 11, V11->as_VMReg()->next(1)); +reg_def R_V12b(SOC, SOC, Op_RegF, 12, V12->as_VMReg()->next(1)); +reg_def R_V13b(SOC, SOC, Op_RegF, 13, V13->as_VMReg()->next(1)); +reg_def R_V14b(SOC, SOC, Op_RegF, 14, V14->as_VMReg()->next(1)); +reg_def R_V15b(SOC, SOC, Op_RegF, 15, V15->as_VMReg()->next(1)); +reg_def R_V16b(SOC, SOC, Op_RegF, 16, V16->as_VMReg()->next(1)); +reg_def R_V17b(SOC, SOC, Op_RegF, 17, V17->as_VMReg()->next(1)); +reg_def R_V18b(SOC, SOC, Op_RegF, 18, V18->as_VMReg()->next(1)); +reg_def R_V19b(SOC, SOC, Op_RegF, 19, V19->as_VMReg()->next(1)); +reg_def R_V20b(SOC, SOC, Op_RegF, 20, V20->as_VMReg()->next(1)); +reg_def R_V21b(SOC, SOC, Op_RegF, 21, V21->as_VMReg()->next(1)); +reg_def R_V22b(SOC, SOC, Op_RegF, 22, V22->as_VMReg()->next(1)); +reg_def R_V23b(SOC, SOC, Op_RegF, 23, V23->as_VMReg()->next(1)); +reg_def R_V24b(SOC, SOC, Op_RegF, 24, V24->as_VMReg()->next(1)); +reg_def R_V25b(SOC, SOC, Op_RegF, 25, V25->as_VMReg()->next(1)); +reg_def R_V26b(SOC, SOC, Op_RegF, 26, V26->as_VMReg()->next(1)); +reg_def R_V27b(SOC, SOC, Op_RegF, 27, V27->as_VMReg()->next(1)); +reg_def R_V28b(SOC, SOC, Op_RegF, 28, V28->as_VMReg()->next(1)); +reg_def R_V29b(SOC, SOC, Op_RegF, 29, V29->as_VMReg()->next(1)); +reg_def R_V30b(SOC, SOC, Op_RegD, 30, V30->as_VMReg()->next(1)); +reg_def R_V31b(SOC, SOC, Op_RegF, 31, V31->as_VMReg()->next(1)); + +reg_def R_V0c(SOC, SOC, Op_RegF, 0, V0->as_VMReg()->next(2)); +reg_def R_V1c(SOC, SOC, Op_RegF, 1, V1->as_VMReg()->next(2)); +reg_def R_V2c(SOC, SOC, Op_RegF, 2, V2->as_VMReg()->next(2)); +reg_def R_V3c(SOC, SOC, Op_RegF, 3, V3->as_VMReg()->next(2)); +reg_def R_V4c(SOC, SOC, Op_RegF, 4, V4->as_VMReg()->next(2)); +reg_def R_V5c(SOC, SOC, Op_RegF, 5, V5->as_VMReg()->next(2)); +reg_def R_V6c(SOC, SOC, Op_RegF, 6, V6->as_VMReg()->next(2)); +reg_def R_V7c(SOC, SOC, Op_RegF, 7, V7->as_VMReg()->next(2)); +reg_def R_V8c(SOC, SOC, Op_RegF, 8, V8->as_VMReg()->next(2)); +reg_def R_V9c(SOC, SOC, Op_RegF, 9, V9->as_VMReg()->next(2)); +reg_def R_V10c(SOC, SOC, Op_RegF, 10, V10->as_VMReg()->next(2)); +reg_def R_V11c(SOC, SOC, Op_RegF, 11, V11->as_VMReg()->next(2)); +reg_def R_V12c(SOC, SOC, Op_RegF, 12, V12->as_VMReg()->next(2)); +reg_def R_V13c(SOC, SOC, Op_RegF, 13, V13->as_VMReg()->next(2)); +reg_def R_V14c(SOC, SOC, Op_RegF, 14, V14->as_VMReg()->next(2)); +reg_def R_V15c(SOC, SOC, Op_RegF, 15, V15->as_VMReg()->next(2)); +reg_def R_V16c(SOC, SOC, Op_RegF, 16, V16->as_VMReg()->next(2)); +reg_def R_V17c(SOC, SOC, Op_RegF, 17, V17->as_VMReg()->next(2)); +reg_def R_V18c(SOC, SOC, Op_RegF, 18, V18->as_VMReg()->next(2)); +reg_def R_V19c(SOC, SOC, Op_RegF, 19, V19->as_VMReg()->next(2)); +reg_def R_V20c(SOC, SOC, Op_RegF, 20, V20->as_VMReg()->next(2)); +reg_def R_V21c(SOC, SOC, Op_RegF, 21, V21->as_VMReg()->next(2)); +reg_def R_V22c(SOC, SOC, Op_RegF, 22, V22->as_VMReg()->next(2)); +reg_def R_V23c(SOC, SOC, Op_RegF, 23, V23->as_VMReg()->next(2)); +reg_def R_V24c(SOC, SOC, Op_RegF, 24, V24->as_VMReg()->next(2)); +reg_def R_V25c(SOC, SOC, Op_RegF, 25, V25->as_VMReg()->next(2)); +reg_def R_V26c(SOC, SOC, Op_RegF, 26, V26->as_VMReg()->next(2)); +reg_def R_V27c(SOC, SOC, Op_RegF, 27, V27->as_VMReg()->next(2)); +reg_def R_V28c(SOC, SOC, Op_RegF, 28, V28->as_VMReg()->next(2)); +reg_def R_V29c(SOC, SOC, Op_RegF, 29, V29->as_VMReg()->next(2)); +reg_def R_V30c(SOC, SOC, Op_RegF, 30, V30->as_VMReg()->next(2)); +reg_def R_V31c(SOC, SOC, Op_RegF, 31, V31->as_VMReg()->next(2)); + +reg_def R_V0d(SOC, SOC, Op_RegF, 0, V0->as_VMReg()->next(3)); +reg_def R_V1d(SOC, SOC, Op_RegF, 1, V1->as_VMReg()->next(3)); +reg_def R_V2d(SOC, SOC, Op_RegF, 2, V2->as_VMReg()->next(3)); +reg_def R_V3d(SOC, SOC, Op_RegF, 3, V3->as_VMReg()->next(3)); +reg_def R_V4d(SOC, SOC, Op_RegF, 4, V4->as_VMReg()->next(3)); +reg_def R_V5d(SOC, SOC, Op_RegF, 5, V5->as_VMReg()->next(3)); +reg_def R_V6d(SOC, SOC, Op_RegF, 6, V6->as_VMReg()->next(3)); +reg_def R_V7d(SOC, SOC, Op_RegF, 7, V7->as_VMReg()->next(3)); +reg_def R_V8d(SOC, SOC, Op_RegF, 8, V8->as_VMReg()->next(3)); +reg_def R_V9d(SOC, SOC, Op_RegF, 9, V9->as_VMReg()->next(3)); +reg_def R_V10d(SOC, SOC, Op_RegF, 10, V10->as_VMReg()->next(3)); +reg_def R_V11d(SOC, SOC, Op_RegF, 11, V11->as_VMReg()->next(3)); +reg_def R_V12d(SOC, SOC, Op_RegF, 12, V12->as_VMReg()->next(3)); +reg_def R_V13d(SOC, SOC, Op_RegF, 13, V13->as_VMReg()->next(3)); +reg_def R_V14d(SOC, SOC, Op_RegF, 14, V14->as_VMReg()->next(3)); +reg_def R_V15d(SOC, SOC, Op_RegF, 15, V15->as_VMReg()->next(3)); +reg_def R_V16d(SOC, SOC, Op_RegF, 16, V16->as_VMReg()->next(3)); +reg_def R_V17d(SOC, SOC, Op_RegF, 17, V17->as_VMReg()->next(3)); +reg_def R_V18d(SOC, SOC, Op_RegF, 18, V18->as_VMReg()->next(3)); +reg_def R_V19d(SOC, SOC, Op_RegF, 19, V19->as_VMReg()->next(3)); +reg_def R_V20d(SOC, SOC, Op_RegF, 20, V20->as_VMReg()->next(3)); +reg_def R_V21d(SOC, SOC, Op_RegF, 21, V21->as_VMReg()->next(3)); +reg_def R_V22d(SOC, SOC, Op_RegF, 22, V22->as_VMReg()->next(3)); +reg_def R_V23d(SOC, SOC, Op_RegF, 23, V23->as_VMReg()->next(3)); +reg_def R_V24d(SOC, SOC, Op_RegF, 24, V24->as_VMReg()->next(3)); +reg_def R_V25d(SOC, SOC, Op_RegF, 25, V25->as_VMReg()->next(3)); +reg_def R_V26d(SOC, SOC, Op_RegF, 26, V26->as_VMReg()->next(3)); +reg_def R_V27d(SOC, SOC, Op_RegF, 27, V27->as_VMReg()->next(3)); +reg_def R_V28d(SOC, SOC, Op_RegF, 28, V28->as_VMReg()->next(3)); +reg_def R_V29d(SOC, SOC, Op_RegF, 29, V29->as_VMReg()->next(3)); +reg_def R_V30d(SOC, SOC, Op_RegF, 30, V30->as_VMReg()->next(3)); +reg_def R_V31d(SOC, SOC, Op_RegF, 31, V31->as_VMReg()->next(3)); + +// ---------------------------- +// Special Registers +// Condition Codes Flag Registers +reg_def APSR (SOC, SOC, Op_RegFlags, 255, VMRegImpl::Bad()); +reg_def FPSCR(SOC, SOC, Op_RegFlags, 255, VMRegImpl::Bad()); + +// ---------------------------- +// Specify the enum values for the registers. These enums are only used by the +// OptoReg "class". We can convert these enum values at will to VMReg when needed +// for visibility to the rest of the vm. The order of this enum influences the +// register allocator so having the freedom to set this order and not be stuck +// with the order that is natural for the rest of the vm is worth it. + +// Quad vector must be aligned here, so list them first. +alloc_class fprs( + R_V8, R_V8b, R_V8c, R_V8d, R_V9, R_V9b, R_V9c, R_V9d, + R_V10, R_V10b, R_V10c, R_V10d, R_V11, R_V11b, R_V11c, R_V11d, + R_V12, R_V12b, R_V12c, R_V12d, R_V13, R_V13b, R_V13c, R_V13d, + R_V14, R_V14b, R_V14c, R_V14d, R_V15, R_V15b, R_V15c, R_V15d, + R_V16, R_V16b, R_V16c, R_V16d, R_V17, R_V17b, R_V17c, R_V17d, + R_V18, R_V18b, R_V18c, R_V18d, R_V19, R_V19b, R_V19c, R_V19d, + R_V20, R_V20b, R_V20c, R_V20d, R_V21, R_V21b, R_V21c, R_V21d, + R_V22, R_V22b, R_V22c, R_V22d, R_V23, R_V23b, R_V23c, R_V23d, + R_V24, R_V24b, R_V24c, R_V24d, R_V25, R_V25b, R_V25c, R_V25d, + R_V26, R_V26b, R_V26c, R_V26d, R_V27, R_V27b, R_V27c, R_V27d, + R_V28, R_V28b, R_V28c, R_V28d, R_V29, R_V29b, R_V29c, R_V29d, + R_V30, R_V30b, R_V30c, R_V30d, R_V31, R_V31b, R_V31c, R_V31d, + R_V0, R_V0b, R_V0c, R_V0d, R_V1, R_V1b, R_V1c, R_V1d, + R_V2, R_V2b, R_V2c, R_V2d, R_V3, R_V3b, R_V3c, R_V3d, + R_V4, R_V4b, R_V4c, R_V4d, R_V5, R_V5b, R_V5c, R_V5d, + R_V6, R_V6b, R_V6c, R_V6d, R_V7, R_V7b, R_V7c, R_V7d +); + +// Need double-register alignment here. +// We are already quad-register aligned because of vectors above. +alloc_class gprs( + R_R0, R_R0x, R_R1, R_R1x, R_R2, R_R2x, R_R3, R_R3x, + R_R4, R_R4x, R_R5, R_R5x, R_R6, R_R6x, R_R7, R_R7x, + R_R8, R_R8x, R_R9, R_R9x, R_R10, R_R10x, R_R11, R_R11x, + R_R12, R_R12x, R_R13, R_R13x, R_R14, R_R14x, R_R15, R_R15x, + R_R16, R_R16x, R_R17, R_R17x, R_R18, R_R18x, R_R19, R_R19x, + R_R20, R_R20x, R_R21, R_R21x, R_R22, R_R22x, R_R23, R_R23x, + R_R24, R_R24x, R_R25, R_R25x, R_R26, R_R26x, R_R27, R_R27x, + R_R28, R_R28x, R_R29, R_R29x, R_R30, R_R30x +); +// Continuing with double-reigister alignment... +alloc_class chunk2(APSR, FPSCR); +alloc_class chunk3(R_SP, R_SPx); +alloc_class chunk4(R_ZR, R_ZRx); + +//----------Architecture Description Register Classes-------------------------- +// Several register classes are automatically defined based upon information in +// this architecture description. +// 1) reg_class inline_cache_reg ( as defined in frame section ) +// 2) reg_class interpreter_method_oop_reg ( as defined in frame section ) +// 3) reg_class stack_slots( /* one chunk of stack-based "registers" */ ) +// + +// ---------------------------- +// Integer Register Classes +// ---------------------------- +reg_class int_reg_all(R_R0, R_R1, R_R2, R_R3, R_R4, R_R5, R_R6, R_R7, + R_R8, R_R9, R_R10, R_R11, R_R12, R_R13, R_R14, R_R15, + R_R16, R_R17, R_R18, R_R19, R_R20, R_R21, R_R22, R_R23, + R_R24, R_R25, R_R26, R_R27, R_R28, R_R29, R_R30 +); + +// Exclusions from i_reg: +// SP (R31) +// Rthread/R28: reserved by HotSpot to the TLS register (invariant within Java) +reg_class int_reg %{ + return _INT_REG_mask; +%} +reg_class ptr_reg %{ + return _PTR_REG_mask; +%} +reg_class vectorx_reg %{ + return _VECTORX_REG_mask; +%} + +reg_class R0_regI(R_R0); +reg_class R1_regI(R_R1); +reg_class R2_regI(R_R2); +reg_class R3_regI(R_R3); +//reg_class R12_regI(R_R12); + +// ---------------------------- +// Pointer Register Classes +// ---------------------------- + +// Special class for storeP instructions, which can store SP or RPC to TLS. +// It is also used for memory addressing, allowing direct TLS addressing. + +reg_class sp_ptr_reg %{ + return _SP_PTR_REG_mask; +%} + +reg_class store_reg %{ + return _STR_REG_mask; +%} + +reg_class store_ptr_reg %{ + return _STR_PTR_REG_mask; +%} + +reg_class spillP_reg %{ + return _SPILLP_REG_mask; +%} + +// Other special pointer regs +reg_class R0_regP(R_R0, R_R0x); +reg_class R1_regP(R_R1, R_R1x); +reg_class R2_regP(R_R2, R_R2x); +reg_class Rexception_regP(R_R19, R_R19x); +reg_class Ricklass_regP(R_R8, R_R8x); +reg_class Rmethod_regP(R_R27, R_R27x); + +reg_class Rthread_regP(R_R28, R_R28x); +reg_class IP_regP(R_R16, R_R16x); +#define RtempRegP IPRegP +reg_class LR_regP(R_R30, R_R30x); + +reg_class SP_regP(R_SP, R_SPx); +reg_class FP_regP(R_R29, R_R29x); + +reg_class ZR_regP(R_ZR, R_ZRx); +reg_class ZR_regI(R_ZR); + +// ---------------------------- +// Long Register Classes +// ---------------------------- +reg_class long_reg %{ return _PTR_REG_mask; %} +// for ldrexd, strexd: first reg of pair must be even +reg_class long_reg_align %{ return LONG_REG_mask(); %} + +reg_class R0_regL(R_R0,R_R0x); // arg 1 or return value + +// ---------------------------- +// Special Class for Condition Code Flags Register +reg_class int_flags(APSR); +reg_class float_flags(FPSCR); + + +// ---------------------------- +// Float Point Register Classes +// ---------------------------- +reg_class sflt_reg_0( + R_V0, R_V1, R_V2, R_V3, R_V4, R_V5, R_V6, R_V7, + R_V8, R_V9, R_V10, R_V11, R_V12, R_V13, R_V14, R_V15, + R_V16, R_V17, R_V18, R_V19, R_V20, R_V21, R_V22, R_V23, + R_V24, R_V25, R_V26, R_V27, R_V28, R_V29, R_V30, R_V31); + +reg_class sflt_reg %{ + return _SFLT_REG_mask; +%} + +reg_class dflt_low_reg %{ + return _DFLT_REG_mask; +%} + +reg_class actual_dflt_reg %{ + return _DFLT_REG_mask; +%} + +reg_class vectorx_reg_0( + R_V0, R_V1, R_V2, R_V3, R_V4, R_V5, R_V6, R_V7, + R_V8, R_V9, R_V10, R_V11, R_V12, R_V13, R_V14, R_V15, + R_V16, R_V17, R_V18, R_V19, R_V20, R_V21, R_V22, R_V23, + R_V24, R_V25, R_V26, R_V27, R_V28, R_V29, R_V30, /*R_V31,*/ + R_V0b, R_V1b, R_V2b, R_V3b, R_V4b, R_V5b, R_V6b, R_V7b, + R_V8b, R_V9b, R_V10b, R_V11b, R_V12b, R_V13b, R_V14b, R_V15b, + R_V16b, R_V17b, R_V18b, R_V19b, R_V20b, R_V21b, R_V22b, R_V23b, + R_V24b, R_V25b, R_V26b, R_V27b, R_V28b, R_V29b, R_V30b, /*R_V31b,*/ + R_V0c, R_V1c, R_V2c, R_V3c, R_V4c, R_V5c, R_V6c, R_V7c, + R_V8c, R_V9c, R_V10c, R_V11c, R_V12c, R_V13c, R_V14c, R_V15c, + R_V16c, R_V17c, R_V18c, R_V19c, R_V20c, R_V21c, R_V22c, R_V23c, + R_V24c, R_V25c, R_V26c, R_V27c, R_V28c, R_V29c, R_V30c, /*R_V31c,*/ + R_V0d, R_V1d, R_V2d, R_V3d, R_V4d, R_V5d, R_V6d, R_V7d, + R_V8d, R_V9d, R_V10d, R_V11d, R_V12d, R_V13d, R_V14d, R_V15d, + R_V16d, R_V17d, R_V18d, R_V19d, R_V20d, R_V21d, R_V22d, R_V23d, + R_V24d, R_V25d, R_V26d, R_V27d, R_V28d, R_V29d, R_V30d, /*R_V31d*/); + +reg_class Rmemcopy_reg %{ + return _RMEMCOPY_REG_mask; +%} + +%} + +source_hpp %{ + +const MachRegisterNumbers R_mem_copy_lo_num = R_V31_num; +const MachRegisterNumbers R_mem_copy_hi_num = R_V31b_num; +const FloatRegister Rmemcopy = V31; + +const MachRegisterNumbers R_hf_ret_lo_num = R_V0_num; +const MachRegisterNumbers R_hf_ret_hi_num = R_V0b_num; +const FloatRegister Rhfret = V0; + +extern OptoReg::Name R_Ricklass_num; +extern OptoReg::Name R_Rmethod_num; +extern OptoReg::Name R_tls_num; +extern OptoReg::Name R_Rheap_base_num; + +extern RegMask _INT_REG_mask; +extern RegMask _PTR_REG_mask; +extern RegMask _SFLT_REG_mask; +extern RegMask _DFLT_REG_mask; +extern RegMask _VECTORX_REG_mask; +extern RegMask _RMEMCOPY_REG_mask; +extern RegMask _SP_PTR_REG_mask; +extern RegMask _SPILLP_REG_mask; +extern RegMask _STR_REG_mask; +extern RegMask _STR_PTR_REG_mask; + +#define LDR_DOUBLE "LDR_D" +#define LDR_FLOAT "LDR_S" +#define STR_DOUBLE "STR_D" +#define STR_FLOAT "STR_S" +#define STR_64 "STR" +#define LDR_64 "LDR" +#define STR_32 "STR_W" +#define LDR_32 "LDR_W" +#define MOV_DOUBLE "FMOV_D" +#define MOV_FLOAT "FMOV_S" +#define FMSR "FMOV_SW" +#define FMRS "FMOV_WS" +#define LDREX "ldxr " +#define STREX "stxr " + +#define str_64 str +#define ldr_64 ldr +#define ldr_32 ldr_w +#define ldrex ldxr +#define strex stxr + +#define fmsr fmov_sw +#define fmrs fmov_ws +#define fconsts fmov_s +#define fconstd fmov_d + +static inline bool is_uimm12(jlong imm, int shift) { + return Assembler::is_unsigned_imm_in_range(imm, 12, shift); +} + +static inline bool is_memoryD(int offset) { + int scale = 3; // LogBytesPerDouble + return is_uimm12(offset, scale); +} + +static inline bool is_memoryfp(int offset) { + int scale = LogBytesPerInt; // include 32-bit word accesses + return is_uimm12(offset, scale); +} + +static inline bool is_memoryI(int offset) { + int scale = LogBytesPerInt; + return is_uimm12(offset, scale); +} + +static inline bool is_memoryP(int offset) { + int scale = LogBytesPerWord; + return is_uimm12(offset, scale); +} + +static inline bool is_memoryHD(int offset) { + int scale = LogBytesPerInt; // include 32-bit word accesses + return is_uimm12(offset, scale); +} + +uintx limmL_low(uintx imm, int n); + +static inline bool Xis_aimm(int imm) { + return Assembler::ArithmeticImmediate(imm).is_encoded(); +} + +static inline bool is_aimm(intptr_t imm) { + return Assembler::ArithmeticImmediate(imm).is_encoded(); +} + +static inline bool is_limmL(uintptr_t imm) { + return Assembler::LogicalImmediate(imm).is_encoded(); +} + +static inline bool is_limmL_low(intptr_t imm, int n) { + return is_limmL(limmL_low(imm, n)); +} + +static inline bool is_limmI(jint imm) { + return Assembler::LogicalImmediate(imm, true).is_encoded(); +} + +static inline uintx limmI_low(jint imm, int n) { + return limmL_low(imm, n); +} + +static inline bool is_limmI_low(jint imm, int n) { + return is_limmL_low(imm, n); +} + +%} + +source %{ + +// Given a register encoding, produce a Integer Register object +static Register reg_to_register_object(int register_encoding) { + assert(R0->encoding() == R_R0_enc && R30->encoding() == R_R30_enc, "right coding"); + assert(Rthread->encoding() == R_R28_enc, "right coding"); + assert(SP->encoding() == R_SP_enc, "right coding"); + return as_Register(register_encoding); +} + +// Given a register encoding, produce a single-precision Float Register object +static FloatRegister reg_to_FloatRegister_object(int register_encoding) { + assert(V0->encoding() == R_V0_enc && V31->encoding() == R_V31_enc, "right coding"); + return as_FloatRegister(register_encoding); +} + +RegMask _INT_REG_mask; +RegMask _PTR_REG_mask; +RegMask _SFLT_REG_mask; +RegMask _DFLT_REG_mask; +RegMask _VECTORX_REG_mask; +RegMask _RMEMCOPY_REG_mask; +RegMask _SP_PTR_REG_mask; +RegMask _SPILLP_REG_mask; +RegMask _STR_REG_mask; +RegMask _STR_PTR_REG_mask; + +OptoReg::Name R_Ricklass_num = -1; +OptoReg::Name R_Rmethod_num = -1; +OptoReg::Name R_tls_num = -1; +OptoReg::Name R_Rtemp_num = -1; +OptoReg::Name R_Rheap_base_num = -1; + +static int mov_oop_size = -1; + +#ifdef ASSERT +static bool same_mask(const RegMask &a, const RegMask &b) { + RegMask a_sub_b = a; a_sub_b.SUBTRACT(b); + RegMask b_sub_a = b; b_sub_a.SUBTRACT(a); + return a_sub_b.Size() == 0 && b_sub_a.Size() == 0; +} +#endif + +void Compile::pd_compiler2_init() { + + R_Ricklass_num = OptoReg::as_OptoReg(Ricklass->as_VMReg()); + R_Rmethod_num = OptoReg::as_OptoReg(Rmethod->as_VMReg()); + R_tls_num = OptoReg::as_OptoReg(Rthread->as_VMReg()); + R_Rtemp_num = OptoReg::as_OptoReg(Rtemp->as_VMReg()); + R_Rheap_base_num = OptoReg::as_OptoReg(Rheap_base->as_VMReg()); + + _INT_REG_mask = _INT_REG_ALL_mask; + _INT_REG_mask.Remove(R_tls_num); + _INT_REG_mask.Remove(R_SP_num); + if (UseCompressedOops) { + _INT_REG_mask.Remove(R_Rheap_base_num); + } + // Remove Rtemp because safepoint poll can trash it + // (see SharedRuntime::generate_handler_blob) + _INT_REG_mask.Remove(R_Rtemp_num); + + _PTR_REG_mask = _INT_REG_mask; + _PTR_REG_mask.smear_to_sets(2); + + // STR_REG = INT_REG+ZR + // SPILLP_REG = INT_REG+SP + // SP_PTR_REG = INT_REG+SP+TLS + _STR_REG_mask = _INT_REG_mask; + _SP_PTR_REG_mask = _STR_REG_mask; + _STR_REG_mask.Insert(R_ZR_num); + _SP_PTR_REG_mask.Insert(R_SP_num); + _SPILLP_REG_mask = _SP_PTR_REG_mask; + _SP_PTR_REG_mask.Insert(R_tls_num); + _STR_PTR_REG_mask = _STR_REG_mask; + _STR_PTR_REG_mask.smear_to_sets(2); + _SP_PTR_REG_mask.smear_to_sets(2); + _SPILLP_REG_mask.smear_to_sets(2); + + _RMEMCOPY_REG_mask = RegMask(R_mem_copy_lo_num); +assert(OptoReg::as_OptoReg(Rmemcopy->as_VMReg()) == R_mem_copy_lo_num, "!"); + + _SFLT_REG_mask = _SFLT_REG_0_mask; + _SFLT_REG_mask.SUBTRACT(_RMEMCOPY_REG_mask); + _DFLT_REG_mask = _SFLT_REG_mask; + _DFLT_REG_mask.smear_to_sets(2); + _VECTORX_REG_mask = _SFLT_REG_mask; + _VECTORX_REG_mask.smear_to_sets(4); + assert(same_mask(_VECTORX_REG_mask, _VECTORX_REG_0_mask), "!"); + +#ifdef ASSERT + RegMask r((RegMask *)&SFLT_REG_mask()); + r.smear_to_sets(2); + assert(same_mask(r, _DFLT_REG_mask), "!"); +#endif + + if (VM_Version::prefer_moves_over_load_literal()) { + mov_oop_size = 4; + } else { + mov_oop_size = 1; + } + + assert(Matcher::interpreter_method_oop_reg_encode() == Rmethod->encoding(), "should be"); +} + +uintx limmL_low(uintx imm, int n) { + // 1: try as is + if (is_limmL(imm)) { + return imm; + } + // 2: try low bits + all 0's + uintx imm0 = imm & right_n_bits(n); + if (is_limmL(imm0)) { + return imm0; + } + // 3: try low bits + all 1's + uintx imm1 = imm0 | left_n_bits(BitsPerWord - n); + if (is_limmL(imm1)) { + return imm1; + } +#if 0 + // 4: try low bits replicated + int field = 1 << log2_intptr(n + n - 1); + assert(field >= n, "!"); + assert(field / n == 1, "!"); + intptr_t immr = immx; + while (field < BitsPerWord) { + intrptr_t bits = immr & right_n_bits(field); + immr = bits | (bits << field); + field = field << 1; + } + // replicate at power-of-2 boundary + if (is_limmL(immr)) { + return immr; + } +#endif + return imm; +} + +// Convert the raw encoding form into the form expected by the +// constructor for Address. +Address Address::make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc) { + RelocationHolder rspec; + if (disp_reloc != relocInfo::none) { + rspec = Relocation::spec_simple(disp_reloc); + } + + Register rbase = (base == 0xff) ? SP : as_Register(base); + if (index != 0xff) { + Register rindex = as_Register(index); + if (disp == 0x7fffffff) { // special value to indicate sign-extend + Address madr(rbase, rindex, ex_sxtw, scale); + madr._rspec = rspec; + return madr; + } else { + assert(disp == 0, "unsupported"); + Address madr(rbase, rindex, ex_lsl, scale); + madr._rspec = rspec; + return madr; + } + } else { + assert(scale == 0, "not supported"); + Address madr(rbase, disp); + madr._rspec = rspec; + return madr; + } +} + +// Location of compiled Java return values. Same as C +OptoRegPair c2::return_value(int ideal_reg) { + assert( ideal_reg >= Op_RegI && ideal_reg <= Op_RegL, "only return normal values" ); + static int lo[Op_RegL+1] = { 0, 0, OptoReg::Bad, R_R0_num, R_R0_num, R_hf_ret_lo_num, R_hf_ret_lo_num, R_R0_num }; + static int hi[Op_RegL+1] = { 0, 0, OptoReg::Bad, OptoReg::Bad, R_R0x_num, OptoReg::Bad, R_hf_ret_hi_num, R_R0x_num }; + return OptoRegPair( hi[ideal_reg], lo[ideal_reg]); +} + +// !!!!! Special hack to get all type of calls to specify the byte offset +// from the start of the call to the point where the return address +// will point. + +int MachCallStaticJavaNode::ret_addr_offset() { + bool far = (_method == NULL) ? maybe_far_call(this) : !cache_reachable(); + bool patchable = _method != NULL; + int call_size = MacroAssembler::call_size(entry_point(), far, patchable); + return (call_size + (_method_handle_invoke ? 1 : 0)) * NativeInstruction::instruction_size; +} + +int MachCallDynamicJavaNode::ret_addr_offset() { + bool far = !cache_reachable(); + int call_size = MacroAssembler::call_size(entry_point(), far, true); + return (mov_oop_size + call_size) * NativeInstruction::instruction_size; +} + +int MachCallRuntimeNode::ret_addr_offset() { + int call_size = 0; + // TODO: check if Leaf nodes also need this + if (!is_MachCallLeaf()) { + // adr $temp, ret_addr + // str $temp, [SP + last_java_pc] + call_size += 2; + } + // bl or mov_slow; blr + bool far = maybe_far_call(this); + call_size += MacroAssembler::call_size(entry_point(), far, false); + return call_size * NativeInstruction::instruction_size; +} + +%} + +// The intptr_t operand types, defined by textual substitution. +// (Cf. opto/type.hpp. This lets us avoid many, many other ifdefs.) +#define immX immL +#define iRegX iRegL +#define aimmX aimmL +#define limmX limmL +#define immX9 immL9 +#define LShiftX LShiftL +#define shimmX immU6 + +#define store_RegLd store_RegL + +//----------ATTRIBUTES--------------------------------------------------------- +//----------Operand Attributes------------------------------------------------- +op_attrib op_cost(1); // Required cost attribute + +//----------OPERANDS----------------------------------------------------------- +// Operand definitions must precede instruction definitions for correct parsing +// in the ADLC because operands constitute user defined types which are used in +// instruction definitions. + +//----------Simple Operands---------------------------------------------------- +// Immediate Operands + +// Integer Immediate: 9-bit (including sign bit), so same as immI8? +// FIXME: simm9 allows -256, but immI8 doesn't... +operand simm9() %{ + predicate(Assembler::is_imm_in_range(n->get_int(), 9, 0)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + + +operand uimm12() %{ + predicate(Assembler::is_unsigned_imm_in_range(n->get_int(), 12, 0)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand aimmP() %{ + predicate(n->get_ptr() == 0 || (is_aimm(n->get_ptr()) && ((ConPNode*)n)->type()->reloc() == relocInfo::none)); + match(ConP); + + op_cost(0); + // formats are generated automatically for constants and base registers + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: 12-bit - for addressing mode +operand immL12() %{ + predicate((-4096 < n->get_long()) && (n->get_long() < 4096)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Long Immediate: 9-bit - for addressing mode +operand immL9() %{ + predicate((-256 <= n->get_long()) && (n->get_long() < 256)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immIMov() %{ + predicate(n->get_int() >> 16 == 0); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immLMov() %{ + predicate(n->get_long() >> 16 == 0); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immUL12() %{ + predicate(is_uimm12(n->get_long(), 0)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immUL12x2() %{ + predicate(is_uimm12(n->get_long(), 1)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immUL12x4() %{ + predicate(is_uimm12(n->get_long(), 2)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immUL12x8() %{ + predicate(is_uimm12(n->get_long(), 3)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +operand immUL12x16() %{ + predicate(is_uimm12(n->get_long(), 4)); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Used for long shift +operand immU6() %{ + predicate(0 <= n->get_int() && (n->get_int() <= 63)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Used for register extended shift +operand immI_0_4() %{ + predicate(0 <= n->get_int() && (n->get_int() <= 4)); + match(ConI); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + +// Compressed Pointer Register +operand iRegN() %{ + constraint(ALLOC_IN_RC(int_reg)); + match(RegN); + match(ZRRegN); + + format %{ %} + interface(REG_INTER); +%} + +operand SPRegP() %{ + constraint(ALLOC_IN_RC(SP_regP)); + match(RegP); + + format %{ %} + interface(REG_INTER); +%} + +operand ZRRegP() %{ + constraint(ALLOC_IN_RC(ZR_regP)); + match(RegP); + + format %{ %} + interface(REG_INTER); +%} + +operand ZRRegL() %{ + constraint(ALLOC_IN_RC(ZR_regP)); + match(RegL); + + format %{ %} + interface(REG_INTER); +%} + +operand ZRRegI() %{ + constraint(ALLOC_IN_RC(ZR_regI)); + match(RegI); + + format %{ %} + interface(REG_INTER); +%} + +operand ZRRegN() %{ + constraint(ALLOC_IN_RC(ZR_regI)); + match(RegN); + + format %{ %} + interface(REG_INTER); +%} diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.cpp b/hotspot/src/cpu/arm/vm/assembler_arm.cpp new file mode 100644 index 00000000000..e1130203ccc --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "ci/ciEnv.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateInterpreterGenerator.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jvm_misc.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/hashtable.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" +#endif // INCLUDE_ALL_GCS + +int AbstractAssembler::code_fill_byte() { + return 0xff; // illegal instruction 0xffffffff +} + +#ifdef ASSERT +bool AbstractAssembler::pd_check_instruction_mark() { return false; } +#endif diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.hpp b/hotspot/src/cpu/arm/vm/assembler_arm.hpp new file mode 100644 index 00000000000..ca1708e55cd --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm.hpp @@ -0,0 +1,404 @@ +/* + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_ASSEMBLER_ARM_HPP +#define CPU_ARM_VM_ASSEMBLER_ARM_HPP + +#include "utilities/macros.hpp" + +enum AsmCondition { + eq, ne, cs, cc, mi, pl, vs, vc, + hi, ls, ge, lt, gt, le, al, nv, + number_of_conditions, + // alternative names + hs = cs, + lo = cc +}; + +enum AsmShift { + lsl, lsr, asr, ror +}; + +#ifdef AARCH64 +enum AsmExtendOp { + ex_uxtb, ex_uxth, ex_uxtw, ex_uxtx, + ex_sxtb, ex_sxth, ex_sxtw, ex_sxtx, + + ex_lsl = ex_uxtx +}; +#endif + +enum AsmOffset { +#ifdef AARCH64 + basic_offset = 0b00, + pre_indexed = 0b11, + post_indexed = 0b01 +#else + basic_offset = 1 << 24, + pre_indexed = 1 << 24 | 1 << 21, + post_indexed = 0 +#endif +}; + + +#ifndef AARCH64 +enum AsmWriteback { + no_writeback, + writeback +}; + +enum AsmOffsetOp { + sub_offset = 0, + add_offset = 1 +}; +#endif + + +// ARM Addressing Modes 2 and 3 - Load and store +class Address VALUE_OBJ_CLASS_SPEC { + private: + Register _base; + Register _index; + int _disp; + AsmOffset _mode; + RelocationHolder _rspec; + int _shift_imm; +#ifdef AARCH64 + AsmExtendOp _extend; +#else + AsmShift _shift; + AsmOffsetOp _offset_op; + + static inline int abs(int x) { return x < 0 ? -x : x; } + static inline int up (int x) { return x < 0 ? 0 : 1; } +#endif + +#ifdef AARCH64 + static const AsmExtendOp LSL = ex_lsl; +#else + static const AsmShift LSL = lsl; +#endif + + public: + Address() : _base(noreg) {} + + Address(Register rn, int offset = 0, AsmOffset mode = basic_offset) { + _base = rn; + _index = noreg; + _disp = offset; + _mode = mode; + _shift_imm = 0; +#ifdef AARCH64 + _extend = ex_lsl; +#else + _shift = lsl; + _offset_op = add_offset; +#endif + } + +#ifdef ASSERT + Address(Register rn, ByteSize offset, AsmOffset mode = basic_offset) { + _base = rn; + _index = noreg; + _disp = in_bytes(offset); + _mode = mode; + _shift_imm = 0; +#ifdef AARCH64 + _extend = ex_lsl; +#else + _shift = lsl; + _offset_op = add_offset; +#endif + } +#endif + +#ifdef AARCH64 + Address(Register rn, Register rm, AsmExtendOp extend = ex_lsl, int shift_imm = 0) { + assert ((extend == ex_uxtw) || (extend == ex_lsl) || (extend == ex_sxtw) || (extend == ex_sxtx), "invalid extend for address mode"); + assert ((0 <= shift_imm) && (shift_imm <= 4), "shift amount is out of range"); + _base = rn; + _index = rm; + _disp = 0; + _mode = basic_offset; + _extend = extend; + _shift_imm = shift_imm; + } +#else + Address(Register rn, Register rm, AsmShift shift = lsl, + int shift_imm = 0, AsmOffset mode = basic_offset, + AsmOffsetOp offset_op = add_offset) { + _base = rn; + _index = rm; + _disp = 0; + _shift = shift; + _shift_imm = shift_imm; + _mode = mode; + _offset_op = offset_op; + } + + Address(Register rn, RegisterOrConstant offset, AsmShift shift = lsl, + int shift_imm = 0) { + _base = rn; + if (offset.is_constant()) { + _index = noreg; + { + int off = (int) offset.as_constant(); + if (shift_imm != 0) { + assert(shift == lsl,"shift not yet encoded"); + off = off << shift_imm; + } + _disp = off; + } + _shift = lsl; + _shift_imm = 0; + } else { + _index = offset.as_register(); + _disp = 0; + _shift = shift; + _shift_imm = shift_imm; + } + _mode = basic_offset; + _offset_op = add_offset; + } +#endif // AARCH64 + + // [base + index * wordSize] + static Address indexed_ptr(Register base, Register index) { + return Address(base, index, LSL, LogBytesPerWord); + } + + // [base + index * BytesPerInt] + static Address indexed_32(Register base, Register index) { + return Address(base, index, LSL, LogBytesPerInt); + } + + // [base + index * BytesPerHeapOop] + static Address indexed_oop(Register base, Register index) { + return Address(base, index, LSL, LogBytesPerHeapOop); + } + + Address plus_disp(int disp) const { + assert((disp == 0) || (_index == noreg),"can't apply an offset to a register indexed address"); + Address a = (*this); + a._disp += disp; + return a; + } + + Address rebase(Register new_base) const { + Address a = (*this); + a._base = new_base; + return a; + } + +#ifdef AARCH64 + int encoding_simd() const { + assert(_index != SP, "encoding constraint"); + assert(_disp == 0 || _mode == post_indexed, "encoding constraint"); + assert(_index == noreg || _mode == basic_offset, "encoding constraint"); + assert(_mode == basic_offset || _mode == post_indexed, "encoding constraint"); + assert(_extend == ex_lsl, "encoding constraint"); + int index; + if (_index == noreg) { + if (_mode == post_indexed) + index = 0b100 << 5 | 31; + else + index = 0; + } else { + index = 0b100 << 5 | _index->encoding(); + } + return index << 16 | _base->encoding_with_sp() << 5; + } +#else /* !AARCH64 */ + int encoding2() const { + assert(_mode == basic_offset || _base != PC, "unpredictable instruction"); + if (_index == noreg) { + assert(-4096 < _disp && _disp < 4096, "encoding constraint"); + return _mode | up(_disp) << 23 | _base->encoding() << 16 | abs(_disp); + } else { + assert(_index != PC && (_mode == basic_offset || _index != _base), "unpredictable instruction"); + assert(_disp == 0 && (_shift_imm >> 5) == 0, "encoding constraint"); + return 1 << 25 | _offset_op << 23 | _mode | _base->encoding() << 16 | + _shift_imm << 7 | _shift << 5 | _index->encoding(); + } + } + + int encoding3() const { + assert(_mode == basic_offset || _base != PC, "unpredictable instruction"); + if (_index == noreg) { + assert(-256 < _disp && _disp < 256, "encoding constraint"); + return _mode | up(_disp) << 23 | 1 << 22 | _base->encoding() << 16 | + (abs(_disp) & 0xf0) << 4 | abs(_disp) & 0x0f; + } else { + assert(_index != PC && (_mode == basic_offset || _index != _base), "unpredictable instruction"); + assert(_disp == 0 && _shift == lsl && _shift_imm == 0, "encoding constraint"); + return _mode | _offset_op << 23 | _base->encoding() << 16 | _index->encoding(); + } + } + + int encoding_ex() const { + assert(_index == noreg && _disp == 0 && _mode == basic_offset && + _base != PC, "encoding constraint"); + return _base->encoding() << 16; + } + + int encoding_vfp() const { + assert(_index == noreg && _mode == basic_offset, "encoding constraint"); + assert(-1024 < _disp && _disp < 1024 && (_disp & 3) == 0, "encoding constraint"); + return _base->encoding() << 16 | up(_disp) << 23 | abs(_disp) >> 2; + } + + int encoding_simd() const { + assert(_base != PC, "encoding constraint"); + assert(_index != PC && _index != SP, "encoding constraint"); + assert(_disp == 0, "encoding constraint"); + assert(_shift == 0, "encoding constraint"); + assert(_index == noreg || _mode == basic_offset, "encoding constraint"); + assert(_mode == basic_offset || _mode == post_indexed, "encoding constraint"); + int index; + if (_index == noreg) { + if (_mode == post_indexed) + index = 13; + else + index = 15; + } else { + index = _index->encoding(); + } + + return _base->encoding() << 16 | index; + } +#endif // !AARCH64 + + Register base() const { + return _base; + } + + Register index() const { + return _index; + } + + int disp() const { + return _disp; + } + + AsmOffset mode() const { + return _mode; + } + + int shift_imm() const { + return _shift_imm; + } + +#ifdef AARCH64 + AsmExtendOp extend() const { + return _extend; + } +#else + AsmShift shift() const { + return _shift; + } + + AsmOffsetOp offset_op() const { + return _offset_op; + } +#endif + + bool uses(Register reg) const { return _base == reg || _index == reg; } + + const relocInfo::relocType rtype() { return _rspec.type(); } + const RelocationHolder& rspec() { return _rspec; } + + // Convert the raw encoding form into the form expected by the + // constructor for Address. + static Address make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc); +}; + +#ifdef COMPILER2 +class VFP VALUE_OBJ_CLASS_SPEC { + // Helper classes to detect whether a floating point constant can be + // encoded in a fconstd or fconsts instruction + // The conversion from the imm8, 8 bit constant, to the floating + // point value encoding is done with either: + // for single precision: imm8<7>:NOT(imm8<6>):Replicate(imm8<6>,5):imm8<5:0>:Zeros(19) + // or + // for double precision: imm8<7>:NOT(imm8<6>):Replicate(imm8<6>,8):imm8<5:0>:Zeros(48) + + private: + class fpnum { + public: + virtual unsigned int f_hi4() const = 0; + virtual bool f_lo_is_null() const = 0; + virtual int e() const = 0; + virtual unsigned int s() const = 0; + + inline bool can_be_imm8() const { return e() >= -3 && e() <= 4 && f_lo_is_null(); } + inline unsigned char imm8() const { int v = (s() << 7) | (((e() - 1) & 0x7) << 4) | f_hi4(); assert((v >> 8) == 0, "overflow"); return v; } + }; + + public: + class float_num : public fpnum { + public: + float_num(float v) { + _num.val = v; + } + + virtual unsigned int f_hi4() const { return (_num.bits << 9) >> (19+9); } + virtual bool f_lo_is_null() const { return (_num.bits & ((1 << 19) - 1)) == 0; } + virtual int e() const { return ((_num.bits << 1) >> (23+1)) - 127; } + virtual unsigned int s() const { return _num.bits >> 31; } + + private: + union { + float val; + unsigned int bits; + } _num; + }; + + class double_num : public fpnum { + public: + double_num(double v) { + _num.val = v; + } + + virtual unsigned int f_hi4() const { return (_num.bits << 12) >> (48+12); } + virtual bool f_lo_is_null() const { return (_num.bits & ((1LL << 48) - 1)) == 0; } + virtual int e() const { return ((_num.bits << 1) >> (52+1)) - 1023; } + virtual unsigned int s() const { return _num.bits >> 63; } + + private: + union { + double val; + unsigned long long bits; + } _num; + }; +}; +#endif + +#ifdef AARCH64 +#include "assembler_arm_64.hpp" +#else +#include "assembler_arm_32.hpp" +#endif + + +#endif // CPU_ARM_VM_ASSEMBLER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/assembler_arm.inline.hpp b/hotspot/src/cpu/arm/vm/assembler_arm.inline.hpp new file mode 100644 index 00000000000..76585f41ff1 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm.inline.hpp @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP +#define CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP + + +#endif // CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_32.cpp b/hotspot/src/cpu/arm/vm/assembler_arm_32.cpp new file mode 100644 index 00000000000..69a609d0104 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm_32.cpp @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "ci/ciEnv.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateInterpreterGenerator.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jvm_misc.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/hashtable.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" +#endif // INCLUDE_ALL_GCS + +#ifdef COMPILER2 +// Convert the raw encoding form into the form expected by the +// constructor for Address. +Address Address::make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc) { + RelocationHolder rspec; + if (disp_reloc != relocInfo::none) { + rspec = Relocation::spec_simple(disp_reloc); + } + + Register rindex = as_Register(index); + if (rindex != PC) { + assert(disp == 0, "unsupported"); + Address madr(as_Register(base), rindex, lsl, scale); + madr._rspec = rspec; + return madr; + } else { + assert(scale == 0, "not supported"); + Address madr(as_Register(base), disp); + madr._rspec = rspec; + return madr; + } +} +#endif + +void AsmOperand::initialize_rotated_imm(unsigned int imm) { + for (int shift = 2; shift <= 24; shift += 2) { + if ((imm & ~(0xff << shift)) == 0) { + _encoding = 1 << 25 | (32 - shift) << 7 | imm >> shift; + return; + } + } + assert((imm & 0x0ffffff0) == 0, "too complicated constant: %d (%x)", imm, imm); + _encoding = 1 << 25 | 4 << 7 | imm >> 28 | imm << 4; +} + +bool AsmOperand::is_rotated_imm(unsigned int imm) { + if ((imm >> 8) == 0) { + return true; + } + for (int shift = 2; shift <= 24; shift += 2) { + if ((imm & ~(0xff << shift)) == 0) { + return true; + } + } + if ((imm & 0x0ffffff0) == 0) { + return true; + } + return false; +} diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_32.hpp b/hotspot/src/cpu/arm/vm/assembler_arm_32.hpp new file mode 100644 index 00000000000..e32f6a98f29 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm_32.hpp @@ -0,0 +1,1245 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_ASSEMBLER_ARM_32_HPP +#define CPU_ARM_VM_ASSEMBLER_ARM_32_HPP + +// ARM Addressing Mode 1 - Data processing operands +class AsmOperand VALUE_OBJ_CLASS_SPEC { + private: + int _encoding; + + void initialize_rotated_imm(unsigned int imm); + + void encode(int imm_8) { + if ((imm_8 >> 8) == 0) { + _encoding = 1 << 25 | imm_8; // the most common case + } else { + initialize_rotated_imm((unsigned int)imm_8); // slow case + } + } + + void encode(Register rm, AsmShift shift, int shift_imm) { + assert((shift_imm >> 5) == 0, "encoding constraint"); + _encoding = shift_imm << 7 | shift << 5 | rm->encoding(); + } + + public: + + AsmOperand(Register reg) { + _encoding = reg->encoding(); + } + + AsmOperand(int imm_8) { + encode(imm_8); + } + +#ifdef ASSERT + AsmOperand(ByteSize bytesize_8) { + const int imm_8 = in_bytes(bytesize_8); + encode(imm_8); + } +#endif // ASSERT + + AsmOperand(Register rm, AsmShift shift, int shift_imm) { + encode(rm,shift,shift_imm); + } + + AsmOperand(Register rm, AsmShift shift, Register rs) { + assert(rm != PC && rs != PC, "unpredictable instruction"); + _encoding = rs->encoding() << 8 | shift << 5 | 1 << 4 | rm->encoding(); + } + + AsmOperand(RegisterOrConstant offset, AsmShift shift = lsl, int shift_imm = 0) { + if (offset.is_register()) { + encode(offset.as_register(), shift, shift_imm); + } else { + assert(shift == lsl,"shift type not yet encoded"); + int imm_8 = ((int)offset.as_constant()) << shift_imm; + encode(imm_8); + } + } + + int encoding() const { + return _encoding; + } + + bool is_immediate() const { + return _encoding & (1 << 25) ? true : false; + } + + Register base_register() const { + assert(!is_immediate(), "is_immediate, no base reg"); + return as_Register(_encoding & 15); + } + + static bool is_rotated_imm(unsigned int imm); +}; + + +// ARM Addressing Mode 4 - Load and store multiple +class RegisterSet VALUE_OBJ_CLASS_SPEC { + private: + int _encoding; + + RegisterSet(int encoding) { + _encoding = encoding; + } + + public: + + RegisterSet(Register reg) { + _encoding = 1 << reg->encoding(); + } + + RegisterSet() { + _encoding = 0; + } + + RegisterSet(Register first, Register last) { + assert(first < last, "encoding constraint"); + _encoding = (1 << (last->encoding() + 1)) - (1 << first->encoding()); + } + + friend RegisterSet operator | (const RegisterSet set1, const RegisterSet set2) { + assert((set1._encoding & set2._encoding) == 0, + "encoding constraint"); + return RegisterSet(set1._encoding | set2._encoding); + } + + int encoding() const { + return _encoding; + } + + bool contains(Register reg) const { + return (_encoding & (1 << reg->encoding())) != 0; + } + + // number of registers in the set + int size() const { + int count = 0; + unsigned int remaining = (unsigned int) _encoding; + while (remaining != 0) { + if ((remaining & 1) != 0) count++; + remaining >>= 1; + } + return count; + } +}; + +#if R9_IS_SCRATCHED +#define R9ifScratched RegisterSet(R9) +#else +#define R9ifScratched RegisterSet() +#endif + +// ARM Addressing Mode 5 - Load and store multiple VFP registers +class FloatRegisterSet VALUE_OBJ_CLASS_SPEC { + private: + int _encoding; + + public: + + FloatRegisterSet(FloatRegister reg) { + if (reg->hi_bit() == 0) { + _encoding = reg->hi_bits() << 12 | reg->lo_bit() << 22 | 1; + } else { + assert (reg->lo_bit() == 0, "impossible encoding"); + _encoding = reg->hi_bits() << 12 | reg->hi_bit() << 22 | 1; + } + } + + FloatRegisterSet(FloatRegister first, int count) { + assert(count >= 1, "encoding constraint"); + if (first->hi_bit() == 0) { + _encoding = first->hi_bits() << 12 | first->lo_bit() << 22 | count; + } else { + assert (first->lo_bit() == 0, "impossible encoding"); + _encoding = first->hi_bits() << 12 | first->hi_bit() << 22 | count; + } + } + + int encoding_s() const { + return _encoding; + } + + int encoding_d() const { + assert((_encoding & 0xFF) <= 16, "no more than 16 double registers" ); + return (_encoding & 0xFFFFFF00) | ((_encoding & 0xFF) << 1); + } + +}; + + +class Assembler : public AbstractAssembler { + + public: + + static const int LogInstructionSize = 2; + static const int InstructionSize = 1 << LogInstructionSize; + + static inline AsmCondition inverse(AsmCondition cond) { + assert ((cond != al) && (cond != nv), "AL and NV conditions cannot be inversed"); + return (AsmCondition)((int)cond ^ 1); + } + + // Returns true if given value can be used as immediate in arithmetic (add/sub/cmp/cmn) instructions. + static inline bool is_arith_imm_in_range(intx value) { + return AsmOperand::is_rotated_imm(value); + } + + // Arithmetic instructions + +#define F(mnemonic, opcode) \ + void mnemonic(Register rd, Register rn, AsmOperand operand, AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | rn->encoding() << 16 | \ + rd->encoding() << 12 | operand.encoding()); \ + } \ + void mnemonic##s(Register rd, Register rn, AsmOperand operand, AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | 1 << 20 | rn->encoding() << 16 | \ + rd->encoding() << 12 | operand.encoding()); \ + } + + F(andr, 0) + F(eor, 1) + F(sub, 2) + F(rsb, 3) + F(add, 4) + F(adc, 5) + F(sbc, 6) + F(rsc, 7) + F(orr, 12) + F(bic, 14) +#undef F + +#define F(mnemonic, opcode) \ + void mnemonic(Register rn, AsmOperand operand, AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | 1 << 20 | rn->encoding() << 16 | \ + operand.encoding()); \ + } + + F(tst, 8) + F(teq, 9) + F(cmp, 10) + F(cmn, 11) +#undef F + +#define F(mnemonic, opcode) \ + void mnemonic(Register rd, AsmOperand operand, AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | rd->encoding() << 12 | \ + operand.encoding()); \ + } \ + void mnemonic##s(Register rd, AsmOperand operand, AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | 1 << 20 | rd->encoding() << 12 | \ + operand.encoding()); \ + } + + F(mov, 13) + F(mvn, 15) +#undef F + + void msr(uint fields, AsmOperand operand, AsmCondition cond = al) { + assert((operand.encoding() & (1<<25)) || ((operand.encoding() & 0xff0) == 0), "invalid addressing mode"); + emit_int32(cond << 28 | 1 << 24 | 1 << 21 | fields << 16 | 0xf << 12 | operand.encoding()); + } + + void mrs(uint fields, Register Rd, AsmCondition cond = al) { + emit_int32(cond << 28 | 1 << 24 | (fields|0xf) << 16 | (Rd->encoding() << 12)); + } + + + enum { + CPSR = 0x00, CPSR_c = 0x01, CPSR_x = 0x02, CPSR_xc = 0x03, + CPSR_s = 0x004, CPSR_sc = 0x05, CPSR_sx = 0x06, CPSR_sxc = 0x07, + CPSR_f = 0x08, CPSR_fc = 0x09, CPSR_fx = 0x0a, CPSR_fxc = 0x0b, + CPSR_fs = 0x0c, CPSR_fsc = 0x0d, CPSR_fsx = 0x0e, CPSR_fsxc = 0x0f, + SPSR = 0x40, SPSR_c = 0x41, SPSR_x = 0x42, SPSR_xc = 0x43, + SPSR_s = 0x44, SPSR_sc = 0x45, SPSR_sx = 0x46, SPSR_sxc = 0x47, + SPSR_f = 0x48, SPSR_fc = 0x49, SPSR_fx = 0x4a, SPSR_fxc = 0x4b, + SPSR_fs = 0x4c, SPSR_fsc = 0x4d, SPSR_fsx = 0x4e, SPSR_fsxc = 0x4f + }; + +#define F(mnemonic, opcode) \ + void mnemonic(Register rdlo, Register rdhi, Register rm, Register rs, \ + AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | rdhi->encoding() << 16 | \ + rdlo->encoding() << 12 | rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); \ + } \ + void mnemonic##s(Register rdlo, Register rdhi, Register rm, Register rs, \ + AsmCondition cond = al) { \ + emit_int32(cond << 28 | opcode << 21 | 1 << 20 | rdhi->encoding() << 16 | \ + rdlo->encoding() << 12 | rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); \ + } + + F(umull, 4) + F(umlal, 5) + F(smull, 6) + F(smlal, 7) +#undef F + + void mul(Register rd, Register rm, Register rs, AsmCondition cond = al) { + emit_int32(cond << 28 | rd->encoding() << 16 | + rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); + } + + void muls(Register rd, Register rm, Register rs, AsmCondition cond = al) { + emit_int32(cond << 28 | 1 << 20 | rd->encoding() << 16 | + rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); + } + + void mla(Register rd, Register rm, Register rs, Register rn, AsmCondition cond = al) { + emit_int32(cond << 28 | 1 << 21 | rd->encoding() << 16 | + rn->encoding() << 12 | rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); + } + + void mlas(Register rd, Register rm, Register rs, Register rn, AsmCondition cond = al) { + emit_int32(cond << 28 | 1 << 21 | 1 << 20 | rd->encoding() << 16 | + rn->encoding() << 12 | rs->encoding() << 8 | 0x9 << 4 | rm->encoding()); + } + + // Loads and stores + +#define F(mnemonic, l, b) \ + void mnemonic(Register rd, Address addr, AsmCondition cond = al) { \ + emit_int32(cond << 28 | 1 << 26 | b << 22 | l << 20 | \ + rd->encoding() << 12 | addr.encoding2()); \ + } + + F(ldr, 1, 0) + F(ldrb, 1, 1) + F(str, 0, 0) + F(strb, 0, 1) +#undef F + +#undef F + +#define F(mnemonic, l, sh, even) \ + void mnemonic(Register rd, Address addr, AsmCondition cond = al) { \ + assert(!even || (rd->encoding() & 1) == 0, "must be even"); \ + emit_int32(cond << 28 | l << 20 | rd->encoding() << 12 | \ + 1 << 7 | sh << 5 | 1 << 4 | addr.encoding3()); \ + } + + F(strh, 0, 1, false) + F(ldrh, 1, 1, false) + F(ldrsb, 1, 2, false) + F(ldrsh, 1, 3, false) + F(strd, 0, 3, true) + +#undef F + + void ldrd(Register rd, Address addr, AsmCondition cond = al) { + assert((rd->encoding() & 1) == 0, "must be even"); + assert(!addr.index()->is_valid() || + (addr.index()->encoding() != rd->encoding() && + addr.index()->encoding() != (rd->encoding()+1)), "encoding constraint"); + emit_int32(cond << 28 | rd->encoding() << 12 | 0xD /* 0b1101 */ << 4 | addr.encoding3()); + } + +#define F(mnemonic, l, pu) \ + void mnemonic(Register rn, RegisterSet reg_set, \ + AsmWriteback w = no_writeback, AsmCondition cond = al) { \ + assert(reg_set.encoding() != 0 && (w == no_writeback || \ + (reg_set.encoding() & (1 << rn->encoding())) == 0), \ + "unpredictable instruction"); \ + emit_int32(cond << 28 | 4 << 25 | pu << 23 | w << 21 | l << 20 | \ + rn->encoding() << 16 | reg_set.encoding()); \ + } + + F(ldmda, 1, 0) F(ldmfa, 1, 0) + F(ldmia, 1, 1) F(ldmfd, 1, 1) + F(ldmdb, 1, 2) F(ldmea, 1, 2) + F(ldmib, 1, 3) F(ldmed, 1, 3) + F(stmda, 0, 0) F(stmed, 0, 0) + F(stmia, 0, 1) F(stmea, 0, 1) + F(stmdb, 0, 2) F(stmfd, 0, 2) + F(stmib, 0, 3) F(stmfa, 0, 3) +#undef F + + void ldrex(Register rd, Address addr, AsmCondition cond = al) { + assert(rd != PC, "unpredictable instruction"); + emit_int32(cond << 28 | 0x19 << 20 | addr.encoding_ex() | + rd->encoding() << 12 | 0xf9f); + } + + void strex(Register rs, Register rd, Address addr, AsmCondition cond = al) { + assert(rd != PC && rs != PC && + rs != rd && rs != addr.base(), "unpredictable instruction"); + emit_int32(cond << 28 | 0x18 << 20 | addr.encoding_ex() | + rs->encoding() << 12 | 0xf90 | rd->encoding()); + } + + void ldrexd(Register rd, Address addr, AsmCondition cond = al) { + assert(rd != PC, "unpredictable instruction"); + emit_int32(cond << 28 | 0x1B << 20 | addr.encoding_ex() | + rd->encoding() << 12 | 0xf9f); + } + + void strexd(Register rs, Register rd, Address addr, AsmCondition cond = al) { + assert(rd != PC && rs != PC && + rs != rd && rs != addr.base(), "unpredictable instruction"); + emit_int32(cond << 28 | 0x1A << 20 | addr.encoding_ex() | + rs->encoding() << 12 | 0xf90 | rd->encoding()); + } + + void clrex() { + emit_int32(0xF << 28 | 0x57 << 20 | 0xFF << 12 | 0x01f); + } + + // Miscellaneous instructions + + void clz(Register rd, Register rm, AsmCondition cond = al) { + emit_int32(cond << 28 | 0x016f0f10 | rd->encoding() << 12 | rm->encoding()); + } + + void rev(Register rd, Register rm, AsmCondition cond = al) { + emit_int32(cond << 28 | 0x06bf0f30 | rd->encoding() << 12 | rm->encoding()); + } + + void rev16(Register rd, Register rm, AsmCondition cond = al) { + emit_int32(cond << 28 | 0x6bf0fb0 | rd->encoding() << 12 | rm->encoding()); + } + + void revsh(Register rd, Register rm, AsmCondition cond = al) { + emit_int32(cond << 28 | 0x6ff0fb0 | rd->encoding() << 12 | rm->encoding()); + } + + void rbit(Register rd, Register rm, AsmCondition cond = al) { + emit_int32(cond << 28 | 0x6ff0f30 | rd->encoding() << 12 | rm->encoding()); + } + + void pld(Address addr) { + emit_int32(0xf550f000 | addr.encoding2()); + } + + void pldw(Address addr) { + assert(VM_Version::arm_arch() >= 7 && os::is_MP(), "no pldw on this processor"); + emit_int32(0xf510f000 | addr.encoding2()); + } + + void svc(int imm_24, AsmCondition cond = al) { + assert((imm_24 >> 24) == 0, "encoding constraint"); + emit_int32(cond << 28 | 0xf << 24 | imm_24); + } + + void ubfx(Register rd, Register rn, unsigned int lsb, unsigned int width, AsmCondition cond = al) { + assert(VM_Version::arm_arch() >= 7, "no ubfx on this processor"); + assert(width > 0, "must be"); + assert(lsb < 32, "must be"); + emit_int32(cond << 28 | 0x3f << 21 | (width - 1) << 16 | rd->encoding() << 12 | + lsb << 7 | 0x5 << 4 | rn->encoding()); + } + + void uxtb(Register rd, Register rm, unsigned int rotation = 0, AsmCondition cond = al) { + assert(VM_Version::arm_arch() >= 7, "no uxtb on this processor"); + assert((rotation % 8) == 0 && (rotation <= 24), "encoding constraint"); + emit_int32(cond << 28 | 0x6e << 20 | 0xf << 16 | rd->encoding() << 12 | + (rotation >> 3) << 10 | 0x7 << 4 | rm->encoding()); + } + + // ARM Memory Barriers + // + // There are two types of memory barriers defined for the ARM processor + // DataSynchronizationBarrier and DataMemoryBarrier + // + // The Linux kernel uses the DataMemoryBarrier for all of it's + // memory barrier operations (smp_mb, smp_rmb, smp_wmb) + // + // There are two forms of each barrier instruction. + // The mcr forms are supported on armv5 and newer architectures + // + // The dmb, dsb instructions were added in armv7 + // architectures and are compatible with their mcr + // predecessors. + // + // Here are the encodings for future reference: + // + // DataSynchronizationBarrier (dsb) + // on ARMv7 - emit_int32(0xF57FF04F) + // + // on ARMv5+ - mcr p15, 0, Rtmp, c7, c10, 4 on earlier processors + // emit_int32(0xe << 28 | 0xe << 24 | 0x7 << 16 | Rtmp->encoding() << 12 | + // 0xf << 8 | 0x9 << 4 | 0xa); + // + // DataMemoryBarrier (dmb) + // on ARMv7 - emit_int32(0xF57FF05F) + // + // on ARMv5+ - mcr p15, 0, Rtmp, c7, c10, 5 on earlier processors + // emit_int32(0xe << 28 | 0xe << 24 | 0x7 << 16 | Rtmp->encoding() << 12 | + // 0xf << 8 | 0xb << 4 | 0xa); + // + + enum DMB_Opt { + DMB_all = 0xf, + DMB_st = 0xe, + }; + + void dmb(DMB_Opt opt, Register reg) { + if (VM_Version::arm_arch() >= 7) { + emit_int32(0xF57FF050 | opt); + } else { + bool preserve_tmp = (reg == noreg); + if(preserve_tmp) { + reg = Rtemp; + str(reg, Address(SP, -wordSize, pre_indexed)); + } + mov(reg, 0); + // DataMemoryBarrier + emit_int32(0xe << 28 | + 0xe << 24 | + 0x7 << 16 | + reg->encoding() << 12 | + 0xf << 8 | + 0xb << 4 | + 0xa); + if(preserve_tmp) { + ldr(reg, Address(SP, wordSize, post_indexed)); + } + } + } + + void dsb(Register reg) { + if (VM_Version::arm_arch() >= 7) { + emit_int32(0xF57FF04F); + } else { + bool preserve_tmp = (reg == noreg); + if(preserve_tmp) { + reg = Rtemp; + str(reg, Address(SP, -wordSize, pre_indexed)); + } + mov(reg, 0); + // DataSynchronizationBarrier + emit_int32(0xe << 28 | + 0xe << 24 | + 0x7 << 16 | + reg->encoding() << 12 | + 0xf << 8 | + 0x9 << 4 | + 0xa); + if(preserve_tmp) { + ldr(reg, Address(SP, wordSize, post_indexed)); + } + } + } + + +#define F(mnemonic, b) \ + void mnemonic(Register rd, Register rm, Register rn, AsmCondition cond = al) { \ + assert(rn != rm && rn != rd, "unpredictable instruction"); \ + emit_int32(cond << 28 | 0x2 << 23 | b << 22 | rn->encoding() << 16 | \ + rd->encoding() << 12 | 9 << 4 | rm->encoding()); \ + } + + F(swp, 0) + F(swpb, 1) +#undef F + + // Branches + +#define F(mnemonic, l) \ + void mnemonic(Register rm, AsmCondition cond = al) { \ + emit_int32(cond << 28 | 0x012fff10 | l << 5 | rm->encoding()); \ + } + + F(bx, 0) + F(blx, 1) +#undef F + +#define F(mnemonic, l) \ + void mnemonic(address target, AsmCondition cond = al) { \ + unsigned int offset = (unsigned int)(target - pc() - 8); \ + assert((offset & 3) == 0, "bad alignment"); \ + assert((offset >> 25) == 0 || ((int)offset >> 25) == -1, "offset is too large"); \ + emit_int32(cond << 28 | l << 24 | offset << 6 >> 8); \ + } + + F(b, 0xa) + F(bl, 0xb) +#undef F + + // ARMv7 instructions + +#define F(mnemonic, wt) \ + void mnemonic(Register rd, int imm_16, AsmCondition cond = al) { \ + assert((imm_16 >> 16) == 0, "encoding constraint"); \ + emit_int32(cond << 28 | wt << 20 | rd->encoding() << 12 | \ + (imm_16 & 0xf000) << 4 | (imm_16 & 0xfff)); \ + } + + F(movw, 0x30) + F(movt, 0x34) +#undef F + + // VFP Support + +// Checks that VFP instructions are not used in SOFTFP mode. +#ifdef __SOFTFP__ +#define CHECK_VFP_PRESENT ShouldNotReachHere() +#else +#define CHECK_VFP_PRESENT +#endif // __SOFTFP__ + + static const int single_cp_num = 0xa00; + static const int double_cp_num = 0xb00; + + // Bits P, Q, R, S collectively form the opcode +#define F(mnemonic, P, Q, R, S) \ + void mnemonic##d(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fn->lo_bit() == 0 && fd->lo_bit() == 0 && fm->lo_bit() == 0, "single precision register?"); \ + emit_int32(cond << 28 | 0x7 << 25 | double_cp_num | \ + P << 23 | Q << 21 | R << 20 | S << 6 | \ + fn->hi_bits() << 16 | fn->hi_bit() << 7 | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + fm->hi_bits() | fm->hi_bit() << 5); \ + } \ + void mnemonic##s(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + AsmCondition cond = al) { \ + assert(fn->hi_bit() == 0 && fd->hi_bit() == 0 && fm->hi_bit() == 0, "double precision register?"); \ + CHECK_VFP_PRESENT; \ + emit_int32(cond << 28 | 0x7 << 25 | single_cp_num | \ + P << 23 | Q << 21 | R << 20 | S << 6 | \ + fn->hi_bits() << 16 | fn->lo_bit() << 7 | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } + + F(fmac, 0, 0, 0, 0) // Fd = Fd + (Fn * Fm) + F(fnmac, 0, 0, 0, 1) // Fd = Fd - (Fn * Fm) + F(fmsc, 0, 0, 1, 0) // Fd = -Fd + (Fn * Fm) + F(fnmsc, 0, 0, 1, 1) // Fd = -Fd - (Fn * Fm) + + F(fmul, 0, 1, 0, 0) // Fd = Fn * Fm + F(fnmul, 0, 1, 0, 1) // Fd = -(Fn * Fm) + F(fadd, 0, 1, 1, 0) // Fd = Fn + Fm + F(fsub, 0, 1, 1, 1) // Fd = Fn - Fm + F(fdiv, 1, 0, 0, 0) // Fd = Fn / Fm +#undef F + + enum VElem_Size { + VELEM_SIZE_8 = 0x00, + VELEM_SIZE_16 = 0x01, + VELEM_SIZE_32 = 0x02, + VELEM_SIZE_64 = 0x03 + }; + + enum VLD_Type { + VLD1_TYPE_1_REG = 0x7 /* 0b0111 */, + VLD1_TYPE_2_REGS = 0xA /* 0b1010 */, + VLD1_TYPE_3_REGS = 0x6 /* 0b0110 */, + VLD1_TYPE_4_REGS = 0x2 /* 0b0010 */ + }; + + enum VFloat_Arith_Size { + VFA_SIZE_F32 = 0x0 /* 0b0 */, + }; + + // Bits P, Q, R, S collectively form the opcode +#define F(mnemonic, P, Q, R, S) \ + void mnemonic(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + int size, int quad) { \ + CHECK_VFP_PRESENT; \ + assert(VM_Version::has_simd(), "simd instruction"); \ + assert(fn->lo_bit() == 0 && fd->lo_bit() == 0 && fm->lo_bit() == 0, \ + "single precision register?"); \ + assert(!quad || ((fn->hi_bits() | fd->hi_bits() | fm->hi_bits()) & 1) == 0, \ + "quad precision register?"); \ + emit_int32(0xf << 28 | P << 23 | Q << 8 | R << 4 | \ + S << 21 | size << 20 | quad << 6 | \ + fn->hi_bits() << 16 | fn->hi_bit() << 7 | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + fm->hi_bits() | fm->hi_bit() << 5); \ + } + + F(vmulI, 0x4 /* 0b0100 */, 0x9 /* 0b1001 */, 1, 0) // Vd = Vn * Vm (int) + F(vaddI, 0x4 /* 0b0100 */, 0x8 /* 0b1000 */, 0, 0) // Vd = Vn + Vm (int) + F(vsubI, 0x6 /* 0b0110 */, 0x8 /* 0b1000 */, 0, 0) // Vd = Vn - Vm (int) + F(vaddF, 0x4 /* 0b0100 */, 0xD /* 0b1101 */, 0, 0) // Vd = Vn + Vm (float) + F(vsubF, 0x4 /* 0b0100 */, 0xD /* 0b1101 */, 0, 1) // Vd = Vn - Vm (float) + F(vmulF, 0x6 /* 0b0110 */, 0xD /* 0b1101 */, 1, 0) // Vd = Vn * Vm (float) + F(vshlSI, 0x4 /* 0b0100 */, 0x4 /* 0b0100 */, 0, 0) // Vd = ashift(Vm,Vn) (int) + F(vshlUI, 0x6 /* 0b0110 */, 0x4 /* 0b0100 */, 0, 0) // Vd = lshift(Vm,Vn) (int) + F(_vandI, 0x4 /* 0b0100 */, 0x1 /* 0b0001 */, 1, 0) // Vd = Vn & Vm (int) + F(_vorI, 0x4 /* 0b0100 */, 0x1 /* 0b0001 */, 1, 1) // Vd = Vn | Vm (int) + F(_vxorI, 0x6 /* 0b0110 */, 0x1 /* 0b0001 */, 1, 0) // Vd = Vn ^ Vm (int) +#undef F + + void vandI(FloatRegister fd, FloatRegister fn, FloatRegister fm, int quad) { + _vandI(fd, fn, fm, 0, quad); + } + void vorI(FloatRegister fd, FloatRegister fn, FloatRegister fm, int quad) { + _vorI(fd, fn, fm, 0, quad); + } + void vxorI(FloatRegister fd, FloatRegister fn, FloatRegister fm, int quad) { + _vxorI(fd, fn, fm, 0, quad); + } + + void vneg(FloatRegister fd, FloatRegister fm, int size, int flt, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(fd->lo_bit() == 0 && fm->lo_bit() == 0, + "single precision register?"); + assert(!quad || ((fd->hi_bits() | fm->hi_bits()) & 1) == 0, + "quad precision register?"); + emit_int32(0xf << 28 | 0x3B /* 0b00111011 */ << 20 | 0x1 /* 0b01 */ << 16 | 0x7 /* 0b111 */ << 7 | + size << 18 | quad << 6 | flt << 10 | + fd->hi_bits() << 12 | fd->hi_bit() << 22 | + fm->hi_bits() << 0 | fm->hi_bit() << 5); + } + + void vnegI(FloatRegister fd, FloatRegister fm, int size, int quad) { + int flt = 0; + vneg(fd, fm, size, flt, quad); + } + + void vshli(FloatRegister fd, FloatRegister fm, int size, int imm, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(fd->lo_bit() == 0 && fm->lo_bit() == 0, + "single precision register?"); + assert(!quad || ((fd->hi_bits() | fm->hi_bits()) & 1) == 0, + "quad precision register?"); + + if (imm >= size) { + // maximum shift gives all zeroes, direction doesn't matter, + // but only available for shift right + vshri(fd, fm, size, size, true /* unsigned */, quad); + return; + } + assert(imm >= 0 && imm < size, "out of range"); + + int imm6 = 0; + int L = 0; + switch (size) { + case 8: + case 16: + case 32: + imm6 = size + imm ; + break; + case 64: + L = 1; + imm6 = imm ; + break; + default: + ShouldNotReachHere(); + } + emit_int32(0xf << 28 | 0x5 /* 0b00101 */ << 23 | 0x51 /* 0b01010001 */ << 4 | + imm6 << 16 | L << 7 | quad << 6 | + fd->hi_bits() << 12 | fd->hi_bit() << 22 | + fm->hi_bits() << 0 | fm->hi_bit() << 5); + } + + void vshri(FloatRegister fd, FloatRegister fm, int size, int imm, + bool U /* unsigned */, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(fd->lo_bit() == 0 && fm->lo_bit() == 0, + "single precision register?"); + assert(!quad || ((fd->hi_bits() | fm->hi_bits()) & 1) == 0, + "quad precision register?"); + assert(imm > 0, "out of range"); + if (imm >= size) { + // maximum shift (all zeroes) + imm = size; + } + int imm6 = 0; + int L = 0; + switch (size) { + case 8: + case 16: + case 32: + imm6 = 2 * size - imm ; + break; + case 64: + L = 1; + imm6 = 64 - imm ; + break; + default: + ShouldNotReachHere(); + } + emit_int32(0xf << 28 | 0x5 /* 0b00101 */ << 23 | 0x1 /* 0b00000001 */ << 4 | + imm6 << 16 | L << 7 | quad << 6 | U << 24 | + fd->hi_bits() << 12 | fd->hi_bit() << 22 | + fm->hi_bits() << 0 | fm->hi_bit() << 5); + } + void vshrUI(FloatRegister fd, FloatRegister fm, int size, int imm, int quad) { + vshri(fd, fm, size, imm, true /* unsigned */, quad); + } + void vshrSI(FloatRegister fd, FloatRegister fm, int size, int imm, int quad) { + vshri(fd, fm, size, imm, false /* signed */, quad); + } + + // Extension opcodes where P,Q,R,S = 1 opcode is in Fn +#define F(mnemonic, N, opcode) \ + void mnemonic##d(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->lo_bit() == 0 && fm->hi_bit() == 0, "incorrect register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + double_cp_num | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } \ + void mnemonic##s(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0 && fm->hi_bit() == 0, "double precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + single_cp_num | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } + + F(fuito, 0, 0x8) // Unsigned integer to floating point conversion + F(fsito, 1, 0x8) // Signed integer to floating point conversion +#undef F + +#define F(mnemonic, N, opcode) \ + void mnemonic##d(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0 && fm->lo_bit() == 0, "incorrect register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + double_cp_num | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->hi_bit() << 5); \ + } \ + void mnemonic##s(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0 && fm->hi_bit() == 0, "double precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + single_cp_num | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } + + F(ftoui, 0, 0xc) // Float to unsigned int conversion + F(ftouiz, 1, 0xc) // Float to unsigned int conversion, RZ mode + F(ftosi, 0, 0xd) // Float to signed int conversion + F(ftosiz, 1, 0xd) // Float to signed int conversion, RZ mode +#undef F + +#define F(mnemonic, N, opcode) \ + void mnemonic##d(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0 && fm->lo_bit() == 0, "incorrect register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + double_cp_num | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->hi_bit() << 5); \ + } \ + void mnemonic##s(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->lo_bit() == 0 && fm->hi_bit() == 0, "incorrect register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + single_cp_num | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } + + F(fcvtd, 1, 0x7) // Single->Double conversion + F(fcvts, 1, 0x7) // Double->Single conversion +#undef F + +#define F(mnemonic, N, opcode) \ + void mnemonic##d(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->lo_bit() == 0 && fm->lo_bit() == 0, "single precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + double_cp_num | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + fm->hi_bits() | fm->hi_bit() << 5); \ + } \ + void mnemonic##s(FloatRegister fd, FloatRegister fm, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0 && fm->hi_bit() == 0, "double precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + single_cp_num | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + fm->hi_bits() | fm->lo_bit() << 5); \ + } + + F(fcpy, 0, 0x0) // Fd = Fm + F(fabs, 1, 0x0) // Fd = abs(Fm) + F(fneg, 0, 0x1) // Fd = -Fm + F(fsqrt, 1, 0x1) // Fd = sqrt(Fm) + F(fcmp, 0, 0x4) // Compare Fd with Fm no exceptions on quiet NANs + F(fcmpe, 1, 0x4) // Compare Fd with Fm with exceptions on quiet NANs +#undef F + + // Opcodes with one operand only +#define F(mnemonic, N, opcode) \ + void mnemonic##d(FloatRegister fd, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->lo_bit() == 0, "single precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + double_cp_num | fd->hi_bits() << 12 | fd->hi_bit() << 22); \ + } \ + void mnemonic##s(FloatRegister fd, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0, "double precision register?"); \ + emit_int32(cond << 28 | 0xeb << 20 | opcode << 16 | N << 7 | 1 << 6 | \ + single_cp_num | fd->hi_bits() << 12 | fd->lo_bit() << 22); \ + } + + F(fcmpz, 0, 0x5) // Compare Fd with 0, no exceptions quiet NANs + F(fcmpez, 1, 0x5) // Compare Fd with 0, with exceptions quiet NANs +#undef F + + // Float loads (L==1) and stores (L==0) +#define F(mnemonic, L) \ + void mnemonic##d(FloatRegister fd, Address addr, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->lo_bit() == 0, "single precision register?"); \ + emit_int32(cond << 28 | 0xd << 24 | L << 20 | \ + fd->hi_bits() << 12 | fd->hi_bit() << 22 | \ + double_cp_num | addr.encoding_vfp()); \ + } \ + void mnemonic##s(FloatRegister fd, Address addr, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(fd->hi_bit() == 0, "double precision register?"); \ + emit_int32(cond << 28 | 0xd << 24 | L << 20 | \ + fd->hi_bits() << 12 | fd->lo_bit() << 22 | \ + single_cp_num | addr.encoding_vfp()); \ + } + + F(fst, 0) // Store 1 register + F(fld, 1) // Load 1 register +#undef F + + // Float load and store multiple +#define F(mnemonic, l, pu) \ + void mnemonic##d(Register rn, FloatRegisterSet reg_set, \ + AsmWriteback w = no_writeback, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(w == no_writeback || rn != PC, "unpredictable instruction"); \ + assert(!(w == no_writeback && pu == 2), "encoding constraint"); \ + assert((reg_set.encoding_d() & 1) == 0, "encoding constraint"); \ + emit_int32(cond << 28 | 6 << 25 | pu << 23 | w << 21 | l << 20 | \ + rn->encoding() << 16 | reg_set.encoding_d() | double_cp_num); \ + } \ + void mnemonic##s(Register rn, FloatRegisterSet reg_set, \ + AsmWriteback w = no_writeback, AsmCondition cond = al) { \ + CHECK_VFP_PRESENT; \ + assert(w == no_writeback || rn != PC, "unpredictable instruction"); \ + assert(!(w == no_writeback && pu == 2), "encoding constraint"); \ + emit_int32(cond << 28 | 6 << 25 | pu << 23 | w << 21 | l << 20 | \ + rn->encoding() << 16 | reg_set.encoding_s() | single_cp_num); \ + } + + F(fldmia, 1, 1) F(fldmfd, 1, 1) + F(fldmdb, 1, 2) F(fldmea, 1, 2) + F(fstmia, 0, 1) F(fstmfd, 0, 1) + F(fstmdb, 0, 2) F(fstmea, 0, 2) +#undef F + + // fconst{s,d} encoding: + // 31 28 27 23 22 21 20 19 16 15 12 10 9 8 7 4 3 0 + // | cond | 11101 | D | 11 | imm4H | Vd | 101 | sz | 0000 | imm4L | + // sz = 0 for single precision, 1 otherwise + // Register number is Vd:D for single precision, D:Vd otherwise + // immediate value is imm4H:imm4L + + void fconsts(FloatRegister fd, unsigned char imm_8, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->hi_bit() == 0, "double precision register?"); + emit_int32(cond << 28 | 0xeb << 20 | single_cp_num | + fd->hi_bits() << 12 | fd->lo_bit() << 22 | (imm_8 & 0xf) | (imm_8 >> 4) << 16); + } + + void fconstd(FloatRegister fd, unsigned char imm_8, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->lo_bit() == 0, "double precision register?"); + emit_int32(cond << 28 | 0xeb << 20 | double_cp_num | + fd->hi_bits() << 12 | fd->hi_bit() << 22 | (imm_8 & 0xf) | (imm_8 >> 4) << 16); + } + + // GPR <-> FPR transfers + void fmsr(FloatRegister fd, Register rd, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->hi_bit() == 0, "double precision register?"); + emit_int32(cond << 28 | 0xe0 << 20 | single_cp_num | 1 << 4 | + fd->hi_bits() << 16 | fd->lo_bit() << 7 | rd->encoding() << 12); + } + + void fmrs(Register rd, FloatRegister fd, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->hi_bit() == 0, "double precision register?"); + emit_int32(cond << 28 | 0xe1 << 20 | single_cp_num | 1 << 4 | + fd->hi_bits() << 16 | fd->lo_bit() << 7 | rd->encoding() << 12); + } + + void fmdrr(FloatRegister fd, Register rd, Register rn, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->lo_bit() == 0, "single precision register?"); + emit_int32(cond << 28 | 0xc4 << 20 | double_cp_num | 1 << 4 | + fd->hi_bits() | fd->hi_bit() << 5 | + rn->encoding() << 16 | rd->encoding() << 12); + } + + void fmrrd(Register rd, Register rn, FloatRegister fd, AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(fd->lo_bit() == 0, "single precision register?"); + emit_int32(cond << 28 | 0xc5 << 20 | double_cp_num | 1 << 4 | + fd->hi_bits() | fd->hi_bit() << 5 | + rn->encoding() << 16 | rd->encoding() << 12); + } + + void fmstat(AsmCondition cond = al) { + CHECK_VFP_PRESENT; + emit_int32(cond << 28 | 0xef1fa10); + } + + void vmrs(Register rt, VFPSystemRegister sr, AsmCondition cond = al) { + assert((sr->encoding() & (~0xf)) == 0, "what system register is that?"); + emit_int32(cond << 28 | rt->encoding() << 12 | sr->encoding() << 16 | 0xef00a10); + } + + void vmsr(VFPSystemRegister sr, Register rt, AsmCondition cond = al) { + assert((sr->encoding() & (~0xf)) == 0, "what system register is that?"); + emit_int32(cond << 28 | rt->encoding() << 12 | sr->encoding() << 16 | 0xee00a10); + } + + void vcnt(FloatRegister Dd, FloatRegister Dm) { + CHECK_VFP_PRESENT; + // emitted at VM startup to detect whether the instruction is available + assert(!VM_Version::is_initialized() || VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0 && Dm->lo_bit() == 0, "single precision registers?"); + emit_int32(0xf3b00500 | Dd->hi_bit() << 22 | Dd->hi_bits() << 12 | Dm->hi_bit() << 5 | Dm->hi_bits()); + } + + void vpaddl(FloatRegister Dd, FloatRegister Dm, int size, bool s) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0 && Dm->lo_bit() == 0, "single precision registers?"); + assert(size == 8 || size == 16 || size == 32, "unexpected size"); + emit_int32(0xf3b00200 | Dd->hi_bit() << 22 | (size >> 4) << 18 | Dd->hi_bits() << 12 | (s ? 0 : 1) << 7 | Dm->hi_bit() << 5 | Dm->hi_bits()); + } + + void vld1(FloatRegister Dd, Address addr, VElem_Size size, int bits) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision registers?"); + int align = 0; + assert(bits == 128, "code assumption"); + VLD_Type type = VLD1_TYPE_2_REGS; // 2x64 + emit_int32(0xf4200000 | Dd->hi_bit() << 22 | Dd->hi_bits() << 12 | type << 8 | size << 6 | align << 4 | addr.encoding_simd()); + } + + void vst1(FloatRegister Dd, Address addr, VElem_Size size, int bits) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision registers?"); + int align = 0; + assert(bits == 128, "code assumption"); + VLD_Type type = VLD1_TYPE_2_REGS; // 2x64 + emit_int32(0xf4000000 | Dd->hi_bit() << 22 | Dd->hi_bits() << 12 | type << 8 | size << 6 | align << 4 | addr.encoding_simd()); + } + + void vmovI(FloatRegister Dd, int imm8, VElem_Size size, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision register?"); + assert(!quad || (Dd->hi_bits() & 1) == 0, "quad precision register?"); + assert(imm8 >= 0 && imm8 < 256, "out of range"); + int op; + int cmode; + switch (size) { + case VELEM_SIZE_8: + op = 0; + cmode = 0xE /* 0b1110 */; + break; + case VELEM_SIZE_16: + op = 0; + cmode = 0x8 /* 0b1000 */; + break; + case VELEM_SIZE_32: + op = 0; + cmode = 0x0 /* 0b0000 */; + break; + default: + ShouldNotReachHere(); + } + emit_int32(0xf << 28 | 0x1 << 25 | 0x1 << 23 | 0x1 << 4 | + (imm8 >> 7) << 24 | ((imm8 & 0x70) >> 4) << 16 | (imm8 & 0xf) | + quad << 6 | op << 5 | cmode << 8 | + Dd->hi_bits() << 12 | Dd->hi_bit() << 22); + } + + void vdupI(FloatRegister Dd, Register Rs, VElem_Size size, int quad, + AsmCondition cond = al) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision register?"); + assert(!quad || (Dd->hi_bits() & 1) == 0, "quad precision register?"); + int b; + int e; + switch (size) { + case VELEM_SIZE_8: + b = 1; + e = 0; + break; + case VELEM_SIZE_16: + b = 0; + e = 1; + break; + case VELEM_SIZE_32: + b = 0; + e = 0; + break; + default: + ShouldNotReachHere(); + } + emit_int32(cond << 28 | 0x1D /* 0b11101 */ << 23 | 0xB /* 0b1011 */ << 8 | 0x1 << 4 | + quad << 21 | b << 22 | e << 5 | Rs->encoding() << 12 | + Dd->hi_bits() << 16 | Dd->hi_bit() << 7); + } + + void vdup(FloatRegister Dd, FloatRegister Ds, int index, int size, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision register?"); + assert(Ds->lo_bit() == 0, "single precision register?"); + assert(!quad || (Dd->hi_bits() & 1) == 0, "quad precision register?"); + int range = 64 / size; + assert(index < range, "overflow"); + int imm4; + switch (size) { + case 8: + assert((index & 0x7 /* 0b111 */) == index, "overflow"); + imm4 = index << 1 | 0x1 /* 0b0001 */; + break; + case 16: + assert((index & 0x3 /* 0b11 */) == index, "overflow"); + imm4 = index << 2 | 0x2 /* 0b0010 */; + break; + case 32: + assert((index & 0x1 /* 0b1 */) == index, "overflow"); + imm4 = index << 3 | 0x4 /* 0b0100 */; + break; + default: + ShouldNotReachHere(); + } + emit_int32(0xF /* 0b1111 */ << 28 | 0x3B /* 0b00111011 */ << 20 | 0x6 /* 0b110 */ << 9 | + quad << 6 | imm4 << 16 | + Dd->hi_bits() << 12 | Dd->hi_bit() << 22 | + Ds->hi_bits() << 00 | Ds->hi_bit() << 5); + } + + void vdupF(FloatRegister Dd, FloatRegister Ss, int quad) { + int index = 0; + FloatRegister Ds = as_FloatRegister(Ss->encoding() & ~1); + if (Ss->lo_bit() != 0) { + /* odd S register */ + assert(Ds->successor() == Ss, "bad reg"); + index = 1; + } else { + /* even S register */ + assert(Ds == Ss, "bad reg"); + } + vdup(Dd, Ds, index, 32, quad); + } + + void vrev(FloatRegister Dd, FloatRegister Dm, int quad, int region_size, VElem_Size size) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision register?"); + assert(Dm->lo_bit() == 0, "single precision register?"); + assert(!quad || ((Dd->hi_bits() | Dm->hi_bits()) & 1) == 0, + "quad precision register?"); + unsigned int op = 0; + switch (region_size) { + case 16: op = 0x2; /*0b10*/ break; + case 32: op = 0x1; /*0b01*/ break; + case 64: op = 0x0; /*0b00*/ break; + default: assert(false, "encoding constraint"); + } + emit_int32(0xf << 28 | 0x7 << 23 | Dd->hi_bit() << 22 | 0x3 << 20 | + size << 18 | Dd->hi_bits() << 12 | op << 7 | quad << 6 | Dm->hi_bit() << 5 | + Dm->hi_bits()); + } + + void veor(FloatRegister Dd, FloatRegister Dn, FloatRegister Dm, int quad) { + CHECK_VFP_PRESENT; + assert(VM_Version::has_simd(), "simd instruction"); + assert(Dd->lo_bit() == 0, "single precision register?"); + assert(Dm->lo_bit() == 0, "single precision register?"); + assert(Dn->lo_bit() == 0, "single precision register?"); + assert(!quad || ((Dd->hi_bits() | Dm->hi_bits() | Dn->hi_bits()) & 1) == 0, + "quad precision register?"); + + emit_int32(0xf << 28 | 0x3 << 24 | Dd->hi_bit() << 22 | Dn->hi_bits() << 16 | + Dd->hi_bits() << 12 | 0x1 << 8 | Dn->hi_bit() << 7 | quad << 6 | + Dm->hi_bit() << 5 | 0x1 << 4 | Dm->hi_bits()); + } + + + Assembler(CodeBuffer* code) : AbstractAssembler(code) {} + +#ifdef COMPILER2 + typedef VFP::double_num double_num; + typedef VFP::float_num float_num; +#endif +}; + +#ifdef __SOFTFP__ +// Soft float function declarations +extern "C" { +extern float __aeabi_fadd(float, float); +extern float __aeabi_fmul(float, float); +extern float __aeabi_fsub(float, float); +extern float __aeabi_fdiv(float, float); + +extern double __aeabi_dadd(double, double); +extern double __aeabi_dmul(double, double); +extern double __aeabi_dsub(double, double); +extern double __aeabi_ddiv(double, double); + +extern double __aeabi_f2d(float); +extern float __aeabi_d2f(double); +extern float __aeabi_i2f(int); +extern double __aeabi_i2d(int); +extern int __aeabi_f2iz(float); + +extern int __aeabi_fcmpeq(float, float); +extern int __aeabi_fcmplt(float, float); +extern int __aeabi_fcmple(float, float); +extern int __aeabi_fcmpge(float, float); +extern int __aeabi_fcmpgt(float, float); + +extern int __aeabi_dcmpeq(double, double); +extern int __aeabi_dcmplt(double, double); +extern int __aeabi_dcmple(double, double); +extern int __aeabi_dcmpge(double, double); +extern int __aeabi_dcmpgt(double, double); + +// Imported code from glibc soft-fp bundle for +// calculation accuracy improvement. See CR 6757269. +extern double __aeabi_fadd_glibc(float, float); +extern double __aeabi_fsub_glibc(float, float); +extern double __aeabi_dadd_glibc(double, double); +extern double __aeabi_dsub_glibc(double, double); +}; +#endif // __SOFTFP__ + + +#endif // CPU_ARM_VM_ASSEMBLER_ARM_32_HPP diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_64.cpp b/hotspot/src/cpu/arm/vm/assembler_arm_64.cpp new file mode 100644 index 00000000000..ae8ba668409 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm_64.cpp @@ -0,0 +1,191 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "ci/ciEnv.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateInterpreterGenerator.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jvm_misc.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/hashtable.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" +#endif // INCLUDE_ALL_GCS + +// Returns whether given imm has equal bit fields <0:size-1> and . +inline bool Assembler::LogicalImmediate::has_equal_subpatterns(uintx imm, int size) { + uintx mask = right_n_bits(size); + uintx subpattern1 = mask_bits(imm, mask); + uintx subpattern2 = mask_bits(imm >> size, mask); + return subpattern1 == subpattern2; +} + +// Returns least size that is a power of two from 2 to 64 with the proviso that given +// imm is composed of repeating patterns of this size. +inline int Assembler::LogicalImmediate::least_pattern_size(uintx imm) { + int size = BitsPerWord; + while (size > 2 && has_equal_subpatterns(imm, size >> 1)) { + size >>= 1; + } + return size; +} + +// Returns count of set bits in given imm. Based on variable-precision SWAR algorithm. +inline int Assembler::LogicalImmediate::population_count(uintx x) { + x -= ((x >> 1) & 0x5555555555555555L); + x = (((x >> 2) & 0x3333333333333333L) + (x & 0x3333333333333333L)); + x = (((x >> 4) + x) & 0x0f0f0f0f0f0f0f0fL); + x += (x >> 8); + x += (x >> 16); + x += (x >> 32); + return(x & 0x7f); +} + +// Let given x be where B = 0 and least bit of A = 1. Returns , where C is B-size set bits. +inline uintx Assembler::LogicalImmediate::set_least_zeroes(uintx x) { + return x | (x - 1); +} + + +#ifdef ASSERT + +// Restores immediate by encoded bit masks. +uintx Assembler::LogicalImmediate::decode() { + assert (_encoded, "should be"); + + int len_code = (_immN << 6) | ((~_imms) & 0x3f); + assert (len_code != 0, "should be"); + + int len = 6; + while (!is_set_nth_bit(len_code, len)) len--; + int esize = 1 << len; + assert (len > 0, "should be"); + assert ((_is32bit ? 32 : 64) >= esize, "should be"); + + int levels = right_n_bits(len); + int S = _imms & levels; + int R = _immr & levels; + + assert (S != levels, "should be"); + + uintx welem = right_n_bits(S + 1); + uintx wmask = (R == 0) ? welem : ((welem >> R) | (welem << (esize - R))); + + for (int size = esize; size < 64; size <<= 1) { + wmask |= (wmask << size); + } + + return wmask; +} + +#endif + + +// Constructs LogicalImmediate by given imm. Figures out if given imm can be used in AArch64 logical +// instructions (AND, ANDS, EOR, ORR) and saves its encoding. +void Assembler::LogicalImmediate::construct(uintx imm, bool is32) { + _is32bit = is32; + + if (is32) { + assert(((imm >> 32) == 0) || (((intx)imm >> 31) == -1), "32-bit immediate is out of range"); + + // Replicate low 32 bits. + imm &= 0xffffffff; + imm |= imm << 32; + } + + // All-zeroes and all-ones can not be encoded. + if (imm != 0 && (~imm != 0)) { + + // Let LPS (least pattern size) be the least size (power of two from 2 to 64) of repeating + // patterns in the immediate. If immediate value can be encoded, it is encoded by pattern + // of exactly LPS size (due to structure of valid patterns). In order to verify + // that immediate value can be encoded, LPS is calculated and bits of immediate + // are verified to be valid pattern. + int lps = least_pattern_size(imm); + uintx lps_mask = right_n_bits(lps); + + // A valid pattern has one of the following forms: + // | 0 x A | 1 x B | 0 x C |, where B > 0 and C > 0, or + // | 1 x A | 0 x B | 1 x C |, where B > 0 and C > 0. + // For simplicity, the second form of the pattern is inverted into the first form. + bool inverted = imm & 0x1; + uintx pattern = (inverted ? ~imm : imm) & lps_mask; + + // | 0 x A | 1 x (B + C) | + uintx without_least_zeroes = set_least_zeroes(pattern); + + // Pattern is valid iff without least zeroes it is a power of two - 1. + if ((without_least_zeroes & (without_least_zeroes + 1)) == 0) { + + // Count B as population count of pattern. + int bits_count = population_count(pattern); + + // Count B+C as population count of pattern without least zeroes + int left_range = population_count(without_least_zeroes); + + // S-prefix is a part of imms field which encodes LPS. + // LPS | S prefix + // 64 | not defined + // 32 | 0b0 + // 16 | 0b10 + // 8 | 0b110 + // 4 | 0b1110 + // 2 | 0b11110 + int s_prefix = (lps == 64) ? 0 : ~set_least_zeroes(lps) & 0x3f; + + // immN bit is set iff LPS == 64. + _immN = (lps == 64) ? 1 : 0; + assert (!is32 || (_immN == 0), "32-bit immediate should be encoded with zero N-bit"); + + // immr is the rotation size. + _immr = lps + (inverted ? 0 : bits_count) - left_range; + + // imms is the field that encodes bits count and S-prefix. + _imms = ((inverted ? (lps - bits_count) : bits_count) - 1) | s_prefix; + + _encoded = true; + assert (decode() == imm, "illegal encoding"); + + return; + } + } + + _encoded = false; +} diff --git a/hotspot/src/cpu/arm/vm/assembler_arm_64.hpp b/hotspot/src/cpu/arm/vm/assembler_arm_64.hpp new file mode 100644 index 00000000000..44d0504036c --- /dev/null +++ b/hotspot/src/cpu/arm/vm/assembler_arm_64.hpp @@ -0,0 +1,1717 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_ASSEMBLER_ARM_64_HPP +#define CPU_ARM_VM_ASSEMBLER_ARM_64_HPP + +enum AsmShift12 { + lsl0, lsl12 +}; + +enum AsmPrefetchOp { + pldl1keep = 0b00000, + pldl1strm, + pldl2keep, + pldl2strm, + pldl3keep, + pldl3strm, + + plil1keep = 0b01000, + plil1strm, + plil2keep, + plil2strm, + plil3keep, + plil3strm, + + pstl1keep = 0b10000, + pstl1strm, + pstl2keep, + pstl2strm, + pstl3keep, + pstl3strm, +}; + +// Shifted register operand for data processing instructions. +class AsmOperand VALUE_OBJ_CLASS_SPEC { + private: + Register _reg; + AsmShift _shift; + int _shift_imm; + + public: + AsmOperand(Register reg) { + assert(reg != SP, "SP is not allowed in shifted register operand"); + _reg = reg; + _shift = lsl; + _shift_imm = 0; + } + + AsmOperand(Register reg, AsmShift shift, int shift_imm) { + assert(reg != SP, "SP is not allowed in shifted register operand"); + assert(shift_imm >= 0, "shift amount should be non-negative"); + _reg = reg; + _shift = shift; + _shift_imm = shift_imm; + } + + Register reg() const { + return _reg; + } + + AsmShift shift() const { + return _shift; + } + + int shift_imm() const { + return _shift_imm; + } +}; + + +class Assembler : public AbstractAssembler { + + public: + + static const int LogInstructionSize = 2; + static const int InstructionSize = 1 << LogInstructionSize; + + Assembler(CodeBuffer* code) : AbstractAssembler(code) {} + + static inline AsmCondition inverse(AsmCondition cond) { + assert ((cond != al) && (cond != nv), "AL and NV conditions cannot be inversed"); + return (AsmCondition)((int)cond ^ 1); + } + + // Returns value of nzcv flags conforming to the given condition. + static inline int flags_for_condition(AsmCondition cond) { + switch(cond) { // NZCV + case mi: case lt: return 0b1000; + case eq: case le: return 0b0100; + case hs: case hi: return 0b0010; + case vs: return 0b0001; + default: return 0b0000; + } + } + + // Immediate, encoded into logical instructions. + class LogicalImmediate { + private: + bool _encoded; + bool _is32bit; + int _immN; + int _immr; + int _imms; + + static inline bool has_equal_subpatterns(uintx imm, int size); + static inline int least_pattern_size(uintx imm); + static inline int population_count(uintx x); + static inline uintx set_least_zeroes(uintx x); + +#ifdef ASSERT + uintx decode(); +#endif + + void construct(uintx imm, bool is32); + + public: + LogicalImmediate(uintx imm, bool is32 = false) { construct(imm, is32); } + + // Returns true if given immediate can be used in AArch64 logical instruction. + bool is_encoded() const { return _encoded; } + + bool is32bit() const { return _is32bit; } + int immN() const { assert(_encoded, "should be"); return _immN; } + int immr() const { assert(_encoded, "should be"); return _immr; } + int imms() const { assert(_encoded, "should be"); return _imms; } + }; + + // Immediate, encoded into arithmetic add/sub instructions. + class ArithmeticImmediate { + private: + bool _encoded; + int _imm; + AsmShift12 _shift; + + public: + ArithmeticImmediate(intx x) { + if (is_unsigned_imm_in_range(x, 12, 0)) { + _encoded = true; + _imm = x; + _shift = lsl0; + } else if (is_unsigned_imm_in_range(x, 12, 12)) { + _encoded = true; + _imm = x >> 12; + _shift = lsl12; + } else { + _encoded = false; + } + } + + ArithmeticImmediate(intx x, AsmShift12 sh) { + if (is_unsigned_imm_in_range(x, 12, 0)) { + _encoded = true; + _imm = x; + _shift = sh; + } else { + _encoded = false; + } + } + + // Returns true if this immediate can be used in AArch64 arithmetic (add/sub/cmp/cmn) instructions. + bool is_encoded() const { return _encoded; } + + int imm() const { assert(_encoded, "should be"); return _imm; } + AsmShift12 shift() const { assert(_encoded, "should be"); return _shift; } + }; + + static inline bool is_imm_in_range(intx value, int bits, int align_bits) { + intx sign_bits = (value >> (bits + align_bits - 1)); + return ((value & right_n_bits(align_bits)) == 0) && ((sign_bits == 0) || (sign_bits == -1)); + } + + static inline int encode_imm(intx value, int bits, int align_bits, int low_bit_in_encoding) { + assert (is_imm_in_range(value, bits, align_bits), "immediate value is out of range"); + return ((value >> align_bits) & right_n_bits(bits)) << low_bit_in_encoding; + } + + static inline bool is_unsigned_imm_in_range(intx value, int bits, int align_bits) { + return (value >= 0) && ((value & right_n_bits(align_bits)) == 0) && ((value >> (align_bits + bits)) == 0); + } + + static inline int encode_unsigned_imm(intx value, int bits, int align_bits, int low_bit_in_encoding) { + assert (is_unsigned_imm_in_range(value, bits, align_bits), "immediate value is out of range"); + return (value >> align_bits) << low_bit_in_encoding; + } + + static inline bool is_offset_in_range(intx offset, int bits) { + assert (bits == 14 || bits == 19 || bits == 26, "wrong bits number"); + return is_imm_in_range(offset, bits, 2); + } + + static inline int encode_offset(intx offset, int bits, int low_bit_in_encoding) { + return encode_imm(offset, bits, 2, low_bit_in_encoding); + } + + // Returns true if given value can be used as immediate in arithmetic (add/sub/cmp/cmn) instructions. + static inline bool is_arith_imm_in_range(intx value) { + return ArithmeticImmediate(value).is_encoded(); + } + + + // Load/store instructions + +#define F(mnemonic, opc) \ + void mnemonic(Register rd, address literal_addr) { \ + intx offset = literal_addr - pc(); \ + assert (opc != 0b01 || offset == 0 || ((uintx)literal_addr & 7) == 0, "ldr target should be aligned"); \ + assert (is_offset_in_range(offset, 19), "offset is out of range"); \ + emit_int32(opc << 30 | 0b011 << 27 | encode_offset(offset, 19, 5) | rd->encoding_with_zr()); \ + } + + F(ldr_w, 0b00) + F(ldr, 0b01) + F(ldrsw, 0b10) +#undef F + +#define F(mnemonic, opc) \ + void mnemonic(FloatRegister rt, address literal_addr) { \ + intx offset = literal_addr - pc(); \ + assert (offset == 0 || ((uintx)literal_addr & right_n_bits(2 + opc)) == 0, "ldr target should be aligned"); \ + assert (is_offset_in_range(offset, 19), "offset is out of range"); \ + emit_int32(opc << 30 | 0b011100 << 24 | encode_offset(offset, 19, 5) | rt->encoding()); \ + } + + F(ldr_s, 0b00) + F(ldr_d, 0b01) + F(ldr_q, 0b10) +#undef F + +#define F(mnemonic, size, o2, L, o1, o0) \ + void mnemonic(Register rt, Register rn) { \ + emit_int32(size << 30 | 0b001000 << 24 | o2 << 23 | L << 22 | o1 << 21 | 0b11111 << 16 | \ + o0 << 15 | 0b11111 << 10 | rn->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(ldxrb, 0b00, 0, 1, 0, 0) + F(ldaxrb, 0b00, 0, 1, 0, 1) + F(ldarb, 0b00, 1, 1, 0, 1) + F(ldxrh, 0b01, 0, 1, 0, 0) + F(ldaxrh, 0b01, 0, 1, 0, 1) + F(ldarh, 0b01, 1, 1, 0, 1) + F(ldxr_w, 0b10, 0, 1, 0, 0) + F(ldaxr_w, 0b10, 0, 1, 0, 1) + F(ldar_w, 0b10, 1, 1, 0, 1) + F(ldxr, 0b11, 0, 1, 0, 0) + F(ldaxr, 0b11, 0, 1, 0, 1) + F(ldar, 0b11, 1, 1, 0, 1) + + F(stlrb, 0b00, 1, 0, 0, 1) + F(stlrh, 0b01, 1, 0, 0, 1) + F(stlr_w, 0b10, 1, 0, 0, 1) + F(stlr, 0b11, 1, 0, 0, 1) +#undef F + +#define F(mnemonic, size, o2, L, o1, o0) \ + void mnemonic(Register rs, Register rt, Register rn) { \ + assert (rs != rt, "should be different"); \ + assert (rs != rn, "should be different"); \ + emit_int32(size << 30 | 0b001000 << 24 | o2 << 23 | L << 22 | o1 << 21 | rs->encoding_with_zr() << 16 | \ + o0 << 15 | 0b11111 << 10 | rn->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(stxrb, 0b00, 0, 0, 0, 0) + F(stlxrb, 0b00, 0, 0, 0, 1) + F(stxrh, 0b01, 0, 0, 0, 0) + F(stlxrh, 0b01, 0, 0, 0, 1) + F(stxr_w, 0b10, 0, 0, 0, 0) + F(stlxr_w, 0b10, 0, 0, 0, 1) + F(stxr, 0b11, 0, 0, 0, 0) + F(stlxr, 0b11, 0, 0, 0, 1) +#undef F + +#define F(mnemonic, size, o2, L, o1, o0) \ + void mnemonic(Register rt, Register rt2, Register rn) { \ + assert (rt != rt2, "should be different"); \ + emit_int32(size << 30 | 0b001000 << 24 | o2 << 23 | L << 22 | o1 << 21 | 0b11111 << 16 | \ + o0 << 15 | rt2->encoding_with_zr() << 10 | rn->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(ldxp_w, 0b10, 0, 1, 1, 0) + F(ldaxp_w, 0b10, 0, 1, 1, 1) + F(ldxp, 0b11, 0, 1, 1, 0) + F(ldaxp, 0b11, 0, 1, 1, 1) +#undef F + +#define F(mnemonic, size, o2, L, o1, o0) \ + void mnemonic(Register rs, Register rt, Register rt2, Register rn) { \ + assert (rs != rt, "should be different"); \ + assert (rs != rt2, "should be different"); \ + assert (rs != rn, "should be different"); \ + emit_int32(size << 30 | 0b001000 << 24 | o2 << 23 | L << 22 | o1 << 21 | rs->encoding_with_zr() << 16 | \ + o0 << 15 | rt2->encoding_with_zr() << 10 | rn->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(stxp_w, 0b10, 0, 0, 1, 0) + F(stlxp_w, 0b10, 0, 0, 1, 1) + F(stxp, 0b11, 0, 0, 1, 0) + F(stlxp, 0b11, 0, 0, 1, 1) +#undef F + +#define F(mnemonic, opc, V, L) \ + void mnemonic(Register rt, Register rt2, Register rn, int offset = 0) { \ + assert (!L || rt != rt2, "should be different"); \ + int align_bits = 2 + (opc >> 1); \ + assert (is_imm_in_range(offset, 7, align_bits), "offset is out of range"); \ + emit_int32(opc << 30 | 0b101 << 27 | V << 26 | L << 22 | encode_imm(offset, 7, align_bits, 15) | \ + rt2->encoding_with_zr() << 10 | rn->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(stnp_w, 0b00, 0, 0) + F(ldnp_w, 0b00, 0, 1) + F(stnp, 0b10, 0, 0) + F(ldnp, 0b10, 0, 1) +#undef F + +#define F(mnemonic, opc, V, L) \ + void mnemonic(FloatRegister rt, FloatRegister rt2, Register rn, int offset = 0) { \ + assert (!L || (rt != rt2), "should be different"); \ + int align_bits = 2 + opc; \ + assert (is_imm_in_range(offset, 7, align_bits), "offset is out of range"); \ + emit_int32(opc << 30 | 0b101 << 27 | V << 26 | L << 22 | encode_imm(offset, 7, align_bits, 15) | \ + rt2->encoding() << 10 | rn->encoding_with_sp() << 5 | rt->encoding()); \ + } + + F(stnp_s, 0b00, 1, 0) + F(stnp_d, 0b01, 1, 0) + F(stnp_q, 0b10, 1, 0) + F(ldnp_s, 0b00, 1, 1) + F(ldnp_d, 0b01, 1, 1) + F(ldnp_q, 0b10, 1, 1) +#undef F + +#define F(mnemonic, size, V, opc) \ + void mnemonic(Register rt, Address addr) { \ + assert((addr.mode() == basic_offset) || (rt != addr.base()), "should be different"); \ + if (addr.index() == noreg) { \ + if ((addr.mode() == basic_offset) && is_unsigned_imm_in_range(addr.disp(), 12, size)) { \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | 0b01 << 24 | opc << 22 | \ + encode_unsigned_imm(addr.disp(), 12, size, 10) | \ + addr.base()->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } else { \ + assert(is_imm_in_range(addr.disp(), 9, 0), "offset is out of range"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | encode_imm(addr.disp(), 9, 0, 12) | \ + addr.mode() << 10 | addr.base()->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } \ + } else { \ + assert (addr.disp() == 0, "non-zero displacement for [reg + reg] address mode"); \ + assert ((addr.shift_imm() == 0) || (addr.shift_imm() == size), "invalid shift amount"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | 1 << 21 | \ + addr.index()->encoding_with_zr() << 16 | addr.extend() << 13 | (addr.shift_imm() != 0) << 12 | \ + 0b10 << 10 | addr.base()->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } \ + } + + F(strb, 0b00, 0, 0b00) + F(ldrb, 0b00, 0, 0b01) + F(ldrsb, 0b00, 0, 0b10) + F(ldrsb_w, 0b00, 0, 0b11) + + F(strh, 0b01, 0, 0b00) + F(ldrh, 0b01, 0, 0b01) + F(ldrsh, 0b01, 0, 0b10) + F(ldrsh_w, 0b01, 0, 0b11) + + F(str_w, 0b10, 0, 0b00) + F(ldr_w, 0b10, 0, 0b01) + F(ldrsw, 0b10, 0, 0b10) + + F(str, 0b11, 0, 0b00) + F(ldr, 0b11, 0, 0b01) +#undef F + +#define F(mnemonic, size, V, opc) \ + void mnemonic(AsmPrefetchOp prfop, Address addr) { \ + assert (addr.mode() == basic_offset, #mnemonic " supports only basic_offset address mode"); \ + if (addr.index() == noreg) { \ + if (is_unsigned_imm_in_range(addr.disp(), 12, size)) { \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | 0b01 << 24 | opc << 22 | \ + encode_unsigned_imm(addr.disp(), 12, size, 10) | \ + addr.base()->encoding_with_sp() << 5 | prfop); \ + } else { \ + assert(is_imm_in_range(addr.disp(), 9, 0), "offset is out of range"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | encode_imm(addr.disp(), 9, 0, 12) | \ + addr.base()->encoding_with_sp() << 5 | prfop); \ + } \ + } else { \ + assert (addr.disp() == 0, "non-zero displacement for [reg + reg] address mode"); \ + assert ((addr.shift_imm() == 0) || (addr.shift_imm() == size), "invalid shift amount"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | 1 << 21 | \ + addr.index()->encoding_with_zr() << 16 | addr.extend() << 13 | (addr.shift_imm() != 0) << 12 | \ + 0b10 << 10 | addr.base()->encoding_with_sp() << 5 | prfop); \ + } \ + } + + F(prfm, 0b11, 0, 0b10) +#undef F + +#define F(mnemonic, size, V, opc) \ + void mnemonic(FloatRegister rt, Address addr) { \ + int align_bits = (((opc & 0b10) >> 1) << 2) | size; \ + if (addr.index() == noreg) { \ + if ((addr.mode() == basic_offset) && is_unsigned_imm_in_range(addr.disp(), 12, align_bits)) { \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | 0b01 << 24 | opc << 22 | \ + encode_unsigned_imm(addr.disp(), 12, align_bits, 10) | \ + addr.base()->encoding_with_sp() << 5 | rt->encoding()); \ + } else { \ + assert(is_imm_in_range(addr.disp(), 9, 0), "offset is out of range"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | encode_imm(addr.disp(), 9, 0, 12) | \ + addr.mode() << 10 | addr.base()->encoding_with_sp() << 5 | rt->encoding()); \ + } \ + } else { \ + assert (addr.disp() == 0, "non-zero displacement for [reg + reg] address mode"); \ + assert ((addr.shift_imm() == 0) || (addr.shift_imm() == align_bits), "invalid shift amount"); \ + emit_int32(size << 30 | 0b111 << 27 | V << 26 | opc << 22 | 1 << 21 | \ + addr.index()->encoding_with_zr() << 16 | addr.extend() << 13 | (addr.shift_imm() != 0) << 12 | \ + 0b10 << 10 | addr.base()->encoding_with_sp() << 5 | rt->encoding()); \ + } \ + } + + F(str_b, 0b00, 1, 0b00) + F(ldr_b, 0b00, 1, 0b01) + F(str_h, 0b01, 1, 0b00) + F(ldr_h, 0b01, 1, 0b01) + F(str_s, 0b10, 1, 0b00) + F(ldr_s, 0b10, 1, 0b01) + F(str_d, 0b11, 1, 0b00) + F(ldr_d, 0b11, 1, 0b01) + F(str_q, 0b00, 1, 0b10) + F(ldr_q, 0b00, 1, 0b11) +#undef F + +#define F(mnemonic, opc, V, L) \ + void mnemonic(Register rt, Register rt2, Address addr) { \ + assert((addr.mode() == basic_offset) || ((rt != addr.base()) && (rt2 != addr.base())), "should be different"); \ + assert(!L || (rt != rt2), "should be different"); \ + assert(addr.index() == noreg, "[reg + reg] address mode is not available for load/store pair"); \ + int align_bits = 2 + (opc >> 1); \ + int mode_encoding = (addr.mode() == basic_offset) ? 0b10 : addr.mode(); \ + assert(is_imm_in_range(addr.disp(), 7, align_bits), "offset is out of range"); \ + emit_int32(opc << 30 | 0b101 << 27 | V << 26 | mode_encoding << 23 | L << 22 | \ + encode_imm(addr.disp(), 7, align_bits, 15) | rt2->encoding_with_zr() << 10 | \ + addr.base()->encoding_with_sp() << 5 | rt->encoding_with_zr()); \ + } + + F(stp_w, 0b00, 0, 0) + F(ldp_w, 0b00, 0, 1) + F(ldpsw, 0b01, 0, 1) + F(stp, 0b10, 0, 0) + F(ldp, 0b10, 0, 1) +#undef F + +#define F(mnemonic, opc, V, L) \ + void mnemonic(FloatRegister rt, FloatRegister rt2, Address addr) { \ + assert(!L || (rt != rt2), "should be different"); \ + assert(addr.index() == noreg, "[reg + reg] address mode is not available for load/store pair"); \ + int align_bits = 2 + opc; \ + int mode_encoding = (addr.mode() == basic_offset) ? 0b10 : addr.mode(); \ + assert(is_imm_in_range(addr.disp(), 7, align_bits), "offset is out of range"); \ + emit_int32(opc << 30 | 0b101 << 27 | V << 26 | mode_encoding << 23 | L << 22 | \ + encode_imm(addr.disp(), 7, align_bits, 15) | rt2->encoding() << 10 | \ + addr.base()->encoding_with_sp() << 5 | rt->encoding()); \ + } + + F(stp_s, 0b00, 1, 0) + F(ldp_s, 0b00, 1, 1) + F(stp_d, 0b01, 1, 0) + F(ldp_d, 0b01, 1, 1) + F(stp_q, 0b10, 1, 0) + F(ldp_q, 0b10, 1, 1) +#undef F + + // Data processing instructions + +#define F(mnemonic, sf, opc) \ + void mnemonic(Register rd, Register rn, const LogicalImmediate& imm) { \ + assert (imm.is_encoded(), "illegal immediate for logical instruction"); \ + assert (imm.is32bit() == (sf == 0), "immediate size does not match instruction size"); \ + emit_int32(sf << 31 | opc << 29 | 0b100100 << 23 | imm.immN() << 22 | imm.immr() << 16 | \ + imm.imms() << 10 | rn->encoding_with_zr() << 5 | \ + ((opc == 0b11) ? rd->encoding_with_zr() : rd->encoding_with_sp())); \ + } \ + void mnemonic(Register rd, Register rn, uintx imm) { \ + LogicalImmediate limm(imm, (sf == 0)); \ + mnemonic(rd, rn, limm); \ + } \ + void mnemonic(Register rd, Register rn, unsigned int imm) { \ + mnemonic(rd, rn, (uintx)imm); \ + } + + F(andr_w, 0, 0b00) + F(orr_w, 0, 0b01) + F(eor_w, 0, 0b10) + F(ands_w, 0, 0b11) + + F(andr, 1, 0b00) + F(orr, 1, 0b01) + F(eor, 1, 0b10) + F(ands, 1, 0b11) +#undef F + + void tst(Register rn, unsigned int imm) { + ands(ZR, rn, imm); + } + + void tst_w(Register rn, unsigned int imm) { + ands_w(ZR, rn, imm); + } + +#define F(mnemonic, sf, opc, N) \ + void mnemonic(Register rd, Register rn, AsmOperand operand) { \ + assert (operand.shift_imm() >> (5 + sf) == 0, "shift amount is too large"); \ + emit_int32(sf << 31 | opc << 29 | 0b01010 << 24 | operand.shift() << 22 | N << 21 | \ + operand.reg()->encoding_with_zr() << 16 | operand.shift_imm() << 10 | \ + rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(andr_w, 0, 0b00, 0) + F(bic_w, 0, 0b00, 1) + F(orr_w, 0, 0b01, 0) + F(orn_w, 0, 0b01, 1) + F(eor_w, 0, 0b10, 0) + F(eon_w, 0, 0b10, 1) + F(ands_w, 0, 0b11, 0) + F(bics_w, 0, 0b11, 1) + + F(andr, 1, 0b00, 0) + F(bic, 1, 0b00, 1) + F(orr, 1, 0b01, 0) + F(orn, 1, 0b01, 1) + F(eor, 1, 0b10, 0) + F(eon, 1, 0b10, 1) + F(ands, 1, 0b11, 0) + F(bics, 1, 0b11, 1) +#undef F + + void tst(Register rn, AsmOperand operand) { + ands(ZR, rn, operand); + } + + void tst_w(Register rn, AsmOperand operand) { + ands_w(ZR, rn, operand); + } + + void mvn(Register rd, AsmOperand operand) { + orn(rd, ZR, operand); + } + + void mvn_w(Register rd, AsmOperand operand) { + orn_w(rd, ZR, operand); + } + +#define F(mnemonic, sf, op, S) \ + void mnemonic(Register rd, Register rn, const ArithmeticImmediate& imm) { \ + assert(imm.is_encoded(), "immediate is out of range"); \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b10001 << 24 | imm.shift() << 22 | \ + imm.imm() << 10 | rn->encoding_with_sp() << 5 | \ + (S == 1 ? rd->encoding_with_zr() : rd->encoding_with_sp())); \ + } \ + void mnemonic(Register rd, Register rn, int imm) { \ + mnemonic(rd, rn, ArithmeticImmediate(imm)); \ + } \ + void mnemonic(Register rd, Register rn, int imm, AsmShift12 shift) { \ + mnemonic(rd, rn, ArithmeticImmediate(imm, shift)); \ + } \ + void mnemonic(Register rd, Register rn, Register rm, AsmExtendOp extend, int shift_imm = 0) { \ + assert ((0 <= shift_imm) && (shift_imm <= 4), "shift amount is out of range"); \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b01011001 << 21 | rm->encoding_with_zr() << 16 | \ + extend << 13 | shift_imm << 10 | rn->encoding_with_sp() << 5 | \ + (S == 1 ? rd->encoding_with_zr() : rd->encoding_with_sp())); \ + } \ + void mnemonic(Register rd, Register rn, AsmOperand operand) { \ + assert (operand.shift() != ror, "illegal shift type"); \ + assert (operand.shift_imm() >> (5 + sf) == 0, "shift amount is too large"); \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b01011 << 24 | operand.shift() << 22 | \ + operand.reg()->encoding_with_zr() << 16 | operand.shift_imm() << 10 | \ + rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(add_w, 0, 0, 0) + F(adds_w, 0, 0, 1) + F(sub_w, 0, 1, 0) + F(subs_w, 0, 1, 1) + + F(add, 1, 0, 0) + F(adds, 1, 0, 1) + F(sub, 1, 1, 0) + F(subs, 1, 1, 1) +#undef F + + void mov(Register rd, Register rm) { + if ((rd == SP) || (rm == SP)) { + add(rd, rm, 0); + } else { + orr(rd, ZR, rm); + } + } + + void mov_w(Register rd, Register rm) { + if ((rd == SP) || (rm == SP)) { + add_w(rd, rm, 0); + } else { + orr_w(rd, ZR, rm); + } + } + + void cmp(Register rn, int imm) { + subs(ZR, rn, imm); + } + + void cmp_w(Register rn, int imm) { + subs_w(ZR, rn, imm); + } + + void cmp(Register rn, Register rm) { + assert (rm != SP, "SP should not be used as the 2nd operand of cmp"); + if (rn == SP) { + subs(ZR, rn, rm, ex_uxtx); + } else { + subs(ZR, rn, rm); + } + } + + void cmp_w(Register rn, Register rm) { + assert ((rn != SP) && (rm != SP), "SP should not be used in 32-bit cmp"); + subs_w(ZR, rn, rm); + } + + void cmp(Register rn, AsmOperand operand) { + assert (rn != SP, "SP is not allowed in cmp with shifted register (AsmOperand)"); + subs(ZR, rn, operand); + } + + void cmn(Register rn, int imm) { + adds(ZR, rn, imm); + } + + void cmn_w(Register rn, int imm) { + adds_w(ZR, rn, imm); + } + + void cmn(Register rn, Register rm) { + assert (rm != SP, "SP should not be used as the 2nd operand of cmp"); + if (rn == SP) { + adds(ZR, rn, rm, ex_uxtx); + } else { + adds(ZR, rn, rm); + } + } + + void cmn_w(Register rn, Register rm) { + assert ((rn != SP) && (rm != SP), "SP should not be used in 32-bit cmp"); + adds_w(ZR, rn, rm); + } + + void neg(Register rd, Register rm) { + sub(rd, ZR, rm); + } + + void neg_w(Register rd, Register rm) { + sub_w(rd, ZR, rm); + } + +#define F(mnemonic, sf, op, S) \ + void mnemonic(Register rd, Register rn, Register rm) { \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b11010000 << 21 | rm->encoding_with_zr() << 16 | \ + rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(adc_w, 0, 0, 0) + F(adcs_w, 0, 0, 1) + F(sbc_w, 0, 1, 0) + F(sbcs_w, 0, 1, 1) + + F(adc, 1, 0, 0) + F(adcs, 1, 0, 1) + F(sbc, 1, 1, 0) + F(sbcs, 1, 1, 1) +#undef F + +#define F(mnemonic, sf, N) \ + void mnemonic(Register rd, Register rn, Register rm, int lsb) { \ + assert ((lsb >> (5 + sf)) == 0, "illegal least significant bit position"); \ + emit_int32(sf << 31 | 0b100111 << 23 | N << 22 | rm->encoding_with_zr() << 16 | \ + lsb << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(extr_w, 0, 0) + F(extr, 1, 1) +#undef F + +#define F(mnemonic, sf, opc) \ + void mnemonic(Register rd, int imm, int shift) { \ + assert ((imm >> 16) == 0, "immediate is out of range"); \ + assert (((shift & 0xf) == 0) && ((shift >> (5 + sf)) == 0), "invalid shift"); \ + emit_int32(sf << 31 | opc << 29 | 0b100101 << 23 | (shift >> 4) << 21 | \ + imm << 5 | rd->encoding_with_zr()); \ + } + + F(movn_w, 0, 0b00) + F(movz_w, 0, 0b10) + F(movk_w, 0, 0b11) + F(movn, 1, 0b00) + F(movz, 1, 0b10) + F(movk, 1, 0b11) +#undef F + + void mov(Register rd, int imm) { + assert ((imm >> 16) == 0, "immediate is out of range"); + movz(rd, imm, 0); + } + + void mov_w(Register rd, int imm) { + assert ((imm >> 16) == 0, "immediate is out of range"); + movz_w(rd, imm, 0); + } + +#define F(mnemonic, sf, op, S) \ + void mnemonic(Register rn, int imm, int nzcv, AsmCondition cond) { \ + assert ((imm >> 5) == 0, "immediate is out of range"); \ + assert ((nzcv >> 4) == 0, "illegal nzcv"); \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b11010010 << 21 | imm << 16 | \ + cond << 12 | 1 << 11 | rn->encoding_with_zr() << 5 | nzcv); \ + } + + F(ccmn_w, 0, 0, 1) + F(ccmp_w, 0, 1, 1) + F(ccmn, 1, 0, 1) + F(ccmp, 1, 1, 1) +#undef F + +#define F(mnemonic, sf, op, S) \ + void mnemonic(Register rn, Register rm, int nzcv, AsmCondition cond) { \ + assert ((nzcv >> 4) == 0, "illegal nzcv"); \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b11010010 << 21 | rm->encoding_with_zr() << 16 | \ + cond << 12 | rn->encoding_with_zr() << 5 | nzcv); \ + } + + F(ccmn_w, 0, 0, 1) + F(ccmp_w, 0, 1, 1) + F(ccmn, 1, 0, 1) + F(ccmp, 1, 1, 1) +#undef F + +#define F(mnemonic, sf, op, S, op2) \ + void mnemonic(Register rd, Register rn, Register rm, AsmCondition cond) { \ + emit_int32(sf << 31 | op << 30 | S << 29 | 0b11010100 << 21 | rm->encoding_with_zr() << 16 | \ + cond << 12 | op2 << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(csel_w, 0, 0, 0, 0b00) + F(csinc_w, 0, 0, 0, 0b01) + F(csinv_w, 0, 1, 0, 0b00) + F(csneg_w, 0, 1, 0, 0b01) + + F(csel, 1, 0, 0, 0b00) + F(csinc, 1, 0, 0, 0b01) + F(csinv, 1, 1, 0, 0b00) + F(csneg, 1, 1, 0, 0b01) +#undef F + + void cset(Register rd, AsmCondition cond) { + csinc(rd, ZR, ZR, inverse(cond)); + } + + void cset_w(Register rd, AsmCondition cond) { + csinc_w(rd, ZR, ZR, inverse(cond)); + } + + void csetm(Register rd, AsmCondition cond) { + csinv(rd, ZR, ZR, inverse(cond)); + } + + void csetm_w(Register rd, AsmCondition cond) { + csinv_w(rd, ZR, ZR, inverse(cond)); + } + + void cinc(Register rd, Register rn, AsmCondition cond) { + csinc(rd, rn, rn, inverse(cond)); + } + + void cinc_w(Register rd, Register rn, AsmCondition cond) { + csinc_w(rd, rn, rn, inverse(cond)); + } + + void cinv(Register rd, Register rn, AsmCondition cond) { + csinv(rd, rn, rn, inverse(cond)); + } + + void cinv_w(Register rd, Register rn, AsmCondition cond) { + csinv_w(rd, rn, rn, inverse(cond)); + } + +#define F(mnemonic, sf, S, opcode) \ + void mnemonic(Register rd, Register rn) { \ + emit_int32(sf << 31 | 1 << 30 | S << 29 | 0b11010110 << 21 | opcode << 10 | \ + rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(rbit_w, 0, 0, 0b000000) + F(rev16_w, 0, 0, 0b000001) + F(rev_w, 0, 0, 0b000010) + F(clz_w, 0, 0, 0b000100) + F(cls_w, 0, 0, 0b000101) + + F(rbit, 1, 0, 0b000000) + F(rev16, 1, 0, 0b000001) + F(rev32, 1, 0, 0b000010) + F(rev, 1, 0, 0b000011) + F(clz, 1, 0, 0b000100) + F(cls, 1, 0, 0b000101) +#undef F + +#define F(mnemonic, sf, S, opcode) \ + void mnemonic(Register rd, Register rn, Register rm) { \ + emit_int32(sf << 31 | S << 29 | 0b11010110 << 21 | rm->encoding_with_zr() << 16 | \ + opcode << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(udiv_w, 0, 0, 0b000010) + F(sdiv_w, 0, 0, 0b000011) + F(lslv_w, 0, 0, 0b001000) + F(lsrv_w, 0, 0, 0b001001) + F(asrv_w, 0, 0, 0b001010) + F(rorv_w, 0, 0, 0b001011) + + F(udiv, 1, 0, 0b000010) + F(sdiv, 1, 0, 0b000011) + F(lslv, 1, 0, 0b001000) + F(lsrv, 1, 0, 0b001001) + F(asrv, 1, 0, 0b001010) + F(rorv, 1, 0, 0b001011) +#undef F + +#define F(mnemonic, sf, op31, o0) \ + void mnemonic(Register rd, Register rn, Register rm, Register ra) { \ + emit_int32(sf << 31 | 0b11011 << 24 | op31 << 21 | rm->encoding_with_zr() << 16 | \ + o0 << 15 | ra->encoding_with_zr() << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(madd_w, 0, 0b000, 0) + F(msub_w, 0, 0b000, 1) + F(madd, 1, 0b000, 0) + F(msub, 1, 0b000, 1) + + F(smaddl, 1, 0b001, 0) + F(smsubl, 1, 0b001, 1) + F(umaddl, 1, 0b101, 0) + F(umsubl, 1, 0b101, 1) +#undef F + + void mul(Register rd, Register rn, Register rm) { + madd(rd, rn, rm, ZR); + } + + void mul_w(Register rd, Register rn, Register rm) { + madd_w(rd, rn, rm, ZR); + } + +#define F(mnemonic, sf, op31, o0) \ + void mnemonic(Register rd, Register rn, Register rm) { \ + emit_int32(sf << 31 | 0b11011 << 24 | op31 << 21 | rm->encoding_with_zr() << 16 | \ + o0 << 15 | 0b11111 << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(smulh, 1, 0b010, 0) + F(umulh, 1, 0b110, 0) +#undef F + +#define F(mnemonic, op) \ + void mnemonic(Register rd, address addr) { \ + intx offset; \ + if (op == 0) { \ + offset = addr - pc(); \ + } else { \ + offset = (((intx)addr) - (((intx)pc()) & ~0xfff)) >> 12; \ + } \ + assert (is_imm_in_range(offset, 21, 0), "offset is out of range"); \ + emit_int32(op << 31 | (offset & 3) << 29 | 0b10000 << 24 | \ + encode_imm(offset >> 2, 19, 0, 5) | rd->encoding_with_zr()); \ + } \ + + F(adr, 0) + F(adrp, 1) +#undef F + + void adr(Register rd, Label& L) { + adr(rd, target(L)); + } + +#define F(mnemonic, sf, opc, N) \ + void mnemonic(Register rd, Register rn, int immr, int imms) { \ + assert ((immr >> (5 + sf)) == 0, "immr is out of range"); \ + assert ((imms >> (5 + sf)) == 0, "imms is out of range"); \ + emit_int32(sf << 31 | opc << 29 | 0b100110 << 23 | N << 22 | immr << 16 | \ + imms << 10 | rn->encoding_with_zr() << 5 | rd->encoding_with_zr()); \ + } + + F(sbfm_w, 0, 0b00, 0) + F(bfm_w, 0, 0b01, 0) + F(ubfm_w, 0, 0b10, 0) + + F(sbfm, 1, 0b00, 1) + F(bfm, 1, 0b01, 1) + F(ubfm, 1, 0b10, 1) +#undef F + +#define F(alias, mnemonic, sf, immr, imms) \ + void alias(Register rd, Register rn, int lsb, int width) { \ + assert ((lsb >> (5 + sf)) == 0, "lsb is out of range"); \ + assert ((1 <= width) && (width <= (32 << sf) - lsb), "width is out of range"); \ + mnemonic(rd, rn, immr, imms); \ + } + + F(bfi_w, bfm_w, 0, (-lsb) & 0x1f, width - 1) + F(bfi, bfm, 1, (-lsb) & 0x3f, width - 1) + F(bfxil_w, bfm_w, 0, lsb, lsb + width - 1) + F(bfxil, bfm, 1, lsb, lsb + width - 1) + F(sbfiz_w, sbfm_w, 0, (-lsb) & 0x1f, width - 1) + F(sbfiz, sbfm, 1, (-lsb) & 0x3f, width - 1) + F(sbfx_w, sbfm_w, 0, lsb, lsb + width - 1) + F(sbfx, sbfm, 1, lsb, lsb + width - 1) + F(ubfiz_w, ubfm_w, 0, (-lsb) & 0x1f, width - 1) + F(ubfiz, ubfm, 1, (-lsb) & 0x3f, width - 1) + F(ubfx_w, ubfm_w, 0, lsb, lsb + width - 1) + F(ubfx, ubfm, 1, lsb, lsb + width - 1) +#undef F + +#define F(alias, mnemonic, sf, immr, imms) \ + void alias(Register rd, Register rn, int shift) { \ + assert ((shift >> (5 + sf)) == 0, "shift is out of range"); \ + mnemonic(rd, rn, immr, imms); \ + } + + F(_asr_w, sbfm_w, 0, shift, 31) + F(_asr, sbfm, 1, shift, 63) + F(_lsl_w, ubfm_w, 0, (-shift) & 0x1f, 31 - shift) + F(_lsl, ubfm, 1, (-shift) & 0x3f, 63 - shift) + F(_lsr_w, ubfm_w, 0, shift, 31) + F(_lsr, ubfm, 1, shift, 63) +#undef F + +#define F(alias, mnemonic, immr, imms) \ + void alias(Register rd, Register rn) { \ + mnemonic(rd, rn, immr, imms); \ + } + + F(sxtb_w, sbfm_w, 0, 7) + F(sxtb, sbfm, 0, 7) + F(sxth_w, sbfm_w, 0, 15) + F(sxth, sbfm, 0, 15) + F(sxtw, sbfm, 0, 31) + F(uxtb_w, ubfm_w, 0, 7) + F(uxtb, ubfm, 0, 7) + F(uxth_w, ubfm_w, 0, 15) + F(uxth, ubfm, 0, 15) +#undef F + + // Branch instructions + +#define F(mnemonic, op) \ + void mnemonic(Register rn) { \ + emit_int32(0b1101011 << 25 | op << 21 | 0b11111 << 16 | rn->encoding_with_zr() << 5); \ + } + + F(br, 0b00) + F(blr, 0b01) + F(ret, 0b10) +#undef F + + void ret() { + ret(LR); + } + +#define F(mnemonic, op) \ + void mnemonic(address target) { \ + intx offset = target - pc(); \ + assert (is_offset_in_range(offset, 26), "offset is out of range"); \ + emit_int32(op << 31 | 0b00101 << 26 | encode_offset(offset, 26, 0)); \ + } + + F(b, 0) + F(bl, 1) +#undef F + + void b(address target, AsmCondition cond) { + if (cond == al) { + b(target); + } else { + intx offset = target - pc(); + assert (is_offset_in_range(offset, 19), "offset is out of range"); + emit_int32(0b0101010 << 25 | encode_offset(offset, 19, 5) | cond); + } + } + + +#define F(mnemonic, sf, op) \ + void mnemonic(Register rt, address target) { \ + intx offset = target - pc(); \ + assert (is_offset_in_range(offset, 19), "offset is out of range"); \ + emit_int32(sf << 31 | 0b011010 << 25 | op << 24 | encode_offset(offset, 19, 5) | rt->encoding_with_zr()); \ + } \ + + F(cbz_w, 0, 0) + F(cbnz_w, 0, 1) + F(cbz, 1, 0) + F(cbnz, 1, 1) +#undef F + +#define F(mnemonic, op) \ + void mnemonic(Register rt, int bit, address target) { \ + intx offset = target - pc(); \ + assert (is_offset_in_range(offset, 14), "offset is out of range"); \ + assert (0 <= bit && bit < 64, "bit number is out of range"); \ + emit_int32((bit >> 5) << 31 | 0b011011 << 25 | op << 24 | (bit & 0x1f) << 19 | \ + encode_offset(offset, 14, 5) | rt->encoding_with_zr()); \ + } \ + + F(tbz, 0) + F(tbnz, 1) +#undef F + + // System instructions + + enum DMB_Opt { + DMB_ld = 0b1101, + DMB_st = 0b1110, + DMB_all = 0b1111 + }; + +#define F(mnemonic, L, op0, op1, CRn, op2, Rt) \ + void mnemonic(DMB_Opt option) { \ + emit_int32(0b1101010100 << 22 | L << 21 | op0 << 19 | op1 << 16 | \ + CRn << 12 | option << 8 | op2 << 5 | Rt); \ + } + + F(dsb, 0, 0b00, 0b011, 0b0011, 0b100, 0b11111) + F(dmb, 0, 0b00, 0b011, 0b0011, 0b101, 0b11111) +#undef F + +#define F(mnemonic, L, op0, op1, CRn, Rt) \ + void mnemonic(int imm) { \ + assert ((imm >> 7) == 0, "immediate is out of range"); \ + emit_int32(0b1101010100 << 22 | L << 21 | op0 << 19 | op1 << 16 | \ + CRn << 12 | imm << 5 | Rt); \ + } + + F(hint, 0, 0b00, 0b011, 0b0010, 0b11111) +#undef F + + void nop() { + hint(0); + } + + void yield() { + hint(1); + } + +#define F(mnemonic, opc, op2, LL) \ + void mnemonic(int imm = 0) { \ + assert ((imm >> 16) == 0, "immediate is out of range"); \ + emit_int32(0b11010100 << 24 | opc << 21 | imm << 5 | op2 << 2 | LL); \ + } + + F(brk, 0b001, 0b000, 0b00) + F(hlt, 0b010, 0b000, 0b00) +#undef F + + enum SystemRegister { // o0<1> op1<3> CRn<4> CRm<4> op2<3> + SysReg_NZCV = 0b101101000010000, + SysReg_FPCR = 0b101101000100000, + }; + + void mrs(Register rt, SystemRegister systemReg) { + assert ((systemReg >> 15) == 0, "systemReg is out of range"); + emit_int32(0b110101010011 << 20 | systemReg << 5 | rt->encoding_with_zr()); + } + + void msr(SystemRegister systemReg, Register rt) { + assert ((systemReg >> 15) == 0, "systemReg is out of range"); + emit_int32(0b110101010001 << 20 | systemReg << 5 | rt->encoding_with_zr()); + } + + // Floating-point instructions + +#define F(mnemonic, M, S, type, opcode2) \ + void mnemonic(FloatRegister rn, FloatRegister rm) { \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rm->encoding() << 16 | 0b1000 << 10 | rn->encoding() << 5 | opcode2); \ + } + + F(fcmp_s, 0, 0, 0b00, 0b00000) + F(fcmpe_s, 0, 0, 0b00, 0b01000) + F(fcmp_d, 0, 0, 0b01, 0b00000) + F(fcmpe_d, 0, 0, 0b01, 0b10000) +#undef F + +#define F(mnemonic, M, S, type, opcode2) \ + void mnemonic(FloatRegister rn) { \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + 0b1000 << 10 | rn->encoding() << 5 | opcode2); \ + } + + F(fcmp0_s, 0, 0, 0b00, 0b01000) + F(fcmpe0_s, 0, 0, 0b00, 0b11000) + F(fcmp0_d, 0, 0, 0b01, 0b01000) + F(fcmpe0_d, 0, 0, 0b01, 0b11000) +#undef F + +#define F(mnemonic, M, S, type, op) \ + void mnemonic(FloatRegister rn, FloatRegister rm, int nzcv, AsmCondition cond) { \ + assert ((nzcv >> 4) == 0, "illegal nzcv"); \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rm->encoding() << 16 | cond << 12 | 0b01 << 10 | rn->encoding() << 5 | op << 4 | nzcv); \ + } + + F(fccmp_s, 0, 0, 0b00, 0) + F(fccmpe_s, 0, 0, 0b00, 1) + F(fccmp_d, 0, 0, 0b01, 0) + F(fccmpe_d, 0, 0, 0b01, 1) +#undef F + +#define F(mnemonic, M, S, type) \ + void mnemonic(FloatRegister rd, FloatRegister rn, FloatRegister rm, AsmCondition cond) { \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rm->encoding() << 16 | cond << 12 | 0b11 << 10 | rn->encoding() << 5 | rd->encoding()); \ + } + + F(fcsel_s, 0, 0, 0b00) + F(fcsel_d, 0, 0, 0b01) +#undef F + +#define F(mnemonic, M, S, type, opcode) \ + void mnemonic(FloatRegister rd, FloatRegister rn) { \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + opcode << 15 | 0b10000 << 10 | rn->encoding() << 5 | rd->encoding()); \ + } + + F(fmov_s, 0, 0, 0b00, 0b000000) + F(fabs_s, 0, 0, 0b00, 0b000001) + F(fneg_s, 0, 0, 0b00, 0b000010) + F(fsqrt_s, 0, 0, 0b00, 0b000011) + F(fcvt_ds, 0, 0, 0b00, 0b000101) + F(fcvt_hs, 0, 0, 0b00, 0b000111) + F(frintn_s, 0, 0, 0b00, 0b001000) + F(frintp_s, 0, 0, 0b00, 0b001001) + F(frintm_s, 0, 0, 0b00, 0b001010) + F(frintz_s, 0, 0, 0b00, 0b001011) + F(frinta_s, 0, 0, 0b00, 0b001100) + F(frintx_s, 0, 0, 0b00, 0b001110) + F(frinti_s, 0, 0, 0b00, 0b001111) + + F(fmov_d, 0, 0, 0b01, 0b000000) + F(fabs_d, 0, 0, 0b01, 0b000001) + F(fneg_d, 0, 0, 0b01, 0b000010) + F(fsqrt_d, 0, 0, 0b01, 0b000011) + F(fcvt_sd, 0, 0, 0b01, 0b000100) + F(fcvt_hd, 0, 0, 0b01, 0b000111) + F(frintn_d, 0, 0, 0b01, 0b001000) + F(frintp_d, 0, 0, 0b01, 0b001001) + F(frintm_d, 0, 0, 0b01, 0b001010) + F(frintz_d, 0, 0, 0b01, 0b001011) + F(frinta_d, 0, 0, 0b01, 0b001100) + F(frintx_d, 0, 0, 0b01, 0b001110) + F(frinti_d, 0, 0, 0b01, 0b001111) + + F(fcvt_sh, 0, 0, 0b11, 0b000100) + F(fcvt_dh, 0, 0, 0b11, 0b000101) +#undef F + +#define F(mnemonic, M, S, type, opcode) \ + void mnemonic(FloatRegister rd, FloatRegister rn, FloatRegister rm) { \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rm->encoding() << 16 | opcode << 12 | 0b10 << 10 | rn->encoding() << 5 | rd->encoding()); \ + } + + F(fmul_s, 0, 0, 0b00, 0b0000) + F(fdiv_s, 0, 0, 0b00, 0b0001) + F(fadd_s, 0, 0, 0b00, 0b0010) + F(fsub_s, 0, 0, 0b00, 0b0011) + F(fmax_s, 0, 0, 0b00, 0b0100) + F(fmin_s, 0, 0, 0b00, 0b0101) + F(fmaxnm_s, 0, 0, 0b00, 0b0110) + F(fminnm_s, 0, 0, 0b00, 0b0111) + F(fnmul_s, 0, 0, 0b00, 0b1000) + + F(fmul_d, 0, 0, 0b01, 0b0000) + F(fdiv_d, 0, 0, 0b01, 0b0001) + F(fadd_d, 0, 0, 0b01, 0b0010) + F(fsub_d, 0, 0, 0b01, 0b0011) + F(fmax_d, 0, 0, 0b01, 0b0100) + F(fmin_d, 0, 0, 0b01, 0b0101) + F(fmaxnm_d, 0, 0, 0b01, 0b0110) + F(fminnm_d, 0, 0, 0b01, 0b0111) + F(fnmul_d, 0, 0, 0b01, 0b1000) +#undef F + +#define F(mnemonic, M, S, type, o1, o0) \ + void mnemonic(FloatRegister rd, FloatRegister rn, FloatRegister rm, FloatRegister ra) { \ + emit_int32(M << 31 | S << 29 | 0b11111 << 24 | type << 22 | o1 << 21 | rm->encoding() << 16 | \ + o0 << 15 | ra->encoding() << 10 | rn->encoding() << 5 | rd->encoding()); \ + } + + F(fmadd_s, 0, 0, 0b00, 0, 0) + F(fmsub_s, 0, 0, 0b00, 0, 1) + F(fnmadd_s, 0, 0, 0b00, 1, 0) + F(fnmsub_s, 0, 0, 0b00, 1, 1) + + F(fmadd_d, 0, 0, 0b01, 0, 0) + F(fmsub_d, 0, 0, 0b01, 0, 1) + F(fnmadd_d, 0, 0, 0b01, 1, 0) + F(fnmsub_d, 0, 0, 0b01, 1, 1) +#undef F + +#define F(mnemonic, M, S, type) \ + void mnemonic(FloatRegister rd, int imm8) { \ + assert ((imm8 >> 8) == 0, "immediate is out of range"); \ + emit_int32(M << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + imm8 << 13 | 0b100 << 10 | rd->encoding()); \ + } + + F(fmov_s, 0, 0, 0b00) + F(fmov_d, 0, 0, 0b01) +#undef F + +#define F(mnemonic, sf, S, type, rmode, opcode) \ + void mnemonic(Register rd, FloatRegister rn) { \ + emit_int32(sf << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rmode << 19 | opcode << 16 | rn->encoding() << 5 | rd->encoding_with_zr()); \ + } + + F(fcvtns_ws, 0, 0, 0b00, 0b00, 0b000) + F(fcvtnu_ws, 0, 0, 0b00, 0b00, 0b001) + F(fcvtas_ws, 0, 0, 0b00, 0b00, 0b100) + F(fcvtau_ws, 0, 0, 0b00, 0b00, 0b101) + F(fmov_ws, 0, 0, 0b00, 0b00, 0b110) + F(fcvtps_ws, 0, 0, 0b00, 0b01, 0b000) + F(fcvtpu_ws, 0, 0, 0b00, 0b01, 0b001) + F(fcvtms_ws, 0, 0, 0b00, 0b10, 0b000) + F(fcvtmu_ws, 0, 0, 0b00, 0b10, 0b001) + F(fcvtzs_ws, 0, 0, 0b00, 0b11, 0b000) + F(fcvtzu_ws, 0, 0, 0b00, 0b11, 0b001) + + F(fcvtns_wd, 0, 0, 0b01, 0b00, 0b000) + F(fcvtnu_wd, 0, 0, 0b01, 0b00, 0b001) + F(fcvtas_wd, 0, 0, 0b01, 0b00, 0b100) + F(fcvtau_wd, 0, 0, 0b01, 0b00, 0b101) + F(fcvtps_wd, 0, 0, 0b01, 0b01, 0b000) + F(fcvtpu_wd, 0, 0, 0b01, 0b01, 0b001) + F(fcvtms_wd, 0, 0, 0b01, 0b10, 0b000) + F(fcvtmu_wd, 0, 0, 0b01, 0b10, 0b001) + F(fcvtzs_wd, 0, 0, 0b01, 0b11, 0b000) + F(fcvtzu_wd, 0, 0, 0b01, 0b11, 0b001) + + F(fcvtns_xs, 1, 0, 0b00, 0b00, 0b000) + F(fcvtnu_xs, 1, 0, 0b00, 0b00, 0b001) + F(fcvtas_xs, 1, 0, 0b00, 0b00, 0b100) + F(fcvtau_xs, 1, 0, 0b00, 0b00, 0b101) + F(fcvtps_xs, 1, 0, 0b00, 0b01, 0b000) + F(fcvtpu_xs, 1, 0, 0b00, 0b01, 0b001) + F(fcvtms_xs, 1, 0, 0b00, 0b10, 0b000) + F(fcvtmu_xs, 1, 0, 0b00, 0b10, 0b001) + F(fcvtzs_xs, 1, 0, 0b00, 0b11, 0b000) + F(fcvtzu_xs, 1, 0, 0b00, 0b11, 0b001) + + F(fcvtns_xd, 1, 0, 0b01, 0b00, 0b000) + F(fcvtnu_xd, 1, 0, 0b01, 0b00, 0b001) + F(fcvtas_xd, 1, 0, 0b01, 0b00, 0b100) + F(fcvtau_xd, 1, 0, 0b01, 0b00, 0b101) + F(fmov_xd, 1, 0, 0b01, 0b00, 0b110) + F(fcvtps_xd, 1, 0, 0b01, 0b01, 0b000) + F(fcvtpu_xd, 1, 0, 0b01, 0b01, 0b001) + F(fcvtms_xd, 1, 0, 0b01, 0b10, 0b000) + F(fcvtmu_xd, 1, 0, 0b01, 0b10, 0b001) + F(fcvtzs_xd, 1, 0, 0b01, 0b11, 0b000) + F(fcvtzu_xd, 1, 0, 0b01, 0b11, 0b001) + + F(fmov_xq, 1, 0, 0b10, 0b01, 0b110) +#undef F + +#define F(mnemonic, sf, S, type, rmode, opcode) \ + void mnemonic(FloatRegister rd, Register rn) { \ + emit_int32(sf << 31 | S << 29 | 0b11110 << 24 | type << 22 | 1 << 21 | \ + rmode << 19 | opcode << 16 | rn->encoding_with_zr() << 5 | rd->encoding()); \ + } + + F(scvtf_sw, 0, 0, 0b00, 0b00, 0b010) + F(ucvtf_sw, 0, 0, 0b00, 0b00, 0b011) + F(fmov_sw, 0, 0, 0b00, 0b00, 0b111) + F(scvtf_dw, 0, 0, 0b01, 0b00, 0b010) + F(ucvtf_dw, 0, 0, 0b01, 0b00, 0b011) + + F(scvtf_sx, 1, 0, 0b00, 0b00, 0b010) + F(ucvtf_sx, 1, 0, 0b00, 0b00, 0b011) + F(scvtf_dx, 1, 0, 0b01, 0b00, 0b010) + F(ucvtf_dx, 1, 0, 0b01, 0b00, 0b011) + F(fmov_dx, 1, 0, 0b01, 0b00, 0b111) + + F(fmov_qx, 1, 0, 0b10, 0b01, 0b111) +#undef F + +#define F(mnemonic, opcode) \ + void mnemonic(FloatRegister Vd, FloatRegister Vn) { \ + emit_int32( opcode << 10 | Vn->encoding() << 5 | Vd->encoding()); \ + } + + F(aese, 0b0100111000101000010010); + F(aesd, 0b0100111000101000010110); + F(aesmc, 0b0100111000101000011010); + F(aesimc, 0b0100111000101000011110); +#undef F + +#ifdef COMPILER2 + typedef VFP::double_num double_num; + typedef VFP::float_num float_num; +#endif + + void vcnt(FloatRegister Dd, FloatRegister Dn, int quad = 0, int size = 0) { + // emitted at VM startup to detect whether the instruction is available + assert(!VM_Version::is_initialized() || VM_Version::has_simd(), "simd instruction"); + assert(size == 0, "illegal size value"); + emit_int32(0x0e205800 | quad << 30 | size << 22 | Dn->encoding() << 5 | Dd->encoding()); + } + +#ifdef COMPILER2 + void addv(FloatRegister Dd, FloatRegister Dm, int quad, int size) { + // emitted at VM startup to detect whether the instruction is available + assert(VM_Version::has_simd(), "simd instruction"); + assert((quad & ~1) == 0, "illegal value"); + assert(size >= 0 && size < 3, "illegal value"); + assert(((size << 1) | quad) != 4, "illegal values (size 2, quad 0)"); + emit_int32(0x0e31b800 | quad << 30 | size << 22 | Dm->encoding() << 5 | Dd->encoding()); + } + + enum VElem_Size { + VELEM_SIZE_8 = 0x00, + VELEM_SIZE_16 = 0x01, + VELEM_SIZE_32 = 0x02, + VELEM_SIZE_64 = 0x03 + }; + + enum VLD_Type { + VLD1_TYPE_1_REG = 0b0111, + VLD1_TYPE_2_REGS = 0b1010, + VLD1_TYPE_3_REGS = 0b0110, + VLD1_TYPE_4_REGS = 0b0010 + }; + + enum VFloat_Arith_Size { + VFA_SIZE_F32 = 0b0, + VFA_SIZE_F64 = 0b1 + }; + +#define F(mnemonic, U, S, P) \ + void mnemonic(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + int size, int quad) { \ + assert(VM_Version::has_simd(), "simd instruction"); \ + assert(!(size == VFA_SIZE_F64 && !quad), "reserved"); \ + assert((size & 1) == size, "overflow"); \ + emit_int32(quad << 30 | U << 29 | 0b01110 << 24 | \ + S << 23 | size << 22 | 1 << 21 | P << 11 | 1 << 10 | \ + fm->encoding() << 16 | \ + fn->encoding() << 5 | \ + fd->encoding()); \ + } + + F(vaddF, 0, 0, 0b11010) // Vd = Vn + Vm (float) + F(vsubF, 0, 1, 0b11010) // Vd = Vn - Vm (float) + F(vmulF, 1, 0, 0b11011) // Vd = Vn - Vm (float) + F(vdivF, 1, 0, 0b11111) // Vd = Vn / Vm (float) +#undef F + +#define F(mnemonic, U) \ + void mnemonic(FloatRegister fd, FloatRegister fm, FloatRegister fn, \ + int size, int quad) { \ + assert(VM_Version::has_simd(), "simd instruction"); \ + assert(!(size == VELEM_SIZE_64 && !quad), "reserved"); \ + assert((size & 0b11) == size, "overflow"); \ + int R = 0; /* rounding */ \ + int S = 0; /* saturating */ \ + emit_int32(quad << 30 | U << 29 | 0b01110 << 24 | size << 22 | \ + 1 << 21 | R << 12 | S << 11 | 0b10001 << 10 | \ + fm->encoding() << 16 | \ + fn->encoding() << 5 | \ + fd->encoding()); \ + } + + F(vshlSI, 0) // Vd = ashift(Vn,Vm) (int) + F(vshlUI, 1) // Vd = lshift(Vn,Vm) (int) +#undef F + +#define F(mnemonic, U, P, M) \ + void mnemonic(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + int size, int quad) { \ + assert(VM_Version::has_simd(), "simd instruction"); \ + assert(!(size == VELEM_SIZE_64 && !quad), "reserved"); \ + assert(!(size == VELEM_SIZE_64 && M), "reserved"); \ + assert((size & 0b11) == size, "overflow"); \ + emit_int32(quad << 30 | U << 29 | 0b01110 << 24 | size << 22 | \ + 1 << 21 | P << 11 | 1 << 10 | \ + fm->encoding() << 16 | \ + fn->encoding() << 5 | \ + fd->encoding()); \ + } + + F(vmulI, 0, 0b10011, true) // Vd = Vn * Vm (int) + F(vaddI, 0, 0b10000, false) // Vd = Vn + Vm (int) + F(vsubI, 1, 0b10000, false) // Vd = Vn - Vm (int) +#undef F + +#define F(mnemonic, U, O) \ + void mnemonic(FloatRegister fd, FloatRegister fn, FloatRegister fm, \ + int quad) { \ + assert(VM_Version::has_simd(), "simd instruction"); \ + emit_int32(quad << 30 | U << 29 | 0b01110 << 24 | O << 22 | \ + 1 << 21 | 0b00011 << 11 | 1 << 10 | \ + fm->encoding() << 16 | \ + fn->encoding() << 5 | \ + fd->encoding()); \ + } + + F(vandI, 0, 0b00) // Vd = Vn & Vm (int) + F(vorI, 0, 0b10) // Vd = Vn | Vm (int) + F(vxorI, 1, 0b00) // Vd = Vn ^ Vm (int) +#undef F + + void vnegI(FloatRegister fd, FloatRegister fn, int size, int quad) { + int U = 1; + assert(VM_Version::has_simd(), "simd instruction"); + assert(quad || size != VELEM_SIZE_64, "reserved"); + emit_int32(quad << 30 | U << 29 | 0b01110 << 24 | + size << 22 | 0b100000101110 << 10 | + fn->encoding() << 5 | + fd->encoding() << 0); + } + + void vshli(FloatRegister fd, FloatRegister fn, int esize, int imm, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + + if (imm >= esize) { + // maximum shift gives all zeroes, direction doesn't matter, + // but only available for shift right + vshri(fd, fn, esize, esize, true /* unsigned */, quad); + return; + } + assert(imm >= 0 && imm < esize, "out of range"); + + int imm7 = esize + imm; + int immh = imm7 >> 3; + assert(immh != 0, "encoding constraint"); + assert((uint)immh < 16, "sanity"); + assert(((immh >> 2) | quad) != 0b10, "reserved"); + emit_int32(quad << 30 | 0b011110 << 23 | imm7 << 16 | + 0b010101 << 10 | fn->encoding() << 5 | fd->encoding() << 0); + } + + void vshri(FloatRegister fd, FloatRegister fn, int esize, int imm, + bool U /* unsigned */, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(imm > 0, "out of range"); + if (imm >= esize) { + // maximum shift (all zeroes) + imm = esize; + } + int imm7 = 2 * esize - imm ; + int immh = imm7 >> 3; + assert(immh != 0, "encoding constraint"); + assert((uint)immh < 16, "sanity"); + assert(((immh >> 2) | quad) != 0b10, "reserved"); + emit_int32(quad << 30 | U << 29 | 0b011110 << 23 | imm7 << 16 | + 0b000001 << 10 | fn->encoding() << 5 | fd->encoding() << 0); + } + void vshrUI(FloatRegister fd, FloatRegister fm, int size, int imm, int quad) { + vshri(fd, fm, size, imm, true /* unsigned */, quad); + } + void vshrSI(FloatRegister fd, FloatRegister fm, int size, int imm, int quad) { + vshri(fd, fm, size, imm, false /* signed */, quad); + } + + void vld1(FloatRegister Vt, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(addr.disp() == 0 || addr.disp() == 16, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 1; + int opcode = VLD1_TYPE_1_REG; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vst1(FloatRegister Vt, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(addr.disp() == 0 || addr.disp() == 16, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 0; + int opcode = VLD1_TYPE_1_REG; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vld1(FloatRegister Vt, FloatRegister Vt2, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(Vt->successor() == Vt2, "Registers must be ordered"); + assert(addr.disp() == 0 || addr.disp() == 32, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 1; + int opcode = VLD1_TYPE_2_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vst1(FloatRegister Vt, FloatRegister Vt2, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(Vt->successor() == Vt2, "Registers must be ordered"); + assert(bits == 128, "unsupported"); + assert(addr.disp() == 0 || addr.disp() == 32, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 0; + int opcode = VLD1_TYPE_2_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vld1(FloatRegister Vt, FloatRegister Vt2, FloatRegister Vt3, + Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(Vt->successor() == Vt2 && Vt2->successor() == Vt3, + "Registers must be ordered"); + assert(addr.disp() == 0 || addr.disp() == 48, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 1; + int opcode = VLD1_TYPE_3_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vst1(FloatRegister Vt, FloatRegister Vt2, FloatRegister Vt3, + Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(Vt->successor() == Vt2 && Vt2->successor() == Vt3, + "Registers must be ordered"); + assert(addr.disp() == 0 || addr.disp() == 48, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 0; + int opcode = VLD1_TYPE_3_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vld1(FloatRegister Vt, FloatRegister Vt2, FloatRegister Vt3, + FloatRegister Vt4, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(Vt->successor() == Vt2 && Vt2->successor() == Vt3 && + Vt3->successor() == Vt4, "Registers must be ordered"); + assert(addr.disp() == 0 || addr.disp() == 64, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 1; + int opcode = VLD1_TYPE_4_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void vst1(FloatRegister Vt, FloatRegister Vt2, FloatRegister Vt3, + FloatRegister Vt4, Address addr, VElem_Size size, int bits) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(bits == 128, "unsupported"); + assert(Vt->successor() == Vt2 && Vt2->successor() == Vt3 && + Vt3->successor() == Vt4, "Registers must be ordered"); + assert(addr.disp() == 0 || addr.disp() == 64, "must be"); + int type = 0b11; // 2D + int quad = 1; + int L = 0; + int opcode = VLD1_TYPE_4_REGS; + emit_int32(quad << 30 | 0b11 << 26 | L << 22 | opcode << 12 | size << 10 | + Vt->encoding() << 0 | addr.encoding_simd()); + } + + void rev32(FloatRegister Vd, FloatRegister Vn, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(size == VELEM_SIZE_8 || size == VELEM_SIZE_16, "must be"); + emit_int32(quad << 30 | 0b101110 << 24 | size << 22 | + 0b100000000010 << 10 | Vn->encoding() << 5 | Vd->encoding()); + } + + void eor(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(size == VELEM_SIZE_8, "must be"); + emit_int32(quad << 30 | 0b101110001 << 21 | Vm->encoding() << 16 | + 0b000111 << 10 | Vn->encoding() << 5 | Vd->encoding()); + } + + void orr(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(size == VELEM_SIZE_8, "must be"); + emit_int32(quad << 30 | 0b001110101 << 21 | Vm->encoding() << 16 | + 0b000111 << 10 | Vn->encoding() << 5 | Vd->encoding()); + } + + void vmovI(FloatRegister Dd, int imm8, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(imm8 >= 0 && imm8 < 256, "out of range"); + int op; + int cmode; + switch (size) { + case VELEM_SIZE_8: + op = 0; + cmode = 0b1110; + break; + case VELEM_SIZE_16: + op = 0; + cmode = 0b1000; + break; + case VELEM_SIZE_32: + op = 0; + cmode = 0b0000; + break; + default: + cmode = 0; + ShouldNotReachHere(); + } + int abc = imm8 >> 5; + int defgh = imm8 & 0b11111; + emit_int32(quad << 30 | op << 29 | 0b1111 << 24 | + abc << 16 | cmode << 12 | 0b01 << 10 | + defgh << 5 | Dd->encoding() << 0); + } + + void vdupI(FloatRegister Dd, Register Rn, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + assert(size <= 3, "unallocated encoding"); + assert(size != 3 || quad == 1, "reserved"); + int imm5 = 1 << size; +#ifdef ASSERT + switch (size) { + case VELEM_SIZE_8: + assert(imm5 == 0b00001, "sanity"); + break; + case VELEM_SIZE_16: + assert(imm5 == 0b00010, "sanity"); + break; + case VELEM_SIZE_32: + assert(imm5 == 0b00100, "sanity"); + break; + case VELEM_SIZE_64: + assert(imm5 == 0b01000, "sanity"); + break; + default: + ShouldNotReachHere(); + } +#endif + emit_int32(quad << 30 | 0b111 << 25 | 0b11 << 10 | + imm5 << 16 | Rn->encoding() << 5 | + Dd->encoding() << 0); + } + + void vdup(FloatRegister Vd, FloatRegister Vn, VElem_Size size, int quad) { + assert(VM_Version::has_simd(), "simd instruction"); + int index = 0; + int bytes = 1 << size; + int range = 16 / bytes; + assert(index < range, "overflow"); + + assert(size != VELEM_SIZE_64 || quad, "reserved"); + assert(8 << VELEM_SIZE_8 == 8, "sanity"); + assert(8 << VELEM_SIZE_16 == 16, "sanity"); + assert(8 << VELEM_SIZE_32 == 32, "sanity"); + assert(8 << VELEM_SIZE_64 == 64, "sanity"); + + int imm5 = (index << (size + 1)) | bytes; + + emit_int32(quad << 30 | 0b001110000 << 21 | imm5 << 16 | 0b000001 << 10 | + Vn->encoding() << 5 | Vd->encoding() << 0); + } + + void vdupF(FloatRegister Vd, FloatRegister Vn, int quad) { + vdup(Vd, Vn, VELEM_SIZE_32, quad); + } + + void vdupD(FloatRegister Vd, FloatRegister Vn, int quad) { + vdup(Vd, Vn, VELEM_SIZE_64, quad); + } +#endif +}; + + +#endif // CPU_ARM_VM_ASSEMBLER_ARM_64_HPP diff --git a/hotspot/src/cpu/arm/vm/bytes_arm.hpp b/hotspot/src/cpu/arm/vm/bytes_arm.hpp new file mode 100644 index 00000000000..0cf7e2a77c9 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/bytes_arm.hpp @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_BYTES_ARM_HPP +#define CPU_ARM_VM_BYTES_ARM_HPP + +#include "memory/allocation.hpp" +#include "utilities/macros.hpp" + +#ifndef VM_LITTLE_ENDIAN +#define VM_LITTLE_ENDIAN 1 +#endif + +class Bytes: AllStatic { + + public: + // Returns true if the byte ordering used by Java is different from the native byte ordering + // of the underlying machine. + static inline bool is_Java_byte_ordering_different() { + return VM_LITTLE_ENDIAN != 0; + } + + static inline u2 get_Java_u2(address p) { + return (u2(p[0]) << 8) | u2(p[1]); + } + + static inline u4 get_Java_u4(address p) { + return u4(p[0]) << 24 | + u4(p[1]) << 16 | + u4(p[2]) << 8 | + u4(p[3]); + } + + static inline u8 get_Java_u8(address p) { + return u8(p[0]) << 56 | + u8(p[1]) << 48 | + u8(p[2]) << 40 | + u8(p[3]) << 32 | + u8(p[4]) << 24 | + u8(p[5]) << 16 | + u8(p[6]) << 8 | + u8(p[7]); + } + + static inline void put_Java_u2(address p, u2 x) { + p[0] = x >> 8; + p[1] = x; + } + + static inline void put_Java_u4(address p, u4 x) { + ((u1*)p)[0] = x >> 24; + ((u1*)p)[1] = x >> 16; + ((u1*)p)[2] = x >> 8; + ((u1*)p)[3] = x; + } + + static inline void put_Java_u8(address p, u8 x) { + ((u1*)p)[0] = x >> 56; + ((u1*)p)[1] = x >> 48; + ((u1*)p)[2] = x >> 40; + ((u1*)p)[3] = x >> 32; + ((u1*)p)[4] = x >> 24; + ((u1*)p)[5] = x >> 16; + ((u1*)p)[6] = x >> 8; + ((u1*)p)[7] = x; + } + +#ifdef VM_LITTLE_ENDIAN + + static inline u2 get_native_u2(address p) { + return (intptr_t(p) & 1) == 0 ? *(u2*)p : u2(p[0]) | (u2(p[1]) << 8); + } + + static inline u4 get_native_u4(address p) { + switch (intptr_t(p) & 3) { + case 0: return *(u4*)p; + case 2: return u4(((u2*)p)[0]) | + u4(((u2*)p)[1]) << 16; + default: return u4(p[0]) | + u4(p[1]) << 8 | + u4(p[2]) << 16 | + u4(p[3]) << 24; + } + } + + static inline u8 get_native_u8(address p) { + switch (intptr_t(p) & 7) { + case 0: return *(u8*)p; + case 4: return u8(((u4*)p)[0]) | + u8(((u4*)p)[1]) << 32; + case 2: return u8(((u2*)p)[0]) | + u8(((u2*)p)[1]) << 16 | + u8(((u2*)p)[2]) << 32 | + u8(((u2*)p)[3]) << 48; + default: return u8(p[0]) | + u8(p[1]) << 8 | + u8(p[2]) << 16 | + u8(p[3]) << 24 | + u8(p[4]) << 32 | + u8(p[5]) << 40 | + u8(p[6]) << 48 | + u8(p[7]) << 56; + } + } + + static inline void put_native_u2(address p, u2 x) { + if ((intptr_t(p) & 1) == 0) { + *(u2*)p = x; + } else { + p[0] = x; + p[1] = x >> 8; + } + } + + static inline void put_native_u4(address p, u4 x) { + switch (intptr_t(p) & 3) { + case 0: *(u4*)p = x; + break; + case 2: ((u2*)p)[0] = x; + ((u2*)p)[1] = x >> 16; + break; + default: ((u1*)p)[0] = x; + ((u1*)p)[1] = x >> 8; + ((u1*)p)[2] = x >> 16; + ((u1*)p)[3] = x >> 24; + break; + } + } + + static inline void put_native_u8(address p, u8 x) { + switch (intptr_t(p) & 7) { + case 0: *(u8*)p = x; + break; + case 4: ((u4*)p)[0] = x; + ((u4*)p)[1] = x >> 32; + break; + case 2: ((u2*)p)[0] = x; + ((u2*)p)[1] = x >> 16; + ((u2*)p)[2] = x >> 32; + ((u2*)p)[3] = x >> 48; + break; + default: ((u1*)p)[0] = x; + ((u1*)p)[1] = x >> 8; + ((u1*)p)[2] = x >> 16; + ((u1*)p)[3] = x >> 24; + ((u1*)p)[4] = x >> 32; + ((u1*)p)[5] = x >> 40; + ((u1*)p)[6] = x >> 48; + ((u1*)p)[7] = x >> 56; + } + } + +#else + + static inline u2 get_native_u2(address p) { return get_Java_u2(p); } + static inline u4 get_native_u4(address p) { return get_Java_u4(p); } + static inline u8 get_native_u8(address p) { return get_Java_u8(p); } + static inline void put_native_u2(address p, u2 x) { put_Java_u2(p, x); } + static inline void put_native_u4(address p, u4 x) { put_Java_u4(p, x); } + static inline void put_native_u8(address p, u8 x) { put_Java_u8(p, x); } + +#endif // VM_LITTLE_ENDIAN + + // Efficient swapping of byte ordering + static inline u2 swap_u2(u2 x); + static inline u4 swap_u4(u4 x); + static inline u8 swap_u8(u8 x); +}; + + +// The following header contains the implementations of swap_u2, swap_u4, and swap_u8 +#include OS_CPU_HEADER_INLINE(bytes) + +#endif // CPU_ARM_VM_BYTES_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_CodeStubs_arm.cpp b/hotspot/src/cpu/arm/vm/c1_CodeStubs_arm.cpp new file mode 100644 index 00000000000..20cf726895a --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_CodeStubs_arm.cpp @@ -0,0 +1,510 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" +#include "c1/c1_CodeStubs.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "nativeInst_arm.hpp" +#include "runtime/sharedRuntime.hpp" +#include "utilities/macros.hpp" +#include "vmreg_arm.inline.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#endif // INCLUDE_ALL_GCS + +#define __ ce->masm()-> + +void CounterOverflowStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + ce->store_parameter(_bci, 0); + ce->store_parameter(_method->as_constant_ptr()->as_metadata(), 1); + __ call(Runtime1::entry_for(Runtime1::counter_overflow_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + + __ b(_continuation); +} + + +// TODO: ARM - is it possible to inline these stubs into the main code stream? + +RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, + bool throw_index_out_of_bounds_exception) + : _throw_index_out_of_bounds_exception(throw_index_out_of_bounds_exception) + , _index(index) +{ + _info = info == NULL ? NULL : new CodeEmitInfo(info); +} + + +void RangeCheckStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + + if (_info->deoptimize_on_exception()) { +#ifdef AARCH64 + __ NOT_TESTED(); +#endif + __ call(Runtime1::entry_for(Runtime1::predicate_failed_trap_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + debug_only(__ should_not_reach_here()); + return; + } + // Pass the array index on stack because all registers must be preserved + ce->verify_reserved_argument_area_size(1); + if (_index->is_cpu_register()) { + __ str_32(_index->as_register(), Address(SP)); + } else { + __ mov_slow(Rtemp, _index->as_jint()); // Rtemp should be OK in C1 + __ str_32(Rtemp, Address(SP)); + } + + if (_throw_index_out_of_bounds_exception) { +#ifdef AARCH64 + __ NOT_TESTED(); +#endif + __ call(Runtime1::entry_for(Runtime1::throw_index_exception_id), relocInfo::runtime_call_type); + } else { + __ call(Runtime1::entry_for(Runtime1::throw_range_check_failed_id), relocInfo::runtime_call_type); + } + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + DEBUG_ONLY(STOP("RangeCheck");) +} + +PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) { + _info = new CodeEmitInfo(info); +} + +void PredicateFailedStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + __ call(Runtime1::entry_for(Runtime1::predicate_failed_trap_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + debug_only(__ should_not_reach_here()); +} + +void DivByZeroStub::emit_code(LIR_Assembler* ce) { + if (_offset != -1) { + ce->compilation()->implicit_exception_table()->append(_offset, __ offset()); + } + __ bind(_entry); + __ call(Runtime1::entry_for(Runtime1::throw_div0_exception_id), + relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + DEBUG_ONLY(STOP("DivByZero");) +} + + +// Implementation of NewInstanceStub + +NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, Runtime1::StubID stub_id) { + _result = result; + _klass = klass; + _klass_reg = klass_reg; + _info = new CodeEmitInfo(info); + assert(stub_id == Runtime1::new_instance_id || + stub_id == Runtime1::fast_new_instance_id || + stub_id == Runtime1::fast_new_instance_init_check_id, + "need new_instance id"); + _stub_id = stub_id; +} + + +void NewInstanceStub::emit_code(LIR_Assembler* ce) { + assert(_result->as_register() == R0, "runtime call setup"); + assert(_klass_reg->as_register() == R1, "runtime call setup"); + __ bind(_entry); + __ call(Runtime1::entry_for(_stub_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + __ b(_continuation); +} + + +// Implementation of NewTypeArrayStub + +NewTypeArrayStub::NewTypeArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) { + _klass_reg = klass_reg; + _length = length; + _result = result; + _info = new CodeEmitInfo(info); +} + + +void NewTypeArrayStub::emit_code(LIR_Assembler* ce) { + assert(_result->as_register() == R0, "runtime call setup"); + assert(_klass_reg->as_register() == R1, "runtime call setup"); + assert(_length->as_register() == R2, "runtime call setup"); + __ bind(_entry); + __ call(Runtime1::entry_for(Runtime1::new_type_array_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + __ b(_continuation); +} + + +// Implementation of NewObjectArrayStub + +NewObjectArrayStub::NewObjectArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) { + _klass_reg = klass_reg; + _result = result; + _length = length; + _info = new CodeEmitInfo(info); +} + + +void NewObjectArrayStub::emit_code(LIR_Assembler* ce) { + assert(_result->as_register() == R0, "runtime call setup"); + assert(_klass_reg->as_register() == R1, "runtime call setup"); + assert(_length->as_register() == R2, "runtime call setup"); + __ bind(_entry); + __ call(Runtime1::entry_for(Runtime1::new_object_array_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + __ b(_continuation); +} + + +// Implementation of MonitorAccessStubs + +MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, CodeEmitInfo* info) +: MonitorAccessStub(obj_reg, lock_reg) +{ + _info = new CodeEmitInfo(info); +} + + +void MonitorEnterStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + const Register obj_reg = _obj_reg->as_pointer_register(); + const Register lock_reg = _lock_reg->as_pointer_register(); + + ce->verify_reserved_argument_area_size(2); +#ifdef AARCH64 + __ stp(obj_reg, lock_reg, Address(SP)); +#else + if (obj_reg < lock_reg) { + __ stmia(SP, RegisterSet(obj_reg) | RegisterSet(lock_reg)); + } else { + __ str(obj_reg, Address(SP)); + __ str(lock_reg, Address(SP, BytesPerWord)); + } +#endif // AARCH64 + + Runtime1::StubID enter_id = ce->compilation()->has_fpu_code() ? + Runtime1::monitorenter_id : + Runtime1::monitorenter_nofpu_id; + __ call(Runtime1::entry_for(enter_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + __ b(_continuation); +} + + +void MonitorExitStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + if (_compute_lock) { + ce->monitor_address(_monitor_ix, _lock_reg); + } + const Register lock_reg = _lock_reg->as_pointer_register(); + + ce->verify_reserved_argument_area_size(1); + __ str(lock_reg, Address(SP)); + + // Non-blocking leaf routine - no call info needed + Runtime1::StubID exit_id = ce->compilation()->has_fpu_code() ? + Runtime1::monitorexit_id : + Runtime1::monitorexit_nofpu_id; + __ call(Runtime1::entry_for(exit_id), relocInfo::runtime_call_type); + __ b(_continuation); +} + + +// Call return is directly after patch word +int PatchingStub::_patch_info_offset = 0; + +void PatchingStub::align_patch_site(MacroAssembler* masm) { +#if 0 + // TODO: investigate if we required to implement this + ShouldNotReachHere(); +#endif +} + +void PatchingStub::emit_code(LIR_Assembler* ce) { + const int patchable_instruction_offset = AARCH64_ONLY(NativeInstruction::instruction_size) NOT_AARCH64(0); + + assert(NativeCall::instruction_size <= _bytes_to_copy && _bytes_to_copy <= 0xFF, + "not enough room for call"); + assert((_bytes_to_copy & 3) == 0, "must copy a multiple of four bytes"); + Label call_patch; + bool is_load = (_id == load_klass_id) || (_id == load_mirror_id) || (_id == load_appendix_id); + +#ifdef AARCH64 + assert(nativeInstruction_at(_pc_start)->is_nop(), "required for MT safe patching"); + + // Same alignment of reg2mem code and PatchingStub code. Required to make copied bind_literal() code properly aligned. + __ align(wordSize); +#endif // AARCH64 + + if (is_load NOT_AARCH64(&& !VM_Version::supports_movw())) { + address start = __ pc(); + + // The following sequence duplicates code provided in MacroAssembler::patchable_mov_oop() + // without creating relocation info entry. +#ifdef AARCH64 + // Extra nop for MT safe patching + __ nop(); +#endif // AARCH64 + + assert((__ pc() - start) == patchable_instruction_offset, "should be"); +#ifdef AARCH64 + __ ldr(_obj, __ pc()); +#else + __ ldr(_obj, Address(PC)); + // Extra nop to handle case of large offset of oop placeholder (see NativeMovConstReg::set_data). + __ nop(); +#endif // AARCH64 + +#ifdef ASSERT + for (int i = 0; i < _bytes_to_copy; i++) { + assert(((address)_pc_start)[i] == start[i], "should be the same code"); + } +#endif // ASSERT + } + + address being_initialized_entry = __ pc(); + if (CommentedAssembly) { + __ block_comment(" patch template"); + } + if (is_load) { + address start = __ pc(); + if (_id == load_mirror_id || _id == load_appendix_id) { + __ patchable_mov_oop(_obj, (jobject)Universe::non_oop_word(), _index); + } else { + __ patchable_mov_metadata(_obj, (Metadata*)Universe::non_oop_word(), _index); + } +#ifdef ASSERT + for (int i = 0; i < _bytes_to_copy; i++) { + assert(((address)_pc_start)[i] == start[i], "should be the same code"); + } +#endif // ASSERT + } else { + int* start = (int*)_pc_start; + int* end = start + (_bytes_to_copy / BytesPerInt); + while (start < end) { + __ emit_int32(*start++); + } + } + address end_of_patch = __ pc(); + + int bytes_to_skip = 0; + if (_id == load_mirror_id) { + int offset = __ offset(); + if (CommentedAssembly) { + __ block_comment(" being_initialized check"); + } + + assert(_obj != noreg, "must be a valid register"); + // Rtemp should be OK in C1 + __ ldr(Rtemp, Address(_obj, java_lang_Class::klass_offset_in_bytes())); + __ ldr(Rtemp, Address(Rtemp, InstanceKlass::init_thread_offset())); + __ cmp(Rtemp, Rthread); + __ b(call_patch, ne); + __ b(_patch_site_continuation); + + bytes_to_skip += __ offset() - offset; + } + + if (CommentedAssembly) { + __ block_comment("patch data - 3 high bytes of the word"); + } + const int sizeof_patch_record = 4; + bytes_to_skip += sizeof_patch_record; + int being_initialized_entry_offset = __ pc() - being_initialized_entry + sizeof_patch_record; + __ emit_int32(0xff | being_initialized_entry_offset << 8 | bytes_to_skip << 16 | _bytes_to_copy << 24); + + address patch_info_pc = __ pc(); + assert(patch_info_pc - end_of_patch == bytes_to_skip, "incorrect patch info"); + + // runtime call will return here + Label call_return; + __ bind(call_return); + ce->add_call_info_here(_info); + assert(_patch_info_offset == (patch_info_pc - __ pc()), "must not change"); + __ b(_patch_site_entry); + + address entry = __ pc(); + NativeGeneralJump::insert_unconditional((address)_pc_start, entry); + address target = NULL; + relocInfo::relocType reloc_type = relocInfo::none; + switch (_id) { + case access_field_id: target = Runtime1::entry_for(Runtime1::access_field_patching_id); break; + case load_klass_id: target = Runtime1::entry_for(Runtime1::load_klass_patching_id); reloc_type = relocInfo::metadata_type; break; + case load_mirror_id: target = Runtime1::entry_for(Runtime1::load_mirror_patching_id); reloc_type = relocInfo::oop_type; break; + case load_appendix_id: target = Runtime1::entry_for(Runtime1::load_appendix_patching_id); reloc_type = relocInfo::oop_type; break; + default: ShouldNotReachHere(); + } + __ bind(call_patch); + + if (CommentedAssembly) { + __ block_comment("patch entry point"); + } + + // arrange for call to return just after patch word + __ adr(LR, call_return); + __ jump(target, relocInfo::runtime_call_type, Rtemp); + + if (is_load) { + CodeSection* cs = __ code_section(); + address pc = (address)_pc_start; + RelocIterator iter(cs, pc, pc + 1); + relocInfo::change_reloc_info_for_address(&iter, pc, reloc_type, relocInfo::none); + } +} + +void DeoptimizeStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + __ mov_slow(Rtemp, _trap_request); + ce->verify_reserved_argument_area_size(1); + __ str(Rtemp, Address(SP)); + __ call(Runtime1::entry_for(Runtime1::deoptimize_id), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + DEBUG_ONLY(__ should_not_reach_here()); +} + + +void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) { + address a; + if (_info->deoptimize_on_exception()) { + // Deoptimize, do not throw the exception, because it is + // probably wrong to do it here. + a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id); + } else { + a = Runtime1::entry_for(Runtime1::throw_null_pointer_exception_id); + } + ce->compilation()->implicit_exception_table()->append(_offset, __ offset()); + __ bind(_entry); + __ call(a, relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + ce->verify_oop_map(_info); + DEBUG_ONLY(STOP("ImplicitNullCheck");) +} + + +void SimpleExceptionStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + // Pass the object on stack because all registers must be preserved + if (_obj->is_cpu_register()) { + ce->verify_reserved_argument_area_size(1); + __ str(_obj->as_pointer_register(), Address(SP)); + } else { + assert(_obj->is_illegal(), "should be"); + } + __ call(Runtime1::entry_for(_stub), relocInfo::runtime_call_type); + ce->add_call_info_here(_info); + DEBUG_ONLY(STOP("SimpleException");) +} + + +void ArrayCopyStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + + VMRegPair args[5]; + BasicType signature[5] = { T_OBJECT, T_INT, T_OBJECT, T_INT, T_INT }; + SharedRuntime::java_calling_convention(signature, args, 5, true); + + Register r[5]; + r[0] = src()->as_pointer_register(); + r[1] = src_pos()->as_register(); + r[2] = dst()->as_pointer_register(); + r[3] = dst_pos()->as_register(); + r[4] = length()->as_register(); + + for (int i = 0; i < 5; i++) { + VMReg arg = args[i].first(); + if (arg->is_stack()) { + __ str(r[i], Address(SP, arg->reg2stack() * VMRegImpl::stack_slot_size)); + } else { + assert(r[i] == arg->as_Register(), "Calling conventions must match"); + } + } + + ce->emit_static_call_stub(); + if (ce->compilation()->bailed_out()) { + return; // CodeCache is full + } + int ret_addr_offset = __ patchable_call(SharedRuntime::get_resolve_static_call_stub(), relocInfo::static_call_type); + assert(ret_addr_offset == __ offset(), "embedded return address not allowed"); + ce->add_call_info_here(info()); + ce->verify_oop_map(info()); + __ b(_continuation); +} + +///////////////////////////////////////////////////////////////////////////// +#if INCLUDE_ALL_GCS + +void G1PreBarrierStub::emit_code(LIR_Assembler* ce) { + // At this point we know that marking is in progress. + // If do_load() is true then we have to emit the + // load of the previous value; otherwise it has already + // been loaded into _pre_val. + + __ bind(_entry); + assert(pre_val()->is_register(), "Precondition."); + + Register pre_val_reg = pre_val()->as_register(); + + if (do_load()) { + ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/); + } + + __ cbz(pre_val_reg, _continuation); + ce->verify_reserved_argument_area_size(1); + __ str(pre_val_reg, Address(SP)); + __ call(Runtime1::entry_for(Runtime1::g1_pre_barrier_slow_id), relocInfo::runtime_call_type); + + __ b(_continuation); +} + +void G1PostBarrierStub::emit_code(LIR_Assembler* ce) { + __ bind(_entry); + assert(addr()->is_register(), "Precondition."); + assert(new_val()->is_register(), "Precondition."); + Register new_val_reg = new_val()->as_register(); + __ cbz(new_val_reg, _continuation); + ce->verify_reserved_argument_area_size(1); + __ str(addr()->as_pointer_register(), Address(SP)); + __ call(Runtime1::entry_for(Runtime1::g1_post_barrier_slow_id), relocInfo::runtime_call_type); + __ b(_continuation); +} + +#endif // INCLUDE_ALL_GCS +///////////////////////////////////////////////////////////////////////////// + +#undef __ diff --git a/hotspot/src/cpu/arm/vm/c1_Defs_arm.hpp b/hotspot/src/cpu/arm/vm/c1_Defs_arm.hpp new file mode 100644 index 00000000000..e16bb3d6673 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_Defs_arm.hpp @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_C1_DEFS_ARM_HPP +#define CPU_ARM_VM_C1_DEFS_ARM_HPP + +// native word offsets from memory address (little endian) +enum { + pd_lo_word_offset_in_bytes = 0, + pd_hi_word_offset_in_bytes = BytesPerWord +}; + +// explicit rounding operations are required to implement the strictFP mode +enum { + pd_strict_fp_requires_explicit_rounding = false +}; + +#ifdef __SOFTFP__ +#define SOFT(n) n +#define VFP(n) +#else // __SOFTFP__ +#define SOFT(n) +#define VFP(n) n +#endif // __SOFTFP__ + + +// registers +enum { + pd_nof_cpu_regs_frame_map = AARCH64_ONLY(33) NOT_AARCH64(16), // number of registers used during code emission + pd_nof_caller_save_cpu_regs_frame_map = AARCH64_ONLY(27) NOT_AARCH64(10), // number of registers killed by calls + pd_nof_cpu_regs_reg_alloc = AARCH64_ONLY(27) NOT_AARCH64(10), // number of registers that are visible to register allocator (including Rheap_base which is visible only if compressed pointers are not enabled) + pd_nof_cpu_regs_linearscan = pd_nof_cpu_regs_frame_map, // number of registers visible to linear scan + pd_nof_cpu_regs_processed_in_linearscan = pd_nof_cpu_regs_reg_alloc + 1, // number of registers processed in linear scan; includes LR as it is used as temporary register in c1_LIRGenerator_arm + pd_first_cpu_reg = 0, + pd_last_cpu_reg = pd_nof_cpu_regs_frame_map - 1, + + pd_nof_fpu_regs_frame_map = VFP(32) SOFT(0), // number of float registers used during code emission + pd_nof_caller_save_fpu_regs_frame_map = VFP(32) SOFT(0), // number of float registers killed by calls + pd_nof_fpu_regs_reg_alloc = AARCH64_ONLY(32) NOT_AARCH64(VFP(30) SOFT(0)), // number of float registers that are visible to register allocator + pd_nof_fpu_regs_linearscan = pd_nof_fpu_regs_frame_map, // number of float registers visible to linear scan + pd_first_fpu_reg = pd_nof_cpu_regs_frame_map, + pd_last_fpu_reg = pd_first_fpu_reg + pd_nof_fpu_regs_frame_map - 1, + + pd_nof_xmm_regs_linearscan = 0, + pd_nof_caller_save_xmm_regs = 0, + pd_first_xmm_reg = -1, + pd_last_xmm_reg = -1 +}; + + +// encoding of float value in debug info: +enum { + pd_float_saved_as_double = false +}; + +#ifdef AARCH64 +#define PATCHED_ADDR 0xff8 +#else +#define PATCHED_ADDR (204) +#endif +#define CARDTABLEMODREF_POST_BARRIER_HELPER +#define GENERATE_ADDRESS_IS_PREFERRED + +#endif // CPU_ARM_VM_C1_DEFS_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.cpp b/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.cpp new file mode 100644 index 00000000000..ac826b491a2 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.cpp @@ -0,0 +1,31 @@ +/* + * 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. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_FpuStackSim.hpp" +#include "c1/c1_FrameMap.hpp" +#include "utilities/array.hpp" +#include "utilities/ostream.hpp" + +// Nothing needed here diff --git a/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.hpp b/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.hpp new file mode 100644 index 00000000000..babd0616fde --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_FpuStackSim_arm.hpp @@ -0,0 +1,30 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP +#define CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP + +// Nothing needed here + +#endif // CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.cpp b/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.cpp new file mode 100644 index 00000000000..55b5fcc137a --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.cpp @@ -0,0 +1,230 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIR.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_arm.inline.hpp" + +LIR_Opr FrameMap::R0_opr; +LIR_Opr FrameMap::R1_opr; +LIR_Opr FrameMap::R2_opr; +LIR_Opr FrameMap::R3_opr; +LIR_Opr FrameMap::R4_opr; +LIR_Opr FrameMap::R5_opr; + +LIR_Opr FrameMap::R0_oop_opr; +LIR_Opr FrameMap::R1_oop_opr; +LIR_Opr FrameMap::R2_oop_opr; +LIR_Opr FrameMap::R3_oop_opr; +LIR_Opr FrameMap::R4_oop_opr; +LIR_Opr FrameMap::R5_oop_opr; + +LIR_Opr FrameMap::R0_metadata_opr; +LIR_Opr FrameMap::R1_metadata_opr; +LIR_Opr FrameMap::R2_metadata_opr; +LIR_Opr FrameMap::R3_metadata_opr; +LIR_Opr FrameMap::R4_metadata_opr; +LIR_Opr FrameMap::R5_metadata_opr; + +#ifdef AARCH64 +LIR_Opr FrameMap::ZR_opr; +#endif // AARCH64 + +LIR_Opr FrameMap::LR_opr; +LIR_Opr FrameMap::LR_oop_opr; +LIR_Opr FrameMap::LR_ptr_opr; +LIR_Opr FrameMap::FP_opr; +LIR_Opr FrameMap::SP_opr; +LIR_Opr FrameMap::Rthread_opr; + +LIR_Opr FrameMap::Int_result_opr; +LIR_Opr FrameMap::Long_result_opr; +LIR_Opr FrameMap::Object_result_opr; +LIR_Opr FrameMap::Float_result_opr; +LIR_Opr FrameMap::Double_result_opr; + +LIR_Opr FrameMap::Exception_oop_opr; +LIR_Opr FrameMap::Exception_pc_opr; + +LIR_Opr FrameMap::_caller_save_cpu_regs[] = { 0 }; +LIR_Opr FrameMap::_caller_save_fpu_regs[]; // same as initialize to zero + +LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool) { + LIR_Opr opr = LIR_OprFact::illegalOpr; + VMReg r_1 = reg->first(); + VMReg r_2 = reg->second(); + if (r_1->is_stack()) { + int st_off = (r_1->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size; + opr = LIR_OprFact::address(new LIR_Address(SP_opr, st_off, type)); + } else if (r_1->is_Register()) { + Register reg = r_1->as_Register(); + if (r_2->is_Register() && (type == T_LONG || type == T_DOUBLE)) { +#ifdef AARCH64 + assert(r_1->next() == r_2, "should be the same"); + opr = as_long_opr(reg); +#else + opr = as_long_opr(reg, r_2->as_Register()); +#endif + } else if (type == T_OBJECT || type == T_ARRAY) { + opr = as_oop_opr(reg); + } else if (type == T_METADATA) { + opr = as_metadata_opr(reg); + } else { + // PreferInterpreterNativeStubs should ensure we never need to + // handle a long opr passed as R3+stack_slot + assert(! r_2->is_stack(), "missing support for ALIGN_WIDE_ARGUMENTS==0"); + opr = as_opr(reg); + } + } else if (r_1->is_FloatRegister()) { + FloatRegister reg = r_1->as_FloatRegister(); + opr = type == T_FLOAT ? as_float_opr(reg) : as_double_opr(reg); + } else { + ShouldNotReachHere(); + } + return opr; +} + + +void FrameMap::initialize() { + if (_init_done) return; + + int i; + int rnum = 0; + + // Registers used for allocation +#ifdef AARCH64 + assert(Rthread == R28 && Rheap_base == R27 && Rtemp == R16, "change the code here"); + for (i = 0; i < 16; i++) { + map_register(rnum++, as_Register(i)); + } + for (i = 17; i < 28; i++) { + map_register(rnum++, as_Register(i)); + } +#else + assert(Rthread == R10 && Rtemp == R12, "change the code here"); + for (i = 0; i < 10; i++) { + map_register(rnum++, as_Register(i)); + } +#endif // AARCH64 + assert(rnum == pd_nof_cpu_regs_reg_alloc, "should be"); + + // Registers not used for allocation + map_register(rnum++, LR); // LR register should be listed first, see c1_LinearScan_arm.hpp::is_processed_reg_num. + assert(rnum == pd_nof_cpu_regs_processed_in_linearscan, "should be"); + + map_register(rnum++, Rtemp); + map_register(rnum++, Rthread); + map_register(rnum++, FP); // ARM32: R7 or R11 + map_register(rnum++, SP); +#ifdef AARCH64 + map_register(rnum++, ZR); +#else + map_register(rnum++, PC); +#endif + assert(rnum == pd_nof_cpu_regs_frame_map, "should be"); + + _init_done = true; + + R0_opr = as_opr(R0); R0_oop_opr = as_oop_opr(R0); R0_metadata_opr = as_metadata_opr(R0); + R1_opr = as_opr(R1); R1_oop_opr = as_oop_opr(R1); R1_metadata_opr = as_metadata_opr(R1); + R2_opr = as_opr(R2); R2_oop_opr = as_oop_opr(R2); R2_metadata_opr = as_metadata_opr(R2); + R3_opr = as_opr(R3); R3_oop_opr = as_oop_opr(R3); R3_metadata_opr = as_metadata_opr(R3); + R4_opr = as_opr(R4); R4_oop_opr = as_oop_opr(R4); R4_metadata_opr = as_metadata_opr(R4); + R5_opr = as_opr(R5); R5_oop_opr = as_oop_opr(R5); R5_metadata_opr = as_metadata_opr(R5); + +#ifdef AARCH64 + ZR_opr = as_opr(ZR); +#endif // AARCH64 + + LR_opr = as_opr(LR); + LR_oop_opr = as_oop_opr(LR); + LR_ptr_opr = as_pointer_opr(LR); + FP_opr = as_pointer_opr(FP); + SP_opr = as_pointer_opr(SP); + Rthread_opr = as_pointer_opr(Rthread); + + // LIR operands for result + Int_result_opr = R0_opr; + Object_result_opr = R0_oop_opr; +#ifdef AARCH64 + Long_result_opr = as_long_opr(R0); + Float_result_opr = as_float_opr(S0); + Double_result_opr = as_double_opr(D0); +#else + Long_result_opr = as_long_opr(R0, R1); +#ifdef __ABI_HARD__ + Float_result_opr = as_float_opr(S0); + Double_result_opr = as_double_opr(D0); +#else + Float_result_opr = LIR_OprFact::single_softfp(0); + Double_result_opr = LIR_OprFact::double_softfp(0, 1); +#endif // __ABI_HARD__ +#endif // AARCH64 + + Exception_oop_opr = as_oop_opr(Rexception_obj); + Exception_pc_opr = as_opr(Rexception_pc); + + for (i = 0; i < nof_caller_save_cpu_regs(); i++) { + _caller_save_cpu_regs[i] = LIR_OprFact::single_cpu(i); + } + for (i = 0; i < nof_caller_save_fpu_regs; i++) { + _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i); + } +} + + +Address FrameMap::make_new_address(ByteSize sp_offset) const { + return Address(SP, sp_offset); +} + +LIR_Opr FrameMap::stack_pointer() { + return FrameMap::SP_opr; +} + +LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() { + assert(Rmh_SP_save == FP, "Fix register used for saving SP for MethodHandle calls"); + return FP_opr; +} + +bool FrameMap::validate_frame() { + int max_offset = in_bytes(framesize_in_bytes()); + int java_index = 0; + for (int i = 0; i < _incoming_arguments->length(); i++) { + LIR_Opr opr = _incoming_arguments->at(i); + if (opr->is_stack()) { + int arg_offset = _argument_locations->at(java_index); + if (arg_offset > max_offset) { + max_offset = arg_offset; + } + } + java_index += type2size[opr->type()]; + } + return max_offset < AARCH64_ONLY(16384) NOT_AARCH64(4096); // TODO-AARCH64 check that LIRAssembler does not generate load/store of byte and half-word with SP as address base +} + +VMReg FrameMap::fpu_regname(int n) { + return as_FloatRegister(n)->as_VMReg(); +} diff --git a/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.hpp b/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.hpp new file mode 100644 index 00000000000..efb2acfb837 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_FrameMap_arm.hpp @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP +#define CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP + + public: + + enum { + first_available_sp_in_frame = 0, + frame_pad_in_bytes = 2*wordSize // Account for FP/LR saved at build_frame(). + }; + + static LIR_Opr R0_opr; + static LIR_Opr R1_opr; + static LIR_Opr R2_opr; + static LIR_Opr R3_opr; + static LIR_Opr R4_opr; + static LIR_Opr R5_opr; + // add more predefined register oprs as needed + + static LIR_Opr R0_oop_opr; + static LIR_Opr R1_oop_opr; + static LIR_Opr R2_oop_opr; + static LIR_Opr R3_oop_opr; + static LIR_Opr R4_oop_opr; + static LIR_Opr R5_oop_opr; + + static LIR_Opr R0_metadata_opr; + static LIR_Opr R1_metadata_opr; + static LIR_Opr R2_metadata_opr; + static LIR_Opr R3_metadata_opr; + static LIR_Opr R4_metadata_opr; + static LIR_Opr R5_metadata_opr; + +#ifdef AARCH64 + static LIR_Opr ZR_opr; +#endif // AARCH64 + + static LIR_Opr LR_opr; + static LIR_Opr LR_oop_opr; + static LIR_Opr LR_ptr_opr; + + static LIR_Opr FP_opr; + static LIR_Opr SP_opr; + static LIR_Opr Rthread_opr; + + static LIR_Opr Int_result_opr; + static LIR_Opr Long_result_opr; + static LIR_Opr Object_result_opr; + static LIR_Opr Float_result_opr; + static LIR_Opr Double_result_opr; + + static LIR_Opr Exception_oop_opr; + static LIR_Opr Exception_pc_opr; + +#ifdef AARCH64 + static LIR_Opr as_long_opr(Register r) { + return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r)); + } + + static LIR_Opr as_pointer_opr(Register r) { + return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r)); + } + + static LIR_Opr as_double_opr(FloatRegister r) { + return LIR_OprFact::double_fpu(r->encoding()); + } +#else + static LIR_Opr as_long_opr(Register r, Register r2) { + return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r2)); + } + + static LIR_Opr as_pointer_opr(Register r) { + return LIR_OprFact::single_cpu(cpu_reg2rnr(r)); + } + + static LIR_Opr as_double_opr(FloatRegister r) { + return LIR_OprFact::double_fpu(r->encoding(), r->successor()->encoding()); + } +#endif + + static LIR_Opr as_float_opr(FloatRegister r) { + return LIR_OprFact::single_fpu(r->encoding()); + } + + static VMReg fpu_regname(int n); + + static bool is_caller_save_register(LIR_Opr opr) { + return true; + } + + static int adjust_reg_range(int range) { + // Reduce the number of available regs (to free Rheap_base) in case of compressed oops + if (UseCompressedOops || UseCompressedClassPointers) return range - 1; + return range; + } + + static int nof_caller_save_cpu_regs() { + return adjust_reg_range(pd_nof_caller_save_cpu_regs_frame_map); + } + + static int last_cpu_reg() { + return pd_last_cpu_reg; + } + +#endif // CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.cpp b/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.cpp new file mode 100644 index 00000000000..4d45cfb0481 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.cpp @@ -0,0 +1,3608 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciInstance.hpp" +#include "gc/shared/barrierSet.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.hpp" +#include "nativeInst_arm.hpp" +#include "oops/objArrayKlass.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_arm.inline.hpp" + +#define __ _masm-> + +// Note: Rtemp usage is this file should not impact C2 and should be +// correct as long as it is not implicitly used in lower layers (the +// arm [macro]assembler) and used with care in the other C1 specific +// files. + +bool LIR_Assembler::is_small_constant(LIR_Opr opr) { + ShouldNotCallThis(); // Not used on ARM + return false; +} + + +LIR_Opr LIR_Assembler::receiverOpr() { + // The first register in Java calling conventions + return FrameMap::R0_oop_opr; +} + +LIR_Opr LIR_Assembler::osrBufferPointer() { + return FrameMap::as_pointer_opr(R0); +} + +#ifndef PRODUCT +void LIR_Assembler::verify_reserved_argument_area_size(int args_count) { + assert(args_count * wordSize <= frame_map()->reserved_argument_area_size(), "not enough space for arguments"); +} +#endif // !PRODUCT + +void LIR_Assembler::store_parameter(jint c, int offset_from_sp_in_words) { + assert(offset_from_sp_in_words >= 0, "invalid offset from sp"); + int offset_from_sp_in_bytes = offset_from_sp_in_words * BytesPerWord; + assert(offset_from_sp_in_bytes < frame_map()->reserved_argument_area_size(), "not enough space"); + __ mov_slow(Rtemp, c); + __ str(Rtemp, Address(SP, offset_from_sp_in_bytes)); +} + +void LIR_Assembler::store_parameter(Metadata* m, int offset_from_sp_in_words) { + assert(offset_from_sp_in_words >= 0, "invalid offset from sp"); + int offset_from_sp_in_bytes = offset_from_sp_in_words * BytesPerWord; + assert(offset_from_sp_in_bytes < frame_map()->reserved_argument_area_size(), "not enough space"); + __ mov_metadata(Rtemp, m); + __ str(Rtemp, Address(SP, offset_from_sp_in_bytes)); +} + +//--------------fpu register translations----------------------- + + +void LIR_Assembler::set_24bit_FPU() { + ShouldNotReachHere(); +} + +void LIR_Assembler::reset_FPU() { + ShouldNotReachHere(); +} + +void LIR_Assembler::fpop() { + Unimplemented(); +} + +void LIR_Assembler::fxch(int i) { + Unimplemented(); +} + +void LIR_Assembler::fld(int i) { + Unimplemented(); +} + +void LIR_Assembler::ffree(int i) { + Unimplemented(); +} + +void LIR_Assembler::breakpoint() { + __ breakpoint(); +} + +void LIR_Assembler::push(LIR_Opr opr) { + Unimplemented(); +} + +void LIR_Assembler::pop(LIR_Opr opr) { + Unimplemented(); +} + +//------------------------------------------- +Address LIR_Assembler::as_Address(LIR_Address* addr) { + Register base = addr->base()->as_pointer_register(); + +#ifdef AARCH64 + int align = exact_log2(type2aelembytes(addr->type(), true)); +#endif + + if (addr->index()->is_illegal() || addr->index()->is_constant()) { + int offset = addr->disp(); + if (addr->index()->is_constant()) { + offset += addr->index()->as_constant_ptr()->as_jint() << addr->scale(); + } + +#ifdef AARCH64 + if (!Assembler::is_unsigned_imm_in_range(offset, 12, align) && !Assembler::is_imm_in_range(offset, 9, 0)) { + BAILOUT_("offset not in range", Address(base)); + } + assert(UseUnalignedAccesses || (offset & right_n_bits(align)) == 0, "offset should be aligned"); +#else + if ((offset <= -4096) || (offset >= 4096)) { + BAILOUT_("offset not in range", Address(base)); + } +#endif // AARCH64 + + return Address(base, offset); + + } else { + assert(addr->disp() == 0, "can't have both"); + int scale = addr->scale(); + +#ifdef AARCH64 + assert((scale == 0) || (scale == align), "scale should be zero or equal to embedded shift"); + + bool is_index_extended = (addr->index()->type() == T_INT); + if (is_index_extended) { + assert(addr->index()->is_single_cpu(), "should be"); + return Address(base, addr->index()->as_register(), ex_sxtw, scale); + } else { + assert(addr->index()->is_double_cpu(), "should be"); + return Address(base, addr->index()->as_register_lo(), ex_lsl, scale); + } +#else + assert(addr->index()->is_single_cpu(), "should be"); + return scale >= 0 ? Address(base, addr->index()->as_register(), lsl, scale) : + Address(base, addr->index()->as_register(), lsr, -scale); +#endif // AARCH64 + } +} + +Address LIR_Assembler::as_Address_hi(LIR_Address* addr) { +#ifdef AARCH64 + ShouldNotCallThis(); // Not used on AArch64 + return Address(); +#else + Address base = as_Address(addr); + assert(base.index() == noreg, "must be"); + if (base.disp() + BytesPerWord >= 4096) { BAILOUT_("offset not in range", Address(base.base(),0)); } + return Address(base.base(), base.disp() + BytesPerWord); +#endif // AARCH64 +} + +Address LIR_Assembler::as_Address_lo(LIR_Address* addr) { +#ifdef AARCH64 + ShouldNotCallThis(); // Not used on AArch64 + return Address(); +#else + return as_Address(addr); +#endif // AARCH64 +} + + +void LIR_Assembler::osr_entry() { + offsets()->set_value(CodeOffsets::OSR_Entry, code_offset()); + BlockBegin* osr_entry = compilation()->hir()->osr_entry(); + ValueStack* entry_state = osr_entry->end()->state(); + int number_of_locks = entry_state->locks_size(); + + __ build_frame(initial_frame_size_in_bytes(), bang_size_in_bytes()); + Register OSR_buf = osrBufferPointer()->as_pointer_register(); + + assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below"); + int monitor_offset = (method()->max_locals() + 2 * (number_of_locks - 1)) * BytesPerWord; + for (int i = 0; i < number_of_locks; i++) { + int slot_offset = monitor_offset - (i * 2 * BytesPerWord); + __ ldr(R1, Address(OSR_buf, slot_offset + 0*BytesPerWord)); + __ ldr(R2, Address(OSR_buf, slot_offset + 1*BytesPerWord)); + __ str(R1, frame_map()->address_for_monitor_lock(i)); + __ str(R2, frame_map()->address_for_monitor_object(i)); + } +} + + +int LIR_Assembler::check_icache() { + Register receiver = LIR_Assembler::receiverOpr()->as_register(); + int offset = __ offset(); + __ inline_cache_check(receiver, Ricklass); + return offset; +} + + +void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo* info) { + jobject o = (jobject)Universe::non_oop_word(); + int index = __ oop_recorder()->allocate_oop_index(o); + + PatchingStub* patch = new PatchingStub(_masm, patching_id(info), index); + + __ patchable_mov_oop(reg, o, index); + patching_epilog(patch, lir_patch_normal, reg, info); +} + + +void LIR_Assembler::klass2reg_with_patching(Register reg, CodeEmitInfo* info) { + Metadata* o = (Metadata*)Universe::non_oop_word(); + int index = __ oop_recorder()->allocate_metadata_index(o); + PatchingStub* patch = new PatchingStub(_masm, PatchingStub::load_klass_id, index); + + __ patchable_mov_metadata(reg, o, index); + patching_epilog(patch, lir_patch_normal, reg, info); +} + + +int LIR_Assembler::initial_frame_size_in_bytes() const { + // Subtracts two words to account for return address and link + return frame_map()->framesize()*VMRegImpl::stack_slot_size - 2*wordSize; +} + + +int LIR_Assembler::emit_exception_handler() { + // TODO: ARM + __ nop(); // See comments in other ports + + address handler_base = __ start_a_stub(exception_handler_size()); + if (handler_base == NULL) { + bailout("exception handler overflow"); + return -1; + } + + int offset = code_offset(); + + // check that there is really an exception + __ verify_not_null_oop(Rexception_obj); + + __ call(Runtime1::entry_for(Runtime1::handle_exception_from_callee_id), relocInfo::runtime_call_type); + __ should_not_reach_here(); + + assert(code_offset() - offset <= exception_handler_size(), "overflow"); + __ end_a_stub(); + + return offset; +} + +// Emit the code to remove the frame from the stack in the exception +// unwind path. +int LIR_Assembler::emit_unwind_handler() { +#ifndef PRODUCT + if (CommentedAssembly) { + _masm->block_comment("Unwind handler"); + } +#endif + + int offset = code_offset(); + + // Fetch the exception from TLS and clear out exception related thread state + Register zero = __ zero_register(Rtemp); + __ ldr(Rexception_obj, Address(Rthread, JavaThread::exception_oop_offset())); + __ str(zero, Address(Rthread, JavaThread::exception_oop_offset())); + __ str(zero, Address(Rthread, JavaThread::exception_pc_offset())); + + __ bind(_unwind_handler_entry); + __ verify_not_null_oop(Rexception_obj); + + // Preform needed unlocking + MonitorExitStub* stub = NULL; + if (method()->is_synchronized()) { + monitor_address(0, FrameMap::R0_opr); + stub = new MonitorExitStub(FrameMap::R0_opr, true, 0); + __ unlock_object(R2, R1, R0, Rtemp, *stub->entry()); + __ bind(*stub->continuation()); + } + + // remove the activation and dispatch to the unwind handler + __ remove_frame(initial_frame_size_in_bytes()); // restores FP and LR + __ jump(Runtime1::entry_for(Runtime1::unwind_exception_id), relocInfo::runtime_call_type, Rtemp); + + // Emit the slow path assembly + if (stub != NULL) { + stub->emit_code(this); + } + + return offset; +} + + +int LIR_Assembler::emit_deopt_handler() { + address handler_base = __ start_a_stub(deopt_handler_size()); + if (handler_base == NULL) { + bailout("deopt handler overflow"); + return -1; + } + + int offset = code_offset(); + + __ mov_relative_address(LR, __ pc()); +#ifdef AARCH64 + __ raw_push(LR, LR); + __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, Rtemp); +#else + __ push(LR); // stub expects LR to be saved + __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg); +#endif // AARCH64 + + assert(code_offset() - offset <= deopt_handler_size(), "overflow"); + __ end_a_stub(); + + return offset; +} + + +void LIR_Assembler::return_op(LIR_Opr result) { + // Pop the frame before safepoint polling + __ remove_frame(initial_frame_size_in_bytes()); + + // mov_slow here is usually one or two instruction + // TODO-AARCH64 3 instructions on AArch64, so try to load polling page by ldr_literal + __ mov_address(Rtemp, os::get_polling_page(), symbolic_Relocation::polling_page_reference); + __ relocate(relocInfo::poll_return_type); + __ ldr(Rtemp, Address(Rtemp)); + __ ret(); +} + + +int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) { + __ mov_address(Rtemp, os::get_polling_page(), symbolic_Relocation::polling_page_reference); + if (info != NULL) { + add_debug_info_for_branch(info); + } + int offset = __ offset(); + __ relocate(relocInfo::poll_type); + __ ldr(Rtemp, Address(Rtemp)); + return offset; +} + + +void LIR_Assembler::move_regs(Register from_reg, Register to_reg) { + if (from_reg != to_reg) { + __ mov(to_reg, from_reg); + } +} + +void LIR_Assembler::const2reg(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info) { + assert(src->is_constant() && dest->is_register(), "must be"); + LIR_Const* c = src->as_constant_ptr(); + + switch (c->type()) { + case T_ADDRESS: + case T_INT: + assert(patch_code == lir_patch_none, "no patching handled here"); + __ mov_slow(dest->as_register(), c->as_jint()); + break; + + case T_LONG: + assert(patch_code == lir_patch_none, "no patching handled here"); +#ifdef AARCH64 + __ mov_slow(dest->as_pointer_register(), (intptr_t)c->as_jlong()); +#else + __ mov_slow(dest->as_register_lo(), c->as_jint_lo()); + __ mov_slow(dest->as_register_hi(), c->as_jint_hi()); +#endif // AARCH64 + break; + + case T_OBJECT: + if (patch_code == lir_patch_none) { + __ mov_oop(dest->as_register(), c->as_jobject()); + } else { + jobject2reg_with_patching(dest->as_register(), info); + } + break; + + case T_METADATA: + if (patch_code == lir_patch_none) { + __ mov_metadata(dest->as_register(), c->as_metadata()); + } else { + klass2reg_with_patching(dest->as_register(), info); + } + break; + + case T_FLOAT: + if (dest->is_single_fpu()) { + __ mov_float(dest->as_float_reg(), c->as_jfloat()); + } else { +#ifdef AARCH64 + ShouldNotReachHere(); +#else + // Simple getters can return float constant directly into r0 + __ mov_slow(dest->as_register(), c->as_jint_bits()); +#endif // AARCH64 + } + break; + + case T_DOUBLE: + if (dest->is_double_fpu()) { + __ mov_double(dest->as_double_reg(), c->as_jdouble()); + } else { +#ifdef AARCH64 + ShouldNotReachHere(); +#else + // Simple getters can return double constant directly into r1r0 + __ mov_slow(dest->as_register_lo(), c->as_jint_lo_bits()); + __ mov_slow(dest->as_register_hi(), c->as_jint_hi_bits()); +#endif // AARCH64 + } + break; + + default: + ShouldNotReachHere(); + } +} + +void LIR_Assembler::const2stack(LIR_Opr src, LIR_Opr dest) { + assert(src->is_constant(), "must be"); + assert(dest->is_stack(), "must be"); + LIR_Const* c = src->as_constant_ptr(); + + switch (c->type()) { + case T_INT: // fall through + case T_FLOAT: + __ mov_slow(Rtemp, c->as_jint_bits()); + __ str_32(Rtemp, frame_map()->address_for_slot(dest->single_stack_ix())); + break; + + case T_ADDRESS: + __ mov_slow(Rtemp, c->as_jint()); + __ str(Rtemp, frame_map()->address_for_slot(dest->single_stack_ix())); + break; + + case T_OBJECT: + __ mov_oop(Rtemp, c->as_jobject()); + __ str(Rtemp, frame_map()->address_for_slot(dest->single_stack_ix())); + break; + + case T_LONG: // fall through + case T_DOUBLE: +#ifdef AARCH64 + __ mov_slow(Rtemp, c->as_jlong_bits()); + __ str(Rtemp, frame_map()->address_for_slot(dest->double_stack_ix())); +#else + __ mov_slow(Rtemp, c->as_jint_lo_bits()); + __ str(Rtemp, frame_map()->address_for_slot(dest->double_stack_ix(), lo_word_offset_in_bytes)); + if (c->as_jint_hi_bits() != c->as_jint_lo_bits()) { + __ mov_slow(Rtemp, c->as_jint_hi_bits()); + } + __ str(Rtemp, frame_map()->address_for_slot(dest->double_stack_ix(), hi_word_offset_in_bytes)); +#endif // AARCH64 + break; + + default: + ShouldNotReachHere(); + } +} + +void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, + CodeEmitInfo* info, bool wide) { +#ifdef AARCH64 + assert((src->as_constant_ptr()->type() == T_OBJECT && src->as_constant_ptr()->as_jobject() == NULL) || + (src->as_constant_ptr()->type() == T_INT && src->as_constant_ptr()->as_jint() == 0) || + (src->as_constant_ptr()->type() == T_LONG && src->as_constant_ptr()->as_jlong() == 0) || + (src->as_constant_ptr()->type() == T_FLOAT && src->as_constant_ptr()->as_jint_bits() == 0) || + (src->as_constant_ptr()->type() == T_DOUBLE && src->as_constant_ptr()->as_jlong_bits() == 0), + "cannot handle otherwise"); + assert(dest->as_address_ptr()->type() == type, "should be"); + + Address addr = as_Address(dest->as_address_ptr()); + int null_check_offset = code_offset(); + switch (type) { + case T_OBJECT: // fall through + case T_ARRAY: + if (UseCompressedOops && !wide) { + __ str_w(ZR, addr); + } else { + __ str(ZR, addr); + } + break; + case T_ADDRESS: // fall through + case T_DOUBLE: // fall through + case T_LONG: __ str(ZR, addr); break; + case T_FLOAT: // fall through + case T_INT: __ str_w(ZR, addr); break; + case T_BOOLEAN: // fall through + case T_BYTE: __ strb(ZR, addr); break; + case T_CHAR: // fall through + case T_SHORT: __ strh(ZR, addr); break; + default: ShouldNotReachHere(); + } +#else + assert((src->as_constant_ptr()->type() == T_OBJECT && src->as_constant_ptr()->as_jobject() == NULL),"cannot handle otherwise"); + __ mov(Rtemp, 0); + + int null_check_offset = code_offset(); + __ str(Rtemp, as_Address(dest->as_address_ptr())); +#endif // AARCH64 + + if (info != NULL) { +#ifndef AARCH64 + assert(false, "arm32 didn't support this before, investigate if bug"); +#endif + add_debug_info_for_null_check(null_check_offset, info); + } +} + +void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) { + assert(src->is_register() && dest->is_register(), "must be"); + + if (src->is_single_cpu()) { + if (dest->is_single_cpu()) { + move_regs(src->as_register(), dest->as_register()); +#ifdef AARCH64 + } else if (dest->is_double_cpu()) { + assert ((src->type() == T_OBJECT) || (src->type() == T_ARRAY) || (src->type() == T_ADDRESS), "invalid src type"); + move_regs(src->as_register(), dest->as_register_lo()); +#else + } else if (dest->is_single_fpu()) { + __ fmsr(dest->as_float_reg(), src->as_register()); +#endif // AARCH64 + } else { + ShouldNotReachHere(); + } + } else if (src->is_double_cpu()) { +#ifdef AARCH64 + move_regs(src->as_register_lo(), dest->as_register_lo()); +#else + if (dest->is_double_cpu()) { + __ long_move(dest->as_register_lo(), dest->as_register_hi(), src->as_register_lo(), src->as_register_hi()); + } else { + __ fmdrr(dest->as_double_reg(), src->as_register_lo(), src->as_register_hi()); + } +#endif // AARCH64 + } else if (src->is_single_fpu()) { + if (dest->is_single_fpu()) { + __ mov_float(dest->as_float_reg(), src->as_float_reg()); + } else if (dest->is_single_cpu()) { + __ mov_fpr2gpr_float(dest->as_register(), src->as_float_reg()); + } else { + ShouldNotReachHere(); + } + } else if (src->is_double_fpu()) { + if (dest->is_double_fpu()) { + __ mov_double(dest->as_double_reg(), src->as_double_reg()); + } else if (dest->is_double_cpu()) { +#ifdef AARCH64 + __ fmov_xd(dest->as_register_lo(), src->as_double_reg()); +#else + __ fmrrd(dest->as_register_lo(), dest->as_register_hi(), src->as_double_reg()); +#endif // AARCH64 + } else { + ShouldNotReachHere(); + } + } else { + ShouldNotReachHere(); + } +} + +void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) { + assert(src->is_register(), "should not call otherwise"); + assert(dest->is_stack(), "should not call otherwise"); + + Address addr = dest->is_single_word() ? + frame_map()->address_for_slot(dest->single_stack_ix()) : + frame_map()->address_for_slot(dest->double_stack_ix()); + +#ifndef AARCH64 + assert(lo_word_offset_in_bytes == 0 && hi_word_offset_in_bytes == 4, "little ending"); + if (src->is_single_fpu() || src->is_double_fpu()) { + if (addr.disp() >= 1024) { BAILOUT("Too exotic case to handle here"); } + } +#endif // !AARCH64 + + if (src->is_single_cpu()) { + switch (type) { + case T_OBJECT: + case T_ARRAY: __ verify_oop(src->as_register()); // fall through + case T_ADDRESS: + case T_METADATA: __ str(src->as_register(), addr); break; + case T_FLOAT: // used in intBitsToFloat intrinsic implementation, fall through + case T_INT: __ str_32(src->as_register(), addr); break; + default: + ShouldNotReachHere(); + } + } else if (src->is_double_cpu()) { + __ str(src->as_register_lo(), addr); +#ifndef AARCH64 + __ str(src->as_register_hi(), frame_map()->address_for_slot(dest->double_stack_ix(), hi_word_offset_in_bytes)); +#endif // !AARCH64 + } else if (src->is_single_fpu()) { + __ str_float(src->as_float_reg(), addr); + } else if (src->is_double_fpu()) { + __ str_double(src->as_double_reg(), addr); + } else { + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, + LIR_PatchCode patch_code, CodeEmitInfo* info, + bool pop_fpu_stack, bool wide, + bool unaligned) { + LIR_Address* to_addr = dest->as_address_ptr(); + Register base_reg = to_addr->base()->as_pointer_register(); + const bool needs_patching = (patch_code != lir_patch_none); + + PatchingStub* patch = NULL; + if (needs_patching) { +#ifdef AARCH64 + // Same alignment of reg2mem code and PatchingStub code. Required to make copied bind_literal() code properly aligned. + __ align(wordSize); +#endif + patch = new PatchingStub(_masm, PatchingStub::access_field_id); +#ifdef AARCH64 + // Extra nop for MT safe patching + __ nop(); +#endif // AARCH64 + } + + int null_check_offset = code_offset(); + + switch (type) { + case T_ARRAY: + case T_OBJECT: + if (UseCompressedOops && !wide) { +#ifdef AARCH64 + const Register temp_src = Rtemp; + assert_different_registers(temp_src, src->as_register()); + __ encode_heap_oop(temp_src, src->as_register()); + null_check_offset = code_offset(); + __ str_32(temp_src, as_Address(to_addr)); +#else + ShouldNotReachHere(); +#endif // AARCH64 + } else { + __ str(src->as_register(), as_Address(to_addr)); + } + break; + + case T_ADDRESS: +#ifdef AARCH64 + case T_LONG: +#endif // AARCH64 + __ str(src->as_pointer_register(), as_Address(to_addr)); + break; + + case T_BYTE: + case T_BOOLEAN: + __ strb(src->as_register(), as_Address(to_addr)); + break; + + case T_CHAR: + case T_SHORT: + __ strh(src->as_register(), as_Address(to_addr)); + break; + + case T_INT: +#ifdef __SOFTFP__ + case T_FLOAT: +#endif // __SOFTFP__ + __ str_32(src->as_register(), as_Address(to_addr)); + break; + +#ifdef AARCH64 + + case T_FLOAT: + __ str_s(src->as_float_reg(), as_Address(to_addr)); + break; + + case T_DOUBLE: + __ str_d(src->as_double_reg(), as_Address(to_addr)); + break; + +#else // AARCH64 + +#ifdef __SOFTFP__ + case T_DOUBLE: +#endif // __SOFTFP__ + case T_LONG: { + Register from_lo = src->as_register_lo(); + Register from_hi = src->as_register_hi(); + if (to_addr->index()->is_register()) { + assert(to_addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + assert(to_addr->disp() == 0, "Not yet supporting both"); + __ add(Rtemp, base_reg, to_addr->index()->as_register()); + base_reg = Rtemp; + __ str(from_lo, Address(Rtemp)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_low, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_high; + } + __ str(from_hi, Address(Rtemp, BytesPerWord)); + } else if (base_reg == from_lo) { + __ str(from_hi, as_Address_hi(to_addr)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_high, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_low; + } + __ str(from_lo, as_Address_lo(to_addr)); + } else { + __ str(from_lo, as_Address_lo(to_addr)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_low, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_high; + } + __ str(from_hi, as_Address_hi(to_addr)); + } + break; + } + +#ifndef __SOFTFP__ + case T_FLOAT: + if (to_addr->index()->is_register()) { + assert(to_addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + __ add(Rtemp, base_reg, to_addr->index()->as_register()); + if ((to_addr->disp() <= -4096) || (to_addr->disp() >= 4096)) { BAILOUT("offset not in range"); } + __ fsts(src->as_float_reg(), Address(Rtemp, to_addr->disp())); + } else { + __ fsts(src->as_float_reg(), as_Address(to_addr)); + } + break; + + case T_DOUBLE: + if (to_addr->index()->is_register()) { + assert(to_addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + __ add(Rtemp, base_reg, to_addr->index()->as_register()); + if ((to_addr->disp() <= -4096) || (to_addr->disp() >= 4096)) { BAILOUT("offset not in range"); } + __ fstd(src->as_double_reg(), Address(Rtemp, to_addr->disp())); + } else { + __ fstd(src->as_double_reg(), as_Address(to_addr)); + } + break; +#endif // __SOFTFP__ + +#endif // AARCH64 + + default: + ShouldNotReachHere(); + } + + if (info != NULL) { + add_debug_info_for_null_check(null_check_offset, info); + } + + if (patch != NULL) { + // Offset embeedded into LDR/STR instruction may appear not enough + // to address a field. So, provide a space for one more instruction + // that will deal with larger offsets. + __ nop(); + patching_epilog(patch, patch_code, base_reg, info); + } +} + + +void LIR_Assembler::stack2reg(LIR_Opr src, LIR_Opr dest, BasicType type) { + assert(src->is_stack(), "should not call otherwise"); + assert(dest->is_register(), "should not call otherwise"); + + Address addr = src->is_single_word() ? + frame_map()->address_for_slot(src->single_stack_ix()) : + frame_map()->address_for_slot(src->double_stack_ix()); + +#ifndef AARCH64 + assert(lo_word_offset_in_bytes == 0 && hi_word_offset_in_bytes == 4, "little ending"); + if (dest->is_single_fpu() || dest->is_double_fpu()) { + if (addr.disp() >= 1024) { BAILOUT("Too exotic case to handle here"); } + } +#endif // !AARCH64 + + if (dest->is_single_cpu()) { + switch (type) { + case T_OBJECT: + case T_ARRAY: + case T_ADDRESS: + case T_METADATA: __ ldr(dest->as_register(), addr); break; + case T_FLOAT: // used in floatToRawIntBits intrinsic implemenation + case T_INT: __ ldr_u32(dest->as_register(), addr); break; + default: + ShouldNotReachHere(); + } + if ((type == T_OBJECT) || (type == T_ARRAY)) { + __ verify_oop(dest->as_register()); + } + } else if (dest->is_double_cpu()) { + __ ldr(dest->as_register_lo(), addr); +#ifndef AARCH64 + __ ldr(dest->as_register_hi(), frame_map()->address_for_slot(src->double_stack_ix(), hi_word_offset_in_bytes)); +#endif // !AARCH64 + } else if (dest->is_single_fpu()) { + __ ldr_float(dest->as_float_reg(), addr); + } else if (dest->is_double_fpu()) { + __ ldr_double(dest->as_double_reg(), addr); + } else { + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type) { + if (src->is_single_stack()) { + switch (src->type()) { + case T_OBJECT: + case T_ARRAY: + case T_ADDRESS: + case T_METADATA: + __ ldr(Rtemp, frame_map()->address_for_slot(src->single_stack_ix())); + __ str(Rtemp, frame_map()->address_for_slot(dest->single_stack_ix())); + break; + + case T_INT: + case T_FLOAT: + __ ldr_u32(Rtemp, frame_map()->address_for_slot(src->single_stack_ix())); + __ str_32(Rtemp, frame_map()->address_for_slot(dest->single_stack_ix())); + break; + + default: + ShouldNotReachHere(); + } + } else { + assert(src->is_double_stack(), "must be"); + __ ldr(Rtemp, frame_map()->address_for_slot(src->double_stack_ix(), lo_word_offset_in_bytes)); + __ str(Rtemp, frame_map()->address_for_slot(dest->double_stack_ix(), lo_word_offset_in_bytes)); +#ifdef AARCH64 + assert(lo_word_offset_in_bytes == 0, "adjust this code"); +#else + __ ldr(Rtemp, frame_map()->address_for_slot(src->double_stack_ix(), hi_word_offset_in_bytes)); + __ str(Rtemp, frame_map()->address_for_slot(dest->double_stack_ix(), hi_word_offset_in_bytes)); +#endif // AARCH64 + } +} + + +void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, + LIR_PatchCode patch_code, CodeEmitInfo* info, + bool wide, bool unaligned) { + assert(src->is_address(), "should not call otherwise"); + assert(dest->is_register(), "should not call otherwise"); + LIR_Address* addr = src->as_address_ptr(); + + Register base_reg = addr->base()->as_pointer_register(); + + PatchingStub* patch = NULL; + if (patch_code != lir_patch_none) { + patch = new PatchingStub(_masm, PatchingStub::access_field_id); +#ifdef AARCH64 + // Extra nop for MT safe patching + __ nop(); +#endif // AARCH64 + } + if (info != NULL) { + add_debug_info_for_null_check_here(info); + } + + switch (type) { + case T_OBJECT: // fall through + case T_ARRAY: + if (UseCompressedOops && !wide) { + __ ldr_u32(dest->as_register(), as_Address(addr)); + } else { + __ ldr(dest->as_register(), as_Address(addr)); + } + break; + + case T_ADDRESS: + if (UseCompressedClassPointers && addr->disp() == oopDesc::klass_offset_in_bytes()) { + __ ldr_u32(dest->as_pointer_register(), as_Address(addr)); + } else { + __ ldr(dest->as_pointer_register(), as_Address(addr)); + } + break; + +#ifdef AARCH64 + case T_LONG: +#else + case T_INT: +#ifdef __SOFTFP__ + case T_FLOAT: +#endif // __SOFTFP__ +#endif // AARCH64 + __ ldr(dest->as_pointer_register(), as_Address(addr)); + break; + + case T_BOOLEAN: + __ ldrb(dest->as_register(), as_Address(addr)); + break; + + case T_BYTE: + __ ldrsb(dest->as_register(), as_Address(addr)); + break; + + case T_CHAR: + __ ldrh(dest->as_register(), as_Address(addr)); + break; + + case T_SHORT: + __ ldrsh(dest->as_register(), as_Address(addr)); + break; + +#ifdef AARCH64 + + case T_INT: + __ ldr_w(dest->as_register(), as_Address(addr)); + break; + + case T_FLOAT: + __ ldr_s(dest->as_float_reg(), as_Address(addr)); + break; + + case T_DOUBLE: + __ ldr_d(dest->as_double_reg(), as_Address(addr)); + break; + +#else // AARCH64 + +#ifdef __SOFTFP__ + case T_DOUBLE: +#endif // __SOFTFP__ + case T_LONG: { + Register to_lo = dest->as_register_lo(); + Register to_hi = dest->as_register_hi(); + if (addr->index()->is_register()) { + assert(addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + assert(addr->disp() == 0, "Not yet supporting both"); + __ add(Rtemp, base_reg, addr->index()->as_register()); + base_reg = Rtemp; + __ ldr(to_lo, Address(Rtemp)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_low, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_high; + } + __ ldr(to_hi, Address(Rtemp, BytesPerWord)); + } else if (base_reg == to_lo) { + __ ldr(to_hi, as_Address_hi(addr)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_high, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_low; + } + __ ldr(to_lo, as_Address_lo(addr)); + } else { + __ ldr(to_lo, as_Address_lo(addr)); + if (patch != NULL) { + patching_epilog(patch, lir_patch_low, base_reg, info); + patch = new PatchingStub(_masm, PatchingStub::access_field_id); + patch_code = lir_patch_high; + } + __ ldr(to_hi, as_Address_hi(addr)); + } + break; + } + +#ifndef __SOFTFP__ + case T_FLOAT: + if (addr->index()->is_register()) { + assert(addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + __ add(Rtemp, base_reg, addr->index()->as_register()); + if ((addr->disp() <= -4096) || (addr->disp() >= 4096)) { BAILOUT("offset not in range"); } + __ flds(dest->as_float_reg(), Address(Rtemp, addr->disp())); + } else { + __ flds(dest->as_float_reg(), as_Address(addr)); + } + break; + + case T_DOUBLE: + if (addr->index()->is_register()) { + assert(addr->scale() == LIR_Address::times_1,"Unexpected scaled register"); + __ add(Rtemp, base_reg, addr->index()->as_register()); + if ((addr->disp() <= -4096) || (addr->disp() >= 4096)) { BAILOUT("offset not in range"); } + __ fldd(dest->as_double_reg(), Address(Rtemp, addr->disp())); + } else { + __ fldd(dest->as_double_reg(), as_Address(addr)); + } + break; +#endif // __SOFTFP__ + +#endif // AARCH64 + + default: + ShouldNotReachHere(); + } + + if (patch != NULL) { + // Offset embeedded into LDR/STR instruction may appear not enough + // to address a field. So, provide a space for one more instruction + // that will deal with larger offsets. + __ nop(); + patching_epilog(patch, patch_code, base_reg, info); + } + +#ifdef AARCH64 + switch (type) { + case T_ARRAY: + case T_OBJECT: + if (UseCompressedOops && !wide) { + __ decode_heap_oop(dest->as_register()); + } + __ verify_oop(dest->as_register()); + break; + + case T_ADDRESS: + if (UseCompressedClassPointers && addr->disp() == oopDesc::klass_offset_in_bytes()) { + __ decode_klass_not_null(dest->as_register()); + } + break; + } +#endif // AARCH64 +} + + +void LIR_Assembler::emit_op3(LIR_Op3* op) { + bool is_32 = op->result_opr()->is_single_cpu(); + + if (op->code() == lir_idiv && op->in_opr2()->is_constant() && is_32) { + int c = op->in_opr2()->as_constant_ptr()->as_jint(); + assert(is_power_of_2(c), "non power-of-2 constant should be put in a register"); + + Register left = op->in_opr1()->as_register(); + Register dest = op->result_opr()->as_register(); + if (c == 1) { + __ mov(dest, left); + } else if (c == 2) { + __ add_32(dest, left, AsmOperand(left, lsr, 31)); + __ asr_32(dest, dest, 1); + } else if (c != (int) 0x80000000) { + int power = log2_intptr(c); + __ asr_32(Rtemp, left, 31); + __ add_32(dest, left, AsmOperand(Rtemp, lsr, 32-power)); // dest = left + (left < 0 ? 2^power - 1 : 0); + __ asr_32(dest, dest, power); // dest = dest >>> power; + } else { + // x/0x80000000 is a special case, since dividend is a power of two, but is negative. + // The only possible result values are 0 and 1, with 1 only for dividend == divisor == 0x80000000. + __ cmp_32(left, c); +#ifdef AARCH64 + __ cset(dest, eq); +#else + __ mov(dest, 0, ne); + __ mov(dest, 1, eq); +#endif // AARCH64 + } + } else { +#ifdef AARCH64 + Register left = op->in_opr1()->as_pointer_register(); + Register right = op->in_opr2()->as_pointer_register(); + Register dest = op->result_opr()->as_pointer_register(); + + switch (op->code()) { + case lir_idiv: + if (is_32) { + __ sdiv_w(dest, left, right); + } else { + __ sdiv(dest, left, right); + } + break; + case lir_irem: { + Register tmp = op->in_opr3()->as_pointer_register(); + assert_different_registers(left, tmp); + assert_different_registers(right, tmp); + if (is_32) { + __ sdiv_w(tmp, left, right); + __ msub_w(dest, right, tmp, left); + } else { + __ sdiv(tmp, left, right); + __ msub(dest, right, tmp, left); + } + break; + } + default: + ShouldNotReachHere(); + } +#else + assert(op->code() == lir_idiv || op->code() == lir_irem, "unexpected op3"); + __ call(StubRoutines::Arm::idiv_irem_entry(), relocInfo::runtime_call_type); + add_debug_info_for_div0_here(op->info()); +#endif // AARCH64 + } +} + + +void LIR_Assembler::emit_opBranch(LIR_OpBranch* op) { +#ifdef ASSERT + assert(op->block() == NULL || op->block()->label() == op->label(), "wrong label"); + if (op->block() != NULL) _branch_target_blocks.append(op->block()); + if (op->ublock() != NULL) _branch_target_blocks.append(op->ublock()); + assert(op->info() == NULL, "CodeEmitInfo?"); +#endif // ASSERT + +#ifdef __SOFTFP__ + assert (op->code() != lir_cond_float_branch, "this should be impossible"); +#else + if (op->code() == lir_cond_float_branch) { +#ifndef AARCH64 + __ fmstat(); +#endif // !AARCH64 + __ b(*(op->ublock()->label()), vs); + } +#endif // __SOFTFP__ + + AsmCondition acond = al; + switch (op->cond()) { + case lir_cond_equal: acond = eq; break; + case lir_cond_notEqual: acond = ne; break; + case lir_cond_less: acond = lt; break; + case lir_cond_lessEqual: acond = le; break; + case lir_cond_greaterEqual: acond = ge; break; + case lir_cond_greater: acond = gt; break; + case lir_cond_aboveEqual: acond = hs; break; + case lir_cond_belowEqual: acond = ls; break; + default: assert(op->cond() == lir_cond_always, "must be"); + } + __ b(*(op->label()), acond); +} + + +void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) { + LIR_Opr src = op->in_opr(); + LIR_Opr dest = op->result_opr(); + + switch (op->bytecode()) { + case Bytecodes::_i2l: +#ifdef AARCH64 + __ sign_extend(dest->as_register_lo(), src->as_register(), 32); +#else + move_regs(src->as_register(), dest->as_register_lo()); + __ mov(dest->as_register_hi(), AsmOperand(src->as_register(), asr, 31)); +#endif // AARCH64 + break; + case Bytecodes::_l2i: + move_regs(src->as_register_lo(), dest->as_register()); + break; + case Bytecodes::_i2b: + __ sign_extend(dest->as_register(), src->as_register(), 8); + break; + case Bytecodes::_i2s: + __ sign_extend(dest->as_register(), src->as_register(), 16); + break; + case Bytecodes::_i2c: + __ zero_extend(dest->as_register(), src->as_register(), 16); + break; + case Bytecodes::_f2d: + __ convert_f2d(dest->as_double_reg(), src->as_float_reg()); + break; + case Bytecodes::_d2f: + __ convert_d2f(dest->as_float_reg(), src->as_double_reg()); + break; + case Bytecodes::_i2f: +#ifdef AARCH64 + __ scvtf_sw(dest->as_float_reg(), src->as_register()); +#else + __ fmsr(Stemp, src->as_register()); + __ fsitos(dest->as_float_reg(), Stemp); +#endif // AARCH64 + break; + case Bytecodes::_i2d: +#ifdef AARCH64 + __ scvtf_dw(dest->as_double_reg(), src->as_register()); +#else + __ fmsr(Stemp, src->as_register()); + __ fsitod(dest->as_double_reg(), Stemp); +#endif // AARCH64 + break; + case Bytecodes::_f2i: +#ifdef AARCH64 + __ fcvtzs_ws(dest->as_register(), src->as_float_reg()); +#else + __ ftosizs(Stemp, src->as_float_reg()); + __ fmrs(dest->as_register(), Stemp); +#endif // AARCH64 + break; + case Bytecodes::_d2i: +#ifdef AARCH64 + __ fcvtzs_wd(dest->as_register(), src->as_double_reg()); +#else + __ ftosizd(Stemp, src->as_double_reg()); + __ fmrs(dest->as_register(), Stemp); +#endif // AARCH64 + break; +#ifdef AARCH64 + case Bytecodes::_l2f: + __ scvtf_sx(dest->as_float_reg(), src->as_register_lo()); + break; + case Bytecodes::_l2d: + __ scvtf_dx(dest->as_double_reg(), src->as_register_lo()); + break; + case Bytecodes::_f2l: + __ fcvtzs_xs(dest->as_register_lo(), src->as_float_reg()); + break; + case Bytecodes::_d2l: + __ fcvtzs_xd(dest->as_register_lo(), src->as_double_reg()); + break; +#endif // AARCH64 + default: + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::emit_alloc_obj(LIR_OpAllocObj* op) { + if (op->init_check()) { + Register tmp = op->tmp1()->as_register(); + __ ldrb(tmp, Address(op->klass()->as_register(), InstanceKlass::init_state_offset())); + add_debug_info_for_null_check_here(op->stub()->info()); + __ cmp(tmp, InstanceKlass::fully_initialized); + __ b(*op->stub()->entry(), ne); + } + __ allocate_object(op->obj()->as_register(), + op->tmp1()->as_register(), + op->tmp2()->as_register(), + op->tmp3()->as_register(), + op->header_size(), + op->object_size(), + op->klass()->as_register(), + *op->stub()->entry()); + __ bind(*op->stub()->continuation()); +} + +void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) { + if (UseSlowPath || + (!UseFastNewObjectArray && (op->type() == T_OBJECT || op->type() == T_ARRAY)) || + (!UseFastNewTypeArray && (op->type() != T_OBJECT && op->type() != T_ARRAY))) { + __ b(*op->stub()->entry()); + } else { + __ allocate_array(op->obj()->as_register(), + op->len()->as_register(), + op->tmp1()->as_register(), + op->tmp2()->as_register(), + op->tmp3()->as_register(), + arrayOopDesc::header_size(op->type()), + type2aelembytes(op->type()), + op->klass()->as_register(), + *op->stub()->entry()); + } + __ bind(*op->stub()->continuation()); +} + +void LIR_Assembler::type_profile_helper(Register mdo, int mdo_offset_bias, + ciMethodData *md, ciProfileData *data, + Register recv, Register tmp1, Label* update_done) { + assert_different_registers(mdo, recv, tmp1); + uint i; + for (i = 0; i < VirtualCallData::row_limit(); i++) { + Label next_test; + // See if the receiver is receiver[n]. + Address receiver_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)) - + mdo_offset_bias); + __ ldr(tmp1, receiver_addr); + __ verify_klass_ptr(tmp1); + __ cmp(recv, tmp1); + __ b(next_test, ne); + Address data_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)) - + mdo_offset_bias); + __ ldr(tmp1, data_addr); + __ add(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, data_addr); + __ b(*update_done); + __ bind(next_test); + } + + // Didn't find receiver; find next empty slot and fill it in + for (i = 0; i < VirtualCallData::row_limit(); i++) { + Label next_test; + Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)) - + mdo_offset_bias); + __ ldr(tmp1, recv_addr); + __ cbnz(tmp1, next_test); + __ str(recv, recv_addr); + __ mov(tmp1, DataLayout::counter_increment); + __ str(tmp1, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)) - + mdo_offset_bias)); + __ b(*update_done); + __ bind(next_test); + } +} + +void LIR_Assembler::setup_md_access(ciMethod* method, int bci, + ciMethodData*& md, ciProfileData*& data, int& mdo_offset_bias) { + md = method->method_data_or_null(); + assert(md != NULL, "Sanity"); + data = md->bci_to_data(bci); + assert(data != NULL, "need data for checkcast"); + assert(data->is_ReceiverTypeData(), "need ReceiverTypeData for type check"); + if (md->byte_offset_of_slot(data, DataLayout::header_offset()) + data->size_in_bytes() >= 4096) { + // The offset is large so bias the mdo by the base of the slot so + // that the ldr can use an immediate offset to reference the slots of the data + mdo_offset_bias = md->byte_offset_of_slot(data, DataLayout::header_offset()); + } +} + +// On 32-bit ARM, code before this helper should test obj for null (ZF should be set if obj is null). +void LIR_Assembler::typecheck_profile_helper1(ciMethod* method, int bci, + ciMethodData*& md, ciProfileData*& data, int& mdo_offset_bias, + Register obj, Register mdo, Register data_val, Label* obj_is_null) { + assert(method != NULL, "Should have method"); + assert_different_registers(obj, mdo, data_val); + setup_md_access(method, bci, md, data, mdo_offset_bias); + Label not_null; +#ifdef AARCH64 + __ cbnz(obj, not_null); +#else + __ b(not_null, ne); +#endif // AARCH64 + __ mov_metadata(mdo, md->constant_encoding()); + if (mdo_offset_bias > 0) { + __ mov_slow(data_val, mdo_offset_bias); + __ add(mdo, mdo, data_val); + } + Address flags_addr(mdo, md->byte_offset_of_slot(data, DataLayout::flags_offset()) - mdo_offset_bias); + __ ldrb(data_val, flags_addr); + __ orr(data_val, data_val, (uint)BitData::null_seen_byte_constant()); + __ strb(data_val, flags_addr); + __ b(*obj_is_null); + __ bind(not_null); +} + +void LIR_Assembler::typecheck_profile_helper2(ciMethodData* md, ciProfileData* data, int mdo_offset_bias, + Register mdo, Register recv, Register value, Register tmp1, + Label* profile_cast_success, Label* profile_cast_failure, + Label* success, Label* failure) { + assert_different_registers(mdo, value, tmp1); + __ bind(*profile_cast_success); + __ mov_metadata(mdo, md->constant_encoding()); + if (mdo_offset_bias > 0) { + __ mov_slow(tmp1, mdo_offset_bias); + __ add(mdo, mdo, tmp1); + } + __ load_klass(recv, value); + type_profile_helper(mdo, mdo_offset_bias, md, data, recv, tmp1, success); + __ b(*success); + // Cast failure case + __ bind(*profile_cast_failure); + __ mov_metadata(mdo, md->constant_encoding()); + if (mdo_offset_bias > 0) { + __ mov_slow(tmp1, mdo_offset_bias); + __ add(mdo, mdo, tmp1); + } + Address data_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()) - mdo_offset_bias); + __ ldr(tmp1, data_addr); + __ sub(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, data_addr); + __ b(*failure); +} + +// Sets `res` to true, if `cond` holds. On AArch64 also sets `res` to false if `cond` does not hold. +static void set_instanceof_result(MacroAssembler* _masm, Register res, AsmCondition cond) { +#ifdef AARCH64 + __ cset(res, cond); +#else + __ mov(res, 1, cond); +#endif // AARCH64 +} + + +void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) { + // TODO: ARM - can be more effective with one more register + switch (op->code()) { + case lir_store_check: { + CodeStub* stub = op->stub(); + Register value = op->object()->as_register(); + Register array = op->array()->as_register(); + Register klass_RInfo = op->tmp1()->as_register(); + Register k_RInfo = op->tmp2()->as_register(); + assert_different_registers(klass_RInfo, k_RInfo, Rtemp); + if (op->should_profile()) { + assert_different_registers(value, klass_RInfo, k_RInfo, Rtemp); + } + + // check if it needs to be profiled + ciMethodData* md; + ciProfileData* data; + int mdo_offset_bias = 0; + Label profile_cast_success, profile_cast_failure, done; + Label *success_target = op->should_profile() ? &profile_cast_success : &done; + Label *failure_target = op->should_profile() ? &profile_cast_failure : stub->entry(); + + if (op->should_profile()) { +#ifndef AARCH64 + __ cmp(value, 0); +#endif // !AARCH64 + typecheck_profile_helper1(op->profiled_method(), op->profiled_bci(), md, data, mdo_offset_bias, value, k_RInfo, Rtemp, &done); + } else { + __ cbz(value, done); + } + assert_different_registers(k_RInfo, value); + add_debug_info_for_null_check_here(op->info_for_exception()); + __ load_klass(k_RInfo, array); + __ load_klass(klass_RInfo, value); + __ ldr(k_RInfo, Address(k_RInfo, ObjArrayKlass::element_klass_offset())); + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + // check for immediate positive hit + __ ldr(Rtemp, Address(klass_RInfo, Rtemp)); + __ cmp(klass_RInfo, k_RInfo); + __ cond_cmp(Rtemp, k_RInfo, ne); + __ b(*success_target, eq); + // check for immediate negative hit + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + __ cmp(Rtemp, in_bytes(Klass::secondary_super_cache_offset())); + __ b(*failure_target, ne); + // slow case + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + __ cbz(R0, *failure_target); + if (op->should_profile()) { + Register mdo = klass_RInfo, recv = k_RInfo, tmp1 = Rtemp; + if (mdo == value) { + mdo = k_RInfo; + recv = klass_RInfo; + } + typecheck_profile_helper2(md, data, mdo_offset_bias, mdo, recv, value, tmp1, + &profile_cast_success, &profile_cast_failure, + &done, stub->entry()); + } + __ bind(done); + break; + } + + case lir_checkcast: { + CodeStub* stub = op->stub(); + Register obj = op->object()->as_register(); + Register res = op->result_opr()->as_register(); + Register klass_RInfo = op->tmp1()->as_register(); + Register k_RInfo = op->tmp2()->as_register(); + ciKlass* k = op->klass(); + assert_different_registers(res, k_RInfo, klass_RInfo, Rtemp); + + // TODO: ARM - Late binding is used to prevent confusion of register allocator + assert(stub->is_exception_throw_stub(), "must be"); + ((SimpleExceptionStub*)stub)->set_obj(op->result_opr()); + + ciMethodData* md; + ciProfileData* data; + int mdo_offset_bias = 0; + + Label done; + + Label profile_cast_failure, profile_cast_success; + Label *failure_target = op->should_profile() ? &profile_cast_failure : op->stub()->entry(); + Label *success_target = op->should_profile() ? &profile_cast_success : &done; + +#ifdef AARCH64 + move_regs(obj, res); + if (op->should_profile()) { + typecheck_profile_helper1(op->profiled_method(), op->profiled_bci(), md, data, mdo_offset_bias, res, klass_RInfo, Rtemp, &done); + } else { + __ cbz(obj, done); + } + if (k->is_loaded()) { + __ mov_metadata(k_RInfo, k->constant_encoding()); + } else { + if (res != obj) { + op->info_for_patch()->add_register_oop(FrameMap::as_oop_opr(res)); + } + klass2reg_with_patching(k_RInfo, op->info_for_patch()); + } + __ load_klass(klass_RInfo, res); + + if (op->fast_check()) { + __ cmp(klass_RInfo, k_RInfo); + __ b(*failure_target, ne); + } else if (k->is_loaded()) { + __ ldr(Rtemp, Address(klass_RInfo, k->super_check_offset())); + if (in_bytes(Klass::secondary_super_cache_offset()) != (int) k->super_check_offset()) { + __ cmp(Rtemp, k_RInfo); + __ b(*failure_target, ne); + } else { + __ cmp(klass_RInfo, k_RInfo); + __ cond_cmp(Rtemp, k_RInfo, ne); + __ b(*success_target, eq); + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + __ cbz(R0, *failure_target); + } + } else { + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + // check for immediate positive hit + __ ldr(Rtemp, Address(klass_RInfo, Rtemp)); + __ cmp(klass_RInfo, k_RInfo); + __ cond_cmp(Rtemp, k_RInfo, ne); + __ b(*success_target, eq); + // check for immediate negative hit + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + __ cmp(Rtemp, in_bytes(Klass::secondary_super_cache_offset())); + __ b(*failure_target, ne); + // slow case + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + __ cbz(R0, *failure_target); + } + +#else // AARCH64 + + __ movs(res, obj); + if (op->should_profile()) { + typecheck_profile_helper1(op->profiled_method(), op->profiled_bci(), md, data, mdo_offset_bias, res, klass_RInfo, Rtemp, &done); + } else { + __ b(done, eq); + } + if (k->is_loaded()) { + __ mov_metadata(k_RInfo, k->constant_encoding()); + } else if (k_RInfo != obj) { + klass2reg_with_patching(k_RInfo, op->info_for_patch()); + __ movs(res, obj); + } else { + // Patching doesn't update "res" register after GC, so do patching first + klass2reg_with_patching(Rtemp, op->info_for_patch()); + __ movs(res, obj); + __ mov(k_RInfo, Rtemp); + } + __ load_klass(klass_RInfo, res, ne); + + if (op->fast_check()) { + __ cmp(klass_RInfo, k_RInfo, ne); + __ b(*failure_target, ne); + } else if (k->is_loaded()) { + __ b(*success_target, eq); + __ ldr(Rtemp, Address(klass_RInfo, k->super_check_offset())); + if (in_bytes(Klass::secondary_super_cache_offset()) != (int) k->super_check_offset()) { + __ cmp(Rtemp, k_RInfo); + __ b(*failure_target, ne); + } else { + __ cmp(klass_RInfo, k_RInfo); + __ cmp(Rtemp, k_RInfo, ne); + __ b(*success_target, eq); + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + __ cbz(R0, *failure_target); + } + } else { + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + __ b(*success_target, eq); + // check for immediate positive hit + __ ldr(Rtemp, Address(klass_RInfo, Rtemp)); + __ cmp(klass_RInfo, k_RInfo); + __ cmp(Rtemp, k_RInfo, ne); + __ b(*success_target, eq); + // check for immediate negative hit + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + __ cmp(Rtemp, in_bytes(Klass::secondary_super_cache_offset())); + __ b(*failure_target, ne); + // slow case + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + __ cbz(R0, *failure_target); + } +#endif // AARCH64 + + if (op->should_profile()) { + Register mdo = klass_RInfo, recv = k_RInfo, tmp1 = Rtemp; + typecheck_profile_helper2(md, data, mdo_offset_bias, mdo, recv, res, tmp1, + &profile_cast_success, &profile_cast_failure, + &done, stub->entry()); + } + __ bind(done); + break; + } + + case lir_instanceof: { + Register obj = op->object()->as_register(); + Register res = op->result_opr()->as_register(); + Register klass_RInfo = op->tmp1()->as_register(); + Register k_RInfo = op->tmp2()->as_register(); + ciKlass* k = op->klass(); + assert_different_registers(res, klass_RInfo, k_RInfo, Rtemp); + + ciMethodData* md; + ciProfileData* data; + int mdo_offset_bias = 0; + + Label done; + + Label profile_cast_failure, profile_cast_success; + Label *failure_target = op->should_profile() ? &profile_cast_failure : &done; + Label *success_target = op->should_profile() ? &profile_cast_success : &done; + +#ifdef AARCH64 + move_regs(obj, res); +#else + __ movs(res, obj); +#endif // AARCH64 + + if (op->should_profile()) { + typecheck_profile_helper1(op->profiled_method(), op->profiled_bci(), md, data, mdo_offset_bias, res, klass_RInfo, Rtemp, &done); + } else { +#ifdef AARCH64 + __ cbz(obj, done); // If obj == NULL, res is false +#else + __ b(done, eq); +#endif // AARCH64 + } + + if (k->is_loaded()) { + __ mov_metadata(k_RInfo, k->constant_encoding()); + } else { + op->info_for_patch()->add_register_oop(FrameMap::as_oop_opr(res)); + klass2reg_with_patching(k_RInfo, op->info_for_patch()); + } + __ load_klass(klass_RInfo, res); + +#ifndef AARCH64 + if (!op->should_profile()) { + __ mov(res, 0); + } +#endif // !AARCH64 + + if (op->fast_check()) { + __ cmp(klass_RInfo, k_RInfo); + if (!op->should_profile()) { + set_instanceof_result(_masm, res, eq); + } else { + __ b(profile_cast_failure, ne); + } + } else if (k->is_loaded()) { + __ ldr(Rtemp, Address(klass_RInfo, k->super_check_offset())); + if (in_bytes(Klass::secondary_super_cache_offset()) != (int) k->super_check_offset()) { + __ cmp(Rtemp, k_RInfo); + if (!op->should_profile()) { + set_instanceof_result(_masm, res, eq); + } else { + __ b(profile_cast_failure, ne); + } + } else { + __ cmp(klass_RInfo, k_RInfo); + __ cond_cmp(Rtemp, k_RInfo, ne); + if (!op->should_profile()) { + set_instanceof_result(_masm, res, eq); + } + __ b(*success_target, eq); + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + if (!op->should_profile()) { + move_regs(R0, res); + } else { + __ cbz(R0, *failure_target); + } + } + } else { + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + // check for immediate positive hit + __ cmp(klass_RInfo, k_RInfo); + if (!op->should_profile()) { +#ifdef AARCH64 + // TODO-AARCH64 check if separate conditional branch is more efficient than ldr+cond_cmp + __ ldr(res, Address(klass_RInfo, Rtemp)); +#else + __ ldr(res, Address(klass_RInfo, Rtemp), ne); +#endif // AARCH64 + __ cond_cmp(res, k_RInfo, ne); + set_instanceof_result(_masm, res, eq); + } else { +#ifdef AARCH64 + // TODO-AARCH64 check if separate conditional branch is more efficient than ldr+cond_cmp + __ ldr(Rtemp, Address(klass_RInfo, Rtemp)); +#else + __ ldr(Rtemp, Address(klass_RInfo, Rtemp), ne); +#endif // AARCH64 + __ cond_cmp(Rtemp, k_RInfo, ne); + } + __ b(*success_target, eq); + // check for immediate negative hit + if (op->should_profile()) { + __ ldr_u32(Rtemp, Address(k_RInfo, Klass::super_check_offset_offset())); + } + __ cmp(Rtemp, in_bytes(Klass::secondary_super_cache_offset())); + if (!op->should_profile()) { +#ifdef AARCH64 + __ mov(res, 0); +#else + __ mov(res, 0, ne); +#endif // AARCH64 + } + __ b(*failure_target, ne); + // slow case + assert(klass_RInfo == R0 && k_RInfo == R1, "runtime call setup"); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); + if (!op->should_profile()) { + move_regs(R0, res); + } + if (op->should_profile()) { + __ cbz(R0, *failure_target); + } + } + + if (op->should_profile()) { + Label done_ok, done_failure; + Register mdo = klass_RInfo, recv = k_RInfo, tmp1 = Rtemp; + typecheck_profile_helper2(md, data, mdo_offset_bias, mdo, recv, res, tmp1, + &profile_cast_success, &profile_cast_failure, + &done_ok, &done_failure); + __ bind(done_failure); + __ mov(res, 0); + __ b(done); + __ bind(done_ok); + __ mov(res, 1); + } + __ bind(done); + break; + } + default: + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) { + // if (*addr == cmpval) { + // *addr = newval; + // dest = 1; + // } else { + // dest = 0; + // } +#ifdef AARCH64 + Label retry, done; + Register addr = op->addr()->as_pointer_register(); + Register cmpval = op->cmp_value()->as_pointer_register(); + Register newval = op->new_value()->as_pointer_register(); + Register dest = op->result_opr()->as_pointer_register(); + assert_different_registers(dest, addr, cmpval, newval, Rtemp); + + if (UseCompressedOops && op->code() == lir_cas_obj) { + Register tmp1 = op->tmp1()->as_pointer_register(); + Register tmp2 = op->tmp2()->as_pointer_register(); + assert_different_registers(dest, addr, cmpval, newval, tmp1, tmp2, Rtemp); + __ encode_heap_oop(tmp1, cmpval); cmpval = tmp1; + __ encode_heap_oop(tmp2, newval); newval = tmp2; + } + + __ mov(dest, ZR); + __ bind(retry); + if (((op->code() == lir_cas_obj) && !UseCompressedOops) || op->code() == lir_cas_long) { + __ ldaxr(Rtemp, addr); + __ cmp(Rtemp, cmpval); + __ b(done, ne); + __ stlxr(Rtemp, newval, addr); + } else if (((op->code() == lir_cas_obj) && UseCompressedOops) || op->code() == lir_cas_int) { + __ ldaxr_w(Rtemp, addr); + __ cmp_w(Rtemp, cmpval); + __ b(done, ne); + __ stlxr_w(Rtemp, newval, addr); + } else { + ShouldNotReachHere(); + } + __ cbnz_w(Rtemp, retry); + __ mov(dest, 1); + __ bind(done); +#else + // FIXME: membar_release + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore | MacroAssembler::LoadStore), Rtemp); + if (op->code() == lir_cas_int || op->code() == lir_cas_obj) { + Register addr = op->addr()->as_register(); + Register cmpval = op->cmp_value()->as_register(); + Register newval = op->new_value()->as_register(); + Register dest = op->result_opr()->as_register(); + assert_different_registers(dest, addr, cmpval, newval, Rtemp); + + __ atomic_cas_bool(cmpval, newval, addr, 0, Rtemp); // Rtemp free by default at C1 LIR layer + __ mov(dest, 1, eq); + __ mov(dest, 0, ne); + } else if (op->code() == lir_cas_long) { + assert(VM_Version::supports_cx8(), "wrong machine"); + Register addr = op->addr()->as_pointer_register(); + Register cmp_value_lo = op->cmp_value()->as_register_lo(); + Register cmp_value_hi = op->cmp_value()->as_register_hi(); + Register new_value_lo = op->new_value()->as_register_lo(); + Register new_value_hi = op->new_value()->as_register_hi(); + Register dest = op->result_opr()->as_register(); + Register tmp_lo = op->tmp1()->as_register_lo(); + Register tmp_hi = op->tmp1()->as_register_hi(); + + assert_different_registers(tmp_lo, tmp_hi, cmp_value_lo, cmp_value_hi, dest, new_value_lo, new_value_hi, addr); + assert(tmp_hi->encoding() == tmp_lo->encoding() + 1, "non aligned register pair"); + assert(new_value_hi->encoding() == new_value_lo->encoding() + 1, "non aligned register pair"); + assert((tmp_lo->encoding() & 0x1) == 0, "misaligned register pair"); + assert((new_value_lo->encoding() & 0x1) == 0, "misaligned register pair"); + __ atomic_cas64(tmp_lo, tmp_hi, dest, cmp_value_lo, cmp_value_hi, + new_value_lo, new_value_hi, addr, 0); + } else { + Unimplemented(); + } +#endif // AARCH64 + // FIXME: is full membar really needed instead of just membar_acquire? + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad | MacroAssembler::StoreStore), Rtemp); +} + + +void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) { + AsmCondition acond = al; + AsmCondition ncond = nv; + if (opr1 != opr2) { + switch (condition) { + case lir_cond_equal: acond = eq; ncond = ne; break; + case lir_cond_notEqual: acond = ne; ncond = eq; break; + case lir_cond_less: acond = lt; ncond = ge; break; + case lir_cond_lessEqual: acond = le; ncond = gt; break; + case lir_cond_greaterEqual: acond = ge; ncond = lt; break; + case lir_cond_greater: acond = gt; ncond = le; break; + case lir_cond_aboveEqual: acond = hs; ncond = lo; break; + case lir_cond_belowEqual: acond = ls; ncond = hi; break; + default: ShouldNotReachHere(); + } + } + +#ifdef AARCH64 + + // TODO-AARCH64 implement it more efficiently + + if (opr1->is_register()) { + reg2reg(opr1, result); + } else if (opr1->is_stack()) { + stack2reg(opr1, result, result->type()); + } else if (opr1->is_constant()) { + const2reg(opr1, result, lir_patch_none, NULL); + } else { + ShouldNotReachHere(); + } + + Label skip; + __ b(skip, acond); + + if (opr2->is_register()) { + reg2reg(opr2, result); + } else if (opr2->is_stack()) { + stack2reg(opr2, result, result->type()); + } else if (opr2->is_constant()) { + const2reg(opr2, result, lir_patch_none, NULL); + } else { + ShouldNotReachHere(); + } + + __ bind(skip); + +#else + for (;;) { // two iterations only + if (opr1 == result) { + // do nothing + } else if (opr1->is_single_cpu()) { + __ mov(result->as_register(), opr1->as_register(), acond); + } else if (opr1->is_double_cpu()) { + __ long_move(result->as_register_lo(), result->as_register_hi(), + opr1->as_register_lo(), opr1->as_register_hi(), acond); + } else if (opr1->is_single_stack()) { + __ ldr(result->as_register(), frame_map()->address_for_slot(opr1->single_stack_ix()), acond); + } else if (opr1->is_double_stack()) { + __ ldr(result->as_register_lo(), + frame_map()->address_for_slot(opr1->double_stack_ix(), lo_word_offset_in_bytes), acond); + __ ldr(result->as_register_hi(), + frame_map()->address_for_slot(opr1->double_stack_ix(), hi_word_offset_in_bytes), acond); + } else if (opr1->is_illegal()) { + // do nothing: this part of the cmove has been optimized away in the peephole optimizer + } else { + assert(opr1->is_constant(), "must be"); + LIR_Const* c = opr1->as_constant_ptr(); + + switch (c->type()) { + case T_INT: + __ mov_slow(result->as_register(), c->as_jint(), acond); + break; + case T_LONG: + __ mov_slow(result->as_register_lo(), c->as_jint_lo(), acond); + __ mov_slow(result->as_register_hi(), c->as_jint_hi(), acond); + break; + case T_OBJECT: + __ mov_oop(result->as_register(), c->as_jobject(), 0, acond); + break; + case T_FLOAT: +#ifdef __SOFTFP__ + // not generated now. + __ mov_slow(result->as_register(), c->as_jint(), acond); +#else + __ mov_float(result->as_float_reg(), c->as_jfloat(), acond); +#endif // __SOFTFP__ + break; + case T_DOUBLE: +#ifdef __SOFTFP__ + // not generated now. + __ mov_slow(result->as_register_lo(), c->as_jint_lo(), acond); + __ mov_slow(result->as_register_hi(), c->as_jint_hi(), acond); +#else + __ mov_double(result->as_double_reg(), c->as_jdouble(), acond); +#endif // __SOFTFP__ + break; + default: + ShouldNotReachHere(); + } + } + + // Negate the condition and repeat the algorithm with the second operand + if (opr1 == opr2) { break; } + opr1 = opr2; + acond = ncond; + } +#endif // AARCH64 +} + +#if defined(AARCH64) || defined(ASSERT) +static int reg_size(LIR_Opr op) { + switch (op->type()) { + case T_FLOAT: + case T_INT: return BytesPerInt; + case T_LONG: + case T_DOUBLE: return BytesPerLong; + case T_OBJECT: + case T_ARRAY: + case T_METADATA: return BytesPerWord; + case T_ADDRESS: + case T_ILLEGAL: // fall through + default: ShouldNotReachHere(); return -1; + } +} +#endif + +void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) { + assert(info == NULL, "unused on this code path"); + assert(dest->is_register(), "wrong items state"); + + if (right->is_address()) { + // special case for adding shifted/extended register + const Register res = dest->as_pointer_register(); + const Register lreg = left->as_pointer_register(); + const LIR_Address* addr = right->as_address_ptr(); + + assert(addr->base()->as_pointer_register() == lreg && addr->index()->is_register() && addr->disp() == 0, "must be"); + + int scale = addr->scale(); + AsmShift shift = lsl; + +#ifdef AARCH64 + bool is_index_extended = reg_size(addr->base()) > reg_size(addr->index()); + if (scale < 0) { + scale = -scale; + shift = lsr; + } + assert(shift == lsl || !is_index_extended, "could not have extend and right shift in one operand"); + assert(0 <= scale && scale <= 63, "scale is too large"); + + if (is_index_extended) { + assert(scale <= 4, "scale is too large for add with extended register"); + assert(addr->index()->is_single_cpu(), "should be"); + assert(addr->index()->type() == T_INT, "should be"); + assert(dest->is_double_cpu(), "should be"); + assert(code == lir_add, "special case of add with extended register"); + + __ add(res, lreg, addr->index()->as_register(), ex_sxtw, scale); + return; + } else if (reg_size(dest) == BytesPerInt) { + assert(reg_size(addr->base()) == reg_size(addr->index()), "should be"); + assert(reg_size(addr->base()) == reg_size(dest), "should be"); + + AsmOperand operand(addr->index()->as_pointer_register(), shift, scale); + switch (code) { + case lir_add: __ add_32(res, lreg, operand); break; + case lir_sub: __ sub_32(res, lreg, operand); break; + default: ShouldNotReachHere(); + } + return; + } +#endif // AARCH64 + + assert(reg_size(addr->base()) == reg_size(addr->index()), "should be"); + assert(reg_size(addr->base()) == reg_size(dest), "should be"); + assert(reg_size(dest) == wordSize, "should be"); + + AsmOperand operand(addr->index()->as_pointer_register(), shift, scale); + switch (code) { + case lir_add: __ add(res, lreg, operand); break; + case lir_sub: __ sub(res, lreg, operand); break; + default: ShouldNotReachHere(); + } + +#ifndef AARCH64 + } else if (left->is_address()) { + assert(code == lir_sub && right->is_single_cpu(), "special case used by strength_reduce_multiply()"); + const LIR_Address* addr = left->as_address_ptr(); + const Register res = dest->as_register(); + const Register rreg = right->as_register(); + assert(addr->base()->as_register() == rreg && addr->index()->is_register() && addr->disp() == 0, "must be"); + __ rsb(res, rreg, AsmOperand(addr->index()->as_register(), lsl, addr->scale())); +#endif // !AARCH64 + + } else if (dest->is_single_cpu()) { + assert(left->is_single_cpu(), "unexpected left operand"); +#ifdef AARCH64 + assert(dest->type() == T_INT, "unexpected dest type"); + assert(left->type() == T_INT, "unexpected left type"); + assert(right->type() == T_INT, "unexpected right type"); +#endif // AARCH64 + + const Register res = dest->as_register(); + const Register lreg = left->as_register(); + + if (right->is_single_cpu()) { + const Register rreg = right->as_register(); + switch (code) { + case lir_add: __ add_32(res, lreg, rreg); break; + case lir_sub: __ sub_32(res, lreg, rreg); break; + case lir_mul: __ mul_32(res, lreg, rreg); break; + default: ShouldNotReachHere(); + } + } else { + assert(right->is_constant(), "must be"); + const jint c = right->as_constant_ptr()->as_jint(); + if (!Assembler::is_arith_imm_in_range(c)) { + BAILOUT("illegal arithmetic operand"); + } + switch (code) { + case lir_add: __ add_32(res, lreg, c); break; + case lir_sub: __ sub_32(res, lreg, c); break; + default: ShouldNotReachHere(); + } + } + + } else if (dest->is_double_cpu()) { +#ifdef AARCH64 + assert(left->is_double_cpu() || + (left->is_single_cpu() && ((left->type() == T_OBJECT) || (left->type() == T_ARRAY) || (left->type() == T_ADDRESS))), + "unexpected left operand"); + + const Register res = dest->as_register_lo(); + const Register lreg = left->as_pointer_register(); + + if (right->is_constant()) { + assert(right->type() == T_LONG, "unexpected right type"); + assert((right->as_constant_ptr()->as_jlong() >> 24) == 0, "out of range"); + jint imm = (jint)right->as_constant_ptr()->as_jlong(); + switch (code) { + case lir_add: __ add(res, lreg, imm); break; + case lir_sub: __ sub(res, lreg, imm); break; + default: ShouldNotReachHere(); + } + } else { + assert(right->is_double_cpu() || + (right->is_single_cpu() && ((right->type() == T_OBJECT) || (right->type() == T_ARRAY) || (right->type() == T_ADDRESS))), + "unexpected right operand"); + const Register rreg = right->as_pointer_register(); + switch (code) { + case lir_add: __ add(res, lreg, rreg); break; + case lir_sub: __ sub(res, lreg, rreg); break; + case lir_mul: __ mul(res, lreg, rreg); break; + default: ShouldNotReachHere(); + } + } +#else // AARCH64 + Register res_lo = dest->as_register_lo(); + Register res_hi = dest->as_register_hi(); + Register lreg_lo = left->as_register_lo(); + Register lreg_hi = left->as_register_hi(); + if (right->is_double_cpu()) { + Register rreg_lo = right->as_register_lo(); + Register rreg_hi = right->as_register_hi(); + if (res_lo == lreg_hi || res_lo == rreg_hi) { + res_lo = Rtemp; + } + switch (code) { + case lir_add: + __ adds(res_lo, lreg_lo, rreg_lo); + __ adc(res_hi, lreg_hi, rreg_hi); + break; + case lir_sub: + __ subs(res_lo, lreg_lo, rreg_lo); + __ sbc(res_hi, lreg_hi, rreg_hi); + break; + default: + ShouldNotReachHere(); + } + } else { + assert(right->is_constant(), "must be"); + assert((right->as_constant_ptr()->as_jlong() >> 32) == 0, "out of range"); + const jint c = (jint) right->as_constant_ptr()->as_jlong(); + if (res_lo == lreg_hi) { + res_lo = Rtemp; + } + switch (code) { + case lir_add: + __ adds(res_lo, lreg_lo, c); + __ adc(res_hi, lreg_hi, 0); + break; + case lir_sub: + __ subs(res_lo, lreg_lo, c); + __ sbc(res_hi, lreg_hi, 0); + break; + default: + ShouldNotReachHere(); + } + } + move_regs(res_lo, dest->as_register_lo()); +#endif // AARCH64 + + } else if (dest->is_single_fpu()) { + assert(left->is_single_fpu(), "must be"); + assert(right->is_single_fpu(), "must be"); + const FloatRegister res = dest->as_float_reg(); + const FloatRegister lreg = left->as_float_reg(); + const FloatRegister rreg = right->as_float_reg(); + switch (code) { + case lir_add: __ add_float(res, lreg, rreg); break; + case lir_sub: __ sub_float(res, lreg, rreg); break; + case lir_mul_strictfp: // fall through + case lir_mul: __ mul_float(res, lreg, rreg); break; + case lir_div_strictfp: // fall through + case lir_div: __ div_float(res, lreg, rreg); break; + default: ShouldNotReachHere(); + } + } else if (dest->is_double_fpu()) { + assert(left->is_double_fpu(), "must be"); + assert(right->is_double_fpu(), "must be"); + const FloatRegister res = dest->as_double_reg(); + const FloatRegister lreg = left->as_double_reg(); + const FloatRegister rreg = right->as_double_reg(); + switch (code) { + case lir_add: __ add_double(res, lreg, rreg); break; + case lir_sub: __ sub_double(res, lreg, rreg); break; + case lir_mul_strictfp: // fall through + case lir_mul: __ mul_double(res, lreg, rreg); break; + case lir_div_strictfp: // fall through + case lir_div: __ div_double(res, lreg, rreg); break; + default: ShouldNotReachHere(); + } + } else { + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr unused, LIR_Opr dest, LIR_Op* op) { + switch (code) { + case lir_abs: + __ abs_double(dest->as_double_reg(), value->as_double_reg()); + break; + case lir_sqrt: + __ sqrt_double(dest->as_double_reg(), value->as_double_reg()); + break; + default: + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) { + assert(dest->is_register(), "wrong items state"); + assert(left->is_register(), "wrong items state"); + + if (dest->is_single_cpu()) { +#ifdef AARCH64 + assert (dest->type() == T_INT, "unexpected result type"); + assert (left->type() == T_INT, "unexpected left type"); + assert (right->type() == T_INT, "unexpected right type"); +#endif // AARCH64 + + const Register res = dest->as_register(); + const Register lreg = left->as_register(); + + if (right->is_single_cpu()) { + const Register rreg = right->as_register(); + switch (code) { + case lir_logic_and: __ and_32(res, lreg, rreg); break; + case lir_logic_or: __ orr_32(res, lreg, rreg); break; + case lir_logic_xor: __ eor_32(res, lreg, rreg); break; + default: ShouldNotReachHere(); + } + } else { + assert(right->is_constant(), "must be"); + const uint c = (uint)right->as_constant_ptr()->as_jint(); + switch (code) { + case lir_logic_and: __ and_32(res, lreg, c); break; + case lir_logic_or: __ orr_32(res, lreg, c); break; + case lir_logic_xor: __ eor_32(res, lreg, c); break; + default: ShouldNotReachHere(); + } + } + } else { + assert(dest->is_double_cpu(), "should be"); + Register res_lo = dest->as_register_lo(); + +#ifdef AARCH64 + assert ((left->is_single_cpu() && left->is_oop_register()) || left->is_double_cpu(), "should be"); + const Register lreg_lo = left->as_pointer_register(); +#else + assert (dest->type() == T_LONG, "unexpected result type"); + assert (left->type() == T_LONG, "unexpected left type"); + assert (right->type() == T_LONG, "unexpected right type"); + + const Register res_hi = dest->as_register_hi(); + const Register lreg_lo = left->as_register_lo(); + const Register lreg_hi = left->as_register_hi(); +#endif // AARCH64 + + if (right->is_register()) { +#ifdef AARCH64 + assert ((right->is_single_cpu() && right->is_oop_register()) || right->is_double_cpu(), "should be"); + const Register rreg_lo = right->as_pointer_register(); + switch (code) { + case lir_logic_and: __ andr(res_lo, lreg_lo, rreg_lo); break; + case lir_logic_or: __ orr (res_lo, lreg_lo, rreg_lo); break; + case lir_logic_xor: __ eor (res_lo, lreg_lo, rreg_lo); break; + default: ShouldNotReachHere(); + } +#else + const Register rreg_lo = right->as_register_lo(); + const Register rreg_hi = right->as_register_hi(); + if (res_lo == lreg_hi || res_lo == rreg_hi) { + res_lo = Rtemp; // Temp register helps to avoid overlap between result and input + } + switch (code) { + case lir_logic_and: + __ andr(res_lo, lreg_lo, rreg_lo); + __ andr(res_hi, lreg_hi, rreg_hi); + break; + case lir_logic_or: + __ orr(res_lo, lreg_lo, rreg_lo); + __ orr(res_hi, lreg_hi, rreg_hi); + break; + case lir_logic_xor: + __ eor(res_lo, lreg_lo, rreg_lo); + __ eor(res_hi, lreg_hi, rreg_hi); + break; + default: + ShouldNotReachHere(); + } + move_regs(res_lo, dest->as_register_lo()); +#endif // AARCH64 + } else { + assert(right->is_constant(), "must be"); +#ifdef AARCH64 + const julong c = (julong)right->as_constant_ptr()->as_jlong(); + Assembler::LogicalImmediate imm(c, false); + if (imm.is_encoded()) { + switch (code) { + case lir_logic_and: __ andr(res_lo, lreg_lo, imm); break; + case lir_logic_or: __ orr (res_lo, lreg_lo, imm); break; + case lir_logic_xor: __ eor (res_lo, lreg_lo, imm); break; + default: ShouldNotReachHere(); + } + } else { + BAILOUT("64 bit constant cannot be inlined"); + } +#else + const jint c_lo = (jint) right->as_constant_ptr()->as_jlong(); + const jint c_hi = (jint) (right->as_constant_ptr()->as_jlong() >> 32); + // Case for logic_or from do_ClassIDIntrinsic() + if (c_hi == 0 && AsmOperand::is_rotated_imm(c_lo)) { + switch (code) { + case lir_logic_and: + __ andr(res_lo, lreg_lo, c_lo); + __ mov(res_hi, 0); + break; + case lir_logic_or: + __ orr(res_lo, lreg_lo, c_lo); + break; + case lir_logic_xor: + __ eor(res_lo, lreg_lo, c_lo); + break; + default: + ShouldNotReachHere(); + } + } else if (code == lir_logic_and && + c_hi == -1 && + (AsmOperand::is_rotated_imm(c_lo) || + AsmOperand::is_rotated_imm(~c_lo))) { + // Another case which handles logic_and from do_ClassIDIntrinsic() + if (AsmOperand::is_rotated_imm(c_lo)) { + __ andr(res_lo, lreg_lo, c_lo); + } else { + __ bic(res_lo, lreg_lo, ~c_lo); + } + if (res_hi != lreg_hi) { + __ mov(res_hi, lreg_hi); + } + } else { + BAILOUT("64 bit constant cannot be inlined"); + } +#endif // AARCH64 + } + } +} + + +#ifdef AARCH64 + +void LIR_Assembler::long_compare_helper(LIR_Opr opr1, LIR_Opr opr2) { + assert(opr1->is_double_cpu(), "should be"); + Register x = opr1->as_register_lo(); + + if (opr2->is_double_cpu()) { + Register y = opr2->as_register_lo(); + __ cmp(x, y); + + } else { + assert(opr2->is_constant(), "should be"); + assert(opr2->as_constant_ptr()->type() == T_LONG, "long constant expected"); + jlong c = opr2->as_jlong(); + assert(((c >> 31) == 0) || ((c >> 31) == -1), "immediate is out of range"); + if (c >= 0) { + __ cmp(x, (jint)c); + } else { + __ cmn(x, (jint)(-c)); + } + } +} + +#endif // AARCH64 + +void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) { + if (opr1->is_single_cpu()) { + if (opr2->is_constant()) { + switch (opr2->as_constant_ptr()->type()) { + case T_INT: { + const jint c = opr2->as_constant_ptr()->as_jint(); + if (Assembler::is_arith_imm_in_range(c)) { + __ cmp_32(opr1->as_register(), c); + } else if (Assembler::is_arith_imm_in_range(-c)) { + __ cmn_32(opr1->as_register(), -c); + } else { + // This can happen when compiling lookupswitch + __ mov_slow(Rtemp, c); + __ cmp_32(opr1->as_register(), Rtemp); + } + break; + } + case T_OBJECT: + assert(opr2->as_constant_ptr()->as_jobject() == NULL, "cannot handle otherwise"); + __ cmp(opr1->as_register(), 0); + break; + default: + ShouldNotReachHere(); + } + } else if (opr2->is_single_cpu()) { + if (opr1->type() == T_OBJECT || opr1->type() == T_ARRAY || opr1->type() == T_METADATA || opr1->type() == T_ADDRESS) { + assert(opr2->type() == T_OBJECT || opr2->type() == T_ARRAY || opr2->type() == T_METADATA || opr2->type() == T_ADDRESS, "incompatibe type"); + __ cmp(opr1->as_register(), opr2->as_register()); + } else { + assert(opr2->type() != T_OBJECT && opr2->type() != T_ARRAY && opr2->type() != T_METADATA && opr2->type() != T_ADDRESS, "incompatibe type"); + __ cmp_32(opr1->as_register(), opr2->as_register()); + } + } else { + ShouldNotReachHere(); + } + } else if (opr1->is_double_cpu()) { +#ifdef AARCH64 + long_compare_helper(opr1, opr2); +#else + Register xlo = opr1->as_register_lo(); + Register xhi = opr1->as_register_hi(); + if (opr2->is_constant() && opr2->as_jlong() == 0) { + assert(condition == lir_cond_equal || condition == lir_cond_notEqual, "cannot handle otherwise"); + __ orrs(Rtemp, xlo, xhi); + } else if (opr2->is_register()) { + Register ylo = opr2->as_register_lo(); + Register yhi = opr2->as_register_hi(); + if (condition == lir_cond_equal || condition == lir_cond_notEqual) { + __ teq(xhi, yhi); + __ teq(xlo, ylo, eq); + } else { + __ subs(xlo, xlo, ylo); + __ sbcs(xhi, xhi, yhi); + } + } else { + ShouldNotReachHere(); + } +#endif // AARCH64 + } else if (opr1->is_single_fpu()) { + if (opr2->is_constant()) { + assert(opr2->as_jfloat() == 0.0f, "cannot handle otherwise"); + __ cmp_zero_float(opr1->as_float_reg()); + } else { + __ cmp_float(opr1->as_float_reg(), opr2->as_float_reg()); + } + } else if (opr1->is_double_fpu()) { + if (opr2->is_constant()) { + assert(opr2->as_jdouble() == 0.0, "cannot handle otherwise"); + __ cmp_zero_double(opr1->as_double_reg()); + } else { + __ cmp_double(opr1->as_double_reg(), opr2->as_double_reg()); + } + } else { + ShouldNotReachHere(); + } +} + +void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dst, LIR_Op2* op) { + const Register res = dst->as_register(); + if (code == lir_cmp_fd2i || code == lir_ucmp_fd2i) { + comp_op(lir_cond_unknown, left, right, op); +#ifdef AARCH64 + if (code == lir_ucmp_fd2i) { // unordered is less + __ cset(res, gt); // 1 if '>', else 0 + __ csinv(res, res, ZR, ge); // previous value if '>=', else -1 + } else { + __ cset(res, hi); // 1 if '>' or unordered, else 0 + __ csinv(res, res, ZR, pl); // previous value if '>=' or unordered, else -1 + } +#else + __ fmstat(); + if (code == lir_ucmp_fd2i) { // unordered is less + __ mvn(res, 0, lt); + __ mov(res, 1, ge); + } else { // unordered is greater + __ mov(res, 1, cs); + __ mvn(res, 0, cc); + } + __ mov(res, 0, eq); +#endif // AARCH64 + + } else { + assert(code == lir_cmp_l2i, "must be"); + +#ifdef AARCH64 + long_compare_helper(left, right); + + __ cset(res, gt); // 1 if '>', else 0 + __ csinv(res, res, ZR, ge); // previous value if '>=', else -1 +#else + Label done; + const Register xlo = left->as_register_lo(); + const Register xhi = left->as_register_hi(); + const Register ylo = right->as_register_lo(); + const Register yhi = right->as_register_hi(); + __ cmp(xhi, yhi); + __ mov(res, 1, gt); + __ mvn(res, 0, lt); + __ b(done, ne); + __ subs(res, xlo, ylo); + __ mov(res, 1, hi); + __ mvn(res, 0, lo); + __ bind(done); +#endif // AARCH64 + } +} + + +void LIR_Assembler::align_call(LIR_Code code) { + // Not needed +} + + +void LIR_Assembler::call(LIR_OpJavaCall *op, relocInfo::relocType rtype) { + int ret_addr_offset = __ patchable_call(op->addr(), rtype); + assert(ret_addr_offset == __ offset(), "embedded return address not allowed"); + add_call_info_here(op->info()); +} + + +void LIR_Assembler::ic_call(LIR_OpJavaCall *op) { + bool near_range = __ cache_fully_reachable(); + address oop_address = pc(); + + bool use_movw = AARCH64_ONLY(false) NOT_AARCH64(VM_Version::supports_movw()); + + // Ricklass may contain something that is not a metadata pointer so + // mov_metadata can't be used + InlinedAddress value((address)Universe::non_oop_word()); + InlinedAddress addr(op->addr()); + if (use_movw) { +#ifdef AARCH64 + ShouldNotReachHere(); +#else + __ movw(Ricklass, ((unsigned int)Universe::non_oop_word()) & 0xffff); + __ movt(Ricklass, ((unsigned int)Universe::non_oop_word()) >> 16); +#endif // AARCH64 + } else { + // No movw/movt, must be load a pc relative value but no + // relocation so no metadata table to load from. + // Use a b instruction rather than a bl, inline constant after the + // branch, use a PC relative ldr to load the constant, arrange for + // the call to return after the constant(s). + __ ldr_literal(Ricklass, value); + } + __ relocate(virtual_call_Relocation::spec(oop_address)); + if (near_range && use_movw) { + __ bl(op->addr()); + } else { + Label call_return; + __ adr(LR, call_return); + if (near_range) { + __ b(op->addr()); + } else { + __ indirect_jump(addr, Rtemp); + __ bind_literal(addr); + } + if (!use_movw) { + __ bind_literal(value); + } + __ bind(call_return); + } + add_call_info(code_offset(), op->info()); +} + + +/* Currently, vtable-dispatch is only enabled for sparc platforms */ +void LIR_Assembler::vtable_call(LIR_OpJavaCall* op) { + ShouldNotReachHere(); +} + +void LIR_Assembler::emit_static_call_stub() { + address call_pc = __ pc(); + address stub = __ start_a_stub(call_stub_size()); + if (stub == NULL) { + BAILOUT("static call stub overflow"); + } + + DEBUG_ONLY(int offset = code_offset();) + + InlinedMetadata metadata_literal(NULL); + __ relocate(static_stub_Relocation::spec(call_pc)); + // If not a single instruction, NativeMovConstReg::next_instruction_address() + // must jump over the whole following ldr_literal. + // (See CompiledStaticCall::set_to_interpreted()) +#ifdef ASSERT + address ldr_site = __ pc(); +#endif + __ ldr_literal(Rmethod, metadata_literal); + assert(nativeMovConstReg_at(ldr_site)->next_instruction_address() == __ pc(), "Fix ldr_literal or its parsing"); + bool near_range = __ cache_fully_reachable(); + InlinedAddress dest((address)-1); + if (near_range) { + address branch_site = __ pc(); + __ b(branch_site); // b to self maps to special NativeJump -1 destination + } else { + __ indirect_jump(dest, Rtemp); + } + __ bind_literal(metadata_literal); // includes spec_for_immediate reloc + if (!near_range) { + __ bind_literal(dest); // special NativeJump -1 destination + } + + assert(code_offset() - offset <= call_stub_size(), "overflow"); + __ end_a_stub(); +} + +void LIR_Assembler::throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info) { + assert(exceptionOop->as_register() == Rexception_obj, "must match"); + assert(exceptionPC->as_register() == Rexception_pc, "must match"); + info->add_register_oop(exceptionOop); + + Runtime1::StubID handle_id = compilation()->has_fpu_code() ? + Runtime1::handle_exception_id : + Runtime1::handle_exception_nofpu_id; + Label return_address; + __ adr(Rexception_pc, return_address); + __ call(Runtime1::entry_for(handle_id), relocInfo::runtime_call_type); + __ bind(return_address); + add_call_info_here(info); // for exception handler +} + +void LIR_Assembler::unwind_op(LIR_Opr exceptionOop) { + assert(exceptionOop->as_register() == Rexception_obj, "must match"); + __ b(_unwind_handler_entry); +} + +void LIR_Assembler::shift_op(LIR_Code code, LIR_Opr left, LIR_Opr count, LIR_Opr dest, LIR_Opr tmp) { +#ifdef AARCH64 + if (dest->is_single_cpu()) { + Register res = dest->as_register(); + Register x = left->as_register(); + Register y = count->as_register(); + assert (dest->type() == T_INT, "unexpected result type"); + assert (left->type() == T_INT, "unexpected left type"); + + switch (code) { + case lir_shl: __ lslv_w(res, x, y); break; + case lir_shr: __ asrv_w(res, x, y); break; + case lir_ushr: __ lsrv_w(res, x, y); break; + default: ShouldNotReachHere(); + } + } else if (dest->is_double_cpu()) { + Register res = dest->as_register_lo(); + Register x = left->as_register_lo(); + Register y = count->as_register(); + + switch (code) { + case lir_shl: __ lslv(res, x, y); break; + case lir_shr: __ asrv(res, x, y); break; + case lir_ushr: __ lsrv(res, x, y); break; + default: ShouldNotReachHere(); + } + } else { + ShouldNotReachHere(); + } +#else + AsmShift shift = lsl; + switch (code) { + case lir_shl: shift = lsl; break; + case lir_shr: shift = asr; break; + case lir_ushr: shift = lsr; break; + default: ShouldNotReachHere(); + } + + if (dest->is_single_cpu()) { + __ andr(Rtemp, count->as_register(), 31); + __ mov(dest->as_register(), AsmOperand(left->as_register(), shift, Rtemp)); + } else if (dest->is_double_cpu()) { + Register dest_lo = dest->as_register_lo(); + Register dest_hi = dest->as_register_hi(); + Register src_lo = left->as_register_lo(); + Register src_hi = left->as_register_hi(); + Register Rcount = count->as_register(); + // Resolve possible register conflicts + if (shift == lsl && dest_hi == src_lo) { + dest_hi = Rtemp; + } else if (shift != lsl && dest_lo == src_hi) { + dest_lo = Rtemp; + } else if (dest_lo == src_lo && dest_hi == src_hi) { + dest_lo = Rtemp; + } else if (dest_lo == Rcount || dest_hi == Rcount) { + Rcount = Rtemp; + } + __ andr(Rcount, count->as_register(), 63); + __ long_shift(dest_lo, dest_hi, src_lo, src_hi, shift, Rcount); + move_regs(dest_lo, dest->as_register_lo()); + move_regs(dest_hi, dest->as_register_hi()); + } else { + ShouldNotReachHere(); + } +#endif // AARCH64 +} + + +void LIR_Assembler::shift_op(LIR_Code code, LIR_Opr left, jint count, LIR_Opr dest) { +#ifdef AARCH64 + if (dest->is_single_cpu()) { + assert (dest->type() == T_INT, "unexpected result type"); + assert (left->type() == T_INT, "unexpected left type"); + count &= 31; + if (count != 0) { + switch (code) { + case lir_shl: __ _lsl_w(dest->as_register(), left->as_register(), count); break; + case lir_shr: __ _asr_w(dest->as_register(), left->as_register(), count); break; + case lir_ushr: __ _lsr_w(dest->as_register(), left->as_register(), count); break; + default: ShouldNotReachHere(); + } + } else { + move_regs(left->as_register(), dest->as_register()); + } + } else if (dest->is_double_cpu()) { + count &= 63; + if (count != 0) { + switch (code) { + case lir_shl: __ _lsl(dest->as_register_lo(), left->as_register_lo(), count); break; + case lir_shr: __ _asr(dest->as_register_lo(), left->as_register_lo(), count); break; + case lir_ushr: __ _lsr(dest->as_register_lo(), left->as_register_lo(), count); break; + default: ShouldNotReachHere(); + } + } else { + move_regs(left->as_register_lo(), dest->as_register_lo()); + } + } else { + ShouldNotReachHere(); + } + +#else + AsmShift shift = lsl; + switch (code) { + case lir_shl: shift = lsl; break; + case lir_shr: shift = asr; break; + case lir_ushr: shift = lsr; break; + default: ShouldNotReachHere(); + } + + if (dest->is_single_cpu()) { + count &= 31; + if (count != 0) { + __ mov(dest->as_register(), AsmOperand(left->as_register(), shift, count)); + } else { + move_regs(left->as_register(), dest->as_register()); + } + } else if (dest->is_double_cpu()) { + count &= 63; + if (count != 0) { + Register dest_lo = dest->as_register_lo(); + Register dest_hi = dest->as_register_hi(); + Register src_lo = left->as_register_lo(); + Register src_hi = left->as_register_hi(); + // Resolve possible register conflicts + if (shift == lsl && dest_hi == src_lo) { + dest_hi = Rtemp; + } else if (shift != lsl && dest_lo == src_hi) { + dest_lo = Rtemp; + } + __ long_shift(dest_lo, dest_hi, src_lo, src_hi, shift, count); + move_regs(dest_lo, dest->as_register_lo()); + move_regs(dest_hi, dest->as_register_hi()); + } else { + __ long_move(dest->as_register_lo(), dest->as_register_hi(), + left->as_register_lo(), left->as_register_hi()); + } + } else { + ShouldNotReachHere(); + } +#endif // AARCH64 +} + + +// Saves 4 given registers in reserved argument area. +void LIR_Assembler::save_in_reserved_area(Register r1, Register r2, Register r3, Register r4) { + verify_reserved_argument_area_size(4); +#ifdef AARCH64 + __ stp(r1, r2, Address(SP, 0)); + __ stp(r3, r4, Address(SP, 2*wordSize)); +#else + __ stmia(SP, RegisterSet(r1) | RegisterSet(r2) | RegisterSet(r3) | RegisterSet(r4)); +#endif // AARCH64 +} + +// Restores 4 given registers from reserved argument area. +void LIR_Assembler::restore_from_reserved_area(Register r1, Register r2, Register r3, Register r4) { +#ifdef AARCH64 + __ ldp(r1, r2, Address(SP, 0)); + __ ldp(r3, r4, Address(SP, 2*wordSize)); +#else + __ ldmia(SP, RegisterSet(r1) | RegisterSet(r2) | RegisterSet(r3) | RegisterSet(r4), no_writeback); +#endif // AARCH64 +} + + +void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) { + ciArrayKlass* default_type = op->expected_type(); + Register src = op->src()->as_register(); + Register src_pos = op->src_pos()->as_register(); + Register dst = op->dst()->as_register(); + Register dst_pos = op->dst_pos()->as_register(); + Register length = op->length()->as_register(); + Register tmp = op->tmp()->as_register(); + Register tmp2 = Rtemp; + + assert(src == R0 && src_pos == R1 && dst == R2 && dst_pos == R3, "code assumption"); +#ifdef AARCH64 + assert(length == R4, "code assumption"); +#endif // AARCH64 + + CodeStub* stub = op->stub(); + + int flags = op->flags(); + BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL; + if (basic_type == T_ARRAY) basic_type = T_OBJECT; + + // If we don't know anything or it's an object array, just go through the generic arraycopy + if (default_type == NULL) { + + // save arguments, because they will be killed by a runtime call + save_in_reserved_area(R0, R1, R2, R3); + +#ifdef AARCH64 + // save length argument, will be killed by a runtime call + __ raw_push(length, ZR); +#else + // pass length argument on SP[0] + __ str(length, Address(SP, -2*wordSize, pre_indexed)); // 2 words for a proper stack alignment +#endif // AARCH64 + + address copyfunc_addr = StubRoutines::generic_arraycopy(); + if (copyfunc_addr == NULL) { // Use C version if stub was not generated + __ call(CAST_FROM_FN_PTR(address, Runtime1::arraycopy)); + } else { +#ifndef PRODUCT + if (PrintC1Statistics) { + __ inc_counter((address)&Runtime1::_generic_arraycopystub_cnt, tmp, tmp2); + } +#endif // !PRODUCT + // the stub is in the code cache so close enough + __ call(copyfunc_addr, relocInfo::runtime_call_type); + } + +#ifdef AARCH64 + __ raw_pop(length, ZR); +#else + __ add(SP, SP, 2*wordSize); +#endif // AARCH64 + + __ cbz_32(R0, *stub->continuation()); + + if (copyfunc_addr != NULL) { + __ mvn_32(tmp, R0); + restore_from_reserved_area(R0, R1, R2, R3); // load saved arguments in slow case only + __ sub_32(length, length, tmp); + __ add_32(src_pos, src_pos, tmp); + __ add_32(dst_pos, dst_pos, tmp); + } else { + restore_from_reserved_area(R0, R1, R2, R3); // load saved arguments in slow case only + } + + __ b(*stub->entry()); + + __ bind(*stub->continuation()); + return; + } + + assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(), + "must be true at this point"); + int elem_size = type2aelembytes(basic_type); + int shift = exact_log2(elem_size); + + // Check for NULL + if (flags & LIR_OpArrayCopy::src_null_check) { + if (flags & LIR_OpArrayCopy::dst_null_check) { + __ cmp(src, 0); + __ cond_cmp(dst, 0, ne); // make one instruction shorter if both checks are needed + __ b(*stub->entry(), eq); + } else { + __ cbz(src, *stub->entry()); + } + } else if (flags & LIR_OpArrayCopy::dst_null_check) { + __ cbz(dst, *stub->entry()); + } + + // If the compiler was not able to prove that exact type of the source or the destination + // of the arraycopy is an array type, check at runtime if the source or the destination is + // an instance type. + if (flags & LIR_OpArrayCopy::type_check) { + if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::dst_objarray)) { + __ load_klass(tmp, dst); + __ ldr_u32(tmp2, Address(tmp, in_bytes(Klass::layout_helper_offset()))); + __ mov_slow(tmp, Klass::_lh_neutral_value); + __ cmp_32(tmp2, tmp); + __ b(*stub->entry(), ge); + } + + if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::src_objarray)) { + __ load_klass(tmp, src); + __ ldr_u32(tmp2, Address(tmp, in_bytes(Klass::layout_helper_offset()))); + __ mov_slow(tmp, Klass::_lh_neutral_value); + __ cmp_32(tmp2, tmp); + __ b(*stub->entry(), ge); + } + } + + // Check if negative + const int all_positive_checks = LIR_OpArrayCopy::src_pos_positive_check | + LIR_OpArrayCopy::dst_pos_positive_check | + LIR_OpArrayCopy::length_positive_check; + switch (flags & all_positive_checks) { + case LIR_OpArrayCopy::src_pos_positive_check: + __ branch_if_negative_32(src_pos, *stub->entry()); + break; + case LIR_OpArrayCopy::dst_pos_positive_check: + __ branch_if_negative_32(dst_pos, *stub->entry()); + break; + case LIR_OpArrayCopy::length_positive_check: + __ branch_if_negative_32(length, *stub->entry()); + break; + case LIR_OpArrayCopy::src_pos_positive_check | LIR_OpArrayCopy::dst_pos_positive_check: + __ branch_if_any_negative_32(src_pos, dst_pos, tmp, *stub->entry()); + break; + case LIR_OpArrayCopy::src_pos_positive_check | LIR_OpArrayCopy::length_positive_check: + __ branch_if_any_negative_32(src_pos, length, tmp, *stub->entry()); + break; + case LIR_OpArrayCopy::dst_pos_positive_check | LIR_OpArrayCopy::length_positive_check: + __ branch_if_any_negative_32(dst_pos, length, tmp, *stub->entry()); + break; + case all_positive_checks: + __ branch_if_any_negative_32(src_pos, dst_pos, length, tmp, *stub->entry()); + break; + default: + assert((flags & all_positive_checks) == 0, "the last option"); + } + + // Range checks + if (flags & LIR_OpArrayCopy::src_range_check) { + __ ldr_s32(tmp2, Address(src, arrayOopDesc::length_offset_in_bytes())); + __ add_32(tmp, src_pos, length); + __ cmp_32(tmp, tmp2); + __ b(*stub->entry(), hi); + } + if (flags & LIR_OpArrayCopy::dst_range_check) { + __ ldr_s32(tmp2, Address(dst, arrayOopDesc::length_offset_in_bytes())); + __ add_32(tmp, dst_pos, length); + __ cmp_32(tmp, tmp2); + __ b(*stub->entry(), hi); + } + + // Check if src and dst are of the same type + if (flags & LIR_OpArrayCopy::type_check) { + // We don't know the array types are compatible + if (basic_type != T_OBJECT) { + // Simple test for basic type arrays + if (UseCompressedClassPointers) { + // We don't need decode because we just need to compare + __ ldr_u32(tmp, Address(src, oopDesc::klass_offset_in_bytes())); + __ ldr_u32(tmp2, Address(dst, oopDesc::klass_offset_in_bytes())); + __ cmp_32(tmp, tmp2); + } else { + __ load_klass(tmp, src); + __ load_klass(tmp2, dst); + __ cmp(tmp, tmp2); + } + __ b(*stub->entry(), ne); + } else { + // For object arrays, if src is a sub class of dst then we can + // safely do the copy. + Label cont, slow; + + address copyfunc_addr = StubRoutines::checkcast_arraycopy(); + + __ load_klass(tmp, src); + __ load_klass(tmp2, dst); + + // We are at a call so all live registers are saved before we + // get here + assert_different_registers(tmp, tmp2, R6, altFP_7_11); + + __ check_klass_subtype_fast_path(tmp, tmp2, R6, altFP_7_11, &cont, copyfunc_addr == NULL ? stub->entry() : &slow, NULL); + + __ mov(R6, R0); + __ mov(altFP_7_11, R1); + __ mov(R0, tmp); + __ mov(R1, tmp2); + __ call(Runtime1::entry_for(Runtime1::slow_subtype_check_id), relocInfo::runtime_call_type); // does not blow any registers except R0, LR and Rtemp + __ cmp_32(R0, 0); + __ mov(R0, R6); + __ mov(R1, altFP_7_11); + + if (copyfunc_addr != NULL) { // use stub if available + // src is not a sub class of dst so we have to do a + // per-element check. + + __ b(cont, ne); + + __ bind(slow); + + int mask = LIR_OpArrayCopy::src_objarray|LIR_OpArrayCopy::dst_objarray; + if ((flags & mask) != mask) { + // Check that at least both of them object arrays. + assert(flags & mask, "one of the two should be known to be an object array"); + + if (!(flags & LIR_OpArrayCopy::src_objarray)) { + __ load_klass(tmp, src); + } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) { + __ load_klass(tmp, dst); + } + int lh_offset = in_bytes(Klass::layout_helper_offset()); + + __ ldr_u32(tmp2, Address(tmp, lh_offset)); + + jint objArray_lh = Klass::array_layout_helper(T_OBJECT); + __ mov_slow(tmp, objArray_lh); + __ cmp_32(tmp, tmp2); + __ b(*stub->entry(), ne); + } + + save_in_reserved_area(R0, R1, R2, R3); + + Register src_ptr = R0; + Register dst_ptr = R1; + Register len = R2; + Register chk_off = R3; + Register super_k = AARCH64_ONLY(R4) NOT_AARCH64(tmp); + + __ add(src_ptr, src, arrayOopDesc::base_offset_in_bytes(basic_type)); + __ add_ptr_scaled_int32(src_ptr, src_ptr, src_pos, shift); + + __ add(dst_ptr, dst, arrayOopDesc::base_offset_in_bytes(basic_type)); + __ add_ptr_scaled_int32(dst_ptr, dst_ptr, dst_pos, shift); + __ load_klass(tmp, dst); + + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); + int sco_offset = in_bytes(Klass::super_check_offset_offset()); + +#ifdef AARCH64 + __ raw_push(length, ZR); // Preserve length around *copyfunc_addr call + + __ mov(len, length); + __ ldr(super_k, Address(tmp, ek_offset)); // super_k == R4 == length, so this load cannot be performed earlier + // TODO-AARCH64: check whether it is faster to load super klass early by using tmp and additional mov. + __ ldr_u32(chk_off, Address(super_k, sco_offset)); +#else // AARCH64 + __ ldr(super_k, Address(tmp, ek_offset)); + + __ mov(len, length); + __ ldr_u32(chk_off, Address(super_k, sco_offset)); + __ push(super_k); +#endif // AARCH64 + + __ call(copyfunc_addr, relocInfo::runtime_call_type); + +#ifndef PRODUCT + if (PrintC1Statistics) { + Label failed; + __ cbnz_32(R0, failed); + __ inc_counter((address)&Runtime1::_arraycopy_checkcast_cnt, tmp, tmp2); + __ bind(failed); + } +#endif // PRODUCT + +#ifdef AARCH64 + __ raw_pop(length, ZR); +#else + __ add(SP, SP, wordSize); // Drop super_k argument +#endif // AARCH64 + + __ cbz_32(R0, *stub->continuation()); + __ mvn_32(tmp, R0); + + // load saved arguments in slow case only + restore_from_reserved_area(R0, R1, R2, R3); + + __ sub_32(length, length, tmp); + __ add_32(src_pos, src_pos, tmp); + __ add_32(dst_pos, dst_pos, tmp); + +#ifndef PRODUCT + if (PrintC1Statistics) { + __ inc_counter((address)&Runtime1::_arraycopy_checkcast_attempt_cnt, tmp, tmp2); + } +#endif + + __ b(*stub->entry()); + + __ bind(cont); + } else { + __ b(*stub->entry(), eq); + __ bind(cont); + } + } + } + +#ifndef PRODUCT + if (PrintC1Statistics) { + address counter = Runtime1::arraycopy_count_address(basic_type); + __ inc_counter(counter, tmp, tmp2); + } +#endif // !PRODUCT + + bool disjoint = (flags & LIR_OpArrayCopy::overlapping) == 0; + bool aligned = (flags & LIR_OpArrayCopy::unaligned) == 0; + const char *name; + address entry = StubRoutines::select_arraycopy_function(basic_type, aligned, disjoint, name, false); + + Register src_ptr = R0; + Register dst_ptr = R1; + Register len = R2; + + __ add(src_ptr, src, arrayOopDesc::base_offset_in_bytes(basic_type)); + __ add_ptr_scaled_int32(src_ptr, src_ptr, src_pos, shift); + + __ add(dst_ptr, dst, arrayOopDesc::base_offset_in_bytes(basic_type)); + __ add_ptr_scaled_int32(dst_ptr, dst_ptr, dst_pos, shift); + + __ mov(len, length); + + __ call(entry, relocInfo::runtime_call_type); + + __ bind(*stub->continuation()); +} + +#ifdef ASSERT + // emit run-time assertion +void LIR_Assembler::emit_assert(LIR_OpAssert* op) { + assert(op->code() == lir_assert, "must be"); + +#ifdef AARCH64 + __ NOT_IMPLEMENTED(); +#else + if (op->in_opr1()->is_valid()) { + assert(op->in_opr2()->is_valid(), "both operands must be valid"); + comp_op(op->condition(), op->in_opr1(), op->in_opr2(), op); + } else { + assert(op->in_opr2()->is_illegal(), "both operands must be illegal"); + assert(op->condition() == lir_cond_always, "no other conditions allowed"); + } + + Label ok; + if (op->condition() != lir_cond_always) { + AsmCondition acond; + switch (op->condition()) { + case lir_cond_equal: acond = eq; break; + case lir_cond_notEqual: acond = ne; break; + case lir_cond_less: acond = lt; break; + case lir_cond_lessEqual: acond = le; break; + case lir_cond_greaterEqual: acond = ge; break; + case lir_cond_greater: acond = gt; break; + case lir_cond_aboveEqual: acond = hs; break; + case lir_cond_belowEqual: acond = ls; break; + default: ShouldNotReachHere(); + } + __ b(ok, acond); + } + if (op->halt()) { + const char* str = __ code_string(op->msg()); + __ stop(str); + } else { + breakpoint(); + } + __ bind(ok); +#endif // AARCH64 +} +#endif // ASSERT + +void LIR_Assembler::emit_updatecrc32(LIR_OpUpdateCRC32* op) { + fatal("CRC32 intrinsic is not implemented on this platform"); +} + +void LIR_Assembler::emit_lock(LIR_OpLock* op) { + Register obj = op->obj_opr()->as_pointer_register(); + Register hdr = op->hdr_opr()->as_pointer_register(); + Register lock = op->lock_opr()->as_pointer_register(); + Register tmp = op->scratch_opr()->is_illegal() ? noreg : + op->scratch_opr()->as_pointer_register(); + + if (!UseFastLocking) { + __ b(*op->stub()->entry()); + } else if (op->code() == lir_lock) { + assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header"); + int null_check_offset = __ lock_object(hdr, obj, lock, tmp, *op->stub()->entry()); + if (op->info() != NULL) { + add_debug_info_for_null_check(null_check_offset, op->info()); + } + } else if (op->code() == lir_unlock) { + __ unlock_object(hdr, obj, lock, tmp, *op->stub()->entry()); + } else { + ShouldNotReachHere(); + } + __ bind(*op->stub()->continuation()); +} + + +void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) { + ciMethod* method = op->profiled_method(); + int bci = op->profiled_bci(); + ciMethod* callee = op->profiled_callee(); + + // Update counter for all call types + ciMethodData* md = method->method_data_or_null(); + assert(md != NULL, "Sanity"); + ciProfileData* data = md->bci_to_data(bci); + assert(data->is_CounterData(), "need CounterData for calls"); + assert(op->mdo()->is_single_cpu(), "mdo must be allocated"); + Register mdo = op->mdo()->as_register(); + assert(op->tmp1()->is_register(), "tmp1 must be allocated"); + Register tmp1 = op->tmp1()->as_pointer_register(); + assert_different_registers(mdo, tmp1); + __ mov_metadata(mdo, md->constant_encoding()); + int mdo_offset_bias = 0; + int max_offset = AARCH64_ONLY(4096 << LogBytesPerWord) NOT_AARCH64(4096); + if (md->byte_offset_of_slot(data, CounterData::count_offset()) + data->size_in_bytes() >= max_offset) { + // The offset is large so bias the mdo by the base of the slot so + // that the ldr can use an immediate offset to reference the slots of the data + mdo_offset_bias = md->byte_offset_of_slot(data, CounterData::count_offset()); + __ mov_slow(tmp1, mdo_offset_bias); + __ add(mdo, mdo, tmp1); + } + + Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()) - mdo_offset_bias); + Bytecodes::Code bc = method->java_code_at_bci(bci); + const bool callee_is_static = callee->is_loaded() && callee->is_static(); + // Perform additional virtual call profiling for invokevirtual and + // invokeinterface bytecodes + if ((bc == Bytecodes::_invokevirtual || bc == Bytecodes::_invokeinterface) && + !callee_is_static && // required for optimized MH invokes + C1ProfileVirtualCalls) { + + assert(op->recv()->is_single_cpu(), "recv must be allocated"); + Register recv = op->recv()->as_register(); + assert_different_registers(mdo, tmp1, recv); + assert(data->is_VirtualCallData(), "need VirtualCallData for virtual calls"); + ciKlass* known_klass = op->known_holder(); + if (C1OptimizeVirtualCallProfiling && known_klass != NULL) { + // We know the type that will be seen at this call site; we can + // statically update the MethodData* rather than needing to do + // dynamic tests on the receiver type + + // NOTE: we should probably put a lock around this search to + // avoid collisions by concurrent compilations + ciVirtualCallData* vc_data = (ciVirtualCallData*) data; + uint i; + for (i = 0; i < VirtualCallData::row_limit(); i++) { + ciKlass* receiver = vc_data->receiver(i); + if (known_klass->equals(receiver)) { + Address data_addr(mdo, md->byte_offset_of_slot(data, + VirtualCallData::receiver_count_offset(i)) - + mdo_offset_bias); + __ ldr(tmp1, data_addr); + __ add(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, data_addr); + return; + } + } + + // Receiver type not found in profile data; select an empty slot + + // Note that this is less efficient than it should be because it + // always does a write to the receiver part of the + // VirtualCallData rather than just the first time + for (i = 0; i < VirtualCallData::row_limit(); i++) { + ciKlass* receiver = vc_data->receiver(i); + if (receiver == NULL) { + Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)) - + mdo_offset_bias); + __ mov_metadata(tmp1, known_klass->constant_encoding()); + __ str(tmp1, recv_addr); + Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)) - + mdo_offset_bias); + __ ldr(tmp1, data_addr); + __ add(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, data_addr); + return; + } + } + } else { + __ load_klass(recv, recv); + Label update_done; + type_profile_helper(mdo, mdo_offset_bias, md, data, recv, tmp1, &update_done); + // Receiver did not match any saved receiver and there is no empty row for it. + // Increment total counter to indicate polymorphic case. + __ ldr(tmp1, counter_addr); + __ add(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, counter_addr); + + __ bind(update_done); + } + } else { + // Static call + __ ldr(tmp1, counter_addr); + __ add(tmp1, tmp1, DataLayout::counter_increment); + __ str(tmp1, counter_addr); + } +} + +void LIR_Assembler::emit_profile_type(LIR_OpProfileType* op) { + fatal("Type profiling not implemented on this platform"); +} + +void LIR_Assembler::emit_delay(LIR_OpDelay*) { + Unimplemented(); +} + + +void LIR_Assembler::monitor_address(int monitor_no, LIR_Opr dst) { + Address mon_addr = frame_map()->address_for_monitor_lock(monitor_no); + __ add_slow(dst->as_pointer_register(), mon_addr.base(), mon_addr.disp()); +} + + +void LIR_Assembler::align_backward_branch_target() { + // TODO-AARCH64 review it + // Some ARM processors do better with 8-byte branch target alignment + __ align(8); +} + + +void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest) { + + if (left->is_single_cpu()) { + assert (dest->type() == T_INT, "unexpected result type"); + assert (left->type() == T_INT, "unexpected left type"); + __ neg_32(dest->as_register(), left->as_register()); + } else if (left->is_double_cpu()) { +#ifdef AARCH64 + __ neg(dest->as_register_lo(), left->as_register_lo()); +#else + Register dest_lo = dest->as_register_lo(); + Register dest_hi = dest->as_register_hi(); + Register src_lo = left->as_register_lo(); + Register src_hi = left->as_register_hi(); + if (dest_lo == src_hi) { + dest_lo = Rtemp; + } + __ rsbs(dest_lo, src_lo, 0); + __ rsc(dest_hi, src_hi, 0); + move_regs(dest_lo, dest->as_register_lo()); +#endif // AARCH64 + } else if (left->is_single_fpu()) { + __ neg_float(dest->as_float_reg(), left->as_float_reg()); + } else if (left->is_double_fpu()) { + __ neg_double(dest->as_double_reg(), left->as_double_reg()); + } else { + ShouldNotReachHere(); + } +} + + +void LIR_Assembler::leal(LIR_Opr addr_opr, LIR_Opr dest) { + LIR_Address* addr = addr_opr->as_address_ptr(); + if (addr->index()->is_illegal()) { + jint c = addr->disp(); + if (!Assembler::is_arith_imm_in_range(c)) { + BAILOUT("illegal arithmetic operand"); + } + __ add(dest->as_pointer_register(), addr->base()->as_pointer_register(), c); + } else { + assert(addr->disp() == 0, "cannot handle otherwise"); +#ifdef AARCH64 + assert(addr->index()->is_double_cpu(), "should be"); +#endif // AARCH64 + __ add(dest->as_pointer_register(), addr->base()->as_pointer_register(), + AsmOperand(addr->index()->as_pointer_register(), lsl, addr->scale())); + } +} + + +void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* args, LIR_Opr tmp, CodeEmitInfo* info) { + assert(!tmp->is_valid(), "don't need temporary"); + __ call(dest); + if (info != NULL) { + add_call_info_here(info); + } +} + + +void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info) { +#ifdef AARCH64 + Unimplemented(); // TODO-AARCH64: Use stlr/ldar instructions for volatile load/store +#else + assert(src->is_double_cpu() && dest->is_address() || + src->is_address() && dest->is_double_cpu(), + "Simple move_op is called for all other cases"); + + int null_check_offset; + if (dest->is_address()) { + // Store + const LIR_Address* addr = dest->as_address_ptr(); + const Register src_lo = src->as_register_lo(); + const Register src_hi = src->as_register_hi(); + assert(addr->index()->is_illegal() && addr->disp() == 0, "The address is simple already"); + + if (src_lo < src_hi) { + null_check_offset = __ offset(); + __ stmia(addr->base()->as_register(), RegisterSet(src_lo) | RegisterSet(src_hi)); + } else { + assert(src_lo < Rtemp, "Rtemp is higher than any allocatable register"); + __ mov(Rtemp, src_hi); + null_check_offset = __ offset(); + __ stmia(addr->base()->as_register(), RegisterSet(src_lo) | RegisterSet(Rtemp)); + } + } else { + // Load + const LIR_Address* addr = src->as_address_ptr(); + const Register dest_lo = dest->as_register_lo(); + const Register dest_hi = dest->as_register_hi(); + assert(addr->index()->is_illegal() && addr->disp() == 0, "The address is simple already"); + + null_check_offset = __ offset(); + if (dest_lo < dest_hi) { + __ ldmia(addr->base()->as_register(), RegisterSet(dest_lo) | RegisterSet(dest_hi)); + } else { + assert(dest_lo < Rtemp, "Rtemp is higher than any allocatable register"); + __ ldmia(addr->base()->as_register(), RegisterSet(dest_lo) | RegisterSet(Rtemp)); + __ mov(dest_hi, Rtemp); + } + } + + if (info != NULL) { + add_debug_info_for_null_check(null_check_offset, info); + } +#endif // AARCH64 +} + + +void LIR_Assembler::membar() { + __ membar(MacroAssembler::StoreLoad, Rtemp); +} + +void LIR_Assembler::membar_acquire() { + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::LoadLoad | MacroAssembler::LoadStore), Rtemp); +} + +void LIR_Assembler::membar_release() { + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore | MacroAssembler::LoadStore), Rtemp); +} + +void LIR_Assembler::membar_loadload() { + __ membar(MacroAssembler::LoadLoad, Rtemp); +} + +void LIR_Assembler::membar_storestore() { + __ membar(MacroAssembler::StoreStore, Rtemp); +} + +void LIR_Assembler::membar_loadstore() { + __ membar(MacroAssembler::LoadStore, Rtemp); +} + +void LIR_Assembler::membar_storeload() { + __ membar(MacroAssembler::StoreLoad, Rtemp); +} + +void LIR_Assembler::on_spin_wait() { + Unimplemented(); +} + +void LIR_Assembler::get_thread(LIR_Opr result_reg) { + // Not used on ARM + Unimplemented(); +} + +void LIR_Assembler::peephole(LIR_List* lir) { +#ifdef AARCH64 + return; // TODO-AARCH64 implement peephole optimizations +#endif + LIR_OpList* inst = lir->instructions_list(); + const int inst_length = inst->length(); + for (int i = 0; i < inst_length; i++) { + LIR_Op* op = inst->at(i); + switch (op->code()) { + case lir_cmp: { + // Replace: + // cmp rX, y + // cmove [EQ] y, z, rX + // with + // cmp rX, y + // cmove [EQ] illegalOpr, z, rX + // + // or + // cmp rX, y + // cmove [NE] z, y, rX + // with + // cmp rX, y + // cmove [NE] z, illegalOpr, rX + // + // moves from illegalOpr should be removed when converting LIR to native assembly + + LIR_Op2* cmp = op->as_Op2(); + assert(cmp != NULL, "cmp LIR instruction is not an op2"); + + if (i + 1 < inst_length) { + LIR_Op2* cmove = inst->at(i + 1)->as_Op2(); + if (cmove != NULL && cmove->code() == lir_cmove) { + LIR_Opr cmove_res = cmove->result_opr(); + bool res_is_op1 = cmove_res == cmp->in_opr1(); + bool res_is_op2 = cmove_res == cmp->in_opr2(); + LIR_Opr cmp_res, cmp_arg; + if (res_is_op1) { + cmp_res = cmp->in_opr1(); + cmp_arg = cmp->in_opr2(); + } else if (res_is_op2) { + cmp_res = cmp->in_opr2(); + cmp_arg = cmp->in_opr1(); + } else { + cmp_res = LIR_OprFact::illegalOpr; + cmp_arg = LIR_OprFact::illegalOpr; + } + + if (cmp_res != LIR_OprFact::illegalOpr) { + LIR_Condition cond = cmove->condition(); + if (cond == lir_cond_equal && cmove->in_opr1() == cmp_arg) { + cmove->set_in_opr1(LIR_OprFact::illegalOpr); + } else if (cond == lir_cond_notEqual && cmove->in_opr2() == cmp_arg) { + cmove->set_in_opr2(LIR_OprFact::illegalOpr); + } + } + } + } + break; + } + + default: + break; + } + } +} + +void LIR_Assembler::atomic_op(LIR_Code code, LIR_Opr src, LIR_Opr data, LIR_Opr dest, LIR_Opr tmp) { + Register ptr = src->as_pointer_register(); + + if (code == lir_xchg) { +#ifdef AARCH64 + if (UseCompressedOops && data->is_oop()) { + __ encode_heap_oop(tmp->as_pointer_register(), data->as_register()); + } +#endif // AARCH64 + } else { + assert (!data->is_oop(), "xadd for oops"); + } + +#ifndef AARCH64 + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore | MacroAssembler::LoadStore), Rtemp); +#endif // !AARCH64 + + Label retry; + __ bind(retry); + + if ((data->type() == T_INT) || (data->is_oop() AARCH64_ONLY(&& UseCompressedOops))) { + Register dst = dest->as_register(); + Register new_val = noreg; +#ifdef AARCH64 + __ ldaxr_w(dst, ptr); +#else + __ ldrex(dst, Address(ptr)); +#endif + if (code == lir_xadd) { + Register tmp_reg = tmp->as_register(); + if (data->is_constant()) { + assert_different_registers(dst, ptr, tmp_reg); + __ add_32(tmp_reg, dst, data->as_constant_ptr()->as_jint()); + } else { + assert_different_registers(dst, ptr, tmp_reg, data->as_register()); + __ add_32(tmp_reg, dst, data->as_register()); + } + new_val = tmp_reg; + } else { + if (UseCompressedOops && data->is_oop()) { + new_val = tmp->as_pointer_register(); + } else { + new_val = data->as_register(); + } + assert_different_registers(dst, ptr, new_val); + } +#ifdef AARCH64 + __ stlxr_w(Rtemp, new_val, ptr); +#else + __ strex(Rtemp, new_val, Address(ptr)); +#endif // AARCH64 + +#ifdef AARCH64 + } else if ((data->type() == T_LONG) || (data->is_oop() && !UseCompressedOops)) { + Register dst = dest->as_pointer_register(); + Register new_val = noreg; + __ ldaxr(dst, ptr); + if (code == lir_xadd) { + Register tmp_reg = tmp->as_pointer_register(); + if (data->is_constant()) { + assert_different_registers(dst, ptr, tmp_reg); + jlong c = data->as_constant_ptr()->as_jlong(); + assert((jlong)((jint)c) == c, "overflow"); + __ add(tmp_reg, dst, (jint)c); + } else { + assert_different_registers(dst, ptr, tmp_reg, data->as_pointer_register()); + __ add(tmp_reg, dst, data->as_pointer_register()); + } + new_val = tmp_reg; + } else { + new_val = data->as_pointer_register(); + assert_different_registers(dst, ptr, new_val); + } + __ stlxr(Rtemp, new_val, ptr); +#else + } else if (data->type() == T_LONG) { + Register dst_lo = dest->as_register_lo(); + Register new_val_lo = noreg; + Register dst_hi = dest->as_register_hi(); + + assert(dst_hi->encoding() == dst_lo->encoding() + 1, "non aligned register pair"); + assert((dst_lo->encoding() & 0x1) == 0, "misaligned register pair"); + + __ bind(retry); + __ ldrexd(dst_lo, Address(ptr)); + if (code == lir_xadd) { + Register tmp_lo = tmp->as_register_lo(); + Register tmp_hi = tmp->as_register_hi(); + + assert(tmp_hi->encoding() == tmp_lo->encoding() + 1, "non aligned register pair"); + assert((tmp_lo->encoding() & 0x1) == 0, "misaligned register pair"); + + if (data->is_constant()) { + jlong c = data->as_constant_ptr()->as_jlong(); + assert((jlong)((jint)c) == c, "overflow"); + assert_different_registers(dst_lo, dst_hi, ptr, tmp_lo, tmp_hi); + __ adds(tmp_lo, dst_lo, (jint)c); + __ adc(tmp_hi, dst_hi, 0); + } else { + Register new_val_lo = data->as_register_lo(); + Register new_val_hi = data->as_register_hi(); + __ adds(tmp_lo, dst_lo, new_val_lo); + __ adc(tmp_hi, dst_hi, new_val_hi); + assert_different_registers(dst_lo, dst_hi, ptr, tmp_lo, tmp_hi, new_val_lo, new_val_hi); + } + new_val_lo = tmp_lo; + } else { + new_val_lo = data->as_register_lo(); + Register new_val_hi = data->as_register_hi(); + + assert_different_registers(dst_lo, dst_hi, ptr, new_val_lo, new_val_hi); + assert(new_val_hi->encoding() == new_val_lo->encoding() + 1, "non aligned register pair"); + assert((new_val_lo->encoding() & 0x1) == 0, "misaligned register pair"); + } + __ strexd(Rtemp, new_val_lo, Address(ptr)); +#endif // AARCH64 + } else { + ShouldNotReachHere(); + } + + __ cbnz_32(Rtemp, retry); + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad | MacroAssembler::StoreStore), Rtemp); + +#ifdef AARCH64 + if (UseCompressedOops && data->is_oop()) { + __ decode_heap_oop(dest->as_register()); + } +#endif // AARCH64 +} + +#undef __ diff --git a/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.hpp b/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.hpp new file mode 100644 index 00000000000..83abf67743e --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LIRAssembler_arm.hpp @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP +#define CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP + + private: + + // Record the type of the receiver in ReceiverTypeData + void type_profile_helper(Register mdo, int mdo_offset_bias, + ciMethodData *md, ciProfileData *data, + Register recv, Register tmp1, Label* update_done); + // Setup pointers to MDO, MDO slot, also compute offset bias to access the slot. + void setup_md_access(ciMethod* method, int bci, + ciMethodData*& md, ciProfileData*& data, int& mdo_offset_bias); + + void typecheck_profile_helper1(ciMethod* method, int bci, + ciMethodData*& md, ciProfileData*& data, int& mdo_offset_bias, + Register obj, Register mdo, Register data_val, Label* obj_is_null); + + void typecheck_profile_helper2(ciMethodData* md, ciProfileData* data, int mdo_offset_bias, + Register mdo, Register recv, Register value, Register tmp1, + Label* profile_cast_success, Label* profile_cast_failure, + Label* success, Label* failure); + +#ifdef AARCH64 + void long_compare_helper(LIR_Opr opr1, LIR_Opr opr2); +#endif // AARCH64 + + // Saves 4 given registers in reserved argument area. + void save_in_reserved_area(Register r1, Register r2, Register r3, Register r4); + + // Restores 4 given registers from reserved argument area. + void restore_from_reserved_area(Register r1, Register r2, Register r3, Register r4); + + enum { + _call_stub_size = AARCH64_ONLY(32) NOT_AARCH64(16), + _call_aot_stub_size = 0, + _exception_handler_size = PRODUCT_ONLY(AARCH64_ONLY(256) NOT_AARCH64(68)) NOT_PRODUCT(AARCH64_ONLY(256+216) NOT_AARCH64(68+60)), + _deopt_handler_size = AARCH64_ONLY(32) NOT_AARCH64(16) + }; + + public: + + void verify_reserved_argument_area_size(int args_count) PRODUCT_RETURN; + + void store_parameter(jint c, int offset_from_sp_in_words); + void store_parameter(Metadata* m, int offset_from_sp_in_words); + +#endif // CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp new file mode 100644 index 00000000000..539a8faf880 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp @@ -0,0 +1,1767 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_LIRGenerator.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_arm.inline.hpp" + +#ifdef ASSERT +#define __ gen()->lir(__FILE__, __LINE__)-> +#else +#define __ gen()->lir()-> +#endif + +void LIRItem::load_byte_item() { + load_item(); +} + +void LIRItem::load_nonconstant() { + LIR_Opr r = value()->operand(); + if (_gen->can_inline_as_constant(value())) { + if (!r->is_constant()) { + r = LIR_OprFact::value_type(value()->type()); + } + _result = r; + } else { + load_item(); + } +} + +//-------------------------------------------------------------- +// LIRGenerator +//-------------------------------------------------------------- + + +LIR_Opr LIRGenerator::exceptionOopOpr() { + return FrameMap::Exception_oop_opr; +} + +LIR_Opr LIRGenerator::exceptionPcOpr() { + return FrameMap::Exception_pc_opr; +} + +LIR_Opr LIRGenerator::syncLockOpr() { + return new_register(T_INT); +} + +LIR_Opr LIRGenerator::syncTempOpr() { + return new_register(T_OBJECT); +} + +LIR_Opr LIRGenerator::getThreadTemp() { + return LIR_OprFact::illegalOpr; +} + +LIR_Opr LIRGenerator::atomicLockOpr() { + return LIR_OprFact::illegalOpr; +} + +LIR_Opr LIRGenerator::result_register_for(ValueType* type, bool callee) { + LIR_Opr opr; + switch (type->tag()) { + case intTag: opr = FrameMap::Int_result_opr; break; + case objectTag: opr = FrameMap::Object_result_opr; break; + case longTag: opr = FrameMap::Long_result_opr; break; + case floatTag: opr = FrameMap::Float_result_opr; break; + case doubleTag: opr = FrameMap::Double_result_opr; break; + case addressTag: + default: ShouldNotReachHere(); return LIR_OprFact::illegalOpr; + } + assert(opr->type_field() == as_OprType(as_BasicType(type)), "type mismatch"); + return opr; +} + + +LIR_Opr LIRGenerator::rlock_byte(BasicType type) { + return new_register(T_INT); +} + + +//--------- loading items into registers -------------------------------- + + +bool LIRGenerator::can_store_as_constant(Value v, BasicType type) const { +#ifdef AARCH64 + if (v->type()->as_IntConstant() != NULL) { + return v->type()->as_IntConstant()->value() == 0; + } else if (v->type()->as_LongConstant() != NULL) { + return v->type()->as_LongConstant()->value() == 0; + } else if (v->type()->as_ObjectConstant() != NULL) { + return v->type()->as_ObjectConstant()->value()->is_null_object(); + } else if (v->type()->as_FloatConstant() != NULL) { + return jint_cast(v->type()->as_FloatConstant()->value()) == 0; + } else if (v->type()->as_DoubleConstant() != NULL) { + return jlong_cast(v->type()->as_DoubleConstant()->value()) == 0; + } +#endif // AARCH64 + return false; +} + + +bool LIRGenerator::can_inline_as_constant(Value v) const { + if (v->type()->as_IntConstant() != NULL) { + return Assembler::is_arith_imm_in_range(v->type()->as_IntConstant()->value()); + } else if (v->type()->as_ObjectConstant() != NULL) { + return v->type()->as_ObjectConstant()->value()->is_null_object(); +#ifdef AARCH64 + } else if (v->type()->as_LongConstant() != NULL) { + return Assembler::is_arith_imm_in_range(v->type()->as_LongConstant()->value()); +#else + } else if (v->type()->as_FloatConstant() != NULL) { + return v->type()->as_FloatConstant()->value() == 0.0f; + } else if (v->type()->as_DoubleConstant() != NULL) { + return v->type()->as_DoubleConstant()->value() == 0.0; +#endif // AARCH64 + } + return false; +} + + +bool LIRGenerator::can_inline_as_constant(LIR_Const* c) const { + ShouldNotCallThis(); // Not used on ARM + return false; +} + + +#ifdef AARCH64 + +static bool can_inline_as_constant_in_cmp(Value v) { + jlong constant; + if (v->type()->as_IntConstant() != NULL) { + constant = v->type()->as_IntConstant()->value(); + } else if (v->type()->as_LongConstant() != NULL) { + constant = v->type()->as_LongConstant()->value(); + } else if (v->type()->as_ObjectConstant() != NULL) { + return v->type()->as_ObjectConstant()->value()->is_null_object(); + } else if (v->type()->as_FloatConstant() != NULL) { + return v->type()->as_FloatConstant()->value() == 0.0f; + } else if (v->type()->as_DoubleConstant() != NULL) { + return v->type()->as_DoubleConstant()->value() == 0.0; + } else { + return false; + } + + return Assembler::is_arith_imm_in_range(constant) || Assembler::is_arith_imm_in_range(-constant); +} + + +static bool can_inline_as_constant_in_logic(Value v) { + if (v->type()->as_IntConstant() != NULL) { + return Assembler::LogicalImmediate(v->type()->as_IntConstant()->value(), true).is_encoded(); + } else if (v->type()->as_LongConstant() != NULL) { + return Assembler::LogicalImmediate(v->type()->as_LongConstant()->value(), false).is_encoded(); + } + return false; +} + + +#endif // AARCH64 + + +LIR_Opr LIRGenerator::safepoint_poll_register() { + return LIR_OprFact::illegalOpr; +} + + +static LIR_Opr make_constant(BasicType type, jlong c) { + switch (type) { + case T_ADDRESS: + case T_OBJECT: return LIR_OprFact::intptrConst(c); + case T_LONG: return LIR_OprFact::longConst(c); + case T_INT: return LIR_OprFact::intConst(c); + default: ShouldNotReachHere(); + return LIR_OprFact::intConst(-1); + } +} + +#ifdef AARCH64 + +void LIRGenerator::add_constant(LIR_Opr src, jlong c, LIR_Opr dest) { + if (c == 0) { + __ move(src, dest); + return; + } + + BasicType type = src->type(); + bool is_neg = (c < 0); + c = ABS(c); + + if ((c >> 24) == 0) { + for (int shift = 0; shift <= 12; shift += 12) { + int part = ((int)c) & (right_n_bits(12) << shift); + if (part != 0) { + if (is_neg) { + __ sub(src, make_constant(type, part), dest); + } else { + __ add(src, make_constant(type, part), dest); + } + src = dest; + } + } + } else { + __ move(make_constant(type, c), dest); + if (is_neg) { + __ sub(src, dest, dest); + } else { + __ add(src, dest, dest); + } + } +} + +#endif // AARCH64 + + +void LIRGenerator::add_large_constant(LIR_Opr src, int c, LIR_Opr dest) { + assert(c != 0, "must be"); +#ifdef AARCH64 + add_constant(src, c, dest); +#else + // Find first non-zero bit + int shift = 0; + while ((c & (3 << shift)) == 0) { + shift += 2; + } + // Add the least significant part of the constant + int mask = 0xff << shift; + __ add(src, LIR_OprFact::intConst(c & mask), dest); + // Add up to 3 other parts of the constant; + // each of them can be represented as rotated_imm + if (c & (mask << 8)) { + __ add(dest, LIR_OprFact::intConst(c & (mask << 8)), dest); + } + if (c & (mask << 16)) { + __ add(dest, LIR_OprFact::intConst(c & (mask << 16)), dest); + } + if (c & (mask << 24)) { + __ add(dest, LIR_OprFact::intConst(c & (mask << 24)), dest); + } +#endif // AARCH64 +} + +static LIR_Address* make_address(LIR_Opr base, LIR_Opr index, LIR_Address::Scale scale, BasicType type) { + return new LIR_Address(base, index, scale, 0, type); +} + +LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index, + int shift, int disp, BasicType type) { + assert(base->is_register(), "must be"); + + if (index->is_constant()) { + disp += index->as_constant_ptr()->as_jint() << shift; + index = LIR_OprFact::illegalOpr; + } + +#ifndef AARCH64 + if (base->type() == T_LONG) { + LIR_Opr tmp = new_register(T_INT); + __ convert(Bytecodes::_l2i, base, tmp); + base = tmp; + } + if (index != LIR_OprFact::illegalOpr && index->type() == T_LONG) { + LIR_Opr tmp = new_register(T_INT); + __ convert(Bytecodes::_l2i, index, tmp); + index = tmp; + } + // At this point base and index should be all ints and not constants + assert(base->is_single_cpu() && !base->is_constant(), "base should be an non-constant int"); + assert(index->is_illegal() || (index->type() == T_INT && !index->is_constant()), "index should be an non-constant int"); +#endif + + int max_disp; + bool disp_is_in_range; + bool embedded_shift; + +#ifdef AARCH64 + int align = exact_log2(type2aelembytes(type, true)); + assert((disp & right_n_bits(align)) == 0, "displacement is not aligned"); + assert(shift == 0 || shift == align, "shift should be zero or equal to embedded align"); + max_disp = (1 << 12) << align; + + if (disp >= 0) { + disp_is_in_range = Assembler::is_unsigned_imm_in_range(disp, 12, align); + } else { + disp_is_in_range = Assembler::is_imm_in_range(disp, 9, 0); + } + + embedded_shift = true; +#else + switch (type) { + case T_BYTE: + case T_SHORT: + case T_CHAR: + max_disp = 256; // ldrh, ldrsb encoding has 8-bit offset + embedded_shift = false; + break; + case T_FLOAT: + case T_DOUBLE: + max_disp = 1024; // flds, fldd have 8-bit offset multiplied by 4 + embedded_shift = false; + break; + case T_LONG: + max_disp = 4096; + embedded_shift = false; + break; + default: + max_disp = 4096; // ldr, ldrb allow 12-bit offset + embedded_shift = true; + } + + disp_is_in_range = (-max_disp < disp && disp < max_disp); +#endif // !AARCH64 + + if (index->is_register()) { + LIR_Opr tmp = new_pointer_register(); + if (!disp_is_in_range) { + add_large_constant(base, disp, tmp); + base = tmp; + disp = 0; + } + LIR_Address* addr = make_address(base, index, (LIR_Address::Scale)shift, type); + if (disp == 0 && embedded_shift) { + // can use ldr/str instruction with register index + return addr; + } else { + LIR_Opr tmp = new_pointer_register(); + __ add(base, LIR_OprFact::address(addr), tmp); // add with shifted/extended register + return new LIR_Address(tmp, disp, type); + } + } + + // If the displacement is too large to be inlined into LDR instruction, + // generate large constant with additional sequence of ADD instructions + int excess_disp = disp & ~(max_disp - 1); + if (excess_disp != 0) { + LIR_Opr tmp = new_pointer_register(); + add_large_constant(base, excess_disp, tmp); + base = tmp; + } + return new LIR_Address(base, disp & (max_disp - 1), type); +} + + +LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_opr, + BasicType type, bool needs_card_mark) { + int base_offset = arrayOopDesc::base_offset_in_bytes(type); + int elem_size = type2aelembytes(type); + + if (index_opr->is_constant()) { + int offset = base_offset + index_opr->as_constant_ptr()->as_jint() * elem_size; + if (needs_card_mark) { + LIR_Opr base_opr = new_pointer_register(); + add_large_constant(array_opr, offset, base_opr); + return new LIR_Address(base_opr, (intx)0, type); + } else { + return generate_address(array_opr, offset, type); + } + } else { + assert(index_opr->is_register(), "must be"); + int scale = exact_log2(elem_size); + if (needs_card_mark) { + LIR_Opr base_opr = new_pointer_register(); + LIR_Address* addr = make_address(base_opr, index_opr, (LIR_Address::Scale)scale, type); + __ add(array_opr, LIR_OprFact::intptrConst(base_offset), base_opr); + __ add(base_opr, LIR_OprFact::address(addr), base_opr); // add with shifted/extended register + return new LIR_Address(base_opr, type); + } else { + return generate_address(array_opr, index_opr, scale, base_offset, type); + } + } +} + + +LIR_Opr LIRGenerator::load_immediate(int x, BasicType type) { + assert(type == T_LONG || type == T_INT, "should be"); + LIR_Opr r = make_constant(type, x); +#ifdef AARCH64 + bool imm_in_range = Assembler::LogicalImmediate(x, type == T_INT).is_encoded(); +#else + bool imm_in_range = AsmOperand::is_rotated_imm(x); +#endif // AARCH64 + if (!imm_in_range) { + LIR_Opr tmp = new_register(type); + __ move(r, tmp); + return tmp; + } + return r; +} + + +void LIRGenerator::increment_counter(address counter, BasicType type, int step) { + LIR_Opr pointer = new_pointer_register(); + __ move(LIR_OprFact::intptrConst(counter), pointer); + LIR_Address* addr = new LIR_Address(pointer, type); + increment_counter(addr, step); +} + + +void LIRGenerator::increment_counter(LIR_Address* addr, int step) { + LIR_Opr temp = new_register(addr->type()); + __ move(addr, temp); + __ add(temp, make_constant(addr->type(), step), temp); + __ move(temp, addr); +} + + +void LIRGenerator::cmp_mem_int(LIR_Condition condition, LIR_Opr base, int disp, int c, CodeEmitInfo* info) { + __ load(new LIR_Address(base, disp, T_INT), FrameMap::LR_opr, info); + __ cmp(condition, FrameMap::LR_opr, c); +} + + +void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr base, int disp, BasicType type, CodeEmitInfo* info) { + __ load(new LIR_Address(base, disp, type), FrameMap::LR_opr, info); + __ cmp(condition, reg, FrameMap::LR_opr); +} + + +bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) { + assert(left != result, "should be different registers"); + if (is_power_of_2(c + 1)) { +#ifdef AARCH64 + __ shift_left(left, log2_intptr(c + 1), result); + __ sub(result, left, result); +#else + LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1); + LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT); + __ sub(LIR_OprFact::address(addr), left, result); // rsb with shifted register +#endif // AARCH64 + return true; + } else if (is_power_of_2(c - 1)) { + LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c - 1); + LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT); + __ add(left, LIR_OprFact::address(addr), result); // add with shifted register + return true; + } + return false; +} + + +void LIRGenerator::store_stack_parameter(LIR_Opr item, ByteSize offset_from_sp) { + assert(item->type() == T_INT, "other types are not expected"); + __ store(item, new LIR_Address(FrameMap::SP_opr, in_bytes(offset_from_sp), item->type())); +} + +void LIRGenerator::set_card(LIR_Opr value, LIR_Address* card_addr) { + assert(CardTableModRefBS::dirty_card_val() == 0, + "Cannot use ZR register (aarch64) or the register containing the card table base address directly (aarch32) otherwise"); +#ifdef AARCH64 + // AARCH64 has a register that is constant zero. We can use that one to set the + // value in the card table to dirty. + __ move(FrameMap::ZR_opr, card_addr); +#else // AARCH64 + CardTableModRefBS* ct = (CardTableModRefBS*)_bs; + if(((intx)ct->byte_map_base & 0xff) == 0) { + // If the card table base address is aligned to 256 bytes, we can use the register + // that contains the card_table_base_address. + __ move(value, card_addr); + } else { + // Otherwise we need to create a register containing that value. + LIR_Opr tmp_zero = new_register(T_INT); + __ move(LIR_OprFact::intConst(CardTableModRefBS::dirty_card_val()), tmp_zero); + __ move(tmp_zero, card_addr); + } +#endif // AARCH64 +} + +void LIRGenerator::CardTableModRef_post_barrier_helper(LIR_OprDesc* addr, LIR_Const* card_table_base) { + assert(addr->is_register(), "must be a register at this point"); + + LIR_Opr tmp = FrameMap::LR_ptr_opr; + + // TODO-AARCH64: check performance + bool load_card_table_base_const = AARCH64_ONLY(false) NOT_AARCH64(VM_Version::supports_movw()); + if (load_card_table_base_const) { + __ move((LIR_Opr)card_table_base, tmp); + } else { + __ move(new LIR_Address(FrameMap::Rthread_opr, in_bytes(JavaThread::card_table_base_offset()), T_ADDRESS), tmp); + } + +#ifdef AARCH64 + LIR_Address* shifted_reg_operand = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTableModRefBS::card_shift, 0, T_BYTE); + LIR_Opr tmp2 = tmp; + __ add(tmp, LIR_OprFact::address(shifted_reg_operand), tmp2); // tmp2 = tmp + (addr >> CardTableModRefBS::card_shift) + LIR_Address* card_addr = new LIR_Address(tmp2, T_BYTE); +#else + // Use unsigned type T_BOOLEAN here rather than (signed) T_BYTE since signed load + // byte instruction does not support the addressing mode we need. + LIR_Address* card_addr = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTableModRefBS::card_shift, 0, T_BOOLEAN); +#endif + if (UseCondCardMark) { + if (UseConcMarkSweepGC) { + __ membar_storeload(); + } + LIR_Opr cur_value = new_register(T_INT); + __ move(card_addr, cur_value); + + LabelObj* L_already_dirty = new LabelObj(); + __ cmp(lir_cond_equal, cur_value, LIR_OprFact::intConst(CardTableModRefBS::dirty_card_val())); + __ branch(lir_cond_equal, T_BYTE, L_already_dirty->label()); + set_card(tmp, card_addr); + __ branch_destination(L_already_dirty->label()); + } else { + if (UseConcMarkSweepGC && CMSPrecleaningEnabled) { + __ membar_storestore(); + } + set_card(tmp, card_addr); + } +} + +//---------------------------------------------------------------------- +// visitor functions +//---------------------------------------------------------------------- + + +void LIRGenerator::do_StoreIndexed(StoreIndexed* x) { + assert(x->is_pinned(),""); + bool needs_range_check = x->compute_needs_range_check(); + 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() || + x->should_profile()); + + LIRItem array(x->array(), this); + LIRItem index(x->index(), this); + LIRItem value(x->value(), this); + LIRItem length(this); + + array.load_item(); + index.load_nonconstant(); + + if (use_length && needs_range_check) { + length.set_instruction(x->length()); + length.load_item(); + } + if (needs_store_check || x->check_boolean()) { + value.load_item(); + } else { + value.load_for_store(x->elt_type()); + } + + set_no_result(x); + + // the CodeEmitInfo must be duplicated for each different + // LIR-instruction because spilling can occur anywhere between two + // instructions and so the debug information must be different + CodeEmitInfo* range_check_info = state_for(x); + CodeEmitInfo* null_check_info = NULL; + if (x->needs_null_check()) { + null_check_info = new CodeEmitInfo(range_check_info); + } + + // emit array address setup early so it schedules better + LIR_Address* array_addr = emit_array_address(array.result(), index.result(), x->elt_type(), obj_store); + + if (GenerateRangeChecks && needs_range_check) { + if (use_length) { + __ cmp(lir_cond_belowEqual, length.result(), index.result()); + __ branch(lir_cond_belowEqual, T_INT, new RangeCheckStub(range_check_info, index.result())); + } else { + array_range_check(array.result(), index.result(), null_check_info, range_check_info); + // range_check also does the null check + null_check_info = NULL; + } + } + + if (GenerateArrayStoreCheck && needs_store_check) { + LIR_Opr tmp1 = FrameMap::R0_oop_opr; + LIR_Opr tmp2 = FrameMap::R1_oop_opr; + CodeEmitInfo* store_check_info = new CodeEmitInfo(range_check_info); + __ store_check(value.result(), array.result(), tmp1, tmp2, + LIR_OprFact::illegalOpr, store_check_info, + x->profiled_method(), x->profiled_bci()); + } + +#if INCLUDE_ALL_GCS + if (obj_store) { + // Needs GC write barriers. + pre_barrier(LIR_OprFact::address(array_addr), LIR_OprFact::illegalOpr /* pre_val */, + true /* do_load */, false /* patch */, NULL); + } +#endif // INCLUDE_ALL_GCS + + LIR_Opr result = maybe_mask_boolean(x, array.result(), value.result(), null_check_info); + __ move(result, array_addr, null_check_info); + if (obj_store) { + post_barrier(LIR_OprFact::address(array_addr), value.result()); + } +} + + +void LIRGenerator::do_MonitorEnter(MonitorEnter* x) { + assert(x->is_pinned(),""); + LIRItem obj(x->obj(), this); + obj.load_item(); + set_no_result(x); + + LIR_Opr lock = new_pointer_register(); + LIR_Opr hdr = new_pointer_register(); + + // Need a scratch register for biased locking on arm + LIR_Opr scratch = LIR_OprFact::illegalOpr; + if(UseBiasedLocking) { + scratch = new_pointer_register(); + } else { + scratch = atomicLockOpr(); + } + + CodeEmitInfo* info_for_exception = NULL; + if (x->needs_null_check()) { + info_for_exception = state_for(x); + } + + CodeEmitInfo* info = state_for(x, x->state(), true); + monitor_enter(obj.result(), lock, hdr, scratch, + x->monitor_no(), info_for_exception, info); +} + + +void LIRGenerator::do_MonitorExit(MonitorExit* x) { + assert(x->is_pinned(),""); + LIRItem obj(x->obj(), this); + obj.dont_load_item(); + set_no_result(x); + + LIR_Opr obj_temp = new_pointer_register(); + LIR_Opr lock = new_pointer_register(); + LIR_Opr hdr = new_pointer_register(); + + monitor_exit(obj_temp, lock, hdr, atomicLockOpr(), x->monitor_no()); +} + + +// _ineg, _lneg, _fneg, _dneg +void LIRGenerator::do_NegateOp(NegateOp* x) { +#ifdef __SOFTFP__ + address runtime_func = NULL; + ValueTag tag = x->type()->tag(); + if (tag == floatTag) { + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::fneg); + } else if (tag == doubleTag) { + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dneg); + } + if (runtime_func != NULL) { + set_result(x, call_runtime(x->x(), runtime_func, x->type(), NULL)); + return; + } +#endif // __SOFTFP__ + LIRItem value(x->x(), this); + value.load_item(); + LIR_Opr reg = rlock_result(x); + __ negate(value.result(), reg); +} + + +// for _fadd, _fmul, _fsub, _fdiv, _frem +// _dadd, _dmul, _dsub, _ddiv, _drem +void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) { + address runtime_func; + switch (x->op()) { + case Bytecodes::_frem: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::frem); + break; + case Bytecodes::_drem: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::drem); + break; +#ifdef __SOFTFP__ + // Call function compiled with -msoft-float. + + // __aeabi_XXXX_glibc: Imported code from glibc soft-fp bundle for calculation accuracy improvement. See CR 6757269. + + case Bytecodes::_fadd: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_fadd_glibc); + break; + case Bytecodes::_fmul: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_fmul); + break; + case Bytecodes::_fsub: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_fsub_glibc); + break; + case Bytecodes::_fdiv: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_fdiv); + break; + case Bytecodes::_dadd: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_dadd_glibc); + break; + case Bytecodes::_dmul: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_dmul); + break; + case Bytecodes::_dsub: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_dsub_glibc); + break; + case Bytecodes::_ddiv: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_ddiv); + break; + default: + ShouldNotReachHere(); +#else // __SOFTFP__ + default: { + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + left.load_item(); + right.load_item(); + rlock_result(x); + arithmetic_op_fpu(x->op(), x->operand(), left.result(), right.result(), x->is_strictfp()); + return; + } +#endif // __SOFTFP__ + } + + LIR_Opr result = call_runtime(x->x(), x->y(), runtime_func, x->type(), NULL); + set_result(x, result); +} + + +void LIRGenerator::make_div_by_zero_check(LIR_Opr right_arg, BasicType type, CodeEmitInfo* info) { + assert(right_arg->is_register(), "must be"); + __ cmp(lir_cond_equal, right_arg, make_constant(type, 0)); + __ branch(lir_cond_equal, type, new DivByZeroStub(info)); +} + + +// for _ladd, _lmul, _lsub, _ldiv, _lrem +void LIRGenerator::do_ArithmeticOp_Long(ArithmeticOp* x) { + CodeEmitInfo* info = NULL; + if (x->op() == Bytecodes::_ldiv || x->op() == Bytecodes::_lrem) { + info = state_for(x); + } + +#ifdef AARCH64 + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + LIRItem* left_arg = &left; + LIRItem* right_arg = &right; + + // Test if instr is commutative and if we should swap + if (x->is_commutative() && left.is_constant()) { + left_arg = &right; + right_arg = &left; + } + + left_arg->load_item(); + switch (x->op()) { + case Bytecodes::_ldiv: + right_arg->load_item(); + make_div_by_zero_check(right_arg->result(), T_LONG, info); + __ idiv(left_arg->result(), right_arg->result(), rlock_result(x), LIR_OprFact::illegalOpr, NULL); + break; + + case Bytecodes::_lrem: { + right_arg->load_item(); + make_div_by_zero_check(right_arg->result(), T_LONG, info); + // a % b is implemented with 2 instructions: + // tmp = a/b (sdiv) + // res = a - b*tmp (msub) + LIR_Opr tmp = FrameMap::as_long_opr(Rtemp); + __ irem(left_arg->result(), right_arg->result(), rlock_result(x), tmp, NULL); + break; + } + + case Bytecodes::_lmul: + if (right_arg->is_constant() && is_power_of_2_long(right_arg->get_jlong_constant())) { + right_arg->dont_load_item(); + __ shift_left(left_arg->result(), exact_log2_long(right_arg->get_jlong_constant()), rlock_result(x)); + } else { + right_arg->load_item(); + __ mul(left_arg->result(), right_arg->result(), rlock_result(x)); + } + break; + + case Bytecodes::_ladd: + case Bytecodes::_lsub: + if (right_arg->is_constant()) { + jlong c = right_arg->get_jlong_constant(); + add_constant(left_arg->result(), (x->op() == Bytecodes::_ladd) ? c : -c, rlock_result(x)); + } else { + right_arg->load_item(); + arithmetic_op_long(x->op(), rlock_result(x), left_arg->result(), right_arg->result(), NULL); + } + break; + + default: + ShouldNotReachHere(); + } +#else + switch (x->op()) { + case Bytecodes::_ldiv: + case Bytecodes::_lrem: { + LIRItem right(x->y(), this); + right.load_item(); + make_div_by_zero_check(right.result(), T_LONG, info); + } + // Fall through + case Bytecodes::_lmul: { + address entry; + switch (x->op()) { + case Bytecodes::_lrem: + entry = CAST_FROM_FN_PTR(address, SharedRuntime::lrem); + break; + case Bytecodes::_ldiv: + entry = CAST_FROM_FN_PTR(address, SharedRuntime::ldiv); + break; + case Bytecodes::_lmul: + entry = CAST_FROM_FN_PTR(address, SharedRuntime::lmul); + break; + default: + ShouldNotReachHere(); + } + LIR_Opr result = call_runtime(x->y(), x->x(), entry, x->type(), NULL); + set_result(x, result); + break; + } + case Bytecodes::_ladd: + case Bytecodes::_lsub: { + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + left.load_item(); + right.load_item(); + rlock_result(x); + arithmetic_op_long(x->op(), x->operand(), left.result(), right.result(), NULL); + break; + } + default: + ShouldNotReachHere(); + } +#endif // AARCH64 +} + + +// for: _iadd, _imul, _isub, _idiv, _irem +void LIRGenerator::do_ArithmeticOp_Int(ArithmeticOp* x) { + bool is_div_rem = x->op() == Bytecodes::_idiv || x->op() == Bytecodes::_irem; + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + LIRItem* left_arg = &left; + LIRItem* right_arg = &right; + + // Test if instr is commutative and if we should swap + if (x->is_commutative() && left.is_constant()) { + left_arg = &right; + right_arg = &left; + } + + if (is_div_rem) { + CodeEmitInfo* info = state_for(x); + if (x->op() == Bytecodes::_idiv && right_arg->is_constant() && is_power_of_2(right_arg->get_jint_constant())) { + left_arg->load_item(); + right_arg->dont_load_item(); + LIR_Opr tmp = LIR_OprFact::illegalOpr; + LIR_Opr result = rlock_result(x); + __ idiv(left_arg->result(), right_arg->result(), result, tmp, info); + } else { +#ifdef AARCH64 + left_arg->load_item(); + right_arg->load_item(); + make_div_by_zero_check(right_arg->result(), T_INT, info); + if (x->op() == Bytecodes::_idiv) { + __ idiv(left_arg->result(), right_arg->result(), rlock_result(x), LIR_OprFact::illegalOpr, NULL); + } else { + // a % b is implemented with 2 instructions: + // tmp = a/b (sdiv) + // res = a - b*tmp (msub) + LIR_Opr tmp = FrameMap::as_opr(Rtemp); + __ irem(left_arg->result(), right_arg->result(), rlock_result(x), tmp, NULL); + } +#else + left_arg->load_item_force(FrameMap::R0_opr); + right_arg->load_item_force(FrameMap::R2_opr); + LIR_Opr tmp = FrameMap::R1_opr; + LIR_Opr result = rlock_result(x); + LIR_Opr out_reg; + if (x->op() == Bytecodes::_irem) { + out_reg = FrameMap::R0_opr; + __ irem(left_arg->result(), right_arg->result(), out_reg, tmp, info); + } else if (x->op() == Bytecodes::_idiv) { + out_reg = FrameMap::R1_opr; + __ idiv(left_arg->result(), right_arg->result(), out_reg, tmp, info); + } + __ move(out_reg, result); +#endif // AARCH64 + } + +#ifdef AARCH64 + } else if (((x->op() == Bytecodes::_iadd) || (x->op() == Bytecodes::_isub)) && right_arg->is_constant()) { + left_arg->load_item(); + jint c = right_arg->get_jint_constant(); + right_arg->dont_load_item(); + add_constant(left_arg->result(), (x->op() == Bytecodes::_iadd) ? c : -c, rlock_result(x)); +#endif // AARCH64 + + } else { + left_arg->load_item(); + if (x->op() == Bytecodes::_imul && right_arg->is_constant()) { + int c = right_arg->get_jint_constant(); + if (c > 0 && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) { + right_arg->dont_load_item(); + } else { + right_arg->load_item(); + } + } else { + AARCH64_ONLY(assert(!right_arg->is_constant(), "constant right_arg is already handled by this moment");) + right_arg->load_nonconstant(); + } + rlock_result(x); + assert(right_arg->is_constant() || right_arg->is_register(), "wrong state of right"); + arithmetic_op_int(x->op(), x->operand(), left_arg->result(), right_arg->result(), NULL); + } +} + + +void LIRGenerator::do_ArithmeticOp(ArithmeticOp* x) { + ValueTag tag = x->type()->tag(); + assert(x->x()->type()->tag() == tag && x->y()->type()->tag() == tag, "wrong parameters"); + switch (tag) { + case floatTag: + case doubleTag: do_ArithmeticOp_FPU(x); return; + case longTag: do_ArithmeticOp_Long(x); return; + case intTag: do_ArithmeticOp_Int(x); return; + } + ShouldNotReachHere(); +} + + +// _ishl, _lshl, _ishr, _lshr, _iushr, _lushr +void LIRGenerator::do_ShiftOp(ShiftOp* x) { + LIRItem value(x->x(), this); + LIRItem count(x->y(), this); + +#ifndef AARCH64 + if (value.type()->is_long()) { + count.set_destroys_register(); + } +#endif // !AARCH64 + + if (count.is_constant()) { + assert(count.type()->as_IntConstant() != NULL, "should be"); + count.dont_load_item(); + } else { + count.load_item(); + } + value.load_item(); + + LIR_Opr res = rlock_result(x); + shift_op(x->op(), res, value.result(), count.result(), LIR_OprFact::illegalOpr); +} + + +// _iand, _land, _ior, _lor, _ixor, _lxor +void LIRGenerator::do_LogicOp(LogicOp* x) { + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + + left.load_item(); + +#ifdef AARCH64 + if (right.is_constant() && can_inline_as_constant_in_logic(right.value())) { + right.dont_load_item(); + } else { + right.load_item(); + } +#else + right.load_nonconstant(); +#endif // AARCH64 + + logic_op(x->op(), rlock_result(x), left.result(), right.result()); +} + + +// _lcmp, _fcmpl, _fcmpg, _dcmpl, _dcmpg +void LIRGenerator::do_CompareOp(CompareOp* x) { +#ifdef __SOFTFP__ + address runtime_func; + switch (x->op()) { + case Bytecodes::_fcmpl: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::fcmpl); + break; + case Bytecodes::_fcmpg: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::fcmpg); + break; + case Bytecodes::_dcmpl: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dcmpl); + break; + case Bytecodes::_dcmpg: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dcmpg); + break; + case Bytecodes::_lcmp: { + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + left.load_item(); + right.load_nonconstant(); + LIR_Opr reg = rlock_result(x); + __ lcmp2int(left.result(), right.result(), reg); + return; + } + default: + ShouldNotReachHere(); + } + LIR_Opr result = call_runtime(x->x(), x->y(), runtime_func, x->type(), NULL); + set_result(x, result); +#else // __SOFTFP__ + LIRItem left(x->x(), this); + LIRItem right(x->y(), this); + left.load_item(); + +#ifdef AARCH64 + if (right.is_constant() && can_inline_as_constant_in_cmp(right.value())) { + right.dont_load_item(); + } else { + right.load_item(); + } +#else + right.load_nonconstant(); +#endif // AARCH64 + + LIR_Opr reg = rlock_result(x); + + if (x->x()->type()->is_float_kind()) { + Bytecodes::Code code = x->op(); + __ fcmp2int(left.result(), right.result(), reg, (code == Bytecodes::_fcmpl || code == Bytecodes::_dcmpl)); + } else if (x->x()->type()->tag() == longTag) { + __ lcmp2int(left.result(), right.result(), reg); + } else { + ShouldNotReachHere(); + } +#endif // __SOFTFP__ +} + + +void LIRGenerator::do_CompareAndSwap(Intrinsic* x, ValueType* type) { + assert(x->number_of_arguments() == 4, "wrong type"); + LIRItem obj (x->argument_at(0), this); // object + LIRItem offset(x->argument_at(1), this); // offset of field + LIRItem cmp (x->argument_at(2), this); // value to compare with field + LIRItem val (x->argument_at(3), this); // replace field with val if matches cmp + + LIR_Opr addr = new_pointer_register(); + LIR_Opr tmp1 = LIR_OprFact::illegalOpr; + LIR_Opr tmp2 = LIR_OprFact::illegalOpr; + + // get address of field + obj.load_item(); + offset.load_item(); + cmp.load_item(); + val.load_item(); + + __ add(obj.result(), offset.result(), addr); + LIR_Opr result = rlock_result(x); + + if (type == objectType) { +#if INCLUDE_ALL_GCS + // Do the pre-write barrier, if any. + pre_barrier(addr, LIR_OprFact::illegalOpr /* pre_val */, + true /* do_load */, false /* patch */, NULL); +#endif // INCLUDE_ALL_GCS +#ifdef AARCH64 + if (UseCompressedOops) { + tmp1 = new_pointer_register(); + tmp2 = new_pointer_register(); + } +#endif // AARCH64 + __ cas_obj(addr, cmp.result(), val.result(), tmp1, tmp2, result); + post_barrier(addr, val.result()); + } + else if (type == intType) { + __ cas_int(addr, cmp.result(), val.result(), tmp1, tmp1, result); + } + else if (type == longType) { +#ifndef AARCH64 + tmp1 = new_register(T_LONG); +#endif // !AARCH64 + __ cas_long(addr, cmp.result(), val.result(), tmp1, tmp2, result); + } + else { + ShouldNotReachHere(); + } +} + + +void LIRGenerator::do_MathIntrinsic(Intrinsic* x) { + address runtime_func; + switch (x->id()) { + case vmIntrinsics::_dabs: { +#ifdef __SOFTFP__ + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dabs); + break; +#else + assert(x->number_of_arguments() == 1, "wrong type"); + LIRItem value(x->argument_at(0), this); + value.load_item(); + __ abs(value.result(), rlock_result(x), LIR_OprFact::illegalOpr); + return; +#endif // __SOFTFP__ + } + case vmIntrinsics::_dsqrt: { +#ifdef __SOFTFP__ + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt); + break; +#else + assert(x->number_of_arguments() == 1, "wrong type"); + LIRItem value(x->argument_at(0), this); + value.load_item(); + __ sqrt(value.result(), rlock_result(x), LIR_OprFact::illegalOpr); + return; +#endif // __SOFTFP__ + } + case vmIntrinsics::_dsin: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dsin); + break; + case vmIntrinsics::_dcos: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dcos); + break; + case vmIntrinsics::_dtan: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dtan); + break; + case vmIntrinsics::_dlog: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dlog); + break; + case vmIntrinsics::_dlog10: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10); + break; + case vmIntrinsics::_dexp: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dexp); + break; + case vmIntrinsics::_dpow: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::dpow); + break; + default: + ShouldNotReachHere(); + return; + } + + LIR_Opr result; + if (x->number_of_arguments() == 1) { + result = call_runtime(x->argument_at(0), runtime_func, x->type(), NULL); + } else { + assert(x->number_of_arguments() == 2 && x->id() == vmIntrinsics::_dpow, "unexpected intrinsic"); + result = call_runtime(x->argument_at(0), x->argument_at(1), runtime_func, x->type(), NULL); + } + set_result(x, result); +} + +void LIRGenerator::do_FmaIntrinsic(Intrinsic* x) { + fatal("FMA intrinsic is not implemented on this platform"); +} + +void LIRGenerator::do_vectorizedMismatch(Intrinsic* x) { + fatal("vectorizedMismatch intrinsic is not implemented on this platform"); +} + +void LIRGenerator::do_ArrayCopy(Intrinsic* x) { + CodeEmitInfo* info = state_for(x, x->state()); + assert(x->number_of_arguments() == 5, "wrong type"); + LIRItem src(x->argument_at(0), this); + LIRItem src_pos(x->argument_at(1), this); + LIRItem dst(x->argument_at(2), this); + LIRItem dst_pos(x->argument_at(3), this); + LIRItem length(x->argument_at(4), this); + + // We put arguments into the same registers which are used for a Java call. + // Note: we used fixed registers for all arguments because all registers + // are caller-saved, so register allocator treats them all as used. + src.load_item_force (FrameMap::R0_oop_opr); + src_pos.load_item_force(FrameMap::R1_opr); + dst.load_item_force (FrameMap::R2_oop_opr); + dst_pos.load_item_force(FrameMap::R3_opr); + length.load_item_force (FrameMap::R4_opr); + LIR_Opr tmp = (FrameMap::R5_opr); + set_no_result(x); + + int flags; + ciArrayKlass* expected_type; + arraycopy_helper(x, &flags, &expected_type); + __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(), length.result(), + tmp, expected_type, flags, info); +} + +void LIRGenerator::do_update_CRC32(Intrinsic* x) { + fatal("CRC32 intrinsic is not implemented on this platform"); +} + +void LIRGenerator::do_update_CRC32C(Intrinsic* x) { + Unimplemented(); +} + +void LIRGenerator::do_Convert(Convert* x) { + address runtime_func; + switch (x->op()) { +#ifndef AARCH64 + case Bytecodes::_l2f: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::l2f); + break; + case Bytecodes::_l2d: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::l2d); + break; + case Bytecodes::_f2l: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::f2l); + break; + case Bytecodes::_d2l: + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::d2l); + break; +#ifdef __SOFTFP__ + case Bytecodes::_f2d: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_f2d); + break; + case Bytecodes::_d2f: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_d2f); + break; + case Bytecodes::_i2f: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_i2f); + break; + case Bytecodes::_i2d: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_i2d); + break; + case Bytecodes::_f2i: + runtime_func = CAST_FROM_FN_PTR(address, __aeabi_f2iz); + break; + case Bytecodes::_d2i: + // This is implemented in hard float in assembler on arm but a call + // on other platforms. + runtime_func = CAST_FROM_FN_PTR(address, SharedRuntime::d2i); + break; +#endif // __SOFTFP__ +#endif // !AARCH64 + default: { + LIRItem value(x->value(), this); + value.load_item(); + LIR_Opr reg = rlock_result(x); + __ convert(x->op(), value.result(), reg, NULL); + return; + } + } + + LIR_Opr result = call_runtime(x->value(), runtime_func, x->type(), NULL); + set_result(x, result); +} + + +void LIRGenerator::do_NewInstance(NewInstance* x) { + print_if_not_loaded(x); + + CodeEmitInfo* info = state_for(x, x->state()); + LIR_Opr reg = result_register_for(x->type()); // R0 is required by runtime call in NewInstanceStub::emit_code + LIR_Opr klass_reg = FrameMap::R1_metadata_opr; // R1 is required by runtime call in NewInstanceStub::emit_code + LIR_Opr tmp1 = new_register(objectType); + LIR_Opr tmp2 = new_register(objectType); + LIR_Opr tmp3 = FrameMap::LR_oop_opr; + + new_instance(reg, x->klass(), x->is_unresolved(), tmp1, tmp2, tmp3, + LIR_OprFact::illegalOpr, klass_reg, info); + + LIR_Opr result = rlock_result(x); + __ move(reg, result); +} + + +void LIRGenerator::do_NewTypeArray(NewTypeArray* x) { + // Evaluate state_for() first, because it can emit code + // with the same fixed registers that are used here (R1, R2) + CodeEmitInfo* info = state_for(x, x->state()); + LIRItem length(x->length(), this); + + length.load_item_force(FrameMap::R2_opr); // R2 is required by runtime call in NewTypeArrayStub::emit_code + LIR_Opr len = length.result(); + + LIR_Opr reg = result_register_for(x->type()); // R0 is required by runtime call in NewTypeArrayStub::emit_code + LIR_Opr klass_reg = FrameMap::R1_metadata_opr; // R1 is required by runtime call in NewTypeArrayStub::emit_code + + LIR_Opr tmp1 = new_register(objectType); + LIR_Opr tmp2 = new_register(objectType); + LIR_Opr tmp3 = FrameMap::LR_oop_opr; + LIR_Opr tmp4 = LIR_OprFact::illegalOpr; + + BasicType elem_type = x->elt_type(); + __ metadata2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg); + + CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info); + __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path); + + LIR_Opr result = rlock_result(x); + __ move(reg, result); +} + + +void LIRGenerator::do_NewObjectArray(NewObjectArray* x) { + // Evaluate state_for() first, because it can emit code + // with the same fixed registers that are used here (R1, R2) + CodeEmitInfo* info = state_for(x, x->state()); + LIRItem length(x->length(), this); + + length.load_item_force(FrameMap::R2_opr); // R2 is required by runtime call in NewObjectArrayStub::emit_code + LIR_Opr len = length.result(); + + CodeEmitInfo* patching_info = NULL; + if (!x->klass()->is_loaded() || PatchALot) { + patching_info = state_for(x, x->state_before()); + } + + LIR_Opr reg = result_register_for(x->type()); // R0 is required by runtime call in NewObjectArrayStub::emit_code + LIR_Opr klass_reg = FrameMap::R1_metadata_opr; // R1 is required by runtime call in NewObjectArrayStub::emit_code + + LIR_Opr tmp1 = new_register(objectType); + LIR_Opr tmp2 = new_register(objectType); + LIR_Opr tmp3 = FrameMap::LR_oop_opr; + LIR_Opr tmp4 = LIR_OprFact::illegalOpr; + + CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info); + ciMetadata* obj = ciObjArrayKlass::make(x->klass()); + if (obj == ciEnv::unloaded_ciobjarrayklass()) { + BAILOUT("encountered unloaded_ciobjarrayklass due to out of memory error"); + } + klass2reg_with_patching(klass_reg, obj, patching_info); + __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, T_OBJECT, klass_reg, slow_path); + + LIR_Opr result = rlock_result(x); + __ move(reg, result); +} + + +void LIRGenerator::do_NewMultiArray(NewMultiArray* x) { + Values* dims = x->dims(); + int i = dims->length(); + LIRItemList* items = new LIRItemList(i, i, NULL); + while (i-- > 0) { + LIRItem* size = new LIRItem(dims->at(i), this); + items->at_put(i, size); + } + + // Need to get the info before, as the items may become invalid through item_free + CodeEmitInfo* patching_info = NULL; + if (!x->klass()->is_loaded() || PatchALot) { + patching_info = state_for(x, x->state_before()); + + // Cannot re-use same xhandlers for multiple CodeEmitInfos, so + // clone all handlers (NOTE: Usually this is handled transparently + // by the CodeEmitInfo cloning logic in CodeStub constructors but + // is done explicitly here because a stub isn't being used). + x->set_exception_handlers(new XHandlers(x->exception_handlers())); + } + + i = dims->length(); + while (i-- > 0) { + LIRItem* size = items->at(i); + size->load_item(); + LIR_Opr sz = size->result(); + assert(sz->type() == T_INT, "should be"); + store_stack_parameter(sz, in_ByteSize(i * BytesPerInt)); + } + + CodeEmitInfo* info = state_for(x, x->state()); + LIR_Opr klass_reg = FrameMap::R0_metadata_opr; + klass2reg_with_patching(klass_reg, x->klass(), patching_info); + + LIR_Opr rank = FrameMap::R2_opr; + __ move(LIR_OprFact::intConst(x->rank()), rank); + LIR_Opr varargs = FrameMap::SP_opr; + LIR_OprList* args = new LIR_OprList(3); + args->append(klass_reg); + args->append(rank); + args->append(varargs); + LIR_Opr reg = result_register_for(x->type()); + __ call_runtime(Runtime1::entry_for(Runtime1::new_multi_array_id), + LIR_OprFact::illegalOpr, reg, args, info); + + LIR_Opr result = rlock_result(x); + __ move(reg, result); +} + + +void LIRGenerator::do_BlockBegin(BlockBegin* x) { + // nothing to do for now +} + + +void LIRGenerator::do_CheckCast(CheckCast* x) { + LIRItem obj(x->obj(), this); + CodeEmitInfo* patching_info = NULL; + if (!x->klass()->is_loaded() || (PatchALot && !x->is_incompatible_class_change_check())) { + patching_info = state_for(x, x->state_before()); + } + + obj.load_item(); + + CodeEmitInfo* info_for_exception = state_for(x); + CodeStub* stub; + if (x->is_incompatible_class_change_check()) { + assert(patching_info == NULL, "can't patch this"); + stub = new SimpleExceptionStub(Runtime1::throw_incompatible_class_change_error_id, + LIR_OprFact::illegalOpr, info_for_exception); + } else { + stub = new SimpleExceptionStub(Runtime1::throw_class_cast_exception_id, + LIR_OprFact::illegalOpr, info_for_exception); + } + + LIR_Opr out_reg = rlock_result(x); + LIR_Opr tmp1 = FrameMap::R0_oop_opr; + LIR_Opr tmp2 = FrameMap::R1_oop_opr; + LIR_Opr tmp3 = LIR_OprFact::illegalOpr; + + __ checkcast(out_reg, obj.result(), x->klass(), tmp1, tmp2, tmp3, x->direct_compare(), + info_for_exception, patching_info, stub, x->profiled_method(), x->profiled_bci()); +} + + +void LIRGenerator::do_InstanceOf(InstanceOf* x) { + LIRItem obj(x->obj(), this); + CodeEmitInfo* patching_info = NULL; + if (!x->klass()->is_loaded() || PatchALot) { + patching_info = state_for(x, x->state_before()); + } + + obj.load_item(); + LIR_Opr out_reg = rlock_result(x); + LIR_Opr tmp1 = FrameMap::R0_oop_opr; + LIR_Opr tmp2 = FrameMap::R1_oop_opr; + LIR_Opr tmp3 = LIR_OprFact::illegalOpr; + + __ instanceof(out_reg, obj.result(), x->klass(), tmp1, tmp2, tmp3, + x->direct_compare(), patching_info, x->profiled_method(), x->profiled_bci()); +} + + +#ifdef __SOFTFP__ +// Turn operator if (f g) into runtime call: +// call _aeabi_fcmp(f, g) +// cmp(eq, 1) +// branch(eq, true path). +void LIRGenerator::do_soft_float_compare(If* x) { + assert(x->number_of_sux() == 2, "inconsistency"); + ValueTag tag = x->x()->type()->tag(); + If::Condition cond = x->cond(); + address runtime_func; + // unordered comparison gets the wrong answer because aeabi functions + // return false. + bool unordered_is_true = x->unordered_is_true(); + // reverse of condition for ne + bool compare_to_zero = false; + switch (lir_cond(cond)) { + case lir_cond_notEqual: + compare_to_zero = true; // fall through + case lir_cond_equal: + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, __aeabi_fcmpeq): + CAST_FROM_FN_PTR(address, __aeabi_dcmpeq); + break; + case lir_cond_less: + if (unordered_is_true) { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_fcmplt): + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_dcmplt); + } else { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, __aeabi_fcmplt): + CAST_FROM_FN_PTR(address, __aeabi_dcmplt); + } + break; + case lir_cond_lessEqual: + if (unordered_is_true) { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_fcmple): + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_dcmple); + } else { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, __aeabi_fcmple): + CAST_FROM_FN_PTR(address, __aeabi_dcmple); + } + break; + case lir_cond_greaterEqual: + if (unordered_is_true) { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_fcmpge): + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_dcmpge); + } else { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, __aeabi_fcmpge): + CAST_FROM_FN_PTR(address, __aeabi_dcmpge); + } + break; + case lir_cond_greater: + if (unordered_is_true) { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_fcmpgt): + CAST_FROM_FN_PTR(address, SharedRuntime::unordered_dcmpgt); + } else { + runtime_func = tag == floatTag ? + CAST_FROM_FN_PTR(address, __aeabi_fcmpgt): + CAST_FROM_FN_PTR(address, __aeabi_dcmpgt); + } + break; + case lir_cond_aboveEqual: + case lir_cond_belowEqual: + ShouldNotReachHere(); // We're not going to get these. + default: + assert(lir_cond(cond) == lir_cond_always, "must be"); + ShouldNotReachHere(); + } + set_no_result(x); + + // add safepoint before generating condition code so it can be recomputed + if (x->is_safepoint()) { + increment_backedge_counter(state_for(x, x->state_before()), x->profiled_bci()); + __ safepoint(LIR_OprFact::illegalOpr, state_for(x, x->state_before())); + } + // Call float compare function, returns (1,0) if true or false. + LIR_Opr result = call_runtime(x->x(), x->y(), runtime_func, intType, NULL); + __ cmp(lir_cond_equal, result, + compare_to_zero ? + LIR_OprFact::intConst(0) : LIR_OprFact::intConst(1)); + profile_branch(x, cond); + move_to_phi(x->state()); + __ branch(lir_cond_equal, T_INT, x->tsux()); +} +#endif // __SOFTFP__ + +void LIRGenerator::do_If(If* x) { + assert(x->number_of_sux() == 2, "inconsistency"); + ValueTag tag = x->x()->type()->tag(); + +#ifdef __SOFTFP__ + if (tag == floatTag || tag == doubleTag) { + do_soft_float_compare(x); + assert(x->default_sux() == x->fsux(), "wrong destination above"); + __ jump(x->default_sux()); + return; + } +#endif // __SOFTFP__ + + LIRItem xitem(x->x(), this); + LIRItem yitem(x->y(), this); + LIRItem* xin = &xitem; + LIRItem* yin = &yitem; + If::Condition cond = x->cond(); + +#ifndef AARCH64 + if (tag == longTag) { + if (cond == If::gtr || cond == If::leq) { + cond = Instruction::mirror(cond); + xin = &yitem; + yin = &xitem; + } + xin->set_destroys_register(); + } +#endif // !AARCH64 + + xin->load_item(); + LIR_Opr left = xin->result(); + LIR_Opr right; + +#ifdef AARCH64 + if (yin->is_constant() && can_inline_as_constant_in_cmp(yin->value())) { + yin->dont_load_item(); + } else { + yin->load_item(); + } + right = yin->result(); +#else + if (tag == longTag && yin->is_constant() && yin->get_jlong_constant() == 0 && + (cond == If::eql || cond == If::neq)) { + // inline long zero + right = LIR_OprFact::value_type(yin->value()->type()); + } else { + yin->load_nonconstant(); + right = yin->result(); + } +#endif // AARCH64 + + set_no_result(x); + + // add safepoint before generating condition code so it can be recomputed + if (x->is_safepoint()) { + increment_backedge_counter(state_for(x, x->state_before()), x->profiled_bci()); + __ safepoint(LIR_OprFact::illegalOpr, state_for(x, x->state_before())); + } + + __ cmp(lir_cond(cond), left, right); + profile_branch(x, cond); + move_to_phi(x->state()); + if (x->x()->type()->is_float_kind()) { + __ branch(lir_cond(cond), right->type(), x->tsux(), x->usux()); + } else { + __ branch(lir_cond(cond), right->type(), x->tsux()); + } + assert(x->default_sux() == x->fsux(), "wrong destination above"); + __ jump(x->default_sux()); +} + + +LIR_Opr LIRGenerator::getThreadPointer() { + return FrameMap::Rthread_opr; +} + +void LIRGenerator::trace_block_entry(BlockBegin* block) { + __ move(LIR_OprFact::intConst(block->block_id()), FrameMap::R0_opr); + LIR_OprList* args = new LIR_OprList(1); + args->append(FrameMap::R0_opr); + address func = CAST_FROM_FN_PTR(address, Runtime1::trace_block_entry); + __ call_runtime_leaf(func, getThreadTemp(), LIR_OprFact::illegalOpr, args); +} + + +void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address, + CodeEmitInfo* info) { +#ifndef AARCH64 + if (value->is_double_cpu()) { + assert(address->index()->is_illegal(), "should have a constant displacement"); + LIR_Opr tmp = new_pointer_register(); + add_large_constant(address->base(), address->disp(), tmp); + __ volatile_store_mem_reg(value, new LIR_Address(tmp, (intx)0, address->type()), info); + return; + } +#endif // !AARCH64 + // TODO-AARCH64 implement with stlr instruction + __ store(value, address, info, lir_patch_none); +} + +void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result, + CodeEmitInfo* info) { +#ifndef AARCH64 + if (result->is_double_cpu()) { + assert(address->index()->is_illegal(), "should have a constant displacement"); + LIR_Opr tmp = new_pointer_register(); + add_large_constant(address->base(), address->disp(), tmp); + __ volatile_load_mem_reg(new LIR_Address(tmp, (intx)0, address->type()), result, info); + return; + } +#endif // !AARCH64 + // TODO-AARCH64 implement with ldar instruction + __ load(address, result, info, lir_patch_none); +} + +void LIRGenerator::get_Object_unsafe(LIR_Opr dst, LIR_Opr src, LIR_Opr offset, + BasicType type, bool is_volatile) { +#ifdef AARCH64 + __ load(new LIR_Address(src, offset, type), dst); +#else + assert(offset->is_single_cpu(), "must be"); + if (is_volatile && dst->is_double_cpu()) { + LIR_Opr tmp = new_pointer_register(); + __ add(src, offset, tmp); + __ volatile_load_mem_reg(new LIR_Address(tmp, (intx)0, type), dst, NULL); + } else if (type == T_FLOAT || type == T_DOUBLE) { + // fld doesn't have indexed addressing mode + LIR_Opr tmp = new_register(T_INT); + __ add(src, offset, tmp); + __ load(new LIR_Address(tmp, (intx)0, type), dst); + } else { + __ load(new LIR_Address(src, offset, type), dst); + } +#endif // AARCH64 +} + +void LIRGenerator::put_Object_unsafe(LIR_Opr src, LIR_Opr offset, LIR_Opr data, + BasicType type, bool is_volatile) { +#ifdef AARCH64 + LIR_Address* addr = new LIR_Address(src, offset, type); + if (type == T_ARRAY || type == T_OBJECT) { + pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */, + true /* do_load */, false /* patch */, NULL); + __ move(data, addr); + assert(src->is_register(), "must be register"); + post_barrier(LIR_OprFact::address(addr), data); + } else { + __ move(data, addr); + } +#else + assert(offset->is_single_cpu(), "must be"); + if (is_volatile && data->is_double_cpu()) { + LIR_Opr tmp = new_register(T_INT); + __ add(src, offset, tmp); + __ volatile_store_mem_reg(data, new LIR_Address(tmp, (intx)0, type), NULL); + } else if (type == T_FLOAT || type == T_DOUBLE) { + // fst doesn't have indexed addressing mode + LIR_Opr tmp = new_register(T_INT); + __ add(src, offset, tmp); + __ move(data, new LIR_Address(tmp, (intx)0, type)); + } else { + LIR_Address* addr = new LIR_Address(src, offset, type); + bool is_obj = (type == T_ARRAY || type == T_OBJECT); +#if INCLUDE_ALL_GCS + if (is_obj) { + // Do the pre-write barrier, if any. + pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */, + true /* do_load */, false /* patch */, NULL); + } +#endif // INCLUDE_ALL_GCS + __ move(data, addr); + if (is_obj) { + assert(src->is_register(), "must be register"); + post_barrier(LIR_OprFact::address(addr), data); + } + } +#endif // AARCH64 +} + +void LIRGenerator::do_UnsafeGetAndSetObject(UnsafeGetAndSetObject* x) { + BasicType type = x->basic_type(); + LIRItem src(x->object(), this); + LIRItem off(x->offset(), this); + LIRItem value(x->value(), this); + + src.load_item(); + if (x->is_add()) { + value.load_nonconstant(); + } else { + value.load_item(); + } + off.load_nonconstant(); + + LIR_Opr dst = rlock_result(x, type); + LIR_Opr data = value.result(); + bool is_obj = (type == T_ARRAY || type == T_OBJECT); + + assert (type == T_INT || type == T_LONG || (!x->is_add() && is_obj), "unexpected type"); + LIR_Opr addr_ptr = new_pointer_register(); + + __ add(src.result(), off.result(), addr_ptr); + + LIR_Address* addr = new LIR_Address(addr_ptr, (intx)0, type); + + if (x->is_add()) { + LIR_Opr tmp = new_register(type); + __ xadd(addr_ptr, data, dst, tmp); + } else { + LIR_Opr tmp = (UseCompressedOops && is_obj) ? new_pointer_register() : LIR_OprFact::illegalOpr; + if (is_obj) { + // Do the pre-write barrier, if any. + pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */, + true /* do_load */, false /* patch */, NULL); + } + __ xchg(addr_ptr, data, dst, tmp); + if (is_obj) { + // Seems to be a precise address + post_barrier(LIR_OprFact::address(addr), data); + } + } +} diff --git a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.hpp b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.hpp new file mode 100644 index 00000000000..24552cb1528 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.hpp @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + + // Helper to set the card at the given address to the given value. + void set_card(LIR_Opr value, LIR_Address* card_addr); + + void make_div_by_zero_check(LIR_Opr right_arg, BasicType type, CodeEmitInfo* info); + +#ifdef AARCH64 + // the helper for arithmetic + void add_constant(LIR_Opr src, jlong c, LIR_Opr dest); +#endif // AARCH64 diff --git a/hotspot/src/cpu/arm/vm/c1_LIR_arm.cpp b/hotspot/src/cpu/arm/vm/c1_LIR_arm.cpp new file mode 100644 index 00000000000..806da320209 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LIR_arm.cpp @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_LIR.hpp" + +FloatRegister LIR_OprDesc::as_float_reg() const { + return as_FloatRegister(fpu_regnr()); +} + +FloatRegister LIR_OprDesc::as_double_reg() const { + return as_FloatRegister(fpu_regnrLo()); +} + +#ifdef AARCH64 +// Reg2 unused. +LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) { + assert(as_FloatRegister(reg2) == fnoreg, "Not used on this platform"); + return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) | + (reg1 << LIR_OprDesc::reg2_shift) | + LIR_OprDesc::double_type | + LIR_OprDesc::fpu_register | + LIR_OprDesc::double_size); +} +#else +LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) { + assert(as_FloatRegister(reg2) != fnoreg, "Arm32 holds double in two regs."); + return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) | + (reg2 << LIR_OprDesc::reg2_shift) | + LIR_OprDesc::double_type | + LIR_OprDesc::fpu_register | + LIR_OprDesc::double_size); +} +#endif + +#ifndef PRODUCT +void LIR_Address::verify() const { +#ifdef _LP64 + assert(base()->is_cpu_register(), "wrong base operand"); +#endif +#ifdef AARCH64 + if (base()->type() == T_INT) { + assert(index()->is_single_cpu() && (index()->type() == T_INT), "wrong index operand"); + } else { + assert(index()->is_illegal() || index()->is_double_cpu() || + (index()->is_single_cpu() && (index()->is_oop_register() || index()->type() == T_INT)), "wrong index operand"); + assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); + } +#else + assert(disp() == 0 || index()->is_illegal(), "can't have both"); + // Note: offsets higher than 4096 must not be rejected here. They can + // be handled by the back-end or will be rejected if not. +#ifdef _LP64 + assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand"); + assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + "wrong type for addresses"); +#else + assert(base()->is_single_cpu(), "wrong base operand"); + assert(index()->is_illegal() || index()->is_single_cpu(), "wrong index operand"); + assert(base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, + "wrong type for addresses"); +#endif +#endif // AARCH64 +} +#endif // PRODUCT diff --git a/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.cpp b/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.cpp new file mode 100644 index 00000000000..21030b9a23f --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.cpp @@ -0,0 +1,32 @@ +/* + * 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. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LinearScan.hpp" +#include "utilities/bitMap.inline.hpp" + +void LinearScan::allocate_fpu_stack() { + // No FPU stack on ARM +} diff --git a/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.hpp b/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.hpp new file mode 100644 index 00000000000..d67643c7dbf --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_LinearScan_arm.hpp @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP +#define CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP + +inline bool LinearScan::is_processed_reg_num(int reg_num) { + return reg_num < pd_nof_cpu_regs_processed_in_linearscan || + reg_num >= pd_nof_cpu_regs_frame_map; +} + +inline int LinearScan::num_physical_regs(BasicType type) { +#ifndef AARCH64 + if (type == T_LONG || type == T_DOUBLE) return 2; +#endif // !AARCH64 + return 1; +} + + +inline bool LinearScan::requires_adjacent_regs(BasicType type) { +#ifdef AARCH64 + return false; +#else + return type == T_DOUBLE || type == T_LONG; +#endif // AARCH64 +} + +inline bool LinearScan::is_caller_save(int assigned_reg) { + assert(assigned_reg >= 0 && assigned_reg < nof_regs, "should call this only for registers"); + // TODO-AARCH64 try to add callee-saved registers + return true; +} + + +inline void LinearScan::pd_add_temps(LIR_Op* op) { + // No extra temporals on ARM +} + + +// Implementation of LinearScanWalker + +inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) { +#ifndef __SOFTFP__ + if (cur->type() == T_FLOAT || cur->type() == T_DOUBLE) { + _first_reg = pd_first_fpu_reg; + _last_reg = pd_first_fpu_reg + pd_nof_fpu_regs_reg_alloc - 1; + return true; + } +#endif // !__SOFTFP__ + + // Use allocatable CPU registers otherwise + _first_reg = pd_first_cpu_reg; + _last_reg = pd_first_cpu_reg + FrameMap::adjust_reg_range(pd_nof_cpu_regs_reg_alloc) - 1; + return true; +} + +#endif // CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.cpp b/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.cpp new file mode 100644 index 00000000000..bc605711570 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.cpp @@ -0,0 +1,408 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc/shared/collectedHeap.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" + +// Note: Rtemp usage is this file should not impact C2 and should be +// correct as long as it is not implicitly used in lower layers (the +// arm [macro]assembler) and used with care in the other C1 specific +// files. + +void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) { + Label verified; + load_klass(Rtemp, receiver); + cmp(Rtemp, iCache); + b(verified, eq); // jump over alignment no-ops +#ifdef AARCH64 + jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type, Rtemp); +#else + jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type); +#endif + align(CodeEntryAlignment); + bind(verified); +} + +void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_bytes) { + assert(bang_size_in_bytes >= frame_size_in_bytes, "stack bang size incorrect"); + assert((frame_size_in_bytes % StackAlignmentInBytes) == 0, "frame size should be aligned"); + +#ifdef AARCH64 + // Extra nop for MT-safe patching in NativeJump::patch_verified_entry + nop(); +#endif // AARCH64 + + arm_stack_overflow_check(bang_size_in_bytes, Rtemp); + + // FP can no longer be used to memorize SP. It may be modified + // if this method contains a methodHandle call site + raw_push(FP, LR); + sub_slow(SP, SP, frame_size_in_bytes); +} + +void C1_MacroAssembler::remove_frame(int frame_size_in_bytes) { + add_slow(SP, SP, frame_size_in_bytes); + raw_pop(FP, LR); +} + +void C1_MacroAssembler::verified_entry() { + if (C1Breakpoint) { + breakpoint(); + } +} + +// Puts address of allocated object into register `obj` and end of allocated object into register `obj_end`. +void C1_MacroAssembler::try_allocate(Register obj, Register obj_end, Register tmp1, Register tmp2, + RegisterOrConstant size_expression, Label& slow_case) { + if (UseTLAB) { + tlab_allocate(obj, obj_end, tmp1, size_expression, slow_case); + } else { + eden_allocate(obj, obj_end, tmp1, tmp2, size_expression, slow_case); + incr_allocated_bytes(size_expression, tmp1); + } +} + + +void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register tmp) { + assert_different_registers(obj, klass, len, tmp); + + if(UseBiasedLocking && !len->is_valid()) { + ldr(tmp, Address(klass, Klass::prototype_header_offset())); + } else { + mov(tmp, (intptr_t)markOopDesc::prototype()); + } + +#ifdef AARCH64 + if (UseCompressedClassPointers) { + str(tmp, Address(obj, oopDesc::mark_offset_in_bytes())); + encode_klass_not_null(tmp, klass); // Take care not to kill klass + str_w(tmp, Address(obj, oopDesc::klass_offset_in_bytes())); + } else { + assert(oopDesc::mark_offset_in_bytes() + wordSize == oopDesc::klass_offset_in_bytes(), "adjust this code"); + stp(tmp, klass, Address(obj, oopDesc::mark_offset_in_bytes())); + } +#else + str(tmp, Address(obj, oopDesc::mark_offset_in_bytes())); + str(klass, Address(obj, oopDesc::klass_offset_in_bytes())); +#endif // AARCH64 + + if (len->is_valid()) { + str_32(len, Address(obj, arrayOopDesc::length_offset_in_bytes())); + } +#ifdef AARCH64 + else if (UseCompressedClassPointers) { + store_klass_gap(obj); + } +#endif // AARCH64 +} + + +// Cleans object body [base..obj_end]. Clobbers `base` and `tmp` registers. +void C1_MacroAssembler::initialize_body(Register base, Register obj_end, Register tmp) { + zero_memory(base, obj_end, tmp); +} + + +void C1_MacroAssembler::initialize_object(Register obj, Register obj_end, Register klass, + Register len, Register tmp1, Register tmp2, + RegisterOrConstant header_size, int obj_size_in_bytes, + bool is_tlab_allocated) +{ + assert_different_registers(obj, obj_end, klass, len, tmp1, tmp2); + initialize_header(obj, klass, len, tmp1); + + const Register ptr = tmp2; + + if (!(UseTLAB && ZeroTLAB && is_tlab_allocated)) { +#ifdef AARCH64 + if (obj_size_in_bytes < 0) { + add_rc(ptr, obj, header_size); + initialize_body(ptr, obj_end, tmp1); + + } else { + int base = instanceOopDesc::header_size() * HeapWordSize; + assert(obj_size_in_bytes >= base, "should be"); + + const int zero_bytes = obj_size_in_bytes - base; + assert((zero_bytes % wordSize) == 0, "should be"); + + if ((zero_bytes % (2*wordSize)) != 0) { + str(ZR, Address(obj, base)); + base += wordSize; + } + + const int stp_count = zero_bytes / (2*wordSize); + + if (zero_bytes > 8 * wordSize) { + Label loop; + add(ptr, obj, base); + mov(tmp1, stp_count); + bind(loop); + subs(tmp1, tmp1, 1); + stp(ZR, ZR, Address(ptr, 2*wordSize, post_indexed)); + b(loop, gt); + } else { + for (int i = 0; i < stp_count; i++) { + stp(ZR, ZR, Address(obj, base + i * 2 * wordSize)); + } + } + } +#else + if (obj_size_in_bytes >= 0 && obj_size_in_bytes <= 8 * BytesPerWord) { + mov(tmp1, 0); + const int base = instanceOopDesc::header_size() * HeapWordSize; + for (int i = base; i < obj_size_in_bytes; i += wordSize) { + str(tmp1, Address(obj, i)); + } + } else { + assert(header_size.is_constant() || header_size.as_register() == ptr, "code assumption"); + add(ptr, obj, header_size); + initialize_body(ptr, obj_end, tmp1); + } +#endif // AARCH64 + } + + // StoreStore barrier required after complete initialization + // (headers + content zeroing), before the object may escape. + membar(MacroAssembler::StoreStore, tmp1); +} + +void C1_MacroAssembler::allocate_object(Register obj, Register tmp1, Register tmp2, Register tmp3, + int header_size, int object_size, + Register klass, Label& slow_case) { + assert_different_registers(obj, tmp1, tmp2, tmp3, klass, Rtemp); + assert(header_size >= 0 && object_size >= header_size, "illegal sizes"); + const int object_size_in_bytes = object_size * BytesPerWord; + + const Register obj_end = tmp1; + const Register len = noreg; + + if (Assembler::is_arith_imm_in_range(object_size_in_bytes)) { + try_allocate(obj, obj_end, tmp2, tmp3, object_size_in_bytes, slow_case); + } else { + // Rtemp should be free at c1 LIR level + mov_slow(Rtemp, object_size_in_bytes); + try_allocate(obj, obj_end, tmp2, tmp3, Rtemp, slow_case); + } + initialize_object(obj, obj_end, klass, len, tmp2, tmp3, instanceOopDesc::header_size() * HeapWordSize, object_size_in_bytes, /* is_tlab_allocated */ UseTLAB); +} + +void C1_MacroAssembler::allocate_array(Register obj, Register len, + Register tmp1, Register tmp2, Register tmp3, + int header_size, int element_size, + Register klass, Label& slow_case) { + assert_different_registers(obj, len, tmp1, tmp2, tmp3, klass, Rtemp); + const int header_size_in_bytes = header_size * BytesPerWord; + const int scale_shift = exact_log2(element_size); + const Register obj_size = Rtemp; // Rtemp should be free at c1 LIR level + +#ifdef AARCH64 + mov_slow(Rtemp, max_array_allocation_length); + cmp_32(len, Rtemp); +#else + cmp_32(len, max_array_allocation_length); +#endif // AARCH64 + b(slow_case, hs); + + bool align_header = ((header_size_in_bytes | element_size) & MinObjAlignmentInBytesMask) != 0; + assert(align_header || ((header_size_in_bytes & MinObjAlignmentInBytesMask) == 0), "must be"); + assert(align_header || ((element_size & MinObjAlignmentInBytesMask) == 0), "must be"); + + mov(obj_size, header_size_in_bytes + (align_header ? (MinObjAlignmentInBytes - 1) : 0)); + add_ptr_scaled_int32(obj_size, obj_size, len, scale_shift); + + if (align_header) { + align_reg(obj_size, obj_size, MinObjAlignmentInBytes); + } + + try_allocate(obj, tmp1, tmp2, tmp3, obj_size, slow_case); + initialize_object(obj, tmp1, klass, len, tmp2, tmp3, header_size_in_bytes, -1, /* is_tlab_allocated */ UseTLAB); +} + +int C1_MacroAssembler::lock_object(Register hdr, Register obj, + Register disp_hdr, Register tmp1, + Label& slow_case) { + Label done, fast_lock, fast_lock_done; + int null_check_offset = 0; + + const Register tmp2 = Rtemp; // Rtemp should be free at c1 LIR level + assert_different_registers(hdr, obj, disp_hdr, tmp1, tmp2); + + assert(BasicObjectLock::lock_offset_in_bytes() == 0, "ajust this code"); + const int obj_offset = BasicObjectLock::obj_offset_in_bytes(); + const int mark_offset = BasicLock::displaced_header_offset_in_bytes(); + + if (UseBiasedLocking) { + // load object + str(obj, Address(disp_hdr, obj_offset)); + null_check_offset = biased_locking_enter(obj, hdr/*scratched*/, tmp1, false, tmp2, done, slow_case); + } + + assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions"); + +#ifdef AARCH64 + + str(obj, Address(disp_hdr, obj_offset)); + + if (!UseBiasedLocking) { + null_check_offset = offset(); + } + ldr(hdr, obj); + + // Test if object is already locked + assert(markOopDesc::unlocked_value == 1, "adjust this code"); + tbnz(hdr, exact_log2(markOopDesc::unlocked_value), fast_lock); + + // Check for recursive locking + // See comments in InterpreterMacroAssembler::lock_object for + // explanations on the fast recursive locking check. + intptr_t mask = ((intptr_t)3) - ((intptr_t)os::vm_page_size()); + Assembler::LogicalImmediate imm(mask, false); + mov(tmp2, SP); + sub(tmp2, hdr, tmp2); + ands(tmp2, tmp2, imm); + b(slow_case, ne); + + // Recursive locking: store 0 into a lock record + str(ZR, Address(disp_hdr, mark_offset)); + b(fast_lock_done); + +#else // AARCH64 + + if (!UseBiasedLocking) { + null_check_offset = offset(); + } + + // On MP platforms the next load could return a 'stale' value if the memory location has been modified by another thread. + // That would be acceptable as ether CAS or slow case path is taken in that case. + + // Must be the first instruction here, because implicit null check relies on it + ldr(hdr, Address(obj, oopDesc::mark_offset_in_bytes())); + + str(obj, Address(disp_hdr, obj_offset)); + tst(hdr, markOopDesc::unlocked_value); + b(fast_lock, ne); + + // Check for recursive locking + // See comments in InterpreterMacroAssembler::lock_object for + // explanations on the fast recursive locking check. + // -1- test low 2 bits + movs(tmp2, AsmOperand(hdr, lsl, 30)); + // -2- test (hdr - SP) if the low two bits are 0 + sub(tmp2, hdr, SP, eq); + movs(tmp2, AsmOperand(tmp2, lsr, exact_log2(os::vm_page_size())), eq); + // If 'eq' then OK for recursive fast locking: store 0 into a lock record. + str(tmp2, Address(disp_hdr, mark_offset), eq); + b(fast_lock_done, eq); + // else need slow case + b(slow_case); + +#endif // AARCH64 + + bind(fast_lock); + // Save previous object header in BasicLock structure and update the header + str(hdr, Address(disp_hdr, mark_offset)); + + cas_for_lock_acquire(hdr, disp_hdr, obj, tmp2, slow_case); + + bind(fast_lock_done); + +#ifndef PRODUCT + if (PrintBiasedLockingStatistics) { + cond_atomic_inc32(al, BiasedLocking::fast_path_entry_count_addr()); + } +#endif // !PRODUCT + + bind(done); + + return null_check_offset; +} + +void C1_MacroAssembler::unlock_object(Register hdr, Register obj, + Register disp_hdr, Register tmp, + Label& slow_case) { + // Note: this method is not using its 'tmp' argument + + assert_different_registers(hdr, obj, disp_hdr, Rtemp); + Register tmp2 = Rtemp; + + assert(BasicObjectLock::lock_offset_in_bytes() == 0, "ajust this code"); + const int obj_offset = BasicObjectLock::obj_offset_in_bytes(); + const int mark_offset = BasicLock::displaced_header_offset_in_bytes(); + + Label done; + if (UseBiasedLocking) { + // load object + ldr(obj, Address(disp_hdr, obj_offset)); + biased_locking_exit(obj, hdr, done); + } + + assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions"); + Label retry; + + // Load displaced header and object from the lock + ldr(hdr, Address(disp_hdr, mark_offset)); + // If hdr is NULL, we've got recursive locking and there's nothing more to do + cbz(hdr, done); + + if(!UseBiasedLocking) { + // load object + ldr(obj, Address(disp_hdr, obj_offset)); + } + + // Restore the object header + cas_for_lock_release(disp_hdr, hdr, obj, tmp2, slow_case); + + bind(done); +} + + +#ifndef PRODUCT + +void C1_MacroAssembler::verify_stack_oop(int stack_offset) { + if (!VerifyOops) return; + verify_oop_addr(Address(SP, stack_offset)); +} + +void C1_MacroAssembler::verify_not_null_oop(Register r) { + Label not_null; + cbnz(r, not_null); + stop("non-null oop required"); + bind(not_null); + if (!VerifyOops) return; + verify_oop(r); +} + +#endif // !PRODUCT diff --git a/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.hpp b/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.hpp new file mode 100644 index 00000000000..b3d2457e64d --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_MacroAssembler_arm.hpp @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP +#define CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP + + private: + + void pd_init() { /* not used */ } + + public: + + // Puts address of allocated object into register `obj` and end of allocated object into register `obj_end`. + // `size_expression` should be a register or constant which can be used as immediate in "add" instruction. + void try_allocate(Register obj, Register obj_end, Register tmp1, Register tmp2, + RegisterOrConstant size_expression, Label& slow_case); + + void initialize_header(Register obj, Register klass, Register len, Register tmp); + + // Cleans object body [base..obj_end]. Clobbers `base` and `tmp` registers. + void initialize_body(Register base, Register obj_end, Register tmp); + + void initialize_object(Register obj, Register obj_end, Register klass, + Register len, Register tmp1, Register tmp2, + RegisterOrConstant header_size_expression, int obj_size_in_bytes, + bool is_tlab_allocated); + + void allocate_object(Register obj, Register tmp1, Register tmp2, Register tmp3, + int header_size, int object_size, + Register klass, Label& slow_case); + + void allocate_array(Register obj, Register len, + Register tmp1, Register tmp2, Register tmp3, + int header_size, int element_size, + Register klass, Label& slow_case); + + enum { + max_array_allocation_length = 0x01000000 + }; + + int lock_object(Register hdr, Register obj, Register disp_hdr, Register tmp, Label& slow_case); + + void unlock_object(Register hdr, Register obj, Register disp_hdr, Register tmp, Label& slow_case); + + // This platform only uses signal-based null checks. The Label is not needed. + void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); } + +#endif // CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp b/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp new file mode 100644 index 00000000000..937dfe91242 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp @@ -0,0 +1,1226 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" +#include "c1/c1_Defs.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_arm.hpp" +#include "oops/compiledICHolder.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "register_arm.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/signature.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_arm.inline.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#endif + +// Note: Rtemp usage is this file should not impact C2 and should be +// correct as long as it is not implicitly used in lower layers (the +// arm [macro]assembler) and used with care in the other C1 specific +// files. + +// Implementation of StubAssembler + +int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, int args_size) { + mov(R0, Rthread); + + int call_offset = set_last_Java_frame(SP, FP, false, Rtemp); + + call(entry); + if (call_offset == -1) { // PC not saved + call_offset = offset(); + } + reset_last_Java_frame(Rtemp); + + assert(frame_size() != no_frame_size, "frame must be fixed"); + if (_stub_id != Runtime1::forward_exception_id) { + ldr(R3, Address(Rthread, Thread::pending_exception_offset())); + } + + if (oop_result1->is_valid()) { + assert_different_registers(oop_result1, R3, Rtemp); + get_vm_result(oop_result1, Rtemp); + } + if (metadata_result->is_valid()) { + assert_different_registers(metadata_result, R3, Rtemp); + get_vm_result_2(metadata_result, Rtemp); + } + + // Check for pending exception + // unpack_with_exception_in_tls path is taken through + // Runtime1::exception_handler_for_pc + if (_stub_id != Runtime1::forward_exception_id) { + assert(frame_size() != no_frame_size, "cannot directly call forward_exception_id"); +#ifdef AARCH64 + Label skip; + cbz(R3, skip); + jump(Runtime1::entry_for(Runtime1::forward_exception_id), relocInfo::runtime_call_type, Rtemp); + bind(skip); +#else + cmp(R3, 0); + jump(Runtime1::entry_for(Runtime1::forward_exception_id), relocInfo::runtime_call_type, Rtemp, ne); +#endif // AARCH64 + } else { +#ifdef ASSERT + // Should not have pending exception in forward_exception stub + ldr(R3, Address(Rthread, Thread::pending_exception_offset())); + cmp(R3, 0); + breakpoint(ne); +#endif // ASSERT + } + return call_offset; +} + + +int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1) { + if (arg1 != R1) { + mov(R1, arg1); + } + return call_RT(oop_result1, metadata_result, entry, 1); +} + + +int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2) { + assert(arg1 == R1 && arg2 == R2, "cannot handle otherwise"); + return call_RT(oop_result1, metadata_result, entry, 2); +} + + +int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) { + assert(arg1 == R1 && arg2 == R2 && arg3 == R3, "cannot handle otherwise"); + return call_RT(oop_result1, metadata_result, entry, 3); +} + + +#define __ sasm-> + +// TODO: ARM - does this duplicate RegisterSaver in SharedRuntime? +#ifdef AARCH64 + + // + // On AArch64 registers save area has the following layout: + // + // |---------------------| + // | return address (LR) | + // | FP | + // |---------------------| + // | D31 | + // | ... | + // | D0 | + // |---------------------| + // | padding | + // |---------------------| + // | R28 | + // | ... | + // | R0 | + // |---------------------| <-- SP + // + +enum RegisterLayout { + number_of_saved_gprs = 29, + number_of_saved_fprs = FloatRegisterImpl::number_of_registers, + + R0_offset = 0, + D0_offset = R0_offset + number_of_saved_gprs + 1, + FP_offset = D0_offset + number_of_saved_fprs, + LR_offset = FP_offset + 1, + + reg_save_size = LR_offset + 1, + + arg1_offset = reg_save_size * wordSize, + arg2_offset = (reg_save_size + 1) * wordSize +}; + +#else + +enum RegisterLayout { + fpu_save_size = pd_nof_fpu_regs_reg_alloc, +#ifndef __SOFTFP__ + D0_offset = 0, +#endif + R0_offset = fpu_save_size, + R1_offset, + R2_offset, + R3_offset, + R4_offset, + R5_offset, + R6_offset, +#if (FP_REG_NUM != 7) + R7_offset, +#endif + R8_offset, + R9_offset, + R10_offset, +#if (FP_REG_NUM != 11) + R11_offset, +#endif + R12_offset, + FP_offset, + LR_offset, + reg_save_size, + arg1_offset = reg_save_size * wordSize, + arg2_offset = (reg_save_size + 1) * wordSize +}; + +#endif // AARCH64 + +static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers = HaveVFP) { + sasm->set_frame_size(reg_save_size /* in words */); + + // Record saved value locations in an OopMap. + // Locations are offsets from sp after runtime call. + OopMap* map = new OopMap(VMRegImpl::slots_per_word * reg_save_size, 0); + +#ifdef AARCH64 + for (int i = 0; i < number_of_saved_gprs; i++) { + map->set_callee_saved(VMRegImpl::stack2reg((R0_offset + i) * VMRegImpl::slots_per_word), as_Register(i)->as_VMReg()); + } + map->set_callee_saved(VMRegImpl::stack2reg(FP_offset * VMRegImpl::slots_per_word), FP->as_VMReg()); + map->set_callee_saved(VMRegImpl::stack2reg(LR_offset * VMRegImpl::slots_per_word), LR->as_VMReg()); + + if (save_fpu_registers) { + for (int i = 0; i < number_of_saved_fprs; i++) { + map->set_callee_saved(VMRegImpl::stack2reg((D0_offset + i) * VMRegImpl::slots_per_word), as_FloatRegister(i)->as_VMReg()); + } + } +#else + int j=0; + for (int i = R0_offset; i < R10_offset; i++) { + if (j == FP_REG_NUM) { + // skip the FP register, saved below + j++; + } + map->set_callee_saved(VMRegImpl::stack2reg(i), as_Register(j)->as_VMReg()); + j++; + } + assert(j == R10->encoding(), "must be"); +#if (FP_REG_NUM != 11) + // add R11, if not saved as FP + map->set_callee_saved(VMRegImpl::stack2reg(R11_offset), R11->as_VMReg()); +#endif + map->set_callee_saved(VMRegImpl::stack2reg(FP_offset), FP->as_VMReg()); + map->set_callee_saved(VMRegImpl::stack2reg(LR_offset), LR->as_VMReg()); + + if (save_fpu_registers) { + for (int i = 0; i < fpu_save_size; i++) { + map->set_callee_saved(VMRegImpl::stack2reg(i), as_FloatRegister(i)->as_VMReg()); + } + } +#endif // AARCH64 + + return map; +} + +static OopMap* save_live_registers(StubAssembler* sasm, bool save_fpu_registers = HaveVFP) { + __ block_comment("save_live_registers"); + sasm->set_frame_size(reg_save_size /* in words */); + +#ifdef AARCH64 + assert((reg_save_size * wordSize) % StackAlignmentInBytes == 0, "SP should be aligned"); + + __ raw_push(FP, LR); + + __ sub(SP, SP, (reg_save_size - 2) * wordSize); + + for (int i = 0; i < round_down(number_of_saved_gprs, 2); i += 2) { + __ stp(as_Register(i), as_Register(i+1), Address(SP, (R0_offset + i) * wordSize)); + } + + if (is_odd(number_of_saved_gprs)) { + int i = number_of_saved_gprs - 1; + __ str(as_Register(i), Address(SP, (R0_offset + i) * wordSize)); + } + + if (save_fpu_registers) { + assert (is_even(number_of_saved_fprs), "adjust this code"); + for (int i = 0; i < number_of_saved_fprs; i += 2) { + __ stp_d(as_FloatRegister(i), as_FloatRegister(i+1), Address(SP, (D0_offset + i) * wordSize)); + } + } +#else + __ push(RegisterSet(FP) | RegisterSet(LR)); + __ push(RegisterSet(R0, R6) | RegisterSet(R8, R10) | R12 | altFP_7_11); + if (save_fpu_registers) { + __ fstmdbd(SP, FloatRegisterSet(D0, fpu_save_size / 2), writeback); + } else { + __ sub(SP, SP, fpu_save_size * wordSize); + } +#endif // AARCH64 + + return generate_oop_map(sasm, save_fpu_registers); +} + + +static void restore_live_registers(StubAssembler* sasm, + bool restore_R0, + bool restore_FP_LR, + bool do_return, + bool restore_fpu_registers = HaveVFP) { + __ block_comment("restore_live_registers"); + +#ifdef AARCH64 + if (restore_R0) { + __ ldr(R0, Address(SP, R0_offset * wordSize)); + } + + assert(is_odd(number_of_saved_gprs), "adjust this code"); + for (int i = 1; i < number_of_saved_gprs; i += 2) { + __ ldp(as_Register(i), as_Register(i+1), Address(SP, (R0_offset + i) * wordSize)); + } + + if (restore_fpu_registers) { + assert (is_even(number_of_saved_fprs), "adjust this code"); + for (int i = 0; i < number_of_saved_fprs; i += 2) { + __ ldp_d(as_FloatRegister(i), as_FloatRegister(i+1), Address(SP, (D0_offset + i) * wordSize)); + } + } + + __ add(SP, SP, (reg_save_size - 2) * wordSize); + + if (restore_FP_LR) { + __ raw_pop(FP, LR); + if (do_return) { + __ ret(); + } + } else { + assert (!do_return, "return without restoring FP/LR"); + } +#else + if (restore_fpu_registers) { + __ fldmiad(SP, FloatRegisterSet(D0, fpu_save_size / 2), writeback); + if (!restore_R0) { + __ add(SP, SP, (R1_offset - fpu_save_size) * wordSize); + } + } else { + __ add(SP, SP, (restore_R0 ? fpu_save_size : R1_offset) * wordSize); + } + __ pop(RegisterSet((restore_R0 ? R0 : R1), R6) | RegisterSet(R8, R10) | R12 | altFP_7_11); + if (restore_FP_LR) { + __ pop(RegisterSet(FP) | RegisterSet(do_return ? PC : LR)); + } else { + assert (!do_return, "return without restoring FP/LR"); + } +#endif // AARCH64 +} + + +static void restore_live_registers_except_R0(StubAssembler* sasm, bool restore_fpu_registers = HaveVFP) { + restore_live_registers(sasm, false, true, true, restore_fpu_registers); +} + +static void restore_live_registers(StubAssembler* sasm, bool restore_fpu_registers = HaveVFP) { + restore_live_registers(sasm, true, true, true, restore_fpu_registers); +} + +#ifndef AARCH64 +static void restore_live_registers_except_FP_LR(StubAssembler* sasm, bool restore_fpu_registers = HaveVFP) { + restore_live_registers(sasm, true, false, false, restore_fpu_registers); +} +#endif // !AARCH64 + +static void restore_live_registers_without_return(StubAssembler* sasm, bool restore_fpu_registers = HaveVFP) { + restore_live_registers(sasm, true, true, false, restore_fpu_registers); +} + + +void Runtime1::initialize_pd() { +} + + +OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) { + OopMap* oop_map = save_live_registers(sasm); + + if (has_argument) { + __ ldr(R1, Address(SP, arg1_offset)); + } + + int call_offset = __ call_RT(noreg, noreg, target); + OopMapSet* oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, oop_map); + + DEBUG_ONLY(STOP("generate_exception_throw");) // Should not reach here + return oop_maps; +} + + +static void restore_sp_for_method_handle(StubAssembler* sasm) { + // Restore SP from its saved reg (FP) if the exception PC is a MethodHandle call site. + __ ldr_s32(Rtemp, Address(Rthread, JavaThread::is_method_handle_return_offset())); +#ifdef AARCH64 + Label skip; + __ cbz(Rtemp, skip); + __ mov(SP, Rmh_SP_save); + __ bind(skip); +#else + __ cmp(Rtemp, 0); + __ mov(SP, Rmh_SP_save, ne); +#endif // AARCH64 +} + + +OopMapSet* Runtime1::generate_handle_exception(StubID id, StubAssembler* sasm) { + __ block_comment("generate_handle_exception"); + + bool save_fpu_registers = false; + + // Save registers, if required. + OopMapSet* oop_maps = new OopMapSet(); + OopMap* oop_map = NULL; + + switch (id) { + case forward_exception_id: { + save_fpu_registers = HaveVFP; + oop_map = generate_oop_map(sasm); + __ ldr(Rexception_obj, Address(Rthread, Thread::pending_exception_offset())); + __ ldr(Rexception_pc, Address(SP, LR_offset * wordSize)); + Register zero = __ zero_register(Rtemp); + __ str(zero, Address(Rthread, Thread::pending_exception_offset())); + break; + } + case handle_exception_id: + save_fpu_registers = HaveVFP; + // fall-through + case handle_exception_nofpu_id: + // At this point all registers MAY be live. + oop_map = save_live_registers(sasm, save_fpu_registers); + break; + case handle_exception_from_callee_id: + // At this point all registers except exception oop (R4/R19) and + // exception pc (R5/R20) are dead. + oop_map = save_live_registers(sasm); // TODO it's not required to save all registers + break; + default: ShouldNotReachHere(); + } + + __ str(Rexception_obj, Address(Rthread, JavaThread::exception_oop_offset())); + __ str(Rexception_pc, Address(Rthread, JavaThread::exception_pc_offset())); + + __ str(Rexception_pc, Address(SP, LR_offset * wordSize)); // patch throwing pc into return address + + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, exception_handler_for_pc)); + oop_maps->add_gc_map(call_offset, oop_map); + + // Exception handler found + __ str(R0, Address(SP, LR_offset * wordSize)); // patch the return address + + // Restore the registers that were saved at the beginning, remove + // frame and jump to the exception handler. + switch (id) { + case forward_exception_id: + case handle_exception_nofpu_id: + case handle_exception_id: + restore_live_registers(sasm, save_fpu_registers); + // Note: the restore live registers includes the jump to LR (patched to R0) + break; + case handle_exception_from_callee_id: + restore_live_registers_without_return(sasm); // must not jump immediatly to handler + restore_sp_for_method_handle(sasm); + __ ret(); + break; + default: ShouldNotReachHere(); + } + + DEBUG_ONLY(STOP("generate_handle_exception");) // Should not reach here + + return oop_maps; +} + + +void Runtime1::generate_unwind_exception(StubAssembler* sasm) { + // FP no longer used to find the frame start + // on entry, remove_frame() has already been called (restoring FP and LR) + + // search the exception handler address of the caller (using the return address) + __ mov(c_rarg0, Rthread); + __ mov(Rexception_pc, LR); + __ mov(c_rarg1, LR); + __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address), c_rarg0, c_rarg1); + + // Exception oop should be still in Rexception_obj and pc in Rexception_pc + // Jump to handler + __ verify_not_null_oop(Rexception_obj); + + // JSR292 extension + restore_sp_for_method_handle(sasm); + + __ jump(R0); +} + + +OopMapSet* Runtime1::generate_patching(StubAssembler* sasm, address target) { + OopMap* oop_map = save_live_registers(sasm); + + // call the runtime patching routine, returns non-zero if nmethod got deopted. + int call_offset = __ call_RT(noreg, noreg, target); + OopMapSet* oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, oop_map); + + DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob(); + assert(deopt_blob != NULL, "deoptimization blob must have been created"); + + __ cmp_32(R0, 0); + +#ifdef AARCH64 + Label call_deopt; + + restore_live_registers_without_return(sasm); + __ b(call_deopt, ne); + __ ret(); + + __ bind(call_deopt); +#else + restore_live_registers_except_FP_LR(sasm); + __ pop(RegisterSet(FP) | RegisterSet(PC), eq); + + // Deoptimization needed + // TODO: ARM - no need to restore FP & LR because unpack_with_reexecution() stores them back + __ pop(RegisterSet(FP) | RegisterSet(LR)); +#endif // AARCH64 + + __ jump(deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type, Rtemp); + + DEBUG_ONLY(STOP("generate_patching");) // Should not reach here + return oop_maps; +} + + +OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) { + const bool must_gc_arguments = true; + const bool dont_gc_arguments = false; + + OopMapSet* oop_maps = NULL; + bool save_fpu_registers = HaveVFP; + + switch (id) { + case forward_exception_id: + { + oop_maps = generate_handle_exception(id, sasm); + // does not return on ARM + } + break; + +#if INCLUDE_ALL_GCS + case g1_pre_barrier_slow_id: + { + // Input: + // - pre_val pushed on the stack + + __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments); + + // save at least the registers that need saving if the runtime is called +#ifdef AARCH64 + __ raw_push(R0, R1); + __ raw_push(R2, R3); + const int nb_saved_regs = 4; +#else // AARCH64 + const RegisterSet saved_regs = RegisterSet(R0,R3) | RegisterSet(R12) | RegisterSet(LR); + const int nb_saved_regs = 6; + assert(nb_saved_regs == saved_regs.size(), "fix nb_saved_regs"); + __ push(saved_regs); +#endif // AARCH64 + + const Register r_pre_val_0 = R0; // must be R0, to be ready for the runtime call + const Register r_index_1 = R1; + const Register r_buffer_2 = R2; + + Address queue_index(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() + + SATBMarkQueue::byte_offset_of_index())); + Address buffer(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() + + SATBMarkQueue::byte_offset_of_buf())); + + Label done; + Label runtime; + + __ ldr(r_index_1, queue_index); + __ ldr(r_pre_val_0, Address(SP, nb_saved_regs*wordSize)); + __ ldr(r_buffer_2, buffer); + + __ subs(r_index_1, r_index_1, wordSize); + __ b(runtime, lt); + + __ str(r_index_1, queue_index); + __ str(r_pre_val_0, Address(r_buffer_2, r_index_1)); + + __ bind(done); + +#ifdef AARCH64 + __ raw_pop(R2, R3); + __ raw_pop(R0, R1); +#else // AARCH64 + __ pop(saved_regs); +#endif // AARCH64 + + __ ret(); + + __ bind(runtime); + + save_live_registers(sasm); + + assert(r_pre_val_0 == c_rarg0, "pre_val should be in R0"); + __ mov(c_rarg1, Rthread); + __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), c_rarg0, c_rarg1); + + restore_live_registers_without_return(sasm); + + __ b(done); + } + break; + case g1_post_barrier_slow_id: + { + // Input: + // - store_addr, pushed on the stack + + __ set_info("g1_post_barrier_slow_id", dont_gc_arguments); + + BarrierSet* bs = Universe::heap()->barrier_set(); + CardTableModRefBS* ct = barrier_set_cast(bs); + Label done; + Label recheck; + Label runtime; + + Address queue_index(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() + + DirtyCardQueue::byte_offset_of_index())); + Address buffer(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() + + DirtyCardQueue::byte_offset_of_buf())); + + AddressLiteral cardtable((address)ct->byte_map_base); + assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); + + // save at least the registers that need saving if the runtime is called +#ifdef AARCH64 + __ raw_push(R0, R1); + __ raw_push(R2, R3); + const int nb_saved_regs = 4; +#else // AARCH64 + const RegisterSet saved_regs = RegisterSet(R0,R3) | RegisterSet(R12) | RegisterSet(LR); + const int nb_saved_regs = 6; + assert(nb_saved_regs == saved_regs.size(), "fix nb_saved_regs"); + __ push(saved_regs); +#endif // AARCH64 + + const Register r_card_addr_0 = R0; // must be R0 for the slow case + const Register r_obj_0 = R0; + const Register r_card_base_1 = R1; + const Register r_tmp2 = R2; + const Register r_index_2 = R2; + const Register r_buffer_3 = R3; + const Register tmp1 = Rtemp; + + __ ldr(r_obj_0, Address(SP, nb_saved_regs*wordSize)); + // Note: there is a comment in x86 code about not using + // ExternalAddress / lea, due to relocation not working + // properly for that address. Should be OK for arm, where we + // explicitly specify that 'cartable' has a relocInfo::none + // type. + __ lea(r_card_base_1, cardtable); + __ add(r_card_addr_0, r_card_base_1, AsmOperand(r_obj_0, lsr, CardTableModRefBS::card_shift)); + + // first quick check without barrier + __ ldrb(r_tmp2, Address(r_card_addr_0)); + + __ cmp(r_tmp2, (int)G1SATBCardTableModRefBS::g1_young_card_val()); + __ b(recheck, ne); + + __ bind(done); + +#ifdef AARCH64 + __ raw_pop(R2, R3); + __ raw_pop(R0, R1); +#else // AARCH64 + __ pop(saved_regs); +#endif // AARCH64 + + __ ret(); + + __ bind(recheck); + + __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), tmp1); + + // reload card state after the barrier that ensures the stored oop was visible + __ ldrb(r_tmp2, Address(r_card_addr_0)); + + assert(CardTableModRefBS::dirty_card_val() == 0, "adjust this code"); + __ cbz(r_tmp2, done); + + // storing region crossing non-NULL, card is clean. + // dirty card and log. + + assert(0 == (int)CardTableModRefBS::dirty_card_val(), "adjust this code"); + if (((intptr_t)ct->byte_map_base & 0xff) == 0) { + // Card table is aligned so the lowest byte of the table address base is zero. + __ strb(r_card_base_1, Address(r_card_addr_0)); + } else { + __ strb(__ zero_register(r_tmp2), Address(r_card_addr_0)); + } + + __ ldr(r_index_2, queue_index); + __ ldr(r_buffer_3, buffer); + + __ subs(r_index_2, r_index_2, wordSize); + __ b(runtime, lt); // go to runtime if now negative + + __ str(r_index_2, queue_index); + + __ str(r_card_addr_0, Address(r_buffer_3, r_index_2)); + + __ b(done); + + __ bind(runtime); + + save_live_registers(sasm); + + assert(r_card_addr_0 == c_rarg0, "card_addr should be in R0"); + __ mov(c_rarg1, Rthread); + __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), c_rarg0, c_rarg1); + + restore_live_registers_without_return(sasm); + + __ b(done); + } + break; +#endif // INCLUDE_ALL_GCS + case new_instance_id: + case fast_new_instance_id: + case fast_new_instance_init_check_id: + { + const Register result = R0; + const Register klass = R1; + + if (UseTLAB && FastTLABRefill && id != new_instance_id) { + // We come here when TLAB allocation failed. + // In this case we either refill TLAB or allocate directly from eden. + Label retry_tlab, try_eden, slow_case, slow_case_no_pop; + + // Make sure the class is fully initialized + if (id == fast_new_instance_init_check_id) { + __ ldrb(result, Address(klass, InstanceKlass::init_state_offset())); + __ cmp(result, InstanceKlass::fully_initialized); + __ b(slow_case_no_pop, ne); + } + + // Free some temporary registers + const Register obj_size = R4; + const Register tmp1 = R5; + const Register tmp2 = LR; + const Register obj_end = Rtemp; + + __ raw_push(R4, R5, LR); + + __ tlab_refill(result, obj_size, tmp1, tmp2, obj_end, try_eden, slow_case); + + __ bind(retry_tlab); + __ ldr_u32(obj_size, Address(klass, Klass::layout_helper_offset())); + __ tlab_allocate(result, obj_end, tmp1, obj_size, slow_case); // initializes result and obj_end + __ initialize_object(result, obj_end, klass, noreg /* len */, tmp1, tmp2, + instanceOopDesc::header_size() * HeapWordSize, -1, + /* is_tlab_allocated */ true); + __ raw_pop_and_ret(R4, R5); + + __ bind(try_eden); + __ ldr_u32(obj_size, Address(klass, Klass::layout_helper_offset())); + __ eden_allocate(result, obj_end, tmp1, tmp2, obj_size, slow_case); // initializes result and obj_end + __ incr_allocated_bytes(obj_size, tmp2); + __ initialize_object(result, obj_end, klass, noreg /* len */, tmp1, tmp2, + instanceOopDesc::header_size() * HeapWordSize, -1, + /* is_tlab_allocated */ false); + __ raw_pop_and_ret(R4, R5); + + __ bind(slow_case); + __ raw_pop(R4, R5, LR); + + __ bind(slow_case_no_pop); + } + + OopMap* map = save_live_registers(sasm); + int call_offset = __ call_RT(result, noreg, CAST_FROM_FN_PTR(address, new_instance), klass); + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, map); + + // MacroAssembler::StoreStore useless (included in the runtime exit path) + + restore_live_registers_except_R0(sasm); + } + break; + + case counter_overflow_id: + { + OopMap* oop_map = save_live_registers(sasm); + __ ldr(R1, Address(SP, arg1_offset)); + __ ldr(R2, Address(SP, arg2_offset)); + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, counter_overflow), R1, R2); + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, oop_map); + restore_live_registers(sasm); + } + break; + + case new_type_array_id: + case new_object_array_id: + { + if (id == new_type_array_id) { + __ set_info("new_type_array", dont_gc_arguments); + } else { + __ set_info("new_object_array", dont_gc_arguments); + } + + const Register result = R0; + const Register klass = R1; + const Register length = R2; + + if (UseTLAB && FastTLABRefill) { + // We come here when TLAB allocation failed. + // In this case we either refill TLAB or allocate directly from eden. + Label retry_tlab, try_eden, slow_case, slow_case_no_pop; + +#ifdef AARCH64 + __ mov_slow(Rtemp, C1_MacroAssembler::max_array_allocation_length); + __ cmp_32(length, Rtemp); +#else + __ cmp_32(length, C1_MacroAssembler::max_array_allocation_length); +#endif // AARCH64 + __ b(slow_case_no_pop, hs); + + // Free some temporary registers + const Register arr_size = R4; + const Register tmp1 = R5; + const Register tmp2 = LR; + const Register tmp3 = Rtemp; + const Register obj_end = tmp3; + + __ raw_push(R4, R5, LR); + + __ tlab_refill(result, arr_size, tmp1, tmp2, tmp3, try_eden, slow_case); + + __ bind(retry_tlab); + // Get the allocation size: round_up((length << (layout_helper & 0xff)) + header_size) + __ ldr_u32(tmp1, Address(klass, Klass::layout_helper_offset())); + __ mov(arr_size, MinObjAlignmentInBytesMask); + __ and_32(tmp2, tmp1, (unsigned int)(Klass::_lh_header_size_mask << Klass::_lh_header_size_shift)); + +#ifdef AARCH64 + __ lslv_w(tmp3, length, tmp1); + __ add(arr_size, arr_size, tmp3); +#else + __ add(arr_size, arr_size, AsmOperand(length, lsl, tmp1)); +#endif // AARCH64 + + __ add(arr_size, arr_size, AsmOperand(tmp2, lsr, Klass::_lh_header_size_shift)); + __ align_reg(arr_size, arr_size, MinObjAlignmentInBytes); + + // tlab_allocate initializes result and obj_end, and preserves tmp2 which contains header_size + __ tlab_allocate(result, obj_end, tmp1, arr_size, slow_case); + + assert_different_registers(result, obj_end, klass, length, tmp1, tmp2); + __ initialize_header(result, klass, length, tmp1); + + __ add(tmp2, result, AsmOperand(tmp2, lsr, Klass::_lh_header_size_shift)); + if (!ZeroTLAB) { + __ initialize_body(tmp2, obj_end, tmp1); + } + + __ membar(MacroAssembler::StoreStore, tmp1); + + __ raw_pop_and_ret(R4, R5); + + __ bind(try_eden); + // Get the allocation size: round_up((length << (layout_helper & 0xff)) + header_size) + __ ldr_u32(tmp1, Address(klass, Klass::layout_helper_offset())); + __ mov(arr_size, MinObjAlignmentInBytesMask); + __ and_32(tmp2, tmp1, (unsigned int)(Klass::_lh_header_size_mask << Klass::_lh_header_size_shift)); + +#ifdef AARCH64 + __ lslv_w(tmp3, length, tmp1); + __ add(arr_size, arr_size, tmp3); +#else + __ add(arr_size, arr_size, AsmOperand(length, lsl, tmp1)); +#endif // AARCH64 + + __ add(arr_size, arr_size, AsmOperand(tmp2, lsr, Klass::_lh_header_size_shift)); + __ align_reg(arr_size, arr_size, MinObjAlignmentInBytes); + + // eden_allocate destroys tmp2, so reload header_size after allocation + // eden_allocate initializes result and obj_end + __ eden_allocate(result, obj_end, tmp1, tmp2, arr_size, slow_case); + __ incr_allocated_bytes(arr_size, tmp2); + __ ldrb(tmp2, Address(klass, in_bytes(Klass::layout_helper_offset()) + + Klass::_lh_header_size_shift / BitsPerByte)); + __ initialize_object(result, obj_end, klass, length, tmp1, tmp2, tmp2, -1, /* is_tlab_allocated */ false); + __ raw_pop_and_ret(R4, R5); + + __ bind(slow_case); + __ raw_pop(R4, R5, LR); + __ bind(slow_case_no_pop); + } + + OopMap* map = save_live_registers(sasm); + int call_offset; + if (id == new_type_array_id) { + call_offset = __ call_RT(result, noreg, CAST_FROM_FN_PTR(address, new_type_array), klass, length); + } else { + call_offset = __ call_RT(result, noreg, CAST_FROM_FN_PTR(address, new_object_array), klass, length); + } + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, map); + + // MacroAssembler::StoreStore useless (included in the runtime exit path) + + restore_live_registers_except_R0(sasm); + } + break; + + case new_multi_array_id: + { + __ set_info("new_multi_array", dont_gc_arguments); + + // R0: klass + // R2: rank + // SP: address of 1st dimension + const Register result = R0; + OopMap* map = save_live_registers(sasm); + + __ mov(R1, R0); + __ add(R3, SP, arg1_offset); + int call_offset = __ call_RT(result, noreg, CAST_FROM_FN_PTR(address, new_multi_array), R1, R2, R3); + + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, map); + + // MacroAssembler::StoreStore useless (included in the runtime exit path) + + restore_live_registers_except_R0(sasm); + } + break; + + case register_finalizer_id: + { + __ set_info("register_finalizer", dont_gc_arguments); + + // Do not call runtime if JVM_ACC_HAS_FINALIZER flag is not set + __ load_klass(Rtemp, R0); + __ ldr_u32(Rtemp, Address(Rtemp, Klass::access_flags_offset())); + +#ifdef AARCH64 + Label L; + __ tbnz(Rtemp, exact_log2(JVM_ACC_HAS_FINALIZER), L); + __ ret(); + __ bind(L); +#else + __ tst(Rtemp, JVM_ACC_HAS_FINALIZER); + __ bx(LR, eq); +#endif // AARCH64 + + // Call VM + OopMap* map = save_live_registers(sasm); + oop_maps = new OopMapSet(); + int call_offset = __ call_RT(noreg, noreg, + CAST_FROM_FN_PTR(address, SharedRuntime::register_finalizer), R0); + oop_maps->add_gc_map(call_offset, map); + restore_live_registers(sasm); + } + break; + + case throw_range_check_failed_id: + { + __ set_info("range_check_failed", dont_gc_arguments); + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_range_check_exception), true); + } + break; + + case throw_index_exception_id: + { + __ set_info("index_range_check_failed", dont_gc_arguments); +#ifdef AARCH64 + __ NOT_TESTED(); +#endif + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_index_exception), true); + } + break; + + case throw_div0_exception_id: + { + __ set_info("throw_div0_exception", dont_gc_arguments); + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_div0_exception), false); + } + break; + + case throw_null_pointer_exception_id: + { + __ set_info("throw_null_pointer_exception", dont_gc_arguments); + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_null_pointer_exception), false); + } + break; + + case handle_exception_nofpu_id: + case handle_exception_id: + { + __ set_info("handle_exception", dont_gc_arguments); + oop_maps = generate_handle_exception(id, sasm); + } + break; + + case handle_exception_from_callee_id: + { + __ set_info("handle_exception_from_callee", dont_gc_arguments); + oop_maps = generate_handle_exception(id, sasm); + } + break; + + case unwind_exception_id: + { + __ set_info("unwind_exception", dont_gc_arguments); + generate_unwind_exception(sasm); + } + break; + + case throw_array_store_exception_id: + { + __ set_info("throw_array_store_exception", dont_gc_arguments); + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), true); + } + break; + + case throw_class_cast_exception_id: + { + __ set_info("throw_class_cast_exception", dont_gc_arguments); + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_class_cast_exception), true); + } + break; + + case throw_incompatible_class_change_error_id: + { + __ set_info("throw_incompatible_class_cast_exception", dont_gc_arguments); +#ifdef AARCH64 + __ NOT_TESTED(); +#endif + oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_incompatible_class_change_error), false); + } + break; + + case slow_subtype_check_id: + { + // (in) R0 - sub, destroyed, + // (in) R1 - super, not changed + // (out) R0 - result: 1 if check passed, 0 otherwise + __ raw_push(R2, R3, LR); + + // Load an array of secondary_supers + __ ldr(R2, Address(R0, Klass::secondary_supers_offset())); + // Length goes to R3 + __ ldr_s32(R3, Address(R2, Array::length_offset_in_bytes())); + __ add(R2, R2, Array::base_offset_in_bytes()); + + Label loop, miss; + __ bind(loop); + __ cbz(R3, miss); + __ ldr(LR, Address(R2, wordSize, post_indexed)); + __ sub(R3, R3, 1); + __ cmp(LR, R1); + __ b(loop, ne); + + // We get here if an equal cache entry is found + __ str(R1, Address(R0, Klass::secondary_super_cache_offset())); + __ mov(R0, 1); + __ raw_pop_and_ret(R2, R3); + + // A cache entry not found - return false + __ bind(miss); + __ mov(R0, 0); + __ raw_pop_and_ret(R2, R3); + } + break; + + case monitorenter_nofpu_id: + save_fpu_registers = false; + // fall through + case monitorenter_id: + { + __ set_info("monitorenter", dont_gc_arguments); + const Register obj = R1; + const Register lock = R2; + OopMap* map = save_live_registers(sasm, save_fpu_registers); + __ ldr(obj, Address(SP, arg1_offset)); + __ ldr(lock, Address(SP, arg2_offset)); + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, monitorenter), obj, lock); + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, map); + restore_live_registers(sasm, save_fpu_registers); + } + break; + + case monitorexit_nofpu_id: + save_fpu_registers = false; + // fall through + case monitorexit_id: + { + __ set_info("monitorexit", dont_gc_arguments); + const Register lock = R1; + OopMap* map = save_live_registers(sasm, save_fpu_registers); + __ ldr(lock, Address(SP, arg1_offset)); + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, monitorexit), lock); + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, map); + restore_live_registers(sasm, save_fpu_registers); + } + break; + + case deoptimize_id: + { + __ set_info("deoptimize", dont_gc_arguments); + OopMap* oop_map = save_live_registers(sasm); + const Register trap_request = R1; + __ ldr(trap_request, Address(SP, arg1_offset)); + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize), trap_request); + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, oop_map); + restore_live_registers_without_return(sasm); + DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob(); + assert(deopt_blob != NULL, "deoptimization blob must have been created"); + __ jump(deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type, AARCH64_ONLY(Rtemp) NOT_AARCH64(noreg)); + } + break; + + case access_field_patching_id: + { + __ set_info("access_field_patching", dont_gc_arguments); + oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, access_field_patching)); + } + break; + + case load_klass_patching_id: + { + __ set_info("load_klass_patching", dont_gc_arguments); + oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_klass_patching)); + } + break; + + case load_appendix_patching_id: + { + __ set_info("load_appendix_patching", dont_gc_arguments); + oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_appendix_patching)); + } + break; + + case load_mirror_patching_id: + { + __ set_info("load_mirror_patching", dont_gc_arguments); + oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_mirror_patching)); + } + break; + + case predicate_failed_trap_id: + { + __ set_info("predicate_failed_trap", dont_gc_arguments); + + OopMap* oop_map = save_live_registers(sasm); + int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, predicate_failed_trap)); + + oop_maps = new OopMapSet(); + oop_maps->add_gc_map(call_offset, oop_map); + + restore_live_registers_without_return(sasm); + + DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob(); + assert(deopt_blob != NULL, "deoptimization blob must have been created"); + __ jump(deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type, Rtemp); + } + break; + + default: + { + __ set_info("unimplemented entry", dont_gc_arguments); + STOP("unimplemented entry"); + } + break; + } + return oop_maps; +} + +#undef __ + +#ifdef __SOFTFP__ +const char *Runtime1::pd_name_for_address(address entry) { + +#define FUNCTION_CASE(a, f) \ + if ((intptr_t)a == CAST_FROM_FN_PTR(intptr_t, f)) return #f + + FUNCTION_CASE(entry, __aeabi_fadd_glibc); + FUNCTION_CASE(entry, __aeabi_fmul); + FUNCTION_CASE(entry, __aeabi_fsub_glibc); + FUNCTION_CASE(entry, __aeabi_fdiv); + + // __aeabi_XXXX_glibc: Imported code from glibc soft-fp bundle for calculation accuracy improvement. See CR 6757269. + FUNCTION_CASE(entry, __aeabi_dadd_glibc); + FUNCTION_CASE(entry, __aeabi_dmul); + FUNCTION_CASE(entry, __aeabi_dsub_glibc); + FUNCTION_CASE(entry, __aeabi_ddiv); + + FUNCTION_CASE(entry, __aeabi_f2d); + FUNCTION_CASE(entry, __aeabi_d2f); + FUNCTION_CASE(entry, __aeabi_i2f); + FUNCTION_CASE(entry, __aeabi_i2d); + FUNCTION_CASE(entry, __aeabi_f2iz); + + FUNCTION_CASE(entry, SharedRuntime::fcmpl); + FUNCTION_CASE(entry, SharedRuntime::fcmpg); + FUNCTION_CASE(entry, SharedRuntime::dcmpl); + FUNCTION_CASE(entry, SharedRuntime::dcmpg); + + FUNCTION_CASE(entry, SharedRuntime::unordered_fcmplt); + FUNCTION_CASE(entry, SharedRuntime::unordered_dcmplt); + FUNCTION_CASE(entry, SharedRuntime::unordered_fcmple); + FUNCTION_CASE(entry, SharedRuntime::unordered_dcmple); + FUNCTION_CASE(entry, SharedRuntime::unordered_fcmpge); + FUNCTION_CASE(entry, SharedRuntime::unordered_dcmpge); + FUNCTION_CASE(entry, SharedRuntime::unordered_fcmpgt); + FUNCTION_CASE(entry, SharedRuntime::unordered_dcmpgt); + + FUNCTION_CASE(entry, SharedRuntime::fneg); + FUNCTION_CASE(entry, SharedRuntime::dneg); + + FUNCTION_CASE(entry, __aeabi_fcmpeq); + FUNCTION_CASE(entry, __aeabi_fcmplt); + FUNCTION_CASE(entry, __aeabi_fcmple); + FUNCTION_CASE(entry, __aeabi_fcmpge); + FUNCTION_CASE(entry, __aeabi_fcmpgt); + + FUNCTION_CASE(entry, __aeabi_dcmpeq); + FUNCTION_CASE(entry, __aeabi_dcmplt); + FUNCTION_CASE(entry, __aeabi_dcmple); + FUNCTION_CASE(entry, __aeabi_dcmpge); + FUNCTION_CASE(entry, __aeabi_dcmpgt); +#undef FUNCTION_CASE + return ""; +} +#else // __SOFTFP__ +const char *Runtime1::pd_name_for_address(address entry) { + return ""; +} +#endif // __SOFTFP__ diff --git a/hotspot/src/cpu/arm/vm/c1_globals_arm.hpp b/hotspot/src/cpu/arm/vm/c1_globals_arm.hpp new file mode 100644 index 00000000000..96a93bf7184 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c1_globals_arm.hpp @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_C1_GLOBALS_ARM_HPP +#define CPU_ARM_VM_C1_GLOBALS_ARM_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + +// +// Sets the default values for platform dependent flags used by the client compiler. +// (see c1_globals.hpp) +// + +#ifndef COMPILER2 // avoid duplicated definitions, favoring C2 version +define_pd_global(bool, BackgroundCompilation, true ); +define_pd_global(bool, UseTLAB, true ); +define_pd_global(bool, ResizeTLAB, true ); +define_pd_global(bool, InlineIntrinsics, false); // TODO: ARM +define_pd_global(bool, PreferInterpreterNativeStubs, false); +define_pd_global(bool, ProfileTraps, false); +define_pd_global(bool, UseOnStackReplacement, true ); +define_pd_global(bool, TieredCompilation, false); +define_pd_global(intx, CompileThreshold, 1500 ); + +define_pd_global(intx, OnStackReplacePercentage, 933 ); +define_pd_global(intx, FreqInlineSize, 325 ); +define_pd_global(size_t, NewSizeThreadIncrease, 4*K ); +define_pd_global(size_t, InitialCodeCacheSize, 160*K); +define_pd_global(size_t, ReservedCodeCacheSize, 32*M ); +define_pd_global(size_t, NonProfiledCodeHeapSize, 13*M ); +define_pd_global(size_t, ProfiledCodeHeapSize, 14*M ); +define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M ); +define_pd_global(bool, ProfileInterpreter, false); +define_pd_global(size_t, CodeCacheExpansionSize, 32*K ); +define_pd_global(uintx, CodeCacheMinBlockLength, 1); +define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K); +define_pd_global(size_t, MetaspaceSize, 12*M ); +define_pd_global(bool, NeverActAsServerClassMachine, true); +define_pd_global(uint64_t, MaxRAM, 1ULL*G); +define_pd_global(bool, CICompileOSR, true ); +#endif // COMPILER2 +define_pd_global(bool, UseTypeProfile, false); +define_pd_global(bool, RoundFPResults, false); + + +define_pd_global(bool, LIRFillDelaySlots, false); +define_pd_global(bool, OptimizeSinglePrecision, true); +define_pd_global(bool, CSEArrayLength, true); +define_pd_global(bool, TwoOperandLIRForm, false); + +#endif // CPU_ARM_VM_C1_GLOBALS_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/c2_globals_arm.hpp b/hotspot/src/cpu/arm/vm/c2_globals_arm.hpp new file mode 100644 index 00000000000..4b424ed0af1 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/c2_globals_arm.hpp @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_C2_GLOBALS_ARM_HPP +#define CPU_ARM_VM_C2_GLOBALS_ARM_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + +// +// Sets the default values for platform dependent flags used by the server compiler. +// (see c2_globals.hpp). Alpha-sorted. + +define_pd_global(bool, BackgroundCompilation, true); +define_pd_global(bool, CICompileOSR, true); +define_pd_global(bool, InlineIntrinsics, false); +define_pd_global(bool, PreferInterpreterNativeStubs, false); +define_pd_global(bool, ProfileTraps, true); +define_pd_global(bool, UseOnStackReplacement, true); +define_pd_global(bool, ProfileInterpreter, true); +#ifdef AARCH64 +define_pd_global(bool, TieredCompilation, trueInTiered); +#else +define_pd_global(bool, TieredCompilation, false); +#endif +define_pd_global(intx, CompileThreshold, 10000); + +define_pd_global(intx, OnStackReplacePercentage, 140); +define_pd_global(intx, ConditionalMoveLimit, 4); +// C2 gets to use all the float/double registers +#ifdef AARCH64 +define_pd_global(intx, FLOATPRESSURE, 31); +#else +define_pd_global(intx, FLOATPRESSURE, 30); +#endif +define_pd_global(intx, FreqInlineSize, 175); +#ifdef AARCH64 +define_pd_global(intx, INTPRESSURE, 27); +#else +define_pd_global(intx, INTPRESSURE, 12); +#endif +define_pd_global(intx, InteriorEntryAlignment, 16); // = CodeEntryAlignment +define_pd_global(size_t, NewSizeThreadIncrease, ScaleForWordSize(4*K)); +// The default setting 16/16 seems to work best. +// (For _228_jack 16/16 is 2% better than 4/4, 16/4, 32/32, 32/16, or 16/32.) +//define_pd_global(intx, OptoLoopAlignment, 16); // = 4*wordSize +define_pd_global(intx, RegisterCostAreaRatio, 16000); +define_pd_global(bool, UseTLAB, true); +define_pd_global(bool, ResizeTLAB, true); +define_pd_global(intx, LoopUnrollLimit, 60); // Design center runs on 1.3.1 +define_pd_global(intx, LoopPercentProfileLimit, 10); +define_pd_global(intx, PostLoopMultiversioning, false); +define_pd_global(intx, MinJumpTableSize, 16); + +// Peephole and CISC spilling both break the graph, and so makes the +// scheduler sick. +define_pd_global(bool, OptoPeephole, false); +define_pd_global(bool, UseCISCSpill, false); +define_pd_global(bool, OptoBundling, false); +define_pd_global(bool, OptoScheduling, true); +define_pd_global(bool, OptoRegScheduling, false); +define_pd_global(bool, SuperWordLoopUnrollAnalysis, false); +define_pd_global(bool, IdealizeClearArrayNode, true); + +#ifdef _LP64 +// We need to make sure that all generated code is within +// 2 gigs of the libjvm.so runtime routines so we can use +// the faster "call" instruction rather than the expensive +// sequence of instructions to load a 64 bit pointer. +// +// InitialCodeCacheSize derived from specjbb2000 run. +define_pd_global(size_t, InitialCodeCacheSize, 2048*K); // Integral multiple of CodeCacheExpansionSize +define_pd_global(size_t, ReservedCodeCacheSize, 48*M); +define_pd_global(size_t, NonProfiledCodeHeapSize, 21*M); +define_pd_global(size_t, ProfiledCodeHeapSize, 22*M); +define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M ); +define_pd_global(size_t, CodeCacheExpansionSize, 64*K); + +// Ergonomics related flags +define_pd_global(uint64_t, MaxRAM, 128ULL*G); +#else +// InitialCodeCacheSize derived from specjbb2000 run. +define_pd_global(size_t, InitialCodeCacheSize, 1536*K); // Integral multiple of CodeCacheExpansionSize +define_pd_global(size_t, ReservedCodeCacheSize, 32*M); +define_pd_global(size_t, NonProfiledCodeHeapSize, 13*M); +define_pd_global(size_t, ProfiledCodeHeapSize, 14*M); +define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M ); +define_pd_global(size_t, CodeCacheExpansionSize, 32*K); +// Ergonomics related flags +define_pd_global(uint64_t, MaxRAM, 4ULL*G); +#endif +define_pd_global(uintx, CodeCacheMinBlockLength, 4); +define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K); + +define_pd_global(bool, TrapBasedRangeChecks, false); // Not needed + +// Heap related flags +define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M)); + +// Ergonomics related flags +define_pd_global(bool, NeverActAsServerClassMachine, false); + +#endif // CPU_ARM_VM_C2_GLOBALS_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/codeBuffer_arm.hpp b/hotspot/src/cpu/arm/vm/codeBuffer_arm.hpp new file mode 100644 index 00000000000..90534fd4825 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/codeBuffer_arm.hpp @@ -0,0 +1,34 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_CODEBUFFER_ARM_HPP +#define CPU_ARM_VM_CODEBUFFER_ARM_HPP + +private: + void pd_initialize() {} + +public: + void flush_bundle(bool start_new_bundle) {} + +#endif // CPU_ARM_VM_CODEBUFFER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp b/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp new file mode 100644 index 00000000000..de7249f277a --- /dev/null +++ b/hotspot/src/cpu/arm/vm/compiledIC_arm.cpp @@ -0,0 +1,166 @@ +/* + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.inline.hpp" +#include "code/compiledIC.hpp" +#include "code/icBuffer.hpp" +#include "code/nativeInst.hpp" +#include "code/nmethod.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/safepoint.hpp" + +// ---------------------------------------------------------------------------- +#if defined(COMPILER2) || INCLUDE_JVMCI +#define __ _masm. +// emit call stub, compiled java to interpreter +address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) { + // Stub is fixed up when the corresponding call is converted from calling + // compiled code to calling interpreted code. + // set (empty), R9 + // b -1 + + if (mark == NULL) { + mark = cbuf.insts_mark(); // get mark within main instrs section + } + + MacroAssembler _masm(&cbuf); + + address base = __ start_a_stub(to_interp_stub_size()); + if (base == NULL) { + return NULL; // CodeBuffer::expand failed + } + + // static stub relocation stores the instruction address of the call + __ relocate(static_stub_Relocation::spec(mark)); + + InlinedMetadata object_literal(NULL); + // single instruction, see NativeMovConstReg::next_instruction_address() in + // CompiledStaticCall::set_to_interpreted() + __ ldr_literal(Rmethod, object_literal); + + __ set_inst_mark(); // Who uses this? + + bool near_range = __ cache_fully_reachable(); + InlinedAddress dest((address)-1); + address branch_site = __ pc(); + if (near_range) { + __ b(branch_site); // special NativeJump -1 destination + } else { + // Can't trash LR, FP, or argument registers + __ indirect_jump(dest, Rtemp); + } + __ bind_literal(object_literal); // includes spec_for_immediate reloc + if (!near_range) { + __ bind_literal(dest); // special NativeJump -1 destination + } + + assert(__ pc() - base <= to_interp_stub_size(), "wrong stub size"); + + // Update current stubs pointer and restore code_end. + __ end_a_stub(); + return base; +} +#undef __ + +// size of C2 call stub, compiled java to interpretor +int CompiledStaticCall::to_interp_stub_size() { + return 8 * NativeInstruction::instruction_size; +} + +// Relocation entries for call stub, compiled java to interpreter. +int CompiledStaticCall::reloc_to_interp_stub() { + return 10; // 4 in emit_to_interp_stub + 1 in Java_Static_Call +} +#endif // COMPILER2 || JVMCI + +void CompiledDirectStaticCall::set_to_interpreted(const methodHandle& callee, address entry) { + address stub = find_stub(/*is_aot*/ false); + guarantee(stub != NULL, "stub not found"); + + if (TraceICs) { + ResourceMark rm; + tty->print_cr("CompiledDirectStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s", + p2i(instruction_address()), + callee->name_and_sig_as_C_string()); + } + + // Creation also verifies the object. + NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); + NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); + +#ifdef ASSERT + // read the value once + volatile intptr_t data = method_holder->data(); + volatile address destination = jump->jump_destination(); + assert(data == 0 || data == (intptr_t)callee(), + "a) MT-unsafe modification of inline cache"); + assert(destination == (address)-1 || destination == entry, + "b) MT-unsafe modification of inline cache"); +#endif + + // Update stub. + method_holder->set_data((intptr_t)callee()); + jump->set_jump_destination(entry); + + // Update jump to call. + set_destination_mt_safe(stub); +} + +void CompiledDirectStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) { + assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call"); + // Reset stub. + address stub = static_stub->addr(); + assert(stub != NULL, "stub not found"); + // Creation also verifies the object. + NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); + NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); + method_holder->set_data(0); + jump->set_jump_destination((address)-1); +} + +//----------------------------------------------------------------------------- +// Non-product mode code +#ifndef PRODUCT + +void CompiledDirectStaticCall::verify() { + // Verify call. + _call->verify(); + if (os::is_MP()) { + _call->verify_alignment(); + } + + // Verify stub. + address stub = find_stub(/*is_aot*/ false); + assert(stub != NULL, "no stub found for static call"); + // Creation also verifies the object. + NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); + NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); + + // Verify state. + assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check"); +} + +#endif // !PRODUCT diff --git a/hotspot/src/cpu/arm/vm/copy_arm.hpp b/hotspot/src/cpu/arm/vm/copy_arm.hpp new file mode 100644 index 00000000000..47cef1f9d99 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/copy_arm.hpp @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_COPY_ARM_HPP +#define CPU_ARM_VM_COPY_ARM_HPP + +#include "utilities/macros.hpp" + +// Inline functions for memory copy and fill. + +// Contains inline asm implementations +#include OS_CPU_HEADER_INLINE(copy) + +static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) { + juint* to = (juint*)tohw; + count *= HeapWordSize / BytesPerInt; + while (count-- > 0) { + *to++ = value; + } +} + +static void pd_fill_to_aligned_words(HeapWord* tohw, size_t count, juint value) { + pd_fill_to_words(tohw, count, value); +} + +static void pd_fill_to_bytes(void* to, size_t count, jubyte value) { + memset(to, value, count); +} + +static void pd_zero_to_words(HeapWord* tohw, size_t count) { + pd_fill_to_words(tohw, count, 0); +} + +static void pd_zero_to_bytes(void* to, size_t count) { + memset(to, 0, count); +} + +#endif // CPU_ARM_VM_COPY_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/debug_arm.cpp b/hotspot/src/cpu/arm/vm/debug_arm.cpp new file mode 100644 index 00000000000..ba3e67a1612 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/debug_arm.cpp @@ -0,0 +1,33 @@ +/* + * 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. + * + */ + +#include "precompiled.hpp" +#include "code/codeCache.hpp" +#include "code/nmethod.hpp" +#include "runtime/frame.hpp" +#include "runtime/init.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" + +void pd_ps(frame f) {} diff --git a/hotspot/src/cpu/arm/vm/depChecker_arm.cpp b/hotspot/src/cpu/arm/vm/depChecker_arm.cpp new file mode 100644 index 00000000000..4a7f2b47832 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/depChecker_arm.cpp @@ -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. + * + */ + +#include "precompiled.hpp" +#include "compiler/disassembler.hpp" +#include "depChecker_arm.hpp" + +// Nothing to do diff --git a/hotspot/src/cpu/arm/vm/depChecker_arm.hpp b/hotspot/src/cpu/arm/vm/depChecker_arm.hpp new file mode 100644 index 00000000000..6a7161d4e7f --- /dev/null +++ b/hotspot/src/cpu/arm/vm/depChecker_arm.hpp @@ -0,0 +1,30 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_DEPCHECKER_ARM_HPP +#define CPU_ARM_VM_DEPCHECKER_ARM_HPP + +// Nothing to do + +#endif // CPU_ARM_VM_DEPCHECKER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/disassembler_arm.hpp b/hotspot/src/cpu/arm/vm/disassembler_arm.hpp new file mode 100644 index 00000000000..ea201d79248 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/disassembler_arm.hpp @@ -0,0 +1,36 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_DISASSEMBLER_ARM_HPP +#define CPU_ARM_VM_DISASSEMBLER_ARM_HPP + + static int pd_instruction_alignment() { + return sizeof(int); + } + + static const char* pd_cpu_opts() { + return ""; + } + +#endif // CPU_ARM_VM_DISASSEMBLER_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/frame_arm.cpp b/hotspot/src/cpu/arm/vm/frame_arm.cpp new file mode 100644 index 00000000000..55f468fa74c --- /dev/null +++ b/hotspot/src/cpu/arm/vm/frame_arm.cpp @@ -0,0 +1,655 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/resourceArea.hpp" +#include "oops/markOop.hpp" +#include "oops/method.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/monitorChunk.hpp" +#include "runtime/signature.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_arm.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#include "runtime/vframeArray.hpp" +#endif +#include "prims/methodHandles.hpp" + +#ifdef ASSERT +void RegisterMap::check_location_valid() { +} +#endif + + +// Profiling/safepoint support + +bool frame::safe_for_sender(JavaThread *thread) { + address sp = (address)_sp; + address fp = (address)_fp; + address unextended_sp = (address)_unextended_sp; + + static size_t stack_guard_size = os::uses_stack_guard_pages() ? + (JavaThread::stack_red_zone_size() + JavaThread::stack_yellow_zone_size()) : 0; + size_t usable_stack_size = thread->stack_size() - stack_guard_size; + + // sp must be within the usable part of the stack (not in guards) + bool sp_safe = (sp != NULL && + (sp <= thread->stack_base()) && + (sp >= thread->stack_base() - usable_stack_size)); + + if (!sp_safe) { + return false; + } + + bool unextended_sp_safe = (unextended_sp != NULL && + (unextended_sp <= thread->stack_base()) && + (unextended_sp >= sp)); + if (!unextended_sp_safe) { + return false; + } + + // We know sp/unextended_sp are safe. Only fp is questionable here. + + bool fp_safe = (fp != NULL && + (fp <= thread->stack_base()) && + fp >= sp); + + if (_cb != NULL ) { + + // First check if frame is complete and tester is reliable + // Unfortunately we can only check frame complete for runtime stubs and nmethod + // other generic buffer blobs are more problematic so we just assume they are + // ok. adapter blobs never have a frame complete and are never ok. + + if (!_cb->is_frame_complete_at(_pc)) { + if (_cb->is_compiled() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) { + return false; + } + } + + // Could just be some random pointer within the codeBlob + if (!_cb->code_contains(_pc)) { + return false; + } + + // Entry frame checks + if (is_entry_frame()) { + // an entry frame must have a valid fp. + return fp_safe && is_entry_frame_valid(thread); + } + + intptr_t* sender_sp = NULL; + address sender_pc = NULL; + + if (is_interpreted_frame()) { + // fp must be safe + if (!fp_safe) { + return false; + } + + sender_pc = (address) this->fp()[return_addr_offset]; + sender_sp = (intptr_t*) addr_at(sender_sp_offset); + + } else { + // must be some sort of compiled/runtime frame + // fp does not have to be safe (although it could be check for c1?) + + sender_sp = _unextended_sp + _cb->frame_size(); + // Is sender_sp safe? + if ((address)sender_sp >= thread->stack_base()) { + return false; + } + // With our calling conventions, the return_address should + // end up being the word on the stack + sender_pc = (address) *(sender_sp - sender_sp_offset + return_addr_offset); + } + + // We must always be able to find a recognizable pc + CodeBlob* sender_blob = CodeCache::find_blob_unsafe(sender_pc); + if (sender_pc == NULL || sender_blob == NULL) { + return false; + } + + + // If the potential sender is the interpreter then we can do some more checking + if (Interpreter::contains(sender_pc)) { + + // FP is always saved in a recognizable place in any code we generate. However + // only if the sender is interpreted/call_stub (c1 too?) are we certain that the saved FP + // is really a frame pointer. + + intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset + link_offset); + bool saved_fp_safe = ((address)saved_fp <= thread->stack_base()) && (saved_fp > sender_sp); + + if (!saved_fp_safe) { + return false; + } + + // construct the potential sender + + frame sender(sender_sp, saved_fp, sender_pc); + + return sender.is_interpreted_frame_valid(thread); + } + + if (sender_blob->is_zombie() || sender_blob->is_unloaded()) { + return false; + } + + // Could just be some random pointer within the codeBlob + if (!sender_blob->code_contains(sender_pc)) { + return false; + } + + // We should never be able to see an adapter if the current frame is something from code cache + if (sender_blob->is_adapter_blob()) { + return false; + } + + // Could be the call_stub + if (StubRoutines::returns_to_call_stub(sender_pc)) { + intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset + link_offset); + bool saved_fp_safe = ((address)saved_fp <= thread->stack_base()) && (saved_fp >= sender_sp); + + if (!saved_fp_safe) { + return false; + } + + // construct the potential sender + + frame sender(sender_sp, saved_fp, sender_pc); + + // Validate the JavaCallWrapper an entry frame must have + address jcw = (address)sender.entry_frame_call_wrapper(); + + bool jcw_safe = (jcw <= thread->stack_base()) && (jcw > (address)sender.fp()); + + return jcw_safe; + } + + // If the frame size is 0 something (or less) is bad because every nmethod has a non-zero frame size + // because the return address counts against the callee's frame. + + if (sender_blob->frame_size() <= 0) { + assert(!sender_blob->is_compiled(), "should count return address at least"); + return false; + } + + // We should never be able to see anything here except an nmethod. If something in the + // code cache (current frame) is called by an entity within the code cache that entity + // should not be anything but the call stub (already covered), the interpreter (already covered) + // or an nmethod. + + if (!sender_blob->is_compiled()) { + return false; + } + + // Could put some more validation for the potential non-interpreted sender + // frame we'd create by calling sender if I could think of any. Wait for next crash in forte... + + // One idea is seeing if the sender_pc we have is one that we'd expect to call to current cb + + // We've validated the potential sender that would be created + return true; + } + + // Must be native-compiled frame. Since sender will try and use fp to find + // linkages it must be safe + + if (!fp_safe) { + return false; + } + + // Will the pc we fetch be non-zero (which we'll find at the oldest frame) + + if ((address) this->fp()[return_addr_offset] == NULL) return false; + + + // could try and do some more potential verification of native frame if we could think of some... + + return true; +} + + +void frame::patch_pc(Thread* thread, address pc) { + address* pc_addr = &((address *)sp())[-sender_sp_offset+return_addr_offset]; + if (TracePcPatching) { + tty->print_cr("patch_pc at address" INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "] ", + p2i(pc_addr), p2i(*pc_addr), p2i(pc)); + } + *pc_addr = pc; + _cb = CodeCache::find_blob(pc); + address original_pc = CompiledMethod::get_deopt_original_pc(this); + if (original_pc != NULL) { + assert(original_pc == _pc, "expected original PC to be stored before patching"); + _deopt_state = is_deoptimized; + // leave _pc as is + } else { + _deopt_state = not_deoptimized; + _pc = pc; + } +} + +bool frame::is_interpreted_frame() const { + return Interpreter::contains(pc()); +} + +int frame::frame_size(RegisterMap* map) const { + frame sender = this->sender(map); + return sender.sp() - sp(); +} + +intptr_t* frame::entry_frame_argument_at(int offset) const { + assert(is_entry_frame(), "entry frame expected"); + // convert offset to index to deal with tsi + int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize); + // Entry frame's arguments are always in relation to unextended_sp() + return &unextended_sp()[index]; +} + +// sender_sp +intptr_t* frame::interpreter_frame_sender_sp() const { + assert(is_interpreted_frame(), "interpreted frame expected"); + return (intptr_t*) at(interpreter_frame_sender_sp_offset); +} + +void frame::set_interpreter_frame_sender_sp(intptr_t* sender_sp) { + assert(is_interpreted_frame(), "interpreted frame expected"); + ptr_at_put(interpreter_frame_sender_sp_offset, (intptr_t) sender_sp); +} + + +// monitor elements + +BasicObjectLock* frame::interpreter_frame_monitor_begin() const { + return (BasicObjectLock*) addr_at(interpreter_frame_monitor_block_bottom_offset); +} + +BasicObjectLock* frame::interpreter_frame_monitor_end() const { + BasicObjectLock* result = (BasicObjectLock*) *addr_at(interpreter_frame_monitor_block_top_offset); + // make sure the pointer points inside the frame + assert((intptr_t) fp() > (intptr_t) result, "result must < than frame pointer"); + assert((intptr_t) sp() <= (intptr_t) result, "result must >= than stack pointer"); + return result; +} + +void frame::interpreter_frame_set_monitor_end(BasicObjectLock* value) { + *((BasicObjectLock**)addr_at(interpreter_frame_monitor_block_top_offset)) = value; +} + +#ifdef AARCH64 + +// Used by template based interpreter deoptimization +void frame::interpreter_frame_set_stack_top(intptr_t* stack_top) { + *((intptr_t**)addr_at(interpreter_frame_stack_top_offset)) = stack_top; +} + +// Used by template based interpreter deoptimization +void frame::interpreter_frame_set_extended_sp(intptr_t* sp) { + *((intptr_t**)addr_at(interpreter_frame_extended_sp_offset)) = sp; +} + +#else + +// Used by template based interpreter deoptimization +void frame::interpreter_frame_set_last_sp(intptr_t* sp) { + *((intptr_t**)addr_at(interpreter_frame_last_sp_offset)) = sp; +} + +#endif // AARCH64 + +frame frame::sender_for_entry_frame(RegisterMap* map) const { + assert(map != NULL, "map must be set"); + // Java frame called from C; skip all C frames and return top C + // frame of that chunk as the sender + JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor(); + assert(!entry_frame_is_first(), "next Java fp must be non zero"); + assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack"); + map->clear(); + assert(map->include_argument_oops(), "should be set by clear"); +#ifdef AARCH64 + assert (jfa->last_Java_pc() != NULL, "pc should be stored"); + frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc()); + return fr; +#else + if (jfa->last_Java_pc() != NULL) { + frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc()); + return fr; + } + frame fr(jfa->last_Java_sp(), jfa->last_Java_fp()); + return fr; +#endif // AARCH64 +} + +//------------------------------------------------------------------------------ +// frame::verify_deopt_original_pc +// +// Verifies the calculated original PC of a deoptimization PC for the +// given unextended SP. The unextended SP might also be the saved SP +// for MethodHandle call sites. +#ifdef ASSERT +void frame::verify_deopt_original_pc(CompiledMethod* nm, intptr_t* unextended_sp, bool is_method_handle_return) { + frame fr; + + // This is ugly but it's better than to change {get,set}_original_pc + // to take an SP value as argument. And it's only a debugging + // method anyway. + fr._unextended_sp = unextended_sp; + + address original_pc = nm->get_original_pc(&fr); + assert(nm->insts_contains(original_pc), "original PC must be in nmethod"); + assert(nm->is_method_handle_return(original_pc) == is_method_handle_return, "must be"); +} +#endif + +//------------------------------------------------------------------------------ +// frame::adjust_unextended_sp +void frame::adjust_unextended_sp() { + // same as on x86 + + // 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: + + CompiledMethod* sender_cm = (_cb == NULL) ? NULL : _cb->as_compiled_method_or_null(); + if (sender_cm != 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 (sender_cm->is_deopt_mh_entry(_pc)) { + DEBUG_ONLY(verify_deopt_mh_original_pc(sender_cm, _fp)); + _unextended_sp = _fp; + } + else if (sender_cm->is_deopt_entry(_pc)) { + DEBUG_ONLY(verify_deopt_original_pc(sender_cm, _unextended_sp)); + } + else if (sender_cm->is_method_handle_return(_pc)) { + _unextended_sp = _fp; + } + } +} + +//------------------------------------------------------------------------------ +// frame::update_map_with_saved_link +void frame::update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr) { + // see x86 for comments + map->set_location(FP->as_VMReg(), (address) link_addr); +#ifdef AARCH64 + // also adjust a high part of register + map->set_location(FP->as_VMReg()->next(), (address) link_addr); +#endif // AARCH64 +} + +frame frame::sender_for_interpreter_frame(RegisterMap* map) const { + // SP is the raw SP from the sender after adapter or interpreter + // extension. + intptr_t* sender_sp = this->sender_sp(); + + // This is the sp before any possible extension (adapter/locals). + intptr_t* unextended_sp = interpreter_frame_sender_sp(); + +#ifdef COMPILER2 + if (map->update_map()) { + update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset)); + } +#endif // COMPILER2 + + return frame(sender_sp, unextended_sp, link(), sender_pc()); +} + +frame frame::sender_for_compiled_frame(RegisterMap* map) const { + assert(map != NULL, "map must be set"); + + // frame owned by optimizing compiler + assert(_cb->frame_size() >= 0, "must have non-zero frame size"); + intptr_t* sender_sp = unextended_sp() + _cb->frame_size(); + intptr_t* unextended_sp = sender_sp; + + address sender_pc = (address) *(sender_sp - sender_sp_offset + return_addr_offset); + + // This is the saved value of FP which may or may not really be an FP. + // It is only an FP if the sender is an interpreter frame (or C1?). + intptr_t** saved_fp_addr = (intptr_t**) (sender_sp - sender_sp_offset + link_offset); + + if (map->update_map()) { + // 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->set_include_argument_oops(_cb->caller_must_gc_arguments(map->thread())); + if (_cb->oop_maps() != NULL) { + OopMapSet::update_register_map(this, map); + } + + // Since the prolog does the save and restore of FP 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. + update_map_with_saved_link(map, saved_fp_addr); + } + + assert(sender_sp != sp(), "must have changed"); + return frame(sender_sp, unextended_sp, *saved_fp_addr, sender_pc); +} + +frame frame::sender(RegisterMap* map) const { + // Default is we done have to follow them. The sender_for_xxx will + // update it accordingly + map->set_include_argument_oops(false); + + if (is_entry_frame()) return sender_for_entry_frame(map); + if (is_interpreted_frame()) return sender_for_interpreter_frame(map); + assert(_cb == CodeCache::find_blob(pc()),"Must be the same"); + + if (_cb != NULL) { + return sender_for_compiled_frame(map); + } + + assert(false, "should not be called for a C frame"); + return frame(); +} + +bool frame::is_interpreted_frame_valid(JavaThread* thread) const { + assert(is_interpreted_frame(), "Not an interpreted frame"); + // These are reasonable sanity checks + if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) { + return false; + } + if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) { + return false; + } + if (fp() + interpreter_frame_initial_sp_offset < sp()) { + return false; + } + // These are hacks to keep us out of trouble. + // The problem with these is that they mask other problems + if (fp() <= sp()) { // this attempts to deal with unsigned comparison above + return false; + } + // do some validation of frame elements + + // first the method + + Method* m = *interpreter_frame_method_addr(); + + // validate the method we'd find in this potential sender + if (!m->is_valid_method()) return false; + + // stack frames shouldn't be much larger than max_stack elements + + if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { + return false; + } + + // validate bci/bcp + + address bcp = interpreter_frame_bcp(); + if (m->validate_bci_from_bcp(bcp) < 0) { + return false; + } + + // validate ConstantPoolCache* + ConstantPoolCache* cp = *interpreter_frame_cache_addr(); + if (cp == NULL || !cp->is_metaspace_object()) return false; + + // validate locals + + address locals = (address) *interpreter_frame_locals_addr(); + + if (locals > thread->stack_base() || locals < (address) fp()) return false; + + // We'd have to be pretty unlucky to be mislead at this point + + return true; +} + +BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) { + assert(is_interpreted_frame(), "interpreted frame expected"); + Method* method = interpreter_frame_method(); + BasicType type = method->result_type(); + + intptr_t* res_addr; + if (method->is_native()) { + // Prior to calling into the runtime to report the method_exit both of + // the possible return value registers are saved. +#ifdef AARCH64 + // Return value registers are saved into the frame + if (type == T_FLOAT || type == T_DOUBLE) { + res_addr = addr_at(interpreter_frame_fp_saved_result_offset); + } else { + res_addr = addr_at(interpreter_frame_gp_saved_result_offset); + } +#else + // Return value registers are pushed to the native stack + res_addr = (intptr_t*)sp(); +#ifdef __ABI_HARD__ + // FP result is pushed onto a stack along with integer result registers + if (type == T_FLOAT || type == T_DOUBLE) { + res_addr += 2; + } +#endif // __ABI_HARD__ +#endif // AARCH64 + } else { + res_addr = (intptr_t*)interpreter_frame_tos_address(); + } + + switch (type) { + case T_OBJECT : + case T_ARRAY : { + oop obj; + if (method->is_native()) { + obj = cast_to_oop(at(interpreter_frame_oop_temp_offset)); + } else { + obj = *(oop*)res_addr; + } + assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check"); + *oop_result = obj; + break; + } + case T_BOOLEAN : value_result->z = *(jboolean*)res_addr; break; + case T_BYTE : value_result->b = *(jbyte*)res_addr; break; + case T_CHAR : value_result->c = *(jchar*)res_addr; break; + case T_SHORT : value_result->s = *(jshort*)res_addr; break; + case T_INT : value_result->i = *(jint*)res_addr; break; + case T_LONG : value_result->j = *(jlong*)res_addr; break; + case T_FLOAT : value_result->f = *(jfloat*)res_addr; break; + case T_DOUBLE : value_result->d = *(jdouble*)res_addr; break; + case T_VOID : /* Nothing to do */ break; + default : ShouldNotReachHere(); + } + + return type; +} + + +intptr_t* frame::interpreter_frame_tos_at(jint offset) const { + int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize); + return &interpreter_frame_tos_address()[index]; +} + +#ifndef PRODUCT + +#define DESCRIBE_FP_OFFSET(name) \ + values.describe(frame_no, fp() + frame::name##_offset, #name) + +void frame::describe_pd(FrameValues& values, int frame_no) { + if (is_interpreted_frame()) { + DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp); +#ifdef AARCH64 + DESCRIBE_FP_OFFSET(interpreter_frame_stack_top); + DESCRIBE_FP_OFFSET(interpreter_frame_extended_sp); +#else + DESCRIBE_FP_OFFSET(interpreter_frame_last_sp); +#endif // AARCH64 + DESCRIBE_FP_OFFSET(interpreter_frame_method); + DESCRIBE_FP_OFFSET(interpreter_frame_mdp); + DESCRIBE_FP_OFFSET(interpreter_frame_cache); + DESCRIBE_FP_OFFSET(interpreter_frame_locals); + DESCRIBE_FP_OFFSET(interpreter_frame_bcp); + DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp); + } +} + +// This is a generic constructor which is only used by pns() in debug.cpp. +frame::frame(void* sp, void* fp, void* pc) { + init((intptr_t*)sp, (intptr_t*)fp, (address)pc); +} +#endif + +intptr_t *frame::initial_deoptimization_info() { + // used to reset the saved FP + return fp(); +} + +intptr_t* frame::real_fp() const { +#ifndef AARCH64 + if (is_entry_frame()) { + // Work-around: FP (currently) does not conform to the ABI for entry + // frames (see generate_call_stub). Might be worth fixing as another CR. + // Following code assumes (and asserts) this has not yet been fixed. + assert(frame::entry_frame_call_wrapper_offset == 0, "adjust this code"); + intptr_t* new_fp = fp(); + new_fp += 5; // saved R0,R1,R2,R4,R10 +#ifndef __SOFTFP__ + new_fp += 8*2; // saved D8..D15 +#endif + return new_fp; + } +#endif // !AARCH64 + if (_cb != NULL) { + // use the frame size if valid + int size = _cb->frame_size(); + if (size > 0) { + return unextended_sp() + size; + } + } + // else rely on fp() + assert(! is_compiled_frame(), "unknown compiled frame size"); + return fp(); +} diff --git a/hotspot/src/cpu/arm/vm/frame_arm.hpp b/hotspot/src/cpu/arm/vm/frame_arm.hpp new file mode 100644 index 00000000000..ee770c09a03 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/frame_arm.hpp @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_FRAME_ARM_HPP +#define CPU_ARM_VM_FRAME_ARM_HPP + +#include "runtime/synchronizer.hpp" + + public: + enum { + pc_return_offset = 0, + // All frames + link_offset = 0, + return_addr_offset = 1, + // non-interpreter frames + sender_sp_offset = 2, + + // Interpreter frames +#ifdef AARCH64 + interpreter_frame_gp_saved_result_offset = 4, // for native calls only + interpreter_frame_fp_saved_result_offset = 3, // for native calls only +#endif + interpreter_frame_oop_temp_offset = 2, // for native calls only + + interpreter_frame_sender_sp_offset = -1, +#ifdef AARCH64 + interpreter_frame_stack_top_offset = interpreter_frame_sender_sp_offset - 1, + interpreter_frame_extended_sp_offset = interpreter_frame_stack_top_offset - 1, + interpreter_frame_method_offset = interpreter_frame_extended_sp_offset - 1, +#else + // outgoing sp before a call to an invoked method + interpreter_frame_last_sp_offset = interpreter_frame_sender_sp_offset - 1, + interpreter_frame_method_offset = interpreter_frame_last_sp_offset - 1, +#endif // AARCH64 + interpreter_frame_mirror_offset = interpreter_frame_method_offset - 1, + interpreter_frame_mdp_offset = interpreter_frame_mirror_offset - 1, + interpreter_frame_cache_offset = interpreter_frame_mdp_offset - 1, + interpreter_frame_locals_offset = interpreter_frame_cache_offset - 1, + interpreter_frame_bcp_offset = interpreter_frame_locals_offset - 1, + interpreter_frame_initial_sp_offset = interpreter_frame_bcp_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 frames + entry_frame_call_wrapper_offset = AARCH64_ONLY(2) NOT_AARCH64(0) + }; + + intptr_t ptr_at(int offset) const { + return *ptr_at_addr(offset); + } + + void ptr_at_put(int offset, intptr_t value) { + *ptr_at_addr(offset) = value; + } + + private: + // an additional field beyond _sp and _pc: + intptr_t* _fp; // frame pointer + // The interpreter and adapters will extend the frame of the caller. + // Since oopMaps are based on the sp of the caller before extension + // we need to know that value. However in order to compute the address + // of the return address we need the real "raw" sp. Since sparc already + // uses sp() to mean "raw" sp and unextended_sp() to mean the caller's + // original sp we use that convention. + + intptr_t* _unextended_sp; + void adjust_unextended_sp(); + + intptr_t* ptr_at_addr(int offset) const { + return (intptr_t*) addr_at(offset); + } + +#ifdef ASSERT + // Used in frame::sender_for_{interpreter,compiled}_frame + static void verify_deopt_original_pc( CompiledMethod* nm, intptr_t* unextended_sp, bool is_method_handle_return = false); + static void verify_deopt_mh_original_pc(CompiledMethod* nm, intptr_t* unextended_sp) { + verify_deopt_original_pc(nm, unextended_sp, true); + } +#endif + + public: + // Constructors + + frame(intptr_t* sp, intptr_t* fp, address pc); + + frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc); + +#ifndef AARCH64 + frame(intptr_t* sp, intptr_t* fp); +#endif // !AARCH64 + + void init(intptr_t* sp, intptr_t* fp, address pc); + + // accessors for the instance variables + // Note: not necessarily the real 'frame pointer' (see real_fp) + intptr_t* fp() const { return _fp; } + + inline address* sender_pc_addr() const; + +#ifdef AARCH64 + // Used by template based interpreter deoptimization + void interpreter_frame_set_stack_top(intptr_t* stack_top); + void interpreter_frame_set_extended_sp(intptr_t* sp); + +#else + // expression stack tos if we are nested in a java call + intptr_t* interpreter_frame_last_sp() const; + + // deoptimization support + void interpreter_frame_set_last_sp(intptr_t* sp); +#endif // AARCH64 + + // helper to update a map with callee-saved FP + static void update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr); + +#endif // CPU_ARM_VM_FRAME_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/frame_arm.inline.hpp b/hotspot/src/cpu/arm/vm/frame_arm.inline.hpp new file mode 100644 index 00000000000..589d75be640 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/frame_arm.inline.hpp @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_FRAME_ARM_INLINE_HPP +#define CPU_ARM_VM_FRAME_ARM_INLINE_HPP + +#include "code/codeCache.hpp" +#include "code/vmreg.inline.hpp" + +// Inline functions for ARM frames: + +// Constructors: + +inline frame::frame() { + _pc = NULL; + _sp = NULL; + _unextended_sp = NULL; + _fp = NULL; + _cb = NULL; + _deopt_state = unknown; +} + +inline void frame::init(intptr_t* sp, intptr_t* fp, address pc) { + _sp = sp; + _unextended_sp = sp; + _fp = fp; + _pc = pc; + assert(pc != NULL, "no pc?"); + _cb = CodeCache::find_blob(pc); + adjust_unextended_sp(); + + address original_pc = CompiledMethod::get_deopt_original_pc(this); + if (original_pc != NULL) { + _pc = original_pc; + _deopt_state = is_deoptimized; + } else { + _deopt_state = not_deoptimized; + } +} + +inline frame::frame(intptr_t* sp, intptr_t* fp, address pc) { + init(sp, fp, pc); +} + +inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc) { + _sp = sp; + _unextended_sp = unextended_sp; + _fp = fp; + _pc = pc; + assert(pc != NULL, "no pc?"); + _cb = CodeCache::find_blob(pc); + adjust_unextended_sp(); + + address original_pc = CompiledMethod::get_deopt_original_pc(this); + if (original_pc != NULL) { + _pc = original_pc; + assert(_cb->as_compiled_method()->insts_contains(_pc), "original PC must be in CompiledMethod"); + _deopt_state = is_deoptimized; + } else { + _deopt_state = not_deoptimized; + } +} + +#ifndef AARCH64 + +inline frame::frame(intptr_t* sp, intptr_t* fp) { + _sp = sp; + _unextended_sp = sp; + _fp = fp; + assert(sp != NULL,"null SP ?"); + _pc = (address)(sp[-1]); + // assert(_pc != NULL, "no pc?"); // see comments in x86 + _cb = CodeCache::find_blob(_pc); + adjust_unextended_sp(); + + address original_pc = CompiledMethod::get_deopt_original_pc(this); + if (original_pc != NULL) { + _pc = original_pc; + _deopt_state = is_deoptimized; + } else { + _deopt_state = not_deoptimized; + } +} + +#endif // !AARCH64 + +// Accessors + +inline bool frame::equal(frame other) const { + bool ret = sp() == other.sp() + && unextended_sp() == other.unextended_sp() + && fp() == other.fp() + && pc() == other.pc(); + assert(!ret || ret && cb() == other.cb() && _deopt_state == other._deopt_state, "inconsistent construction"); + return ret; +} + +// Return unique id for this frame. The id must have a value where we can distinguish +// identity and younger/older relationship. NULL represents an invalid (incomparable) +// frame. +inline intptr_t* frame::id(void) const { return unextended_sp(); } + +// Relationals on frames based +// Return true if the frame is younger (more recent activation) than the frame represented by id +inline bool frame::is_younger(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id"); + return this->id() < id ; } + +// Return true if the frame is older (less recent activation) than the frame represented by id +inline bool frame::is_older(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id"); + return this->id() > id ; } + + + +inline intptr_t* frame::link() const { return (intptr_t*) *(intptr_t **)addr_at(link_offset); } + +inline intptr_t* frame::unextended_sp() const { return _unextended_sp; } + +// Return address: + +inline address* frame::sender_pc_addr() const { return (address*) addr_at(return_addr_offset); } +inline address frame::sender_pc() const { return *sender_pc_addr(); } + +inline intptr_t* frame::sender_sp() const { return addr_at(sender_sp_offset); } + +inline intptr_t** frame::interpreter_frame_locals_addr() const { + return (intptr_t**)addr_at(interpreter_frame_locals_offset); +} + +#ifndef AARCH64 +inline intptr_t* frame::interpreter_frame_last_sp() const { + return *(intptr_t**)addr_at(interpreter_frame_last_sp_offset); +} +#endif // !AARCH64 + +inline intptr_t* frame::interpreter_frame_bcp_addr() const { + return (intptr_t*)addr_at(interpreter_frame_bcp_offset); +} + +inline intptr_t* frame::interpreter_frame_mdp_addr() const { + return (intptr_t*)addr_at(interpreter_frame_mdp_offset); +} + + +// Constant pool cache + +inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const { + return (ConstantPoolCache**)addr_at(interpreter_frame_cache_offset); +} + +// Method + +inline Method** frame::interpreter_frame_method_addr() const { + return (Method**)addr_at(interpreter_frame_method_offset); +} + +inline oop* frame::interpreter_frame_mirror_addr() const { + return (oop*)addr_at(interpreter_frame_mirror_offset); +} + +// top of expression stack +inline intptr_t* frame::interpreter_frame_tos_address() const { +#ifdef AARCH64 + intptr_t* stack_top = (intptr_t*)*addr_at(interpreter_frame_stack_top_offset); + assert(stack_top != NULL, "should be stored before call"); + assert(stack_top <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos"); + return stack_top; +#else + intptr_t* last_sp = interpreter_frame_last_sp(); + if (last_sp == NULL ) { + return sp(); + } else { + // sp() may have been extended or shrunk by an adapter. At least + // check that we don't fall behind the legal region. + // For top deoptimized frame last_sp == interpreter_frame_monitor_end. + assert(last_sp <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos"); + return last_sp; + } +#endif // AARCH64 +} + +inline oop* frame::interpreter_frame_temp_oop_addr() const { + return (oop *)(fp() + interpreter_frame_oop_temp_offset); +} + +inline int frame::interpreter_frame_monitor_size() { + return BasicObjectLock::size(); +} + + +// expression stack +// (the max_stack arguments are used by the GC; see class FrameClosure) + +inline intptr_t* frame::interpreter_frame_expression_stack() const { + intptr_t* monitor_end = (intptr_t*) interpreter_frame_monitor_end(); + return monitor_end-1; +} + + +inline jint frame::interpreter_frame_expression_stack_direction() { return -1; } + + +// Entry frames + +inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const { + return (JavaCallWrapper**)addr_at(entry_frame_call_wrapper_offset); +} + + +// Compiled frames + +inline bool frame::volatile_across_calls(Register reg) { + return true; +} + +inline oop frame::saved_oop_result(RegisterMap* map) const { + oop* result_adr = (oop*) map->location(R0->as_VMReg()); + guarantee(result_adr != NULL, "bad register save location"); + return (*result_adr); +} + +inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { + oop* result_adr = (oop*) map->location(R0->as_VMReg()); + guarantee(result_adr != NULL, "bad register save location"); + *result_adr = obj; +} + +#endif // CPU_ARM_VM_FRAME_ARM_INLINE_HPP diff --git a/hotspot/src/cpu/arm/vm/globalDefinitions_arm.hpp b/hotspot/src/cpu/arm/vm/globalDefinitions_arm.hpp new file mode 100644 index 00000000000..0ede3bfac81 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/globalDefinitions_arm.hpp @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP +#define CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP + +#ifdef AARCH64 +#define AARCH64_ONLY(code) code +#define AARCH64_ONLY_ARG(arg) , arg +#define NOT_AARCH64(code) +#define NOT_AARCH64_ARG(arg) +#else +#define AARCH64_ONLY(code) +#define AARCH64_ONLY_ARG(arg) +#define NOT_AARCH64(code) code +#define NOT_AARCH64_ARG(arg) , arg +#endif + +const int StackAlignmentInBytes = AARCH64_ONLY(16) NOT_AARCH64(8); + +// Indicates whether the C calling conventions require that +// 32-bit integer argument values are extended to 64 bits. +const bool CCallingConventionRequiresIntsAsLongs = false; + +#ifdef __SOFTFP__ +const bool HaveVFP = false; +#else +const bool HaveVFP = true; +#endif + +#if defined(__ARM_PCS_VFP) || defined(AARCH64) +#define __ABI_HARD__ +#endif + +#if defined(__ARM_ARCH_7A__) || defined(AARCH64) +#define SUPPORTS_NATIVE_CX8 +#endif + +#define STUBROUTINES_MD_HPP "stubRoutines_arm.hpp" +#define INTERP_MASM_MD_HPP "interp_masm_arm.hpp" +#define TEMPLATETABLE_MD_HPP "templateTable_arm.hpp" +#ifdef AARCH64 +#define ADGLOBALS_MD_HPP "adfiles/adGlobals_arm_64.hpp" +#define AD_MD_HPP "adfiles/ad_arm_64.hpp" +#else +#define ADGLOBALS_MD_HPP "adfiles/adGlobals_arm_32.hpp" +#define AD_MD_HPP "adfiles/ad_arm_32.hpp" +#endif +#define C1_LIRGENERATOR_MD_HPP "c1_LIRGenerator_arm.hpp" + +#ifdef TARGET_COMPILER_gcc +#ifdef ARM32 +#undef BREAKPOINT +#define BREAKPOINT __asm__ volatile ("bkpt") +#endif +#endif + +#endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/globals_arm.hpp b/hotspot/src/cpu/arm/vm/globals_arm.hpp new file mode 100644 index 00000000000..04c0b342162 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/globals_arm.hpp @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_GLOBALS_ARM_HPP +#define CPU_ARM_VM_GLOBALS_ARM_HPP + +// +// Sets the default values for platform dependent flags used by the runtime system. +// (see globals.hpp) +// + +define_pd_global(bool, ShareVtableStubs, true); + +define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks +define_pd_global(bool, UncommonNullCast, true); // Uncommon-trap NULLs past to check cast +define_pd_global(bool, TrapBasedNullChecks, false); // Not needed + +define_pd_global(uintx, CodeCacheSegmentSize, 64 TIERED_ONLY(+64)); // Tiered compilation has large code-entry alignment. +define_pd_global(intx, CodeEntryAlignment, 16); +define_pd_global(intx, OptoLoopAlignment, 16); + +define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this + +#define DEFAULT_STACK_YELLOW_PAGES (2) +#define DEFAULT_STACK_RED_PAGES (1) +#define DEFAULT_STACK_SHADOW_PAGES (5 DEBUG_ONLY(+1)) +#define DEFAULT_STACK_RESERVED_PAGES (0) + +#define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES +#define MIN_STACK_RED_PAGES DEFAULT_STACK_RED_PAGES +#define MIN_STACK_SHADOW_PAGES DEFAULT_STACK_SHADOW_PAGES +#define MIN_STACK_RESERVED_PAGES (0) + +define_pd_global(intx, StackYellowPages, DEFAULT_STACK_YELLOW_PAGES); +define_pd_global(intx, StackRedPages, DEFAULT_STACK_RED_PAGES); +define_pd_global(intx, StackShadowPages, DEFAULT_STACK_SHADOW_PAGES); +define_pd_global(intx, StackReservedPages, DEFAULT_STACK_RESERVED_PAGES); + +define_pd_global(intx, InlineFrequencyCount, 50); +#if defined(COMPILER1) || defined(COMPILER2) +define_pd_global(intx, InlineSmallCode, 1500); +#endif + +define_pd_global(bool, RewriteBytecodes, true); +define_pd_global(bool, RewriteFrequentPairs, true); + +define_pd_global(bool, UseMembar, true); + +define_pd_global(bool, PreserveFramePointer, false); + +// GC Ergo Flags +define_pd_global(size_t, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread + +define_pd_global(uintx, TypeProfileLevel, 0); + +// No performance work done here yet. +define_pd_global(bool, CompactStrings, false); + +define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong); + +#define ARCH_FLAGS(develop, \ + product, \ + diagnostic, \ + experimental, \ + notproduct, \ + range, \ + constraint, \ + writeable) \ + \ + develop(bool, VerifyInterpreterStackTop, false, \ + "Verify interpreter stack top at every stack expansion (AArch64 only)") \ + \ + develop(bool, ZapHighNonSignificantBits, false, \ + "Zap high non-significant bits of values (AArch64 only)") \ + \ + +#endif // CPU_ARM_VM_GLOBALS_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/icBuffer_arm.cpp b/hotspot/src/cpu/arm/vm/icBuffer_arm.cpp new file mode 100644 index 00000000000..b158572c0dd --- /dev/null +++ b/hotspot/src/cpu/arm/vm/icBuffer_arm.cpp @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_arm.inline.hpp" +#include "code/icBuffer.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_arm.hpp" +#include "oops/oop.inline.hpp" + +#define __ masm-> + +int InlineCacheBuffer::ic_stub_code_size() { + return (AARCH64_ONLY(8) NOT_AARCH64(4)) * Assembler::InstructionSize; +} + +void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin, void* cached_value, address entry_point) { + ResourceMark rm; + CodeBuffer code(code_begin, ic_stub_code_size()); + MacroAssembler* masm = new MacroAssembler(&code); + + InlinedAddress oop_literal((address) cached_value); + __ ldr_literal(Ricklass, oop_literal); + // FIXME: OK to remove reloc here? + __ patchable_jump(entry_point, relocInfo::runtime_call_type, Rtemp); + __ bind_literal(oop_literal); + __ flush(); +} + +address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { + address jump_address; + jump_address = code_begin + NativeInstruction::instruction_size; + NativeJump* jump = nativeJump_at(jump_address); + return jump->jump_destination(); +} + +void* InlineCacheBuffer::ic_buffer_cached_value(address code_begin) { + NativeMovConstReg* move = nativeMovConstReg_at(code_begin); + return (void*)move->data(); +} + +#undef __ diff --git a/hotspot/src/cpu/arm/vm/icache_arm.cpp b/hotspot/src/cpu/arm/vm/icache_arm.cpp new file mode 100644 index 00000000000..ae163619fdc --- /dev/null +++ b/hotspot/src/cpu/arm/vm/icache_arm.cpp @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" +#include "assembler_arm.inline.hpp" +#include "runtime/icache.hpp" + +#define __ _masm-> + +#ifdef AARCH64 + +static int icache_flush(address addr, int lines, int magic) { + // TODO-AARCH64 Figure out actual cache line size (mrs Xt, CTR_EL0) + + address p = addr; + for (int i = 0; i < lines; i++, p += ICache::line_size) { + __asm__ volatile( + " dc cvau, %[p]" + : + : [p] "r" (p) + : "memory"); + } + + __asm__ volatile( + " dsb ish" + : : : "memory"); + + p = addr; + for (int i = 0; i < lines; i++, p += ICache::line_size) { + __asm__ volatile( + " ic ivau, %[p]" + : + : [p] "r" (p) + : "memory"); + } + + __asm__ volatile( + " dsb ish\n\t" + " isb\n\t" + : : : "memory"); + + return magic; +} + +#else + +static int icache_flush(address addr, int lines, int magic) { + __builtin___clear_cache(addr, addr + (lines << ICache::log2_line_size)); + return magic; +} + +#endif // AARCH64 + +void ICacheStubGenerator::generate_icache_flush(ICache::flush_icache_stub_t* flush_icache_stub) { + address start = (address)icache_flush; + + *flush_icache_stub = (ICache::flush_icache_stub_t)start; + + // ICache::invalidate_range() contains explicit condition that the first + // call is invoked on the generated icache flush stub code range. + ICache::invalidate_range(start, 0); + + { + // dummy code mark to make the shared code happy + // (fields that would need to be modified to emulate the correct + // mark are not accessible) + StubCodeMark mark(this, "ICache", "fake_stub_for_inlined_icache_flush"); + __ ret(); + } +} + +#undef __ diff --git a/hotspot/src/cpu/arm/vm/icache_arm.hpp b/hotspot/src/cpu/arm/vm/icache_arm.hpp new file mode 100644 index 00000000000..6b8c5856a32 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/icache_arm.hpp @@ -0,0 +1,40 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_ICACHE_ARM_HPP +#define CPU_ARM_VM_ICACHE_ARM_HPP + +// Interface for updating the instruction cache. Whenever the VM modifies +// code, part of the processor instruction cache potentially has to be flushed. + +class ICache : public AbstractICache { + public: + enum { + stub_size = 32, // Size of the icache flush stub in bytes + line_size = BytesPerWord, // conservative + log2_line_size = LogBytesPerWord // log2(line_size) + }; +}; + +#endif // CPU_ARM_VM_ICACHE_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/interp_masm_arm.cpp b/hotspot/src/cpu/arm/vm/interp_masm_arm.cpp new file mode 100644 index 00000000000..2f41b102a85 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/interp_masm_arm.cpp @@ -0,0 +1,2272 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "gc/shared/barrierSet.inline.hpp" +#include "gc/shared/cardTableModRefBS.inline.hpp" +#include "gc/shared/collectedHeap.hpp" +#include "interp_masm_arm.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "logging/log.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "oops/method.hpp" +#include "oops/methodData.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/sharedRuntime.hpp" + +#if INCLUDE_ALL_GCS +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" +#endif // INCLUDE_ALL_GCS + +//-------------------------------------------------------------------- +// Implementation of InterpreterMacroAssembler + + + + +InterpreterMacroAssembler::InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) { +} + +void InterpreterMacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) { +#if defined(ASSERT) && !defined(AARCH64) + // Ensure that last_sp is not filled. + { Label L; + ldr(Rtemp, Address(FP, frame::interpreter_frame_last_sp_offset * wordSize)); + cbz(Rtemp, L); + stop("InterpreterMacroAssembler::call_VM_helper: last_sp != NULL"); + bind(L); + } +#endif // ASSERT && !AARCH64 + + // Rbcp must be saved/restored since it may change due to GC. + save_bcp(); + +#ifdef AARCH64 + check_no_cached_stack_top(Rtemp); + save_stack_top(); + check_extended_sp(Rtemp); + cut_sp_before_call(); +#endif // AARCH64 + + // super call + MacroAssembler::call_VM_helper(oop_result, entry_point, number_of_arguments, check_exceptions); + +#ifdef AARCH64 + // Restore SP to extended SP + restore_sp_after_call(Rtemp); + check_stack_top(); + clear_cached_stack_top(); +#endif // AARCH64 + + // Restore interpreter specific registers. + restore_bcp(); + restore_method(); +} + +void InterpreterMacroAssembler::jump_to_entry(address entry) { + assert(entry, "Entry must have been generated by now"); + b(entry); +} + +void InterpreterMacroAssembler::check_and_handle_popframe() { + if (can_pop_frame()) { + Label L; + const Register popframe_cond = R2_tmp; + + // Initiate popframe handling only if it is not already being processed. If the flag + // has the popframe_processing bit set, it means that this code is called *during* popframe + // handling - we don't want to reenter. + + ldr_s32(popframe_cond, Address(Rthread, JavaThread::popframe_condition_offset())); + tbz(popframe_cond, exact_log2(JavaThread::popframe_pending_bit), L); + tbnz(popframe_cond, exact_log2(JavaThread::popframe_processing_bit), L); + + // Call Interpreter::remove_activation_preserving_args_entry() to get the + // address of the same-named entrypoint in the generated interpreter code. + call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_preserving_args_entry)); + + // Call indirectly to avoid generation ordering problem. + jump(R0); + + bind(L); + } +} + + +// Blows R2, Rtemp. Sets TOS cached value. +void InterpreterMacroAssembler::load_earlyret_value(TosState state) { + const Register thread_state = R2_tmp; + + ldr(thread_state, Address(Rthread, JavaThread::jvmti_thread_state_offset())); + + const Address tos_addr(thread_state, JvmtiThreadState::earlyret_tos_offset()); + const Address oop_addr(thread_state, JvmtiThreadState::earlyret_oop_offset()); + const Address val_addr(thread_state, JvmtiThreadState::earlyret_value_offset()); +#ifndef AARCH64 + const Address val_addr_hi(thread_state, JvmtiThreadState::earlyret_value_offset() + + in_ByteSize(wordSize)); +#endif // !AARCH64 + + Register zero = zero_register(Rtemp); + + switch (state) { + case atos: ldr(R0_tos, oop_addr); + str(zero, oop_addr); + interp_verify_oop(R0_tos, state, __FILE__, __LINE__); + break; + +#ifdef AARCH64 + case ltos: ldr(R0_tos, val_addr); break; +#else + case ltos: ldr(R1_tos_hi, val_addr_hi); // fall through +#endif // AARCH64 + case btos: // fall through + case ztos: // fall through + case ctos: // fall through + case stos: // fall through + case itos: ldr_s32(R0_tos, val_addr); break; +#ifdef __SOFTFP__ + case dtos: ldr(R1_tos_hi, val_addr_hi); // fall through + case ftos: ldr(R0_tos, val_addr); break; +#else + case ftos: ldr_float (S0_tos, val_addr); break; + case dtos: ldr_double(D0_tos, val_addr); break; +#endif // __SOFTFP__ + case vtos: /* nothing to do */ break; + default : ShouldNotReachHere(); + } + // Clean up tos value in the thread object + str(zero, val_addr); +#ifndef AARCH64 + str(zero, val_addr_hi); +#endif // !AARCH64 + + mov(Rtemp, (int) ilgl); + str_32(Rtemp, tos_addr); +} + + +// Blows R2, Rtemp. +void InterpreterMacroAssembler::check_and_handle_earlyret() { + if (can_force_early_return()) { + Label L; + const Register thread_state = R2_tmp; + + ldr(thread_state, Address(Rthread, JavaThread::jvmti_thread_state_offset())); + cbz(thread_state, 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. + + ldr_s32(Rtemp, Address(thread_state, JvmtiThreadState::earlyret_state_offset())); + cmp(Rtemp, JvmtiThreadState::earlyret_pending); + b(L, ne); + + // Call Interpreter::remove_activation_early_entry() to get the address of the + // same-named entrypoint in the generated interpreter code. + + ldr_s32(R0, Address(thread_state, JvmtiThreadState::earlyret_tos_offset())); + call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_early_entry), R0); + + jump(R0); + + bind(L); + } +} + + +// Sets reg. Blows Rtemp. +void InterpreterMacroAssembler::get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset) { + assert(bcp_offset >= 0, "bcp is still pointing to start of bytecode"); + assert(reg != Rtemp, "should be different registers"); + + ldrb(Rtemp, Address(Rbcp, bcp_offset)); + ldrb(reg, Address(Rbcp, bcp_offset+1)); + orr(reg, reg, AsmOperand(Rtemp, lsl, BitsPerByte)); +} + +void InterpreterMacroAssembler::get_index_at_bcp(Register index, int bcp_offset, Register tmp_reg, size_t index_size) { + assert_different_registers(index, tmp_reg); + if (index_size == sizeof(u2)) { + // load bytes of index separately to avoid unaligned access + ldrb(index, Address(Rbcp, bcp_offset+1)); + ldrb(tmp_reg, Address(Rbcp, bcp_offset)); + orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte)); + } else if (index_size == sizeof(u4)) { + // TODO-AARCH64: consider using unaligned access here + ldrb(index, Address(Rbcp, bcp_offset+3)); + ldrb(tmp_reg, Address(Rbcp, bcp_offset+2)); + orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte)); + ldrb(tmp_reg, Address(Rbcp, bcp_offset+1)); + orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte)); + ldrb(tmp_reg, Address(Rbcp, bcp_offset)); + orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte)); + // Check if the secondary index definition is still ~x, otherwise + // we have to change the following assembler code to calculate the + // plain index. + assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line"); + mvn_32(index, index); // convert to plain index + } else if (index_size == sizeof(u1)) { + ldrb(index, Address(Rbcp, bcp_offset)); + } else { + ShouldNotReachHere(); + } +} + +// Sets cache, index. +void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size) { + assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); + assert_different_registers(cache, index); + + get_index_at_bcp(index, bcp_offset, cache, index_size); + + // load constant pool cache pointer + ldr(cache, Address(FP, frame::interpreter_frame_cache_offset * wordSize)); + + // convert from field index to ConstantPoolCacheEntry index + assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below"); + // TODO-AARCH64 merge this shift with shift "add(..., Rcache, AsmOperand(Rindex, lsl, LogBytesPerWord))" after this method is called + logical_shift_left(index, index, 2); +} + +// Sets cache, index, bytecode. +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); + // caution index and bytecode can be the same + add(bytecode, cache, AsmOperand(index, lsl, LogBytesPerWord)); +#ifdef AARCH64 + add(bytecode, bytecode, (1 + byte_no) + in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset())); + ldarb(bytecode, bytecode); +#else + ldrb(bytecode, Address(bytecode, (1 + byte_no) + in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()))); + TemplateTable::volatile_barrier(MacroAssembler::LoadLoad, noreg, true); +#endif // AARCH64 +} + +// Sets cache. Blows reg_tmp. +void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register reg_tmp, int bcp_offset, size_t index_size) { + assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); + assert_different_registers(cache, reg_tmp); + + get_index_at_bcp(reg_tmp, bcp_offset, cache, index_size); + + // load constant pool cache pointer + ldr(cache, Address(FP, frame::interpreter_frame_cache_offset * wordSize)); + + // skip past the header + add(cache, cache, in_bytes(ConstantPoolCache::base_offset())); + // convert from field index to ConstantPoolCacheEntry index + // and from word offset to byte offset + assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below"); + add(cache, cache, AsmOperand(reg_tmp, lsl, 2 + LogBytesPerWord)); +} + +// Load object from cpool->resolved_references(index) +void InterpreterMacroAssembler::load_resolved_reference_at_index( + Register result, Register index) { + assert_different_registers(result, index); + get_constant_pool(result); + + Register cache = result; + // load pointer for resolved_references[] objArray + ldr(cache, Address(result, ConstantPool::resolved_references_offset_in_bytes())); + // JNIHandles::resolve(result) + ldr(cache, Address(cache, 0)); + // Add in the index + // convert from field index to resolved_references() index and from + // word index to byte offset. Since this is a java object, it can be compressed + add(cache, cache, AsmOperand(index, lsl, LogBytesPerHeapOop)); + load_heap_oop(result, Address(cache, arrayOopDesc::base_offset_in_bytes(T_OBJECT))); +} + +// Generate a subtype check: branch to not_subtype if sub_klass is +// not a subtype of super_klass. +// Profiling code for the subtype check failure (profile_typecheck_failed) +// should be explicitly generated by the caller in the not_subtype case. +// Blows Rtemp, tmp1, tmp2. +void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass, + Register Rsuper_klass, + Label ¬_subtype, + Register tmp1, + Register tmp2) { + + assert_different_registers(Rsub_klass, Rsuper_klass, tmp1, tmp2, Rtemp); + Label ok_is_subtype, loop, update_cache; + + const Register super_check_offset = tmp1; + const Register cached_super = tmp2; + + // Profile the not-null value's klass. + profile_typecheck(tmp1, Rsub_klass); + + // Load the super-klass's check offset into + ldr_u32(super_check_offset, Address(Rsuper_klass, Klass::super_check_offset_offset())); + + // Check for self + cmp(Rsub_klass, Rsuper_klass); + + // Load from the sub-klass's super-class display list, or a 1-word cache of + // the secondary superclass list, or a failing value with a sentinel offset + // if the super-klass is an interface or exceptionally deep in the Java + // hierarchy and we have to scan the secondary superclass list the hard way. + // See if we get an immediate positive hit + ldr(cached_super, Address(Rsub_klass, super_check_offset)); + + cond_cmp(Rsuper_klass, cached_super, ne); + b(ok_is_subtype, eq); + + // Check for immediate negative hit + cmp(super_check_offset, in_bytes(Klass::secondary_super_cache_offset())); + b(not_subtype, ne); + + // Now do a linear scan of the secondary super-klass chain. + const Register supers_arr = tmp1; + const Register supers_cnt = tmp2; + const Register cur_super = Rtemp; + + // Load objArrayOop of secondary supers. + ldr(supers_arr, Address(Rsub_klass, Klass::secondary_supers_offset())); + + ldr_u32(supers_cnt, Address(supers_arr, Array::length_offset_in_bytes())); // Load the array length +#ifdef AARCH64 + cbz(supers_cnt, not_subtype); + add(supers_arr, supers_arr, Array::base_offset_in_bytes()); +#else + cmp(supers_cnt, 0); + + // Skip to the start of array elements and prefetch the first super-klass. + ldr(cur_super, Address(supers_arr, Array::base_offset_in_bytes(), pre_indexed), ne); + b(not_subtype, eq); +#endif // AARCH64 + + bind(loop); + +#ifdef AARCH64 + ldr(cur_super, Address(supers_arr, wordSize, post_indexed)); +#endif // AARCH64 + + cmp(cur_super, Rsuper_klass); + b(update_cache, eq); + + subs(supers_cnt, supers_cnt, 1); + +#ifndef AARCH64 + ldr(cur_super, Address(supers_arr, wordSize, pre_indexed), ne); +#endif // !AARCH64 + + b(loop, ne); + + b(not_subtype); + + bind(update_cache); + // Must be equal but missed in cache. Update cache. + str(Rsuper_klass, Address(Rsub_klass, Klass::secondary_super_cache_offset())); + + bind(ok_is_subtype); +} + + +// The 1st part of the store check. +// Sets card_table_base register. +void InterpreterMacroAssembler::store_check_part1(Register card_table_base) { + // Check barrier set type (should be card table) and element size + BarrierSet* bs = Universe::heap()->barrier_set(); + assert(bs->kind() == BarrierSet::CardTableForRS || + bs->kind() == BarrierSet::CardTableExtension, + "Wrong barrier set kind"); + + CardTableModRefBS* ct = barrier_set_cast(bs); + assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "Adjust store check code"); + + // Load card table base address. + + /* Performance note. + + There is an alternative way of loading card table base address + from thread descriptor, which may look more efficient: + + ldr(card_table_base, Address(Rthread, JavaThread::card_table_base_offset())); + + However, performance measurements of micro benchmarks and specJVM98 + showed that loading of card table base from thread descriptor is + 7-18% slower compared to loading of literal embedded into the code. + Possible cause is a cache miss (card table base address resides in a + rarely accessed area of thread descriptor). + */ + // TODO-AARCH64 Investigate if mov_slow is faster than ldr from Rthread on AArch64 + mov_address(card_table_base, (address)ct->byte_map_base, symbolic_Relocation::card_table_reference); +} + +// The 2nd part of the store check. +void InterpreterMacroAssembler::store_check_part2(Register obj, Register card_table_base, Register tmp) { + assert_different_registers(obj, card_table_base, tmp); + + assert(CardTableModRefBS::dirty_card_val() == 0, "Dirty card value must be 0 due to optimizations."); +#ifdef AARCH64 + add(card_table_base, card_table_base, AsmOperand(obj, lsr, CardTableModRefBS::card_shift)); + Address card_table_addr(card_table_base); +#else + Address card_table_addr(card_table_base, obj, lsr, CardTableModRefBS::card_shift); +#endif + + if (UseCondCardMark) { + if (UseConcMarkSweepGC) { + membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg); + } + Label already_dirty; + + ldrb(tmp, card_table_addr); + cbz(tmp, already_dirty); + + set_card(card_table_base, card_table_addr, tmp); + bind(already_dirty); + + } else { + if (UseConcMarkSweepGC && CMSPrecleaningEnabled) { + membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg); + } + set_card(card_table_base, card_table_addr, tmp); + } +} + +void InterpreterMacroAssembler::set_card(Register card_table_base, Address card_table_addr, Register tmp) { +#ifdef AARCH64 + strb(ZR, card_table_addr); +#else + CardTableModRefBS* ct = barrier_set_cast(Universe::heap()->barrier_set()); + if ((((uintptr_t)ct->byte_map_base & 0xff) == 0)) { + // Card table is aligned so the lowest byte of the table address base is zero. + // This works only if the code is not saved for later use, possibly + // in a context where the base would no longer be aligned. + strb(card_table_base, card_table_addr); + } else { + mov(tmp, 0); + strb(tmp, card_table_addr); + } +#endif // AARCH64 +} + +////////////////////////////////////////////////////////////////////////////////// +#if INCLUDE_ALL_GCS + +// G1 pre-barrier. +// Blows all volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). +// If store_addr != noreg, then previous value is loaded from [store_addr]; +// in such case store_addr and new_val registers are preserved; +// otherwise pre_val register is preserved. +void InterpreterMacroAssembler::g1_write_barrier_pre(Register store_addr, + Register new_val, + Register pre_val, + Register tmp1, + Register tmp2) { + Label done; + Label runtime; + + if (store_addr != noreg) { + assert_different_registers(store_addr, new_val, pre_val, tmp1, tmp2, noreg); + } else { + assert (new_val == noreg, "should be"); + assert_different_registers(pre_val, tmp1, tmp2, noreg); + } + + Address in_progress(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() + + SATBMarkQueue::byte_offset_of_active())); + Address index(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() + + SATBMarkQueue::byte_offset_of_index())); + Address buffer(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() + + SATBMarkQueue::byte_offset_of_buf())); + + // Is marking active? + assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "adjust this code"); + ldrb(tmp1, in_progress); + cbz(tmp1, done); + + // Do we need to load the previous value? + if (store_addr != noreg) { + load_heap_oop(pre_val, Address(store_addr, 0)); + } + + // Is the previous value null? + cbz(pre_val, done); + + // Can we store original value in the thread's buffer? + // Is index == 0? + // (The index field is typed as size_t.) + + ldr(tmp1, index); // tmp1 := *index_adr + ldr(tmp2, buffer); + + subs(tmp1, tmp1, wordSize); // tmp1 := tmp1 - wordSize + b(runtime, lt); // If negative, goto runtime + + str(tmp1, index); // *index_adr := tmp1 + + // Record the previous value + str(pre_val, Address(tmp2, tmp1)); + b(done); + + bind(runtime); + + // save the live input values +#ifdef AARCH64 + if (store_addr != noreg) { + raw_push(store_addr, new_val); + } else { + raw_push(pre_val, ZR); + } +#else + if (store_addr != noreg) { + // avoid raw_push to support any ordering of store_addr and new_val + push(RegisterSet(store_addr) | RegisterSet(new_val)); + } else { + push(pre_val); + } +#endif // AARCH64 + + if (pre_val != R0) { + mov(R0, pre_val); + } + mov(R1, Rthread); + + call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), R0, R1); + +#ifdef AARCH64 + if (store_addr != noreg) { + raw_pop(store_addr, new_val); + } else { + raw_pop(pre_val, ZR); + } +#else + if (store_addr != noreg) { + pop(RegisterSet(store_addr) | RegisterSet(new_val)); + } else { + pop(pre_val); + } +#endif // AARCH64 + + bind(done); +} + +// G1 post-barrier. +// Blows all volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). +void InterpreterMacroAssembler::g1_write_barrier_post(Register store_addr, + Register new_val, + Register tmp1, + Register tmp2, + Register tmp3) { + + Address queue_index(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() + + DirtyCardQueue::byte_offset_of_index())); + Address buffer(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() + + DirtyCardQueue::byte_offset_of_buf())); + + BarrierSet* bs = Universe::heap()->barrier_set(); + CardTableModRefBS* ct = (CardTableModRefBS*)bs; + Label done; + Label runtime; + + // Does store cross heap regions? + + eor(tmp1, store_addr, new_val); +#ifdef AARCH64 + logical_shift_right(tmp1, tmp1, HeapRegion::LogOfHRGrainBytes); + cbz(tmp1, done); +#else + movs(tmp1, AsmOperand(tmp1, lsr, HeapRegion::LogOfHRGrainBytes)); + b(done, eq); +#endif + + // crosses regions, storing NULL? + + cbz(new_val, done); + + // storing region crossing non-NULL, is card already dirty? + const Register card_addr = tmp1; + assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); + + mov_address(tmp2, (address)ct->byte_map_base, symbolic_Relocation::card_table_reference); + add(card_addr, tmp2, AsmOperand(store_addr, lsr, CardTableModRefBS::card_shift)); + + ldrb(tmp2, Address(card_addr)); + cmp(tmp2, (int)G1SATBCardTableModRefBS::g1_young_card_val()); + b(done, eq); + + membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), tmp2); + + assert(CardTableModRefBS::dirty_card_val() == 0, "adjust this code"); + ldrb(tmp2, Address(card_addr)); + cbz(tmp2, done); + + // storing a region crossing, non-NULL oop, card is clean. + // dirty card and log. + + strb(zero_register(tmp2), Address(card_addr)); + + ldr(tmp2, queue_index); + ldr(tmp3, buffer); + + subs(tmp2, tmp2, wordSize); + b(runtime, lt); // go to runtime if now negative + + str(tmp2, queue_index); + + str(card_addr, Address(tmp3, tmp2)); + b(done); + + bind(runtime); + + if (card_addr != R0) { + mov(R0, card_addr); + } + mov(R1, Rthread); + call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), R0, R1); + + bind(done); +} + +#endif // INCLUDE_ALL_GCS +////////////////////////////////////////////////////////////////////////////////// + + +// Java Expression Stack + +void InterpreterMacroAssembler::pop_ptr(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + ldr(r, Address(Rstack_top, wordSize, post_indexed)); +} + +void InterpreterMacroAssembler::pop_i(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + ldr_s32(r, Address(Rstack_top, wordSize, post_indexed)); + zap_high_non_significant_bits(r); +} + +#ifdef AARCH64 +void InterpreterMacroAssembler::pop_l(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + ldr(r, Address(Rstack_top, 2*wordSize, post_indexed)); +} +#else +void InterpreterMacroAssembler::pop_l(Register lo, Register hi) { + assert_different_registers(lo, hi); + assert(lo < hi, "lo must be < hi"); + pop(RegisterSet(lo) | RegisterSet(hi)); +} +#endif // AARCH64 + +void InterpreterMacroAssembler::pop_f(FloatRegister fd) { +#ifdef AARCH64 + ldr_s(fd, Address(Rstack_top, wordSize, post_indexed)); +#else + fpops(fd); +#endif // AARCH64 +} + +void InterpreterMacroAssembler::pop_d(FloatRegister fd) { +#ifdef AARCH64 + ldr_d(fd, Address(Rstack_top, 2*wordSize, post_indexed)); +#else + fpopd(fd); +#endif // AARCH64 +} + + +// Transition vtos -> state. Blows R0, R1. Sets TOS cached value. +void InterpreterMacroAssembler::pop(TosState state) { + switch (state) { + case atos: pop_ptr(R0_tos); break; + case btos: // fall through + case ztos: // fall through + case ctos: // fall through + case stos: // fall through + case itos: pop_i(R0_tos); break; +#ifdef AARCH64 + case ltos: pop_l(R0_tos); break; +#else + case ltos: pop_l(R0_tos_lo, R1_tos_hi); break; +#endif // AARCH64 +#ifdef __SOFTFP__ + case ftos: pop_i(R0_tos); break; + case dtos: pop_l(R0_tos_lo, R1_tos_hi); break; +#else + case ftos: pop_f(S0_tos); break; + case dtos: pop_d(D0_tos); break; +#endif // __SOFTFP__ + case vtos: /* nothing to do */ break; + default : ShouldNotReachHere(); + } + interp_verify_oop(R0_tos, state, __FILE__, __LINE__); +} + +void InterpreterMacroAssembler::push_ptr(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + str(r, Address(Rstack_top, -wordSize, pre_indexed)); + check_stack_top_on_expansion(); +} + +void InterpreterMacroAssembler::push_i(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + str_32(r, Address(Rstack_top, -wordSize, pre_indexed)); + check_stack_top_on_expansion(); +} + +#ifdef AARCH64 +void InterpreterMacroAssembler::push_l(Register r) { + assert(r != Rstack_top, "unpredictable instruction"); + stp(r, ZR, Address(Rstack_top, -2*wordSize, pre_indexed)); + check_stack_top_on_expansion(); +} +#else +void InterpreterMacroAssembler::push_l(Register lo, Register hi) { + assert_different_registers(lo, hi); + assert(lo < hi, "lo must be < hi"); + push(RegisterSet(lo) | RegisterSet(hi)); +} +#endif // AARCH64 + +void InterpreterMacroAssembler::push_f() { +#ifdef AARCH64 + str_s(S0_tos, Address(Rstack_top, -wordSize, pre_indexed)); + check_stack_top_on_expansion(); +#else + fpushs(S0_tos); +#endif // AARCH64 +} + +void InterpreterMacroAssembler::push_d() { +#ifdef AARCH64 + str_d(D0_tos, Address(Rstack_top, -2*wordSize, pre_indexed)); + check_stack_top_on_expansion(); +#else + fpushd(D0_tos); +#endif // AARCH64 +} + +// Transition state -> vtos. Blows Rtemp. +void InterpreterMacroAssembler::push(TosState state) { + interp_verify_oop(R0_tos, state, __FILE__, __LINE__); + switch (state) { + case atos: push_ptr(R0_tos); break; + case btos: // fall through + case ztos: // fall through + case ctos: // fall through + case stos: // fall through + case itos: push_i(R0_tos); break; +#ifdef AARCH64 + case ltos: push_l(R0_tos); break; +#else + case ltos: push_l(R0_tos_lo, R1_tos_hi); break; +#endif // AARCH64 +#ifdef __SOFTFP__ + case ftos: push_i(R0_tos); break; + case dtos: push_l(R0_tos_lo, R1_tos_hi); break; +#else + case ftos: push_f(); break; + case dtos: push_d(); break; +#endif // __SOFTFP__ + case vtos: /* nothing to do */ break; + default : ShouldNotReachHere(); + } +} + + +#ifndef AARCH64 + +// Converts return value in R0/R1 (interpreter calling conventions) to TOS cached value. +void InterpreterMacroAssembler::convert_retval_to_tos(TosState state) { +#if (!defined __SOFTFP__ && !defined __ABI_HARD__) + // According to interpreter calling conventions, result is returned in R0/R1, + // but templates expect ftos in S0, and dtos in D0. + if (state == ftos) { + fmsr(S0_tos, R0); + } else if (state == dtos) { + fmdrr(D0_tos, R0, R1); + } +#endif // !__SOFTFP__ && !__ABI_HARD__ +} + +// Converts TOS cached value to return value in R0/R1 (according to interpreter calling conventions). +void InterpreterMacroAssembler::convert_tos_to_retval(TosState state) { +#if (!defined __SOFTFP__ && !defined __ABI_HARD__) + // According to interpreter calling conventions, result is returned in R0/R1, + // so ftos (S0) and dtos (D0) are moved to R0/R1. + if (state == ftos) { + fmrs(R0, S0_tos); + } else if (state == dtos) { + fmrrd(R0, R1, D0_tos); + } +#endif // !__SOFTFP__ && !__ABI_HARD__ +} + +#endif // !AARCH64 + + +// Helpers for swap and dup +void InterpreterMacroAssembler::load_ptr(int n, Register val) { + ldr(val, Address(Rstack_top, Interpreter::expr_offset_in_bytes(n))); +} + +void InterpreterMacroAssembler::store_ptr(int n, Register val) { + str(val, Address(Rstack_top, Interpreter::expr_offset_in_bytes(n))); +} + + +void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() { +#ifdef AARCH64 + check_no_cached_stack_top(Rtemp); + save_stack_top(); + cut_sp_before_call(); + mov(Rparams, Rstack_top); +#endif // AARCH64 + + // set sender sp + mov(Rsender_sp, SP); + +#ifndef AARCH64 + // record last_sp + str(Rsender_sp, Address(FP, frame::interpreter_frame_last_sp_offset * wordSize)); +#endif // !AARCH64 +} + +// Jump to from_interpreted entry of a call unless single stepping is possible +// in this thread in which case we must call the i2i entry +void InterpreterMacroAssembler::jump_from_interpreted(Register method) { + assert_different_registers(method, Rtemp); + + prepare_to_jump_from_interpreted(); + + if (can_post_interpreter_events()) { + // JVMTI events, such as single-stepping, are implemented partly by avoiding running + // compiled code in threads for which the event is enabled. Check here for + // interp_only_mode if these events CAN be enabled. + + ldr_s32(Rtemp, Address(Rthread, JavaThread::interp_only_mode_offset())); +#ifdef AARCH64 + { + Label not_interp_only_mode; + + cbz(Rtemp, not_interp_only_mode); + indirect_jump(Address(method, Method::interpreter_entry_offset()), Rtemp); + + bind(not_interp_only_mode); + } +#else + cmp(Rtemp, 0); + ldr(PC, Address(method, Method::interpreter_entry_offset()), ne); +#endif // AARCH64 + } + + indirect_jump(Address(method, Method::from_interpreted_offset()), Rtemp); +} + + +void InterpreterMacroAssembler::restore_dispatch() { + mov_slow(RdispatchTable, (address)Interpreter::dispatch_table(vtos)); +} + + +// The following two routines provide a hook so that an implementation +// can schedule the dispatch in two parts. +void InterpreterMacroAssembler::dispatch_prolog(TosState state, int step) { + // Nothing ARM-specific to be done here. +} + +void InterpreterMacroAssembler::dispatch_epilog(TosState state, int step) { + dispatch_next(state, step); +} + +void InterpreterMacroAssembler::dispatch_base(TosState state, + DispatchTableMode table_mode, + bool verifyoop) { + if (VerifyActivationFrameSize) { + Label L; +#ifdef AARCH64 + mov(Rtemp, SP); + sub(Rtemp, FP, Rtemp); +#else + sub(Rtemp, FP, SP); +#endif // AARCH64 + int min_frame_size = (frame::link_offset - frame::interpreter_frame_initial_sp_offset) * wordSize; + cmp(Rtemp, min_frame_size); + b(L, ge); + stop("broken stack frame"); + bind(L); + } + + if (verifyoop) { + interp_verify_oop(R0_tos, state, __FILE__, __LINE__); + } + + if((state == itos) || (state == btos) || (state == ztos) || (state == ctos) || (state == stos)) { + zap_high_non_significant_bits(R0_tos); + } + +#ifdef ASSERT + Label L; + mov_slow(Rtemp, (address)Interpreter::dispatch_table(vtos)); + cmp(Rtemp, RdispatchTable); + b(L, eq); + stop("invalid RdispatchTable"); + bind(L); +#endif + + if (table_mode == DispatchDefault) { + if (state == vtos) { + indirect_jump(Address::indexed_ptr(RdispatchTable, R3_bytecode), Rtemp); + } else { +#ifdef AARCH64 + sub(Rtemp, R3_bytecode, (Interpreter::distance_from_dispatch_table(vtos) - + Interpreter::distance_from_dispatch_table(state))); + indirect_jump(Address::indexed_ptr(RdispatchTable, Rtemp), Rtemp); +#else + // on 32-bit ARM this method is faster than the one above. + sub(Rtemp, RdispatchTable, (Interpreter::distance_from_dispatch_table(vtos) - + Interpreter::distance_from_dispatch_table(state)) * wordSize); + indirect_jump(Address::indexed_ptr(Rtemp, R3_bytecode), Rtemp); +#endif + } + } else { + assert(table_mode == DispatchNormal, "invalid dispatch table mode"); + address table = (address) Interpreter::normal_table(state); + mov_slow(Rtemp, table); + indirect_jump(Address::indexed_ptr(Rtemp, R3_bytecode), Rtemp); + } + + nop(); // to avoid filling CPU pipeline with invalid instructions + nop(); +} + +void InterpreterMacroAssembler::dispatch_only(TosState state) { + dispatch_base(state, DispatchDefault); +} + + +void InterpreterMacroAssembler::dispatch_only_normal(TosState state) { + dispatch_base(state, DispatchNormal); +} + +void InterpreterMacroAssembler::dispatch_only_noverify(TosState state) { + dispatch_base(state, DispatchNormal, false); +} + +void InterpreterMacroAssembler::dispatch_next(TosState state, int step) { + // load next bytecode and advance Rbcp + ldrb(R3_bytecode, Address(Rbcp, step, pre_indexed)); + dispatch_base(state, DispatchDefault); +} + +void InterpreterMacroAssembler::narrow(Register result) { + // mask integer result to narrower return type. + const Register Rtmp = R2; + + // get method type + ldr(Rtmp, Address(Rmethod, Method::const_offset())); + ldrb(Rtmp, Address(Rtmp, ConstMethod::result_type_offset())); + + Label notBool, notByte, notChar, done; + cmp(Rtmp, T_INT); + b(done, eq); + + cmp(Rtmp, T_BOOLEAN); + b(notBool, ne); + and_32(result, result, 1); + b(done); + + bind(notBool); + cmp(Rtmp, T_BYTE); + b(notByte, ne); + sign_extend(result, result, 8); + b(done); + + bind(notByte); + cmp(Rtmp, T_CHAR); + b(notChar, ne); + zero_extend(result, result, 16); + b(done); + + bind(notChar); + // cmp(Rtmp, T_SHORT); + // b(done, ne); + sign_extend(result, result, 16); + + // Nothing to do + bind(done); +} + +// remove activation +// +// Unlock the receiver if this is a synchronized method. +// Unlock any Java monitors from syncronized blocks. +// Remove the activation from the stack. +// +// If there are locked Java monitors +// If throw_monitor_exception +// throws IllegalMonitorStateException +// Else if install_monitor_exception +// installs IllegalMonitorStateException +// Else +// no error processing +void InterpreterMacroAssembler::remove_activation(TosState state, Register ret_addr, + bool throw_monitor_exception, + bool install_monitor_exception, + bool notify_jvmdi) { + Label unlock, unlocked, no_unlock; + + // Note: Registers R0, R1, S0 and D0 (TOS cached value) may be in use for the result. + + const Address do_not_unlock_if_synchronized(Rthread, + JavaThread::do_not_unlock_if_synchronized_offset()); + + const Register Rflag = R2; + const Register Raccess_flags = R3; + + restore_method(); + + ldrb(Rflag, do_not_unlock_if_synchronized); + + // get method access flags + ldr_u32(Raccess_flags, Address(Rmethod, Method::access_flags_offset())); + + strb(zero_register(Rtemp), do_not_unlock_if_synchronized); // reset the flag + + // check if method is synchronized + + tbz(Raccess_flags, JVM_ACC_SYNCHRONIZED_BIT, unlocked); + + // Don't unlock anything if the _do_not_unlock_if_synchronized flag is set. + cbnz(Rflag, no_unlock); + + // unlock monitor + push(state); // save result + + // BasicObjectLock will be first in list, since this is a synchronized method. However, need + // to check that the object has not been unlocked by an explicit monitorexit bytecode. + + const Register Rmonitor = R1; // fixed in unlock_object() + const Register Robj = R2; + + // address of first monitor + sub(Rmonitor, FP, - frame::interpreter_frame_monitor_block_bottom_offset * wordSize + (int)sizeof(BasicObjectLock)); + + ldr(Robj, Address(Rmonitor, BasicObjectLock::obj_offset_in_bytes())); + cbnz(Robj, unlock); + + pop(state); + + if (throw_monitor_exception) { + // Entry already unlocked, need to throw exception + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_illegal_monitor_state_exception)); + should_not_reach_here(); + } else { + // Monitor already unlocked during a stack unroll. + // If requested, install an illegal_monitor_state_exception. + // Continue with stack unrolling. + if (install_monitor_exception) { + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::new_illegal_monitor_state_exception)); + } + b(unlocked); + } + + + // Exception case for the check that all monitors are unlocked. + const Register Rcur = R2; + Label restart_check_monitors_unlocked, exception_monitor_is_still_locked; + + bind(exception_monitor_is_still_locked); + // Monitor entry is still locked, need to throw exception. + // Rcur: monitor entry. + + if (throw_monitor_exception) { + // Throw exception + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_illegal_monitor_state_exception)); + should_not_reach_here(); + } else { + // Stack unrolling. Unlock object and install illegal_monitor_exception + // Unlock does not block, so don't have to worry about the frame + + push(state); + mov(R1, Rcur); + unlock_object(R1); + + if (install_monitor_exception) { + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::new_illegal_monitor_state_exception)); + } + + pop(state); + b(restart_check_monitors_unlocked); + } + + bind(unlock); + unlock_object(Rmonitor); + pop(state); + + // Check that for block-structured locking (i.e., that all locked objects has been unlocked) + bind(unlocked); + + // Check that all monitors are unlocked + { + Label loop; + + const int entry_size = frame::interpreter_frame_monitor_size() * wordSize; + const Register Rbottom = R3; + const Register Rcur_obj = Rtemp; + + bind(restart_check_monitors_unlocked); + + ldr(Rcur, Address(FP, frame::interpreter_frame_monitor_block_top_offset * wordSize)); + // points to current entry, starting with top-most entry + sub(Rbottom, FP, -frame::interpreter_frame_monitor_block_bottom_offset * wordSize); + // points to word before bottom of monitor block + + cmp(Rcur, Rbottom); // check if there are no monitors +#ifndef AARCH64 + ldr(Rcur_obj, Address(Rcur, BasicObjectLock::obj_offset_in_bytes()), ne); + // prefetch monitor's object +#endif // !AARCH64 + b(no_unlock, eq); + + bind(loop); +#ifdef AARCH64 + ldr(Rcur_obj, Address(Rcur, BasicObjectLock::obj_offset_in_bytes())); +#endif // AARCH64 + // check if current entry is used + cbnz(Rcur_obj, exception_monitor_is_still_locked); + + add(Rcur, Rcur, entry_size); // otherwise advance to next entry + cmp(Rcur, Rbottom); // check if bottom reached +#ifndef AARCH64 + ldr(Rcur_obj, Address(Rcur, BasicObjectLock::obj_offset_in_bytes()), ne); + // prefetch monitor's object +#endif // !AARCH64 + b(loop, ne); // if not at bottom then check this entry + } + + bind(no_unlock); + + // jvmti support + if (notify_jvmdi) { + notify_method_exit(state, NotifyJVMTI); // preserve TOSCA + } else { + notify_method_exit(state, SkipNotifyJVMTI); // preserve TOSCA + } + + // remove activation +#ifdef AARCH64 + ldr(Rtemp, Address(FP, frame::interpreter_frame_sender_sp_offset * wordSize)); + ldp(FP, LR, Address(FP)); + mov(SP, Rtemp); +#else + mov(Rtemp, FP); + ldmia(FP, RegisterSet(FP) | RegisterSet(LR)); + ldr(SP, Address(Rtemp, frame::interpreter_frame_sender_sp_offset * wordSize)); +#endif + + if (ret_addr != LR) { + mov(ret_addr, LR); + } +} + + +// At certain points in the method invocation the monitor of +// synchronized methods hasn't been entered yet. +// To correctly handle exceptions at these points, we set the thread local +// variable _do_not_unlock_if_synchronized to true. The remove_activation will +// check this flag. +void InterpreterMacroAssembler::set_do_not_unlock_if_synchronized(bool flag, Register tmp) { + const Address do_not_unlock_if_synchronized(Rthread, + JavaThread::do_not_unlock_if_synchronized_offset()); + if (flag) { + mov(tmp, 1); + strb(tmp, do_not_unlock_if_synchronized); + } else { + strb(zero_register(tmp), do_not_unlock_if_synchronized); + } +} + +// Lock object +// +// Argument: R1 : Points to BasicObjectLock to be used for locking. +// Must be initialized with object to lock. +// Blows volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64), Rtemp, LR. Calls VM. +void InterpreterMacroAssembler::lock_object(Register Rlock) { + assert(Rlock == R1, "the second argument"); + + if (UseHeavyMonitors) { + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), Rlock); + } else { + Label done; + + const Register Robj = R2; + const Register Rmark = R3; + assert_different_registers(Robj, Rmark, Rlock, R0, Rtemp); + + const int obj_offset = BasicObjectLock::obj_offset_in_bytes(); + const int lock_offset = BasicObjectLock::lock_offset_in_bytes (); + const int mark_offset = lock_offset + BasicLock::displaced_header_offset_in_bytes(); + + Label already_locked, slow_case; + + // Load object pointer + ldr(Robj, Address(Rlock, obj_offset)); + + if (UseBiasedLocking) { + biased_locking_enter(Robj, Rmark/*scratched*/, R0, false, Rtemp, done, slow_case); + } + +#ifdef AARCH64 + assert(oopDesc::mark_offset_in_bytes() == 0, "must be"); + ldr(Rmark, Robj); + + // Test if object is already locked + assert(markOopDesc::unlocked_value == 1, "adjust this code"); + tbz(Rmark, exact_log2(markOopDesc::unlocked_value), already_locked); + +#else // AARCH64 + + // On MP platforms the next load could return a 'stale' value if the memory location has been modified by another thread. + // That would be acceptable as ether CAS or slow case path is taken in that case. + // Exception to that is if the object is locked by the calling thread, then the recursive test will pass (guaranteed as + // loads are satisfied from a store queue if performed on the same processor). + + assert(oopDesc::mark_offset_in_bytes() == 0, "must be"); + ldr(Rmark, Address(Robj, oopDesc::mark_offset_in_bytes())); + + // Test if object is already locked + tst(Rmark, markOopDesc::unlocked_value); + b(already_locked, eq); + +#endif // !AARCH64 + // Save old object->mark() into BasicLock's displaced header + str(Rmark, Address(Rlock, mark_offset)); + + cas_for_lock_acquire(Rmark, Rlock, Robj, Rtemp, slow_case); + +#ifndef PRODUCT + if (PrintBiasedLockingStatistics) { + cond_atomic_inc32(al, BiasedLocking::fast_path_entry_count_addr()); + } +#endif //!PRODUCT + + b(done); + + // If we got here that means the object is locked by ether calling thread or another thread. + bind(already_locked); + // Handling of locked objects: recursive locks and slow case. + + // Fast check for recursive lock. + // + // Can apply the optimization only if this is a stack lock + // allocated in this thread. For efficiency, we can focus on + // recently allocated stack locks (instead of reading the stack + // base and checking whether 'mark' points inside the current + // thread stack): + // 1) (mark & 3) == 0 + // 2) SP <= mark < SP + os::pagesize() + // + // Warning: SP + os::pagesize can overflow the stack base. We must + // neither apply the optimization for an inflated lock allocated + // just above the thread stack (this is why condition 1 matters) + // nor apply the optimization if the stack lock is inside the stack + // of another thread. The latter is avoided even in case of overflow + // because we have guard pages at the end of all stacks. Hence, if + // we go over the stack base and hit the stack of another thread, + // this should not be in a writeable area that could contain a + // stack lock allocated by that thread. As a consequence, a stack + // lock less than page size away from SP is guaranteed to be + // owned by the current thread. + // + // Note: assuming SP is aligned, we can check the low bits of + // (mark-SP) instead of the low bits of mark. In that case, + // assuming page size is a power of 2, we can merge the two + // conditions into a single test: + // => ((mark - SP) & (3 - os::pagesize())) == 0 + +#ifdef AARCH64 + // Use the single check since the immediate is OK for AARCH64 + sub(R0, Rmark, Rstack_top); + intptr_t mask = ((intptr_t)3) - ((intptr_t)os::vm_page_size()); + Assembler::LogicalImmediate imm(mask, false); + ands(R0, R0, imm); + + // For recursive case store 0 into lock record. + // It is harmless to store it unconditionally as lock record contains some garbage + // value in its _displaced_header field by this moment. + str(ZR, Address(Rlock, mark_offset)); + +#else // AARCH64 + // (3 - os::pagesize()) cannot be encoded as an ARM immediate operand. + // Check independently the low bits and the distance to SP. + // -1- test low 2 bits + movs(R0, AsmOperand(Rmark, lsl, 30)); + // -2- test (mark - SP) if the low two bits are 0 + sub(R0, Rmark, SP, eq); + movs(R0, AsmOperand(R0, lsr, exact_log2(os::vm_page_size())), eq); + // If still 'eq' then recursive locking OK: store 0 into lock record + str(R0, Address(Rlock, mark_offset), eq); + +#endif // AARCH64 + +#ifndef PRODUCT + if (PrintBiasedLockingStatistics) { + cond_atomic_inc32(eq, BiasedLocking::fast_path_entry_count_addr()); + } +#endif // !PRODUCT + + b(done, eq); + + bind(slow_case); + + // Call the runtime routine for slow case + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), Rlock); + + bind(done); + } +} + + +// Unlocks an object. Used in monitorexit bytecode and remove_activation. +// +// Argument: R1: Points to BasicObjectLock structure for lock +// Throw an IllegalMonitorException if object is not locked by current thread +// Blows volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64), Rtemp, LR. Calls VM. +void InterpreterMacroAssembler::unlock_object(Register Rlock) { + assert(Rlock == R1, "the second argument"); + + if (UseHeavyMonitors) { + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), Rlock); + } else { + Label done, slow_case; + + const Register Robj = R2; + const Register Rmark = R3; + const Register Rresult = R0; + assert_different_registers(Robj, Rmark, Rlock, R0, Rtemp); + + const int obj_offset = BasicObjectLock::obj_offset_in_bytes(); + const int lock_offset = BasicObjectLock::lock_offset_in_bytes (); + const int mark_offset = lock_offset + BasicLock::displaced_header_offset_in_bytes(); + + const Register Rzero = zero_register(Rtemp); + + // Load oop into Robj + ldr(Robj, Address(Rlock, obj_offset)); + + // Free entry + str(Rzero, Address(Rlock, obj_offset)); + + if (UseBiasedLocking) { + biased_locking_exit(Robj, Rmark, done); + } + + // Load the old header from BasicLock structure + ldr(Rmark, Address(Rlock, mark_offset)); + + // Test for recursion (zero mark in BasicLock) + cbz(Rmark, done); + + bool allow_fallthrough_on_failure = true; + + cas_for_lock_release(Rlock, Rmark, Robj, Rtemp, slow_case, allow_fallthrough_on_failure); + + b(done, eq); + + bind(slow_case); + + // Call the runtime routine for slow case. + str(Robj, Address(Rlock, obj_offset)); // restore obj + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), Rlock); + + bind(done); + } +} + + +// Test ImethodDataPtr. If it is null, continue at the specified label +void InterpreterMacroAssembler::test_method_data_pointer(Register mdp, Label& zero_continue) { + assert(ProfileInterpreter, "must be profiling interpreter"); + ldr(mdp, Address(FP, frame::interpreter_frame_mdp_offset * wordSize)); + cbz(mdp, zero_continue); +} + + +// Set the method data pointer for the current bcp. +// Blows volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64), Rtemp, LR. +void InterpreterMacroAssembler::set_method_data_pointer_for_bcp() { + assert(ProfileInterpreter, "must be profiling interpreter"); + Label set_mdp; + + // Test MDO to avoid the call if it is NULL. + ldr(Rtemp, Address(Rmethod, Method::method_data_offset())); + cbz(Rtemp, set_mdp); + + mov(R0, Rmethod); + mov(R1, Rbcp); + call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::bcp_to_di), R0, R1); + // R0/W0: mdi + + // mdo is guaranteed to be non-zero here, we checked for it before the call. + ldr(Rtemp, Address(Rmethod, Method::method_data_offset())); + add(Rtemp, Rtemp, in_bytes(MethodData::data_offset())); + add_ptr_scaled_int32(Rtemp, Rtemp, R0, 0); + + bind(set_mdp); + str(Rtemp, Address(FP, frame::interpreter_frame_mdp_offset * wordSize)); +} + + +void InterpreterMacroAssembler::verify_method_data_pointer() { + assert(ProfileInterpreter, "must be profiling interpreter"); +#ifdef ASSERT + Label verify_continue; + save_caller_save_registers(); + + const Register Rmdp = R2; + test_method_data_pointer(Rmdp, verify_continue); // If mdp is zero, continue + + // If the mdp is valid, it will point to a DataLayout header which is + // consistent with the bcp. The converse is highly probable also. + + ldrh(R3, Address(Rmdp, DataLayout::bci_offset())); + ldr(Rtemp, Address(Rmethod, Method::const_offset())); + add(R3, R3, Rtemp); + add(R3, R3, in_bytes(ConstMethod::codes_offset())); + cmp(R3, Rbcp); + b(verify_continue, eq); + + mov(R0, Rmethod); + mov(R1, Rbcp); + call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::verify_mdp), R0, R1, Rmdp); + + bind(verify_continue); + restore_caller_save_registers(); +#endif // ASSERT +} + + +void InterpreterMacroAssembler::set_mdp_data_at(Register mdp_in, int offset, Register value) { + assert(ProfileInterpreter, "must be profiling interpreter"); + assert_different_registers(mdp_in, value); + str(value, Address(mdp_in, offset)); +} + + +// Increments mdp data. Sets bumped_count register to adjusted counter. +void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in, + int offset, + Register bumped_count, + bool decrement) { + assert(ProfileInterpreter, "must be profiling interpreter"); + + // Counter address + Address data(mdp_in, offset); + assert_different_registers(mdp_in, bumped_count); + + increment_mdp_data_at(data, bumped_count, decrement); +} + +void InterpreterMacroAssembler::set_mdp_flag_at(Register mdp_in, int flag_byte_constant) { + assert_different_registers(mdp_in, Rtemp); + assert(ProfileInterpreter, "must be profiling interpreter"); + assert((0 < flag_byte_constant) && (flag_byte_constant < (1 << BitsPerByte)), "flag mask is out of range"); + + // Set the flag + ldrb(Rtemp, Address(mdp_in, in_bytes(DataLayout::flags_offset()))); + orr(Rtemp, Rtemp, (unsigned)flag_byte_constant); + strb(Rtemp, Address(mdp_in, in_bytes(DataLayout::flags_offset()))); +} + + +// Increments mdp data. Sets bumped_count register to adjusted counter. +void InterpreterMacroAssembler::increment_mdp_data_at(Address data, + Register bumped_count, + bool decrement) { + assert(ProfileInterpreter, "must be profiling interpreter"); + + ldr(bumped_count, data); + if (decrement) { + // Decrement the register. Set condition codes. + subs(bumped_count, bumped_count, DataLayout::counter_increment); + // Avoid overflow. +#ifdef AARCH64 + assert(DataLayout::counter_increment == 1, "required for cinc"); + cinc(bumped_count, bumped_count, pl); +#else + add(bumped_count, bumped_count, DataLayout::counter_increment, pl); +#endif // AARCH64 + } else { + // Increment the register. Set condition codes. + adds(bumped_count, bumped_count, DataLayout::counter_increment); + // Avoid overflow. +#ifdef AARCH64 + assert(DataLayout::counter_increment == 1, "required for cinv"); + cinv(bumped_count, bumped_count, mi); // inverts 0x80..00 back to 0x7f..ff +#else + sub(bumped_count, bumped_count, DataLayout::counter_increment, mi); +#endif // AARCH64 + } + str(bumped_count, data); +} + + +void InterpreterMacroAssembler::test_mdp_data_at(Register mdp_in, + int offset, + Register value, + Register test_value_out, + Label& not_equal_continue) { + assert(ProfileInterpreter, "must be profiling interpreter"); + assert_different_registers(mdp_in, test_value_out, value); + + ldr(test_value_out, Address(mdp_in, offset)); + cmp(test_value_out, value); + + b(not_equal_continue, ne); +} + + +void InterpreterMacroAssembler::update_mdp_by_offset(Register mdp_in, int offset_of_disp, Register reg_temp) { + assert(ProfileInterpreter, "must be profiling interpreter"); + assert_different_registers(mdp_in, reg_temp); + + ldr(reg_temp, Address(mdp_in, offset_of_disp)); + add(mdp_in, mdp_in, reg_temp); + str(mdp_in, Address(FP, frame::interpreter_frame_mdp_offset * wordSize)); +} + + +void InterpreterMacroAssembler::update_mdp_by_offset(Register mdp_in, Register reg_offset, Register reg_tmp) { + assert(ProfileInterpreter, "must be profiling interpreter"); + assert_different_registers(mdp_in, reg_offset, reg_tmp); + + ldr(reg_tmp, Address(mdp_in, reg_offset)); + add(mdp_in, mdp_in, reg_tmp); + str(mdp_in, Address(FP, frame::interpreter_frame_mdp_offset * wordSize)); +} + + +void InterpreterMacroAssembler::update_mdp_by_constant(Register mdp_in, int constant) { + assert(ProfileInterpreter, "must be profiling interpreter"); + add(mdp_in, mdp_in, constant); + str(mdp_in, Address(FP, frame::interpreter_frame_mdp_offset * wordSize)); +} + + +// Blows volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). +void InterpreterMacroAssembler::update_mdp_for_ret(Register return_bci) { + assert(ProfileInterpreter, "must be profiling interpreter"); + assert_different_registers(return_bci, R0, R1, R2, R3, Rtemp); + + mov(R1, return_bci); + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::update_mdp_for_ret), R1); +} + + +// Sets mdp, bumped_count registers, blows Rtemp. +void InterpreterMacroAssembler::profile_taken_branch(Register mdp, Register bumped_count) { + assert_different_registers(mdp, bumped_count); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + // Otherwise, assign to mdp + test_method_data_pointer(mdp, profile_continue); + + // We are taking a branch. Increment the taken count. + increment_mdp_data_at(mdp, in_bytes(JumpData::taken_offset()), bumped_count); + + // The method data pointer needs to be updated to reflect the new target. + update_mdp_by_offset(mdp, in_bytes(JumpData::displacement_offset()), Rtemp); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_not_taken_branch(Register mdp) { + assert_different_registers(mdp, Rtemp); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // We are taking a branch. Increment the not taken count. + increment_mdp_data_at(mdp, in_bytes(BranchData::not_taken_offset()), Rtemp); + + // The method data pointer needs to be updated to correspond to the next bytecode + update_mdp_by_constant(mdp, in_bytes(BranchData::branch_data_size())); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_call(Register mdp) { + assert_different_registers(mdp, Rtemp); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // We are making a call. Increment the count. + increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()), Rtemp); + + // The method data pointer needs to be updated to reflect the new target. + update_mdp_by_constant(mdp, in_bytes(CounterData::counter_data_size())); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_final_call(Register mdp) { + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // We are making a call. Increment the count. + increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()), Rtemp); + + // The method data pointer needs to be updated to reflect the new target. + update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_virtual_call(Register mdp, Register receiver, bool receiver_can_be_null) { + assert_different_registers(mdp, receiver, Rtemp); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + Label skip_receiver_profile; + if (receiver_can_be_null) { + Label not_null; + cbnz(receiver, not_null); + // We are making a call. Increment the count for null receiver. + increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()), Rtemp); + b(skip_receiver_profile); + bind(not_null); + } + + // Record the receiver type. + record_klass_in_profile(receiver, mdp, Rtemp, true); + bind(skip_receiver_profile); + + // The method data pointer needs to be updated to reflect the new target. + update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); + bind(profile_continue); + } +} + + +void InterpreterMacroAssembler::record_klass_in_profile_helper( + Register receiver, Register mdp, + Register reg_tmp, + int start_row, Label& done, bool is_virtual_call) { + if (TypeProfileWidth == 0) + return; + + assert_different_registers(receiver, mdp, reg_tmp); + + int last_row = VirtualCallData::row_limit() - 1; + assert(start_row <= last_row, "must be work left to do"); + // Test this row for both the receiver and for null. + // Take any of three different outcomes: + // 1. found receiver => increment count and goto done + // 2. found null => keep looking for case 1, maybe allocate this cell + // 3. found something else => keep looking for cases 1 and 2 + // Case 3 is handled by a recursive call. + for (int row = start_row; row <= last_row; row++) { + Label next_test; + + // See if the receiver is receiver[n]. + int recvr_offset = in_bytes(VirtualCallData::receiver_offset(row)); + + test_mdp_data_at(mdp, recvr_offset, receiver, reg_tmp, next_test); + + // The receiver is receiver[n]. Increment count[n]. + int count_offset = in_bytes(VirtualCallData::receiver_count_offset(row)); + increment_mdp_data_at(mdp, count_offset, reg_tmp); + b(done); + + bind(next_test); + // reg_tmp now contains the receiver from the CallData. + + if (row == start_row) { + Label found_null; + // Failed the equality check on receiver[n]... Test for null. + if (start_row == last_row) { + // The only thing left to do is handle the null case. + if (is_virtual_call) { + cbz(reg_tmp, found_null); + // 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(mdp, in_bytes(CounterData::count_offset()), reg_tmp); + b(done); + bind(found_null); + } else { + cbnz(reg_tmp, done); + } + break; + } + // Since null is rare, make it be the branch-taken case. + cbz(reg_tmp, found_null); + + // Put all the "Case 3" tests here. + record_klass_in_profile_helper(receiver, mdp, reg_tmp, start_row + 1, done, is_virtual_call); + + // Found a null. Keep searching for a matching receiver, + // but remember that this is an empty (unused) slot. + bind(found_null); + } + } + + // In the fall-through case, we found no matching receiver, but we + // observed the receiver[start_row] is NULL. + + // Fill in the receiver field and increment the count. + 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)); + mov(reg_tmp, DataLayout::counter_increment); + set_mdp_data_at(mdp, count_offset, reg_tmp); + if (start_row > 0) { + b(done); + } +} + +void InterpreterMacroAssembler::record_klass_in_profile(Register receiver, + Register mdp, + Register reg_tmp, + bool is_virtual_call) { + assert(ProfileInterpreter, "must be profiling"); + assert_different_registers(receiver, mdp, reg_tmp); + + Label done; + + record_klass_in_profile_helper(receiver, mdp, reg_tmp, 0, done, is_virtual_call); + + bind (done); +} + +// Sets mdp, blows volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). +void InterpreterMacroAssembler::profile_ret(Register mdp, Register return_bci) { + assert_different_registers(mdp, return_bci, Rtemp, R0, R1, R2, R3); + + if (ProfileInterpreter) { + Label profile_continue; + uint row; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // Update the total ret count. + increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()), Rtemp); + + for (row = 0; row < RetData::row_limit(); row++) { + Label next_test; + + // See if return_bci is equal to bci[n]: + test_mdp_data_at(mdp, in_bytes(RetData::bci_offset(row)), return_bci, + Rtemp, next_test); + + // return_bci is equal to bci[n]. Increment the count. + increment_mdp_data_at(mdp, in_bytes(RetData::bci_count_offset(row)), Rtemp); + + // The method data pointer needs to be updated to reflect the new target. + update_mdp_by_offset(mdp, in_bytes(RetData::bci_displacement_offset(row)), Rtemp); + b(profile_continue); + bind(next_test); + } + + update_mdp_for_ret(return_bci); + + bind(profile_continue); + } +} + + +// Sets mdp. +void InterpreterMacroAssembler::profile_null_seen(Register mdp) { + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + set_mdp_flag_at(mdp, BitData::null_seen_byte_constant()); + + // The method data pointer needs to be updated. + int mdp_delta = in_bytes(BitData::bit_data_size()); + if (TypeProfileCasts) { + mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size()); + } + update_mdp_by_constant(mdp, mdp_delta); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_typecheck_failed(Register mdp) { + assert_different_registers(mdp, Rtemp); + + if (ProfileInterpreter && TypeProfileCasts) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + int count_offset = in_bytes(CounterData::count_offset()); + // Back up the address, since we have already bumped the mdp. + count_offset -= in_bytes(VirtualCallData::virtual_call_data_size()); + + // *Decrement* the counter. We expect to see zero or small negatives. + increment_mdp_data_at(mdp, count_offset, Rtemp, true); + + bind (profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass) +{ + assert_different_registers(mdp, klass, Rtemp); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // The method data pointer needs to be updated. + int mdp_delta = in_bytes(BitData::bit_data_size()); + if (TypeProfileCasts) { + mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size()); + + // Record the object type. + record_klass_in_profile(klass, mdp, Rtemp, false); + } + update_mdp_by_constant(mdp, mdp_delta); + + bind(profile_continue); + } +} + + +// Sets mdp, blows Rtemp. +void InterpreterMacroAssembler::profile_switch_default(Register mdp) { + assert_different_registers(mdp, Rtemp); + + if (ProfileInterpreter) { + Label profile_continue; + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // Update the default case count + increment_mdp_data_at(mdp, in_bytes(MultiBranchData::default_count_offset()), Rtemp); + + // The method data pointer needs to be updated. + update_mdp_by_offset(mdp, in_bytes(MultiBranchData::default_displacement_offset()), Rtemp); + + bind(profile_continue); + } +} + + +// Sets mdp. Blows reg_tmp1, reg_tmp2. Index could be the same as reg_tmp2. +void InterpreterMacroAssembler::profile_switch_case(Register mdp, Register index, Register reg_tmp1, Register reg_tmp2) { + assert_different_registers(mdp, reg_tmp1, reg_tmp2); + assert_different_registers(mdp, reg_tmp1, index); + + if (ProfileInterpreter) { + Label profile_continue; + + const int count_offset = in_bytes(MultiBranchData::case_array_offset()) + + in_bytes(MultiBranchData::relative_count_offset()); + + const int displacement_offset = in_bytes(MultiBranchData::case_array_offset()) + + in_bytes(MultiBranchData::relative_displacement_offset()); + + // If no method data exists, go to profile_continue. + test_method_data_pointer(mdp, profile_continue); + + // Build the base (index * per_case_size_in_bytes()) + logical_shift_left(reg_tmp1, index, exact_log2(in_bytes(MultiBranchData::per_case_size()))); + + // Update the case count + add(reg_tmp1, reg_tmp1, count_offset); + increment_mdp_data_at(Address(mdp, reg_tmp1), reg_tmp2); + + // The method data pointer needs to be updated. + add(reg_tmp1, reg_tmp1, displacement_offset - count_offset); + update_mdp_by_offset(mdp, reg_tmp1, reg_tmp2); + + bind (profile_continue); + } +} + + +void InterpreterMacroAssembler::byteswap_u32(Register r, Register rtmp1, Register rtmp2) { +#ifdef AARCH64 + rev_w(r, r); +#else + if (VM_Version::supports_rev()) { + rev(r, r); + } else { + eor(rtmp1, r, AsmOperand(r, ror, 16)); + mvn(rtmp2, 0x0000ff00); + andr(rtmp1, rtmp2, AsmOperand(rtmp1, lsr, 8)); + eor(r, rtmp1, AsmOperand(r, ror, 8)); + } +#endif // AARCH64 +} + + +void InterpreterMacroAssembler::inc_global_counter(address address_of_counter, int offset, Register tmp1, Register tmp2, bool avoid_overflow) { + const intx addr = (intx) (address_of_counter + offset); + + assert ((addr & 0x3) == 0, "address of counter should be aligned"); + const intx offset_mask = right_n_bits(AARCH64_ONLY(12 + 2) NOT_AARCH64(12)); + + const address base = (address) (addr & ~offset_mask); + const int offs = (int) (addr & offset_mask); + + const Register addr_base = tmp1; + const Register val = tmp2; + + mov_slow(addr_base, base); + ldr_s32(val, Address(addr_base, offs)); + + if (avoid_overflow) { + adds_32(val, val, 1); +#ifdef AARCH64 + Label L; + b(L, mi); + str_32(val, Address(addr_base, offs)); + bind(L); +#else + str(val, Address(addr_base, offs), pl); +#endif // AARCH64 + } else { + add_32(val, val, 1); + str_32(val, Address(addr_base, offs)); + } +} + +void InterpreterMacroAssembler::interp_verify_oop(Register reg, TosState state, const char *file, int line) { + if (state == atos) { MacroAssembler::_verify_oop(reg, "broken oop", file, line); } +} + +// Inline assembly for: +// +// if (thread is in interp_only_mode) { +// InterpreterRuntime::post_method_entry(); +// } +// if (DTraceMethodProbes) { +// SharedRuntime::dtrace_method_entry(method, receiver); +// } +// if (RC_TRACE_IN_RANGE(0x00001000, 0x00002000)) { +// SharedRuntime::rc_trace_method_entry(method, receiver); +// } + +void InterpreterMacroAssembler::notify_method_entry() { + // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to + // track stack depth. If it is possible to enter interp_only_mode we add + // the code to check if the event should be sent. + if (can_post_interpreter_events()) { + Label L; + + ldr_s32(Rtemp, Address(Rthread, JavaThread::interp_only_mode_offset())); + cbz(Rtemp, L); + + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_entry)); + + bind(L); + } + + // Note: Disable DTrace runtime check for now to eliminate overhead on each method entry + if (DTraceMethodProbes) { + Label Lcontinue; + + ldrb_global(Rtemp, (address)&DTraceMethodProbes); + cbz(Rtemp, Lcontinue); + + mov(R0, Rthread); + mov(R1, Rmethod); + call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry), R0, R1); + + bind(Lcontinue); + } + // RedefineClasses() tracing support for obsolete method entry + if (log_is_enabled(Trace, redefine, class, obsolete)) { + mov(R0, Rthread); + mov(R1, Rmethod); + call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::rc_trace_method_entry), + R0, R1); + } +} + + +void InterpreterMacroAssembler::notify_method_exit( + TosState state, NotifyMethodExitMode mode, + bool native, Register result_lo, Register result_hi, FloatRegister result_fp) { + // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to + // track stack depth. If it is possible to enter interp_only_mode we add + // the code to check if the event should be sent. + if (mode == NotifyJVMTI && can_post_interpreter_events()) { + Label L; + // Note: frame::interpreter_frame_result has a dependency on how the + // method result is saved across the call to post_method_exit. If this + // is changed then the interpreter_frame_result implementation will + // need to be updated too. + + ldr_s32(Rtemp, Address(Rthread, JavaThread::interp_only_mode_offset())); + cbz(Rtemp, L); + + if (native) { + // For c++ and template interpreter push both result registers on the + // stack in native, we don't know the state. + // On AArch64 result registers are stored into the frame at known locations. + // See frame::interpreter_frame_result for code that gets the result values from here. + assert(result_lo != noreg, "result registers should be defined"); + +#ifdef AARCH64 + assert(result_hi == noreg, "result_hi is not used on AArch64"); + assert(result_fp != fnoreg, "FP result register must be defined"); + + str_d(result_fp, Address(FP, frame::interpreter_frame_fp_saved_result_offset * wordSize)); + str(result_lo, Address(FP, frame::interpreter_frame_gp_saved_result_offset * wordSize)); +#else + assert(result_hi != noreg, "result registers should be defined"); + +#ifdef __ABI_HARD__ + assert(result_fp != fnoreg, "FP result register must be defined"); + sub(SP, SP, 2 * wordSize); + fstd(result_fp, Address(SP)); +#endif // __ABI_HARD__ + + push(RegisterSet(result_lo) | RegisterSet(result_hi)); +#endif // AARCH64 + + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit)); + +#ifdef AARCH64 + ldr_d(result_fp, Address(FP, frame::interpreter_frame_fp_saved_result_offset * wordSize)); + ldr(result_lo, Address(FP, frame::interpreter_frame_gp_saved_result_offset * wordSize)); +#else + pop(RegisterSet(result_lo) | RegisterSet(result_hi)); +#ifdef __ABI_HARD__ + fldd(result_fp, Address(SP)); + add(SP, SP, 2 * wordSize); +#endif // __ABI_HARD__ +#endif // AARCH64 + + } else { + // For the template interpreter, the value on tos is the size of the + // state. (c++ interpreter calls jvmti somewhere else). + push(state); + call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit)); + pop(state); + } + + bind(L); + } + + // Note: Disable DTrace runtime check for now to eliminate overhead on each method exit + if (DTraceMethodProbes) { + Label Lcontinue; + + ldrb_global(Rtemp, (address)&DTraceMethodProbes); + cbz(Rtemp, Lcontinue); + + push(state); + + mov(R0, Rthread); + mov(R1, Rmethod); + + call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), R0, R1); + + pop(state); + + bind(Lcontinue); + } +} + + +#ifndef PRODUCT + +void InterpreterMacroAssembler::trace_state(const char* msg) { + int push_size = save_caller_save_registers(); + + Label Lcontinue; + InlinedString Lmsg0("%s: FP=" INTPTR_FORMAT ", SP=" INTPTR_FORMAT "\n"); + InlinedString Lmsg(msg); + InlinedAddress Lprintf((address)printf); + + ldr_literal(R0, Lmsg0); + ldr_literal(R1, Lmsg); + mov(R2, FP); + add(R3, SP, push_size); // original SP (without saved registers) + ldr_literal(Rtemp, Lprintf); + call(Rtemp); + + b(Lcontinue); + + bind_literal(Lmsg0); + bind_literal(Lmsg); + bind_literal(Lprintf); + + + bind(Lcontinue); + + restore_caller_save_registers(); +} + +#endif + +// Jump if ((*counter_addr += increment) & mask) satisfies the condition. +void InterpreterMacroAssembler::increment_mask_and_jump(Address counter_addr, + int increment, Address mask_addr, + Register scratch, Register scratch2, + AsmCondition cond, Label* where) { + // caution: scratch2 and base address of counter_addr can be the same + assert_different_registers(scratch, scratch2); + ldr_u32(scratch, counter_addr); + add(scratch, scratch, increment); + str_32(scratch, counter_addr); + +#ifdef AARCH64 + ldr_u32(scratch2, mask_addr); + ands_w(ZR, scratch, scratch2); +#else + ldr(scratch2, mask_addr); + andrs(scratch, scratch, scratch2); +#endif // AARCH64 + b(*where, cond); +} + +void InterpreterMacroAssembler::get_method_counters(Register method, + Register Rcounters, + Label& skip) { + const Address method_counters(method, Method::method_counters_offset()); + Label has_counters; + + ldr(Rcounters, method_counters); + cbnz(Rcounters, has_counters); + +#ifdef AARCH64 + const Register tmp = Rcounters; + const int saved_regs_size = 20*wordSize; + + // Note: call_VM will cut SP according to Rstack_top value before call, and restore SP to + // extended_sp value from frame after the call. + // So make sure there is enough stack space to save registers and adjust Rstack_top accordingly. + { + Label enough_stack_space; + check_extended_sp(tmp); + sub(Rstack_top, Rstack_top, saved_regs_size); + cmp(SP, Rstack_top); + b(enough_stack_space, ls); + + align_reg(tmp, Rstack_top, StackAlignmentInBytes); + mov(SP, tmp); + str(tmp, Address(FP, frame::interpreter_frame_extended_sp_offset * wordSize)); + + bind(enough_stack_space); + check_stack_top(); + + int offset = 0; + stp(R0, R1, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R2, R3, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R4, R5, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R6, R7, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R8, R9, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R10, R11, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R12, R13, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R14, R15, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R16, R17, Address(Rstack_top, offset)); offset += 2*wordSize; + stp(R18, LR, Address(Rstack_top, offset)); offset += 2*wordSize; + assert (offset == saved_regs_size, "should be"); + } +#else + push(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(R14)); +#endif // AARCH64 + + mov(R1, method); + call_VM(noreg, CAST_FROM_FN_PTR(address, + InterpreterRuntime::build_method_counters), R1); + +#ifdef AARCH64 + { + int offset = 0; + ldp(R0, R1, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R2, R3, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R4, R5, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R6, R7, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R8, R9, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R10, R11, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R12, R13, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R14, R15, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R16, R17, Address(Rstack_top, offset)); offset += 2*wordSize; + ldp(R18, LR, Address(Rstack_top, offset)); offset += 2*wordSize; + assert (offset == saved_regs_size, "should be"); + + add(Rstack_top, Rstack_top, saved_regs_size); + } +#else + pop(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(R14)); +#endif // AARCH64 + + ldr(Rcounters, method_counters); + cbz(Rcounters, skip); // No MethodCounters created, OutOfMemory + + bind(has_counters); +} diff --git a/hotspot/src/cpu/arm/vm/interp_masm_arm.hpp b/hotspot/src/cpu/arm/vm/interp_masm_arm.hpp new file mode 100644 index 00000000000..5c753753f95 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/interp_masm_arm.hpp @@ -0,0 +1,355 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_INTERP_MASM_ARM_HPP +#define CPU_ARM_VM_INTERP_MASM_ARM_HPP + +#include "asm/macroAssembler.hpp" +#include "asm/macroAssembler.inline.hpp" +#include "interpreter/invocationCounter.hpp" +#include "runtime/frame.hpp" +#include "prims/jvmtiExport.hpp" + +// This file specializes the assember with interpreter-specific macros + + +class InterpreterMacroAssembler: public MacroAssembler { + + public: + + // allow JvmtiExport checks to be extended + bool can_force_early_return() { return JvmtiExport::can_force_early_return(); } + bool can_post_interpreter_events() { return JvmtiExport::can_post_interpreter_events(); } + bool can_pop_frame() { return JvmtiExport::can_pop_frame(); } + bool can_post_breakpoint() { return JvmtiExport::can_post_breakpoint(); } + bool can_post_field_access() { return JvmtiExport::can_post_field_access(); } + bool can_post_field_modification() { return JvmtiExport::can_post_field_modification(); } + // flags controlled by JVMTI settings + bool rewrite_frequent_pairs() { return RewriteFrequentPairs; } + + protected: + + // Template interpreter specific version of call_VM_helper + virtual void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions); + + virtual void check_and_handle_popframe(); + virtual void check_and_handle_earlyret(); + + // base routine for all dispatches + typedef enum { DispatchDefault, DispatchNormal } DispatchTableMode; + void dispatch_base(TosState state, DispatchTableMode table_mode, bool verifyoop = true); + + public: + InterpreterMacroAssembler(CodeBuffer* code); + + // Interpreter-specific registers +#if defined(AARCH64) && defined(ASSERT) + +#define check_stack_top() _check_stack_top("invalid Rstack_top at " __FILE__ ":" XSTR(__LINE__)) +#define check_stack_top_on_expansion() _check_stack_top("invalid Rstack_top at " __FILE__ ":" XSTR(__LINE__), VerifyInterpreterStackTop) +#define check_extended_sp(tmp) _check_extended_sp(tmp, "SP does not match extended SP in frame at " __FILE__ ":" XSTR(__LINE__)) +#define check_no_cached_stack_top(tmp) _check_no_cached_stack_top(tmp, "stack_top is already cached in frame at " __FILE__ ":" XSTR(__LINE__)) + + void _check_stack_top(const char* msg, bool enabled = true) { + if (enabled) { + Label L; + cmp(SP, Rstack_top); + b(L, ls); + stop(msg); + bind(L); + } + } + + void _check_extended_sp(Register tmp, const char* msg) { + Label L; + ldr(tmp, Address(FP, frame::interpreter_frame_extended_sp_offset * wordSize)); + cmp(SP, tmp); + b(L, eq); + stop(msg); + bind(L); + } + + void _check_no_cached_stack_top(Register tmp, const char* msg) { + Label L; + ldr(tmp, Address(FP, frame::interpreter_frame_stack_top_offset * wordSize)); + cbz(tmp, L); + stop(msg); + bind(L); + } + +#else + + inline void check_stack_top() {} + inline void check_stack_top_on_expansion() {} + inline void check_extended_sp(Register tmp) {} + inline void check_no_cached_stack_top(Register tmp) {} + +#endif // AARCH64 && ASSERT + + void save_bcp() { str(Rbcp, Address(FP, frame::interpreter_frame_bcp_offset * wordSize)); } + void restore_bcp() { ldr(Rbcp, Address(FP, frame::interpreter_frame_bcp_offset * wordSize)); } + void restore_locals() { ldr(Rlocals, Address(FP, frame::interpreter_frame_locals_offset * wordSize)); } + void restore_method() { ldr(Rmethod, Address(FP, frame::interpreter_frame_method_offset * wordSize)); } + void restore_dispatch(); + +#ifdef AARCH64 + void save_stack_top() { check_stack_top(); str(Rstack_top, Address(FP, frame::interpreter_frame_stack_top_offset * wordSize)); } + void clear_cached_stack_top() { str(ZR, Address(FP, frame::interpreter_frame_stack_top_offset * wordSize)); } + void restore_stack_top() { ldr(Rstack_top, Address(FP, frame::interpreter_frame_stack_top_offset * wordSize)); clear_cached_stack_top(); check_stack_top(); } + void cut_sp_before_call() { align_reg(SP, Rstack_top, StackAlignmentInBytes); } + void restore_sp_after_call(Register tmp) { ldr(tmp, Address(FP, frame::interpreter_frame_extended_sp_offset * wordSize)); mov(SP, tmp); } +#endif + + // Helpers for runtime call arguments/results + void get_const(Register reg) { ldr(reg, Address(Rmethod, Method::const_offset())); } + void get_constant_pool(Register reg) { get_const(reg); ldr(reg, Address(reg, ConstMethod::constants_offset())); } + void get_constant_pool_cache(Register reg) { get_constant_pool(reg); ldr(reg, Address(reg, ConstantPool::cache_offset_in_bytes())); } + void get_cpool_and_tags(Register cpool, Register tags) { get_constant_pool(cpool); ldr(tags, Address(cpool, ConstantPool::tags_offset_in_bytes())); } + + // Sets reg. Blows Rtemp. + void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset); + + // Sets index. Blows reg_tmp. + void get_index_at_bcp(Register index, int bcp_offset, Register reg_tmp, size_t index_size = sizeof(u2)); + // Sets cache, index. + 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)); + // Sets cache. Blows reg_tmp. + void get_cache_entry_pointer_at_bcp(Register cache, Register reg_tmp, int bcp_offset, size_t index_size = sizeof(u2)); + + // Load object from cpool->resolved_references(*bcp+1) + void load_resolved_reference_at_index(Register result, Register tmp); + + void store_check_part1(Register card_table_base); // Sets card_table_base register. + void store_check_part2(Register obj, Register card_table_base, Register tmp); + + void set_card(Register card_table_base, Address card_table_addr, Register tmp); + +#if INCLUDE_ALL_GCS + // G1 pre-barrier. + // Blows all volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). + // If store_addr != noreg, then previous value is loaded from [store_addr]; + // in such case store_addr and new_val registers are preserved; + // otherwise pre_val register is preserved. + void g1_write_barrier_pre(Register store_addr, + Register new_val, + Register pre_val, + Register tmp1, + Register tmp2); + + // G1 post-barrier. + // Blows all volatile registers (R0-R3 on 32-bit ARM, R0-R18 on AArch64, Rtemp, LR). + void g1_write_barrier_post(Register store_addr, + Register new_val, + Register tmp1, + Register tmp2, + Register tmp3); +#endif // INCLUDE_ALL_GCS + + void pop_ptr(Register r); + void pop_i(Register r = R0_tos); +#ifdef AARCH64 + void pop_l(Register r = R0_tos); +#else + void pop_l(Register lo = R0_tos_lo, Register hi = R1_tos_hi); +#endif + void pop_f(FloatRegister fd); + void pop_d(FloatRegister fd); + + void push_ptr(Register r); + void push_i(Register r = R0_tos); +#ifdef AARCH64 + void push_l(Register r = R0_tos); +#else + void push_l(Register lo = R0_tos_lo, Register hi = R1_tos_hi); +#endif + void push_f(); + void push_d(); + + // Transition vtos -> state. Blows R0, R1. Sets TOS cached value. + void pop(TosState state); + // Transition state -> vtos. Blows Rtemp. + void push(TosState state); + +#ifndef AARCH64 + // The following methods are overridden to allow overloaded calls to + // MacroAssembler::push/pop(Register) + // MacroAssembler::push/pop(RegisterSet) + // InterpreterMacroAssembler::push/pop(TosState) + void push(Register rd, AsmCondition cond = al) { MacroAssembler::push(rd, cond); } + void pop(Register rd, AsmCondition cond = al) { MacroAssembler::pop(rd, cond); } + + void push(RegisterSet reg_set, AsmCondition cond = al) { MacroAssembler::push(reg_set, cond); } + void pop(RegisterSet reg_set, AsmCondition cond = al) { MacroAssembler::pop(reg_set, cond); } + + // Converts return value in R0/R1 (interpreter calling conventions) to TOS cached value. + void convert_retval_to_tos(TosState state); + // Converts TOS cached value to return value in R0/R1 (according to interpreter calling conventions). + void convert_tos_to_retval(TosState state); +#endif + + // JVMTI ForceEarlyReturn support + void load_earlyret_value(TosState state); + + void jump_to_entry(address entry); + + // Blows Rtemp. + void empty_expression_stack() { + ldr(Rstack_top, Address(FP, frame::interpreter_frame_monitor_block_top_offset * wordSize)); + check_stack_top(); +#ifdef AARCH64 + clear_cached_stack_top(); +#else + // NULL last_sp until next java call + str(zero_register(Rtemp), Address(FP, frame::interpreter_frame_last_sp_offset * wordSize)); +#endif // AARCH64 + } + + // Helpers for swap and dup + void load_ptr(int n, Register val); + void store_ptr(int n, Register val); + + // Generate a subtype check: branch to not_subtype if sub_klass is + // not a subtype of super_klass. + // Profiling code for the subtype check failure (profile_typecheck_failed) + // should be explicitly generated by the caller in the not_subtype case. + // Blows Rtemp, tmp1, tmp2. + void gen_subtype_check(Register Rsub_klass, Register Rsuper_klass, + Label ¬_subtype, Register tmp1, Register tmp2); + + // Dispatching + void dispatch_prolog(TosState state, int step = 0); + void dispatch_epilog(TosState state, int step = 0); + void dispatch_only(TosState state); // dispatch by R3_bytecode + void dispatch_only_normal(TosState state); // dispatch normal table by R3_bytecode + void dispatch_only_noverify(TosState state); + void dispatch_next(TosState state, int step = 0); // load R3_bytecode from [Rbcp + step] and dispatch by R3_bytecode + + // jump to an invoked target + void prepare_to_jump_from_interpreted(); + void jump_from_interpreted(Register method); + + void narrow(Register result); + + // Returning from interpreted functions + // + // Removes the current activation (incl. unlocking of monitors) + // and sets up the return address. This code is also used for + // exception unwindwing. In that case, we do not want to throw + // IllegalMonitorStateExceptions, since that might get us into an + // infinite rethrow exception loop. + // Additionally this code is used for popFrame and earlyReturn. + // In popFrame case we want to skip throwing an exception, + // installing an exception, and notifying jvmdi. + // In earlyReturn case we only want to skip throwing an exception + // and installing an exception. + void remove_activation(TosState state, Register ret_addr, + bool throw_monitor_exception = true, + bool install_monitor_exception = true, + bool notify_jvmdi = true); + + // At certain points in the method invocation the monitor of + // synchronized methods hasn't been entered yet. + // To correctly handle exceptions at these points, we set the thread local + // variable _do_not_unlock_if_synchronized to true. The remove_activation will + // check this flag. + void set_do_not_unlock_if_synchronized(bool flag, Register tmp); + + // Debugging + void interp_verify_oop(Register reg, TosState state, const char* file, int line); // only if +VerifyOops && state == atos + + void verify_FPU(int stack_depth, TosState state = ftos) { + // No VFP state verification is required for ARM + } + + // Object locking + void lock_object (Register lock_reg); + void unlock_object(Register lock_reg); + + // Interpreter profiling operations + void set_method_data_pointer_for_bcp(); // Blows R0-R3/R0-R18, Rtemp, LR + void test_method_data_pointer(Register mdp, Label& zero_continue); + void verify_method_data_pointer(); + + void set_mdp_data_at(Register mdp_in, int offset, Register value); + + // Increments mdp data. Sets bumped_count register to adjusted counter. + void increment_mdp_data_at(Address data, Register bumped_count, bool decrement = false); + // Increments mdp data. Sets bumped_count register to adjusted counter. + void increment_mdp_data_at(Register mdp_in, int offset, Register bumped_count, bool decrement = false); + void increment_mask_and_jump(Address counter_addr, + int increment, Address mask_addr, + Register scratch, Register scratch2, + AsmCondition cond, Label* where); + void set_mdp_flag_at(Register mdp_in, int flag_constant); + + void test_mdp_data_at(Register mdp_in, int offset, Register value, + Register test_value_out, + Label& not_equal_continue); + + void record_klass_in_profile(Register receiver, Register mdp, + Register reg_tmp, bool is_virtual_call); + void record_klass_in_profile_helper(Register receiver, Register mdp, + Register reg_tmp, + int start_row, Label& done, bool is_virtual_call); + + void update_mdp_by_offset(Register mdp_in, int offset_of_offset, Register reg_tmp); + void update_mdp_by_offset(Register mdp_in, Register reg_offset, Register reg_tmp); + void update_mdp_by_constant(Register mdp_in, int constant); + void update_mdp_for_ret(Register return_bci); // Blows R0-R3/R0-R18, Rtemp, LR + + void profile_taken_branch(Register mdp, Register bumped_count); // Sets mdp, bumped_count registers, blows Rtemp. + void profile_not_taken_branch(Register mdp); // Sets mdp, blows Rtemp. + + void profile_call(Register mdp); // Sets mdp, blows Rtemp. + void profile_final_call(Register mdp); // Sets mdp, blows Rtemp. + void profile_virtual_call(Register mdp, Register receiver, // Sets mdp, blows Rtemp. + bool receiver_can_be_null = false); + void profile_ret(Register mdp, Register return_bci); // Sets mdp, blows R0-R3/R0-R18, Rtemp, LR + void profile_null_seen(Register mdp); // Sets mdp. + void profile_typecheck(Register mdp, Register klass); // Sets mdp, blows Rtemp. + + void profile_typecheck_failed(Register mdp); // Sets mdp, blows Rtemp. + void profile_switch_default(Register mdp); // Sets mdp, blows Rtemp. + + // Sets mdp. Blows reg_tmp1, reg_tmp2. Index could be the same as reg_tmp2. + void profile_switch_case(Register mdp, Register index, Register reg_tmp1, Register reg_tmp2); + + void byteswap_u32(Register r, Register rtmp1, Register rtmp2); + + void inc_global_counter(address address_of_counter, int offset_in_bytes, Register tmp1, Register tmp2, bool avoid_overflow); + + typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode; + + // support for jvmti + void notify_method_entry(); + void notify_method_exit(TosState state, NotifyMethodExitMode mode, + bool native = false, Register result_lo = noreg, Register result_hi = noreg, FloatRegister result_fp = fnoreg); + + void trace_state(const char* msg) PRODUCT_RETURN; + + void get_method_counters(Register method, Register Rcounters, Label& skip); +}; + +#endif // CPU_ARM_VM_INTERP_MASM_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/interpreterRT_arm.cpp b/hotspot/src/cpu/arm/vm/interpreterRT_arm.cpp new file mode 100644 index 00000000000..4925f630c8d --- /dev/null +++ b/hotspot/src/cpu/arm/vm/interpreterRT_arm.cpp @@ -0,0 +1,449 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/universe.inline.hpp" +#include "oops/method.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/signature.hpp" + +#define __ _masm-> + +#ifdef SHARING_FAST_NATIVE_FINGERPRINTS +// mapping from SignatureIterator param to (common) type of parsing +static const u1 shared_type[] = { + (u1) SignatureIterator::int_parm, // bool + (u1) SignatureIterator::int_parm, // byte + (u1) SignatureIterator::int_parm, // char + (u1) SignatureIterator::int_parm, // short + (u1) SignatureIterator::int_parm, // int + (u1) SignatureIterator::long_parm, // long +#ifndef __ABI_HARD__ + (u1) SignatureIterator::int_parm, // float, passed as int + (u1) SignatureIterator::long_parm, // double, passed as long +#else + (u1) SignatureIterator::float_parm, // float + (u1) SignatureIterator::double_parm, // double +#endif + (u1) SignatureIterator::obj_parm, // obj + (u1) SignatureIterator::done_parm // done +}; + +uint64_t InterpreterRuntime::normalize_fast_native_fingerprint(uint64_t fingerprint) { + if (fingerprint == UCONST64(-1)) { + // special signature used when the argument list cannot be encoded in a 64 bits value + return fingerprint; + } + int shift = SignatureIterator::static_feature_size; + uint64_t result = fingerprint & ((1 << shift) - 1); + fingerprint >>= shift; + + BasicType ret_type = (BasicType) (fingerprint & SignatureIterator::result_feature_mask); + // For ARM, the fast signature handler only needs to know whether + // the return value must be unboxed. T_OBJECT and T_ARRAY need not + // be distinguished from each other and all other return values + // behave like integers with respect to the handler. + bool unbox = (ret_type == T_OBJECT) || (ret_type == T_ARRAY); + if (unbox) { + ret_type = T_OBJECT; + } else { + ret_type = T_INT; + } + result |= ((uint64_t) ret_type) << shift; + shift += SignatureIterator::result_feature_size; + fingerprint >>= SignatureIterator::result_feature_size; + + while (true) { + uint32_t type = (uint32_t) (fingerprint & SignatureIterator::parameter_feature_mask); + if (type == SignatureIterator::done_parm) { + result |= ((uint64_t) SignatureIterator::done_parm) << shift; + return result; + } + assert((type >= SignatureIterator::bool_parm) && (type <= SignatureIterator::obj_parm), "check fingerprint encoding"); + int shared = shared_type[type - SignatureIterator::bool_parm]; + result |= ((uint64_t) shared) << shift; + shift += SignatureIterator::parameter_feature_size; + fingerprint >>= SignatureIterator::parameter_feature_size; + } +} +#endif // SHARING_FAST_NATIVE_FINGERPRINTS + +// Implementation of SignatureHandlerGenerator +void InterpreterRuntime::SignatureHandlerGenerator::pass_int() { + if (_ireg < GPR_PARAMS) { + Register dst = as_Register(_ireg); + __ ldr_s32(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + _ireg++; + } else { + __ ldr_s32(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str_32(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +} + +void InterpreterRuntime::SignatureHandlerGenerator::pass_long() { +#ifdef AARCH64 + if (_ireg < GPR_PARAMS) { + Register dst = as_Register(_ireg); + __ ldr(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset() + 1))); + _ireg++; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset() + 1))); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#else + if (_ireg <= 2) { +#if (ALIGN_WIDE_ARGUMENTS == 1) + if ((_ireg & 1) != 0) { + // 64-bit values should be 8-byte aligned + _ireg++; + } +#endif + Register dst1 = as_Register(_ireg); + Register dst2 = as_Register(_ireg+1); + __ ldr(dst1, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()+1))); + __ ldr(dst2, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + _ireg += 2; +#if (ALIGN_WIDE_ARGUMENTS == 0) + } else if (_ireg == 3) { + // uses R3 + one stack slot + Register dst1 = as_Register(_ireg); + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ ldr(dst1, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()+1))); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _ireg += 1; + _abi_offset += 1; +#endif + } else { +#if (ALIGN_WIDE_ARGUMENTS == 1) + if(_abi_offset & 1) _abi_offset++; +#endif + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()+1))); + __ str(Rtemp, Address(SP, (_abi_offset) * wordSize)); + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str(Rtemp, Address(SP, (_abi_offset+1) * wordSize)); + _abi_offset += 2; + _ireg = 4; + } +#endif // AARCH64 +} + +void InterpreterRuntime::SignatureHandlerGenerator::pass_object() { +#ifdef AARCH64 + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ cmp(Rtemp, 0); + __ sub(Rtemp, Rlocals, -Interpreter::local_offset_in_bytes(offset())); + if (_ireg < GPR_PARAMS) { + Register dst = as_Register(_ireg); + __ csel(dst, ZR, Rtemp, eq); + _ireg++; + } else { + __ csel(Rtemp, ZR, Rtemp, eq); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#else + if (_ireg < 4) { + Register dst = as_Register(_ireg); + __ ldr(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ cmp(dst, 0); + __ sub(dst, Rlocals, -Interpreter::local_offset_in_bytes(offset()), ne); + _ireg++; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ cmp(Rtemp, 0); + __ sub(Rtemp, Rlocals, -Interpreter::local_offset_in_bytes(offset()), ne); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#endif // AARCH64 +} + +#ifndef __ABI_HARD__ +void InterpreterRuntime::SignatureHandlerGenerator::pass_float() { + if (_ireg < 4) { + Register dst = as_Register(_ireg); + __ ldr(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + _ireg++; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +} + +#else +#ifndef __SOFTFP__ +void InterpreterRuntime::SignatureHandlerGenerator::pass_float() { +#ifdef AARCH64 + if (_freg < FPR_PARAMS) { + FloatRegister dst = as_FloatRegister(_freg); + __ ldr_s(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + _freg++; + } else { + __ ldr_u32(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str_32(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#else + if((_fp_slot < 16) || (_single_fpr_slot & 1)) { + if ((_single_fpr_slot & 1) == 0) { + _single_fpr_slot = _fp_slot; + _fp_slot += 2; + } + __ flds(as_FloatRegister(_single_fpr_slot), Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + _single_fpr_slot++; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#endif // AARCH64 +} + +void InterpreterRuntime::SignatureHandlerGenerator::pass_double() { +#ifdef AARCH64 + if (_freg < FPR_PARAMS) { + FloatRegister dst = as_FloatRegister(_freg); + __ ldr_d(dst, Address(Rlocals, Interpreter::local_offset_in_bytes(offset() + 1))); + _freg++; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset() + 1))); + __ str(Rtemp, Address(SP, _abi_offset * wordSize)); + _abi_offset++; + } +#else + if(_fp_slot <= 14) { + __ fldd(as_FloatRegister(_fp_slot), Address(Rlocals, Interpreter::local_offset_in_bytes(offset()+1))); + _fp_slot += 2; + } else { + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()+1))); + __ str(Rtemp, Address(SP, (_abi_offset) * wordSize)); + __ ldr(Rtemp, Address(Rlocals, Interpreter::local_offset_in_bytes(offset()))); + __ str(Rtemp, Address(SP, (_abi_offset+1) * wordSize)); + _abi_offset += 2; + _single_fpr_slot = 16; + } +#endif // AARCH64 +} +#endif // __SOFTFP__ +#endif // __ABI_HARD__ + +void InterpreterRuntime::SignatureHandlerGenerator::generate(uint64_t fingerprint) { + iterate(fingerprint); + + BasicType result_type = SignatureIterator::return_type(fingerprint); + + address result_handler = Interpreter::result_handler(result_type); + +#ifdef AARCH64 + __ mov_slow(R0, (address)result_handler); +#else + // Check that result handlers are not real handler on ARM (0 or -1). + // This ensures the signature handlers do not need symbolic information. + assert((result_handler == NULL)||(result_handler==(address)0xffffffff),""); + __ mov_slow(R0, (intptr_t)result_handler); +#endif + + __ ret(); +} + + +// Implementation of SignatureHandlerLibrary + +void SignatureHandlerLibrary::pd_set_handler(address handler) {} + +class SlowSignatureHandler: public NativeSignatureIterator { + private: + address _from; + intptr_t* _to; + +#ifndef __ABI_HARD__ + virtual void pass_int() { + *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + _from -= Interpreter::stackElementSize; + } + + virtual void pass_float() { + *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + _from -= Interpreter::stackElementSize; + } + + virtual void pass_long() { +#if (ALIGN_WIDE_ARGUMENTS == 1) + if (((intptr_t)_to & 7) != 0) { + // 64-bit values should be 8-byte aligned + _to++; + } +#endif + _to[0] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + _to[1] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0)); + _to += 2; + _from -= 2*Interpreter::stackElementSize; + } + + virtual void pass_object() { + intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0)); + *_to++ = (*(intptr_t*)from_addr == 0) ? (intptr_t)NULL : from_addr; + _from -= Interpreter::stackElementSize; + } + +#else + + intptr_t* _toFP; + intptr_t* _toGP; + int _last_gp; + int _last_fp; +#ifndef AARCH64 + int _last_single_fp; +#endif // !AARCH64 + + virtual void pass_int() { + if(_last_gp < GPR_PARAMS) { + _toGP[_last_gp++] = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } else { + *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } + _from -= Interpreter::stackElementSize; + } + + virtual void pass_long() { +#ifdef AARCH64 + if(_last_gp < GPR_PARAMS) { + _toGP[_last_gp++] = *(jlong *)(_from+Interpreter::local_offset_in_bytes(1)); + } else { + *_to++ = *(jlong *)(_from+Interpreter::local_offset_in_bytes(1)); + } +#else + assert(ALIGN_WIDE_ARGUMENTS == 1, "ABI_HARD not supported with unaligned wide arguments"); + if (_last_gp <= 2) { + if(_last_gp & 1) _last_gp++; + _toGP[_last_gp++] = *(jint *)(_from+Interpreter::local_offset_in_bytes(1)); + _toGP[_last_gp++] = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } else { + if (((intptr_t)_to & 7) != 0) { + // 64-bit values should be 8-byte aligned + _to++; + } + _to[0] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + _to[1] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0)); + _to += 2; + _last_gp = 4; + } +#endif // AARCH64 + _from -= 2*Interpreter::stackElementSize; + } + + virtual void pass_object() { + intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0)); + if(_last_gp < GPR_PARAMS) { + _toGP[_last_gp++] = (*(intptr_t*)from_addr == 0) ? NULL : from_addr; + } else { + *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr; + } + _from -= Interpreter::stackElementSize; + } + + virtual void pass_float() { +#ifdef AARCH64 + if(_last_fp < FPR_PARAMS) { + _toFP[_last_fp++] = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } else { + *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } +#else + if((_last_fp < 16) || (_last_single_fp & 1)) { + if ((_last_single_fp & 1) == 0) { + _last_single_fp = _last_fp; + _last_fp += 2; + } + + _toFP[_last_single_fp++] = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } else { + *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0)); + } +#endif // AARCH64 + _from -= Interpreter::stackElementSize; + } + + virtual void pass_double() { +#ifdef AARCH64 + if(_last_fp < FPR_PARAMS) { + _toFP[_last_fp++] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + } else { + *_to++ = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + } +#else + assert(ALIGN_WIDE_ARGUMENTS == 1, "ABI_HARD not supported with unaligned wide arguments"); + if(_last_fp <= 14) { + _toFP[_last_fp++] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + _toFP[_last_fp++] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0)); + } else { + if (((intptr_t)_to & 7) != 0) { // 64-bit values should be 8-byte aligned + _to++; + } + _to[0] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1)); + _to[1] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0)); + _to += 2; + _last_single_fp = 16; + } +#endif // AARCH64 + _from -= 2*Interpreter::stackElementSize; + } + +#endif // !__ABI_HARD__ + + public: + SlowSignatureHandler(methodHandle method, address from, intptr_t* to) : + NativeSignatureIterator(method) { + _from = from; + +#ifdef __ABI_HARD__ + _toGP = to; + _toFP = _toGP + GPR_PARAMS; + _to = _toFP + AARCH64_ONLY(FPR_PARAMS) NOT_AARCH64(8*2); + _last_gp = (is_static() ? 2 : 1); + _last_fp = 0; +#ifndef AARCH64 + _last_single_fp = 0; +#endif // !AARCH64 +#else + _to = to + (is_static() ? 2 : 1); +#endif // __ABI_HARD__ + } +}; + +IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to)) + methodHandle m(thread, (Method*)method); + assert(m->is_native(), "sanity check"); + SlowSignatureHandler(m, (address)from, to).iterate(UCONST64(-1)); + return Interpreter::result_handler(m->result_type()); +IRT_END diff --git a/hotspot/src/cpu/arm/vm/interpreterRT_arm.hpp b/hotspot/src/cpu/arm/vm/interpreterRT_arm.hpp new file mode 100644 index 00000000000..fa1e0dce678 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/interpreterRT_arm.hpp @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_INTERPRETERRT_ARM_HPP +#define CPU_ARM_VM_INTERPRETERRT_ARM_HPP + +#include "memory/allocation.hpp" + +// native method calls + +class SignatureHandlerGenerator: public NativeSignatureIterator { + private: + MacroAssembler* _masm; + int _abi_offset; + int _ireg; + +#ifdef __ABI_HARD__ +#ifdef AARCH64 + int _freg; +#else + int _fp_slot; // number of FPR's with arguments loaded + int _single_fpr_slot; +#endif +#endif + + void move(int from_offset, int to_offset); + void box(int from_offset, int to_offset); + + void pass_int(); + void pass_long(); + void pass_float(); + void pass_object(); +#ifdef __ABI_HARD__ + void pass_double(); +#endif + public: + // Creation + SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer) : NativeSignatureIterator(method) { + _masm = new MacroAssembler(buffer); + _abi_offset = 0; + _ireg = is_static() ? 2 : 1; +#ifdef __ABI_HARD__ +#ifdef AARCH64 + _freg = 0; +#else + _fp_slot = 0; + _single_fpr_slot = 0; +#endif +#endif + } + + // Code generation + void generate(uint64_t fingerprint); + +}; + +#ifndef AARCH64 +// ARM provides a normalized fingerprint for native calls (to increase +// sharing). See normalize_fast_native_fingerprint +#define SHARING_FAST_NATIVE_FINGERPRINTS +#endif + +#endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/javaFrameAnchor_arm.hpp b/hotspot/src/cpu/arm/vm/javaFrameAnchor_arm.hpp new file mode 100644 index 00000000000..b8ac0b13523 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/javaFrameAnchor_arm.hpp @@ -0,0 +1,86 @@ +/* + * 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. + * + */ + +#ifndef CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP +#define CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP + +private: + + // FP value associated with _last_Java_sp: + intptr_t* volatile _last_Java_fp; // pointer is volatile not what it points to + +public: + // Each arch must define reset, save, restore + // These are used by objects that only care about: + // 1 - initializing a new state (thread creation, javaCalls) + // 2 - saving a current state (javaCalls) + // 3 - restoring an old state (javaCalls) + + void clear(void) { + // clearing _last_Java_sp must be first + _last_Java_sp = NULL; + // fence? + _last_Java_fp = NULL; + _last_Java_pc = NULL; + } + + void copy(JavaFrameAnchor* src) { + // In order to make sure the transition state is valid for "this" + // We must clear _last_Java_sp before copying the rest of the new data + // + // Hack Alert: Temporary bugfix for 4717480/4721647 + // To act like previous version (pd_cache_state) don't NULL _last_Java_sp + // unless the value is changing + // + if (_last_Java_sp != src->_last_Java_sp) + _last_Java_sp = NULL; + + _last_Java_fp = src->_last_Java_fp; + _last_Java_pc = src->_last_Java_pc; + // Must be last so profiler will always see valid frame if has_last_frame() is true + _last_Java_sp = src->_last_Java_sp; + } + + // Always walkable + bool walkable(void) { return true; } + // Never any thing to do since we are always walkable and can find address of return addresses + void make_walkable(JavaThread* thread) { } + + intptr_t* last_Java_sp(void) const { return _last_Java_sp; } + + address last_Java_pc(void) { return _last_Java_pc; } + +private: + + static ByteSize last_Java_fp_offset() { return byte_offset_of(JavaFrameAnchor, _last_Java_fp); } + +public: + + void set_last_Java_sp(intptr_t* sp) { _last_Java_sp = sp; } + + intptr_t* last_Java_fp(void) { return _last_Java_fp; } + // Assert (last_Java_sp == NULL || fp == NULL) + void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; } + +#endif // CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/jniFastGetField_arm.cpp b/hotspot/src/cpu/arm/vm/jniFastGetField_arm.cpp new file mode 100644 index 00000000000..f9bd9f37970 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/jniFastGetField_arm.cpp @@ -0,0 +1,277 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" +#include "assembler_arm.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/safepoint.hpp" + +#define __ masm-> + +#define BUFFER_SIZE 96 + +address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) { + const char* name = NULL; + address slow_case_addr = NULL; + switch (type) { + case T_BOOLEAN: + name = "jni_fast_GetBooleanField"; + slow_case_addr = jni_GetBooleanField_addr(); + break; + case T_BYTE: + name = "jni_fast_GetByteField"; + slow_case_addr = jni_GetByteField_addr(); + break; + case T_CHAR: + name = "jni_fast_GetCharField"; + slow_case_addr = jni_GetCharField_addr(); + break; + case T_SHORT: + name = "jni_fast_GetShortField"; + slow_case_addr = jni_GetShortField_addr(); + break; + case T_INT: + name = "jni_fast_GetIntField"; + slow_case_addr = jni_GetIntField_addr(); + break; + case T_LONG: + name = "jni_fast_GetLongField"; + slow_case_addr = jni_GetLongField_addr(); + break; + case T_FLOAT: + name = "jni_fast_GetFloatField"; + slow_case_addr = jni_GetFloatField_addr(); + break; + case T_DOUBLE: + name = "jni_fast_GetDoubleField"; + slow_case_addr = jni_GetDoubleField_addr(); + break; + default: + ShouldNotReachHere(); + } + + // R0 - jni env + // R1 - object handle + // R2 - jfieldID + + const Register Rsafepoint_counter_addr = AARCH64_ONLY(R4) NOT_AARCH64(R3); + const Register Robj = AARCH64_ONLY(R5) NOT_AARCH64(R1); + const Register Rres = AARCH64_ONLY(R6) NOT_AARCH64(R0); +#ifndef AARCH64 + const Register Rres_hi = R1; +#endif // !AARCH64 + const Register Rsafept_cnt = Rtemp; + const Register Rsafept_cnt2 = Rsafepoint_counter_addr; + const Register Rtmp1 = AARCH64_ONLY(R7) NOT_AARCH64(R3); // same as Rsafepoint_counter_addr on 32-bit ARM + const Register Rtmp2 = AARCH64_ONLY(R8) NOT_AARCH64(R2); // same as jfieldID on 32-bit ARM + +#ifdef AARCH64 + assert_different_registers(Rsafepoint_counter_addr, Rsafept_cnt, Robj, Rres, Rtmp1, Rtmp2, R0, R1, R2, LR); + assert_different_registers(Rsafept_cnt2, Rsafept_cnt, Rres, R0, R1, R2, LR); +#else + assert_different_registers(Rsafepoint_counter_addr, Rsafept_cnt, Robj, Rres, LR); + assert_different_registers(Rsafept_cnt, R1, R2, Rtmp1, LR); + assert_different_registers(Rsafepoint_counter_addr, Rsafept_cnt, Rres, Rres_hi, Rtmp2, LR); + assert_different_registers(Rsafept_cnt2, Rsafept_cnt, Rres, Rres_hi, LR); +#endif // AARCH64 + + address fast_entry; + + ResourceMark rm; + BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE); + CodeBuffer cbuf(blob); + MacroAssembler* masm = new MacroAssembler(&cbuf); + fast_entry = __ pc(); + + // Safepoint check + InlinedAddress safepoint_counter_addr(SafepointSynchronize::safepoint_counter_addr()); + Label slow_case; + __ ldr_literal(Rsafepoint_counter_addr, safepoint_counter_addr); + +#ifndef AARCH64 + __ push(RegisterSet(R0, R3)); // save incoming arguments for slow case +#endif // !AARCH64 + + __ ldr_s32(Rsafept_cnt, Address(Rsafepoint_counter_addr)); + __ tbnz(Rsafept_cnt, 0, slow_case); + + if (os::is_MP()) { + // Address dependency restricts memory access ordering. It's cheaper than explicit LoadLoad barrier + __ andr(Rtmp1, Rsafept_cnt, (unsigned)1); + __ ldr(Robj, Address(R1, Rtmp1)); + } else { + __ ldr(Robj, Address(R1)); + } + +#ifdef AARCH64 + __ add(Robj, Robj, AsmOperand(R2, lsr, 2)); + Address field_addr = Address(Robj); +#else + Address field_addr; + if (type != T_BOOLEAN + && type != T_INT +#ifndef __ABI_HARD__ + && type != T_FLOAT +#endif // !__ABI_HARD__ + ) { + // Only ldr and ldrb support embedded shift, other loads do not + __ add(Robj, Robj, AsmOperand(R2, lsr, 2)); + field_addr = Address(Robj); + } else { + field_addr = Address(Robj, R2, lsr, 2); + } +#endif // AARCH64 + assert(count < LIST_CAPACITY, "LIST_CAPACITY too small"); + speculative_load_pclist[count] = __ pc(); + + switch (type) { + case T_BOOLEAN: + __ ldrb(Rres, field_addr); + break; + case T_BYTE: + __ ldrsb(Rres, field_addr); + break; + case T_CHAR: + __ ldrh(Rres, field_addr); + break; + case T_SHORT: + __ ldrsh(Rres, field_addr); + break; + case T_INT: +#ifndef __ABI_HARD__ + case T_FLOAT: +#endif + __ ldr_s32(Rres, field_addr); + break; + case T_LONG: +#ifndef __ABI_HARD__ + case T_DOUBLE: +#endif +#ifdef AARCH64 + __ ldr(Rres, field_addr); +#else + // Safe to use ldrd since long and double fields are 8-byte aligned + __ ldrd(Rres, field_addr); +#endif // AARCH64 + break; +#ifdef __ABI_HARD__ + case T_FLOAT: + __ ldr_float(S0, field_addr); + break; + case T_DOUBLE: + __ ldr_double(D0, field_addr); + break; +#endif // __ABI_HARD__ + default: + ShouldNotReachHere(); + } + + if(os::is_MP()) { + // Address dependency restricts memory access ordering. It's cheaper than explicit LoadLoad barrier +#if defined(__ABI_HARD__) && !defined(AARCH64) + if (type == T_FLOAT || type == T_DOUBLE) { + __ ldr_literal(Rsafepoint_counter_addr, safepoint_counter_addr); + __ fmrrd(Rres, Rres_hi, D0); + __ eor(Rtmp2, Rres, Rres); + __ ldr_s32(Rsafept_cnt2, Address(Rsafepoint_counter_addr, Rtmp2)); + } else +#endif // __ABI_HARD__ && !AARCH64 + { +#ifndef AARCH64 + __ ldr_literal(Rsafepoint_counter_addr, safepoint_counter_addr); +#endif // !AARCH64 + __ eor(Rtmp2, Rres, Rres); + __ ldr_s32(Rsafept_cnt2, Address(Rsafepoint_counter_addr, Rtmp2)); + } + } else { + __ ldr_s32(Rsafept_cnt2, Address(Rsafepoint_counter_addr)); + } + __ cmp(Rsafept_cnt2, Rsafept_cnt); +#ifdef AARCH64 + __ b(slow_case, ne); + __ mov(R0, Rres); + __ ret(); +#else + // discards saved R0 R1 R2 R3 + __ add(SP, SP, 4 * wordSize, eq); + __ bx(LR, eq); +#endif // AARCH64 + + slowcase_entry_pclist[count++] = __ pc(); + + __ bind(slow_case); +#ifndef AARCH64 + __ pop(RegisterSet(R0, R3)); +#endif // !AARCH64 + // thumb mode switch handled by MacroAssembler::jump if needed + __ jump(slow_case_addr, relocInfo::none, Rtemp); + + __ bind_literal(safepoint_counter_addr); + + __ flush(); + + guarantee((__ pc() - fast_entry) <= BUFFER_SIZE, "BUFFER_SIZE too small"); + + return fast_entry; +} + +address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) { + ShouldNotReachHere(); + return NULL; +} + +address JNI_FastGetField::generate_fast_get_boolean_field() { + return generate_fast_get_int_field0(T_BOOLEAN); +} + +address JNI_FastGetField::generate_fast_get_byte_field() { + return generate_fast_get_int_field0(T_BYTE); +} + +address JNI_FastGetField::generate_fast_get_char_field() { + return generate_fast_get_int_field0(T_CHAR); +} + +address JNI_FastGetField::generate_fast_get_short_field() { + return generate_fast_get_int_field0(T_SHORT); +} + +address JNI_FastGetField::generate_fast_get_int_field() { + return generate_fast_get_int_field0(T_INT); +} + +address JNI_FastGetField::generate_fast_get_long_field() { + return generate_fast_get_int_field0(T_LONG); +} + +address JNI_FastGetField::generate_fast_get_float_field() { + return generate_fast_get_int_field0(T_FLOAT); +} + +address JNI_FastGetField::generate_fast_get_double_field() { + return generate_fast_get_int_field0(T_DOUBLE); +} diff --git a/hotspot/src/cpu/arm/vm/jniTypes_arm.hpp b/hotspot/src/cpu/arm/vm/jniTypes_arm.hpp new file mode 100644 index 00000000000..7b23ccfe262 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/jniTypes_arm.hpp @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_JNITYPES_ARM_HPP +#define CPU_ARM_VM_JNITYPES_ARM_HPP + +#include "memory/allocation.hpp" +#include "oops/oop.hpp" +#include "prims/jni.h" + +// This file holds platform-dependent routines used to write primitive jni +// types to the array of arguments passed into JavaCalls::call + +class JNITypes : AllStatic { + // These functions write a java primitive type (in native format) + // to a java stack slot array to be passed as an argument to JavaCalls:calls. + // I.e., they are functionally 'push' operations if they have a 'pos' + // formal parameter. Note that jlong's and jdouble's are written + // _in reverse_ of the order in which they appear in the interpreter + // stack. This is because call stubs (see stubGenerator_arm.cpp) + // reverse the argument list constructed by JavaCallArguments (see + // javaCalls.hpp). + +private: + +#ifndef AARCH64 + // 32bit Helper routines. + static inline void put_int2r(jint *from, intptr_t *to) { *(jint *)(to++) = from[1]; + *(jint *)(to ) = from[0]; } + static inline void put_int2r(jint *from, intptr_t *to, int& pos) { put_int2r(from, to + pos); pos += 2; } +#endif + +public: + // Ints are stored in native format in one JavaCallArgument slot at *to. + static inline void put_int(jint from, intptr_t *to) { *(jint *)(to + 0 ) = from; } + static inline void put_int(jint from, intptr_t *to, int& pos) { *(jint *)(to + pos++) = from; } + static inline void put_int(jint *from, intptr_t *to, int& pos) { *(jint *)(to + pos++) = *from; } + +#ifdef AARCH64 + // Longs are stored in native format in one JavaCallArgument slot at *(to+1). + static inline void put_long(jlong from, intptr_t *to) { *(jlong *)(to + 1 + 0) = from; } + static inline void put_long(jlong from, intptr_t *to, int& pos) { *(jlong *)(to + 1 + pos) = from; pos += 2; } + static inline void put_long(jlong *from, intptr_t *to, int& pos) { *(jlong *)(to + 1 + pos) = *from; pos += 2; } +#else + // Longs are stored in big-endian word format in two JavaCallArgument slots at *to. + // The high half is in *to and the low half in *(to+1). + static inline void put_long(jlong from, intptr_t *to) { put_int2r((jint *)&from, to); } + static inline void put_long(jlong from, intptr_t *to, int& pos) { put_int2r((jint *)&from, to, pos); } + static inline void put_long(jlong *from, intptr_t *to, int& pos) { put_int2r((jint *) from, to, pos); } +#endif + + // Oops are stored in native format in one JavaCallArgument slot at *to. + static inline void put_obj(oop from, intptr_t *to) { *(oop *)(to + 0 ) = from; } + static inline void put_obj(oop from, intptr_t *to, int& pos) { *(oop *)(to + pos++) = from; } + static inline void put_obj(oop *from, intptr_t *to, int& pos) { *(oop *)(to + pos++) = *from; } + + // Floats are stored in native format in one JavaCallArgument slot at *to. + static inline void put_float(jfloat from, intptr_t *to) { *(jfloat *)(to + 0 ) = from; } + static inline void put_float(jfloat from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) = from; } + static inline void put_float(jfloat *from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) = *from; } + +#ifdef AARCH64 + // Doubles are stored in native word format in one JavaCallArgument slot at *(to+1). + static inline void put_double(jdouble from, intptr_t *to) { *(jdouble *)(to + 1 + 0) = from; } + static inline void put_double(jdouble from, intptr_t *to, int& pos) { *(jdouble *)(to + 1 + pos) = from; pos += 2; } + static inline void put_double(jdouble *from, intptr_t *to, int& pos) { *(jdouble *)(to + 1 + pos) = *from; pos += 2; } +#else + // Doubles are stored in big-endian word format in two JavaCallArgument slots at *to. + // The high half is in *to and the low half in *(to+1). + static inline void put_double(jdouble from, intptr_t *to) { put_int2r((jint *)&from, to); } + static inline void put_double(jdouble from, intptr_t *to, int& pos) { put_int2r((jint *)&from, to, pos); } + static inline void put_double(jdouble *from, intptr_t *to, int& pos) { put_int2r((jint *) from, to, pos); } +#endif + +}; + +#endif // CPU_ARM_VM_JNITYPES_ARM_HPP diff --git a/jdk/src/java.compact2/share/classes/module-info.java b/hotspot/src/cpu/arm/vm/jni_arm.h similarity index 58% rename from jdk/src/java.compact2/share/classes/module-info.java rename to hotspot/src/cpu/arm/vm/jni_arm.h index 0666be8fc10..2a1d4f717b7 100644 --- a/jdk/src/java.compact2/share/classes/module-info.java +++ b/hotspot/src/cpu/arm/vm/jni_arm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,13 +23,30 @@ * questions. */ -/** - * Supplements {@code java.compact1} with JDBC, JAXP, and RMI. - */ -module java.compact2 { - requires transitive java.compact1; - requires transitive java.rmi; - requires transitive java.sql; - requires transitive java.xml; -} +#ifndef _JAVASOFT_JNI_MD_H_ +#define _JAVASOFT_JNI_MD_H_ +// Note: please do not change these without also changing jni_md.h in the JDK +// repository +#ifndef __has_attribute + #define __has_attribute(x) 0 +#endif +#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility) + #define JNIEXPORT __attribute__((externally_visible,visibility("default"))) + #define JNIIMPORT __attribute__((externally_visible,visibility("default"))) +#else + #define JNIEXPORT + #define JNIIMPORT +#endif + +#define JNICALL + +typedef int jint; +#if defined(_LP64) + typedef long jlong; +#else + typedef long long jlong; +#endif +typedef signed char jbyte; + +#endif /* !_JAVASOFT_JNI_MD_H_ */ diff --git a/hotspot/src/cpu/arm/vm/jvmciCodeInstaller_arm.cpp b/hotspot/src/cpu/arm/vm/jvmciCodeInstaller_arm.cpp new file mode 100644 index 00000000000..dc225a227a0 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/jvmciCodeInstaller_arm.cpp @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 "jvmci/jvmciCodeInstaller.hpp" +#include "jvmci/jvmciRuntime.hpp" +#include "jvmci/jvmciCompilerToVM.hpp" +#include "jvmci/jvmciJavaClasses.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_arm.inline.hpp" + +jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, Handle method, TRAPS) { + Unimplemented(); + return 0; +} + +void CodeInstaller::pd_patch_OopConstant(int pc_offset, Handle constant, TRAPS) { + Unimplemented(); +} + +void CodeInstaller::pd_patch_MetaspaceConstant(int pc_offset, Handle constant, TRAPS) { + Unimplemented(); +} + +void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS) { + Unimplemented(); +} + +void CodeInstaller::pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination, TRAPS) { + Unimplemented(); +} + +void CodeInstaller::pd_relocate_JavaMethod(Handle hotspot_method, jint pc_offset, TRAPS) { + Unimplemented(); +} + +void CodeInstaller::pd_relocate_poll(address pc, jint mark, TRAPS) { + Unimplemented(); +} + +// convert JVMCI register indices (as used in oop maps) to HotSpot registers +VMReg CodeInstaller::get_hotspot_reg(jint jvmci_reg, TRAPS) { + return NULL; +} + +bool CodeInstaller::is_general_purpose_reg(VMReg hotspotRegister) { + return false; +} diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.cpp b/hotspot/src/cpu/arm/vm/macroAssembler_arm.cpp new file mode 100644 index 00000000000..ada7d3fc485 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/macroAssembler_arm.cpp @@ -0,0 +1,3120 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "asm/macroAssembler.hpp" +#include "ci/ciEnv.hpp" +#include "code/nativeInst.hpp" +#include "compiler/disassembler.hpp" +#include "gc/shared/cardTableModRefBS.hpp" +#include "gc/shared/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/resourceArea.hpp" +#include "oops/klass.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1SATBCardTableModRefBS.hpp" +#include "gc/g1/heapRegion.hpp" +#endif + +// Implementation of AddressLiteral + +void AddressLiteral::set_rspec(relocInfo::relocType rtype) { + switch (rtype) { + case relocInfo::oop_type: + // Oops are a special case. Normally they would be their own section + // but in cases like icBuffer they are literals in the code stream that + // we don't have a section for. We use none so that we get a literal address + // which is always patchable. + break; + case relocInfo::external_word_type: + _rspec = external_word_Relocation::spec(_target); + break; + case relocInfo::internal_word_type: + _rspec = internal_word_Relocation::spec(_target); + break; + case relocInfo::opt_virtual_call_type: + _rspec = opt_virtual_call_Relocation::spec(); + break; + case relocInfo::static_call_type: + _rspec = static_call_Relocation::spec(); + break; + case relocInfo::runtime_call_type: + _rspec = runtime_call_Relocation::spec(); + break; + case relocInfo::poll_type: + case relocInfo::poll_return_type: + _rspec = Relocation::spec_simple(rtype); + break; + case relocInfo::none: + break; + default: + ShouldNotReachHere(); + break; + } +} + +// Initially added to the Assembler interface as a pure virtual: +// RegisterConstant delayed_value(..) +// for: +// 6812678 macro assembler needs delayed binding of a few constants (for 6655638) +// this was subsequently modified to its present name and return type +RegisterOrConstant MacroAssembler::delayed_value_impl(intptr_t* delayed_value_addr, + Register tmp, + int offset) { + ShouldNotReachHere(); + return RegisterOrConstant(-1); +} + + +#ifdef AARCH64 +// Note: ARM32 version is OS dependent +void MacroAssembler::breakpoint(AsmCondition cond) { + if (cond == al) { + brk(); + } else { + Label L; + b(L, inverse(cond)); + brk(); + bind(L); + } +} +#endif // AARCH64 + + +// virtual method calling +void MacroAssembler::lookup_virtual_method(Register recv_klass, + Register vtable_index, + Register method_result) { + const int base_offset = in_bytes(Klass::vtable_start_offset()) + vtableEntry::method_offset_in_bytes(); + assert(vtableEntry::size() * wordSize == wordSize, "adjust the scaling in the code below"); + add(recv_klass, recv_klass, AsmOperand(vtable_index, lsl, LogBytesPerWord)); + ldr(method_result, Address(recv_klass, base_offset)); +} + + +// Simplified, combined version, good for typical uses. +// Falls through on failure. +void MacroAssembler::check_klass_subtype(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp_reg2, + Register temp_reg3, + Label& L_success) { + Label L_failure; + check_klass_subtype_fast_path(sub_klass, super_klass, temp_reg, temp_reg2, &L_success, &L_failure, NULL); + check_klass_subtype_slow_path(sub_klass, super_klass, temp_reg, temp_reg2, temp_reg3, &L_success, NULL); + bind(L_failure); +}; + +void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp_reg2, + Label* L_success, + Label* L_failure, + Label* L_slow_path) { + + assert_different_registers(sub_klass, super_klass, temp_reg, temp_reg2, noreg); + const Register super_check_offset = temp_reg2; + + Label L_fallthrough; + int label_nulls = 0; + 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, "at most one NULL in the batch"); + + int sc_offset = in_bytes(Klass::secondary_super_cache_offset()); + int sco_offset = in_bytes(Klass::super_check_offset_offset()); + Address super_check_offset_addr(super_klass, sco_offset); + + // 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 + // type would need its own customized SSA. + // We move this check to the front of the fast path because many + // 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(sub_klass, super_klass); + b(*L_success, eq); + + // Check the supertype display: + ldr_u32(super_check_offset, super_check_offset_addr); + + Address super_check_addr(sub_klass, super_check_offset); + ldr(temp_reg, super_check_addr); + cmp(super_klass, temp_reg); // load displayed supertype + + // This check has worked decisively for primary supers. + // Secondary supers are sought in the super_cache ('super_cache_addr'). + // (Secondary supers are interfaces and very deeply nested subtypes.) + // This works in the same check above because of a tricky aliasing + // between the super_cache and the primary super display elements. + // (The 'super_check_addr' can address either, as the case requires.) + // Note that the cache is updated below if it does not help us find + // what we need immediately. + // 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). + + b(*L_success, eq); + cmp_32(super_check_offset, sc_offset); + if (L_failure == &L_fallthrough) { + b(*L_slow_path, eq); + } else { + b(*L_failure, ne); + if (L_slow_path != &L_fallthrough) { + b(*L_slow_path); + } + } + + bind(L_fallthrough); +} + + +void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp2_reg, + Register temp3_reg, + Label* L_success, + Label* L_failure, + bool set_cond_codes) { +#ifdef AARCH64 + NOT_IMPLEMENTED(); +#else + // Note: if used by code that expects a register to be 0 on success, + // this register must be temp_reg and set_cond_codes must be true + + Register saved_reg = noreg; + + // get additional tmp registers + if (temp3_reg == noreg) { + saved_reg = temp3_reg = LR; + push(saved_reg); + } + + assert(temp2_reg != noreg, "need all the temporary registers"); + assert_different_registers(sub_klass, super_klass, temp_reg, temp2_reg, temp3_reg); + + Register cmp_temp = temp_reg; + Register scan_temp = temp3_reg; + Register count_temp = temp2_reg; + + Label L_fallthrough; + int label_nulls = 0; + if (L_success == NULL) { L_success = &L_fallthrough; label_nulls++; } + if (L_failure == NULL) { L_failure = &L_fallthrough; label_nulls++; } + assert(label_nulls <= 1, "at most one NULL in the batch"); + + // a couple of useful fields in sub_klass: + int ss_offset = in_bytes(Klass::secondary_supers_offset()); + int sc_offset = in_bytes(Klass::secondary_super_cache_offset()); + Address secondary_supers_addr(sub_klass, ss_offset); + Address super_cache_addr( sub_klass, sc_offset); + +#ifndef PRODUCT + inc_counter((address)&SharedRuntime::_partial_subtype_ctr, scan_temp, count_temp); +#endif + + // We will consult the secondary-super array. + ldr(scan_temp, Address(sub_klass, ss_offset)); + + assert(! UseCompressedOops, "search_key must be the compressed super_klass"); + // else search_key is the + Register search_key = super_klass; + + // Load the array length. + ldr(count_temp, Address(scan_temp, Array::length_offset_in_bytes())); + add(scan_temp, scan_temp, Array::base_offset_in_bytes()); + + add(count_temp, count_temp, 1); + + Label L_loop, L_setnz_and_fail, L_fail; + + // Top of search loop + bind(L_loop); + // Notes: + // scan_temp starts at the array elements + // count_temp is 1+size + subs(count_temp, count_temp, 1); + if ((L_failure != &L_fallthrough) && (! set_cond_codes) && (saved_reg == noreg)) { + // direct jump to L_failure if failed and no cleanup needed + b(*L_failure, eq); // not found and + } else { + b(L_fail, eq); // not found in the array + } + + // Load next super to check + // In the array of super classes elements are pointer sized. + int element_size = wordSize; + ldr(cmp_temp, Address(scan_temp, element_size, post_indexed)); + + // Look for Rsuper_klass on Rsub_klass's secondary super-class-overflow list + subs(cmp_temp, cmp_temp, search_key); + + // A miss means we are NOT a subtype and need to keep looping + b(L_loop, ne); + + // Falling out the bottom means we found a hit; we ARE a subtype + + // Note: temp_reg/cmp_temp is already 0 and flag Z is set + + // Success. Cache the super we found and proceed in triumph. + str(super_klass, Address(sub_klass, sc_offset)); + + if (saved_reg != noreg) { + // Return success + pop(saved_reg); + } + + b(*L_success); + + bind(L_fail); + // Note1: check "b(*L_failure, eq)" above if adding extra instructions here + if (set_cond_codes) { + movs(temp_reg, sub_klass); // clears Z and sets temp_reg to non-0 if needed + } + if (saved_reg != noreg) { + pop(saved_reg); + } + if (L_failure != &L_fallthrough) { + b(*L_failure); + } + + bind(L_fallthrough); +#endif +} + +// Returns address of receiver parameter, using tmp as base register. tmp and params_count can be the same. +Address MacroAssembler::receiver_argument_address(Register params_base, Register params_count, Register tmp) { + assert_different_registers(params_base, params_count); + add(tmp, params_base, AsmOperand(params_count, lsl, Interpreter::logStackElementSize)); + return Address(tmp, -Interpreter::stackElementSize); +} + + +void MacroAssembler::align(int modulus) { + while (offset() % modulus != 0) { + nop(); + } +} + +int MacroAssembler::set_last_Java_frame(Register last_java_sp, + Register last_java_fp, + bool save_last_java_pc, + Register tmp) { + int pc_offset; + if (last_java_fp != noreg) { + // optional + str(last_java_fp, Address(Rthread, JavaThread::last_Java_fp_offset())); + _fp_saved = true; + } else { + _fp_saved = false; + } + if (AARCH64_ONLY(true) NOT_AARCH64(save_last_java_pc)) { // optional on 32-bit ARM +#ifdef AARCH64 + pc_offset = mov_pc_to(tmp); + str(tmp, Address(Rthread, JavaThread::last_Java_pc_offset())); +#else + str(PC, Address(Rthread, JavaThread::last_Java_pc_offset())); + pc_offset = offset() + VM_Version::stored_pc_adjustment(); +#endif + _pc_saved = true; + } else { + _pc_saved = false; + pc_offset = -1; + } + // According to comment in javaFrameAnchorm SP must be saved last, so that other + // entries are valid when SP is set. + + // However, this is probably not a strong constrainst since for instance PC is + // sometimes read from the stack at SP... but is pushed later (by the call). Hence, + // we now write the fields in the expected order but we have not added a StoreStore + // barrier. + + // XXX: if the ordering is really important, PC should always be saved (without forgetting + // to update oop_map offsets) and a StoreStore barrier might be needed. + + if (last_java_sp == noreg) { + last_java_sp = SP; // always saved + } +#ifdef AARCH64 + if (last_java_sp == SP) { + mov(tmp, SP); + str(tmp, Address(Rthread, JavaThread::last_Java_sp_offset())); + } else { + str(last_java_sp, Address(Rthread, JavaThread::last_Java_sp_offset())); + } +#else + str(last_java_sp, Address(Rthread, JavaThread::last_Java_sp_offset())); +#endif + + return pc_offset; // for oopmaps +} + +void MacroAssembler::reset_last_Java_frame(Register tmp) { + const Register Rzero = zero_register(tmp); + str(Rzero, Address(Rthread, JavaThread::last_Java_sp_offset())); + if (_fp_saved) { + str(Rzero, Address(Rthread, JavaThread::last_Java_fp_offset())); + } + if (_pc_saved) { + str(Rzero, Address(Rthread, JavaThread::last_Java_pc_offset())); + } +} + + +// Implementation of call_VM versions + +void MacroAssembler::call_VM_leaf_helper(address entry_point, int number_of_arguments) { + assert(number_of_arguments >= 0, "cannot have negative number of arguments"); + assert(number_of_arguments <= 4, "cannot have more than 4 arguments"); + +#ifndef AARCH64 + // Safer to save R9 here since callers may have been written + // assuming R9 survives. This is suboptimal but is not worth + // optimizing for the few platforms where R9 is scratched. + push(RegisterSet(R4) | R9ifScratched); + mov(R4, SP); + bic(SP, SP, StackAlignmentInBytes - 1); +#endif // AARCH64 + call(entry_point, relocInfo::runtime_call_type); +#ifndef AARCH64 + mov(SP, R4); + pop(RegisterSet(R4) | R9ifScratched); +#endif // AARCH64 +} + + +void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) { + assert(number_of_arguments >= 0, "cannot have negative number of arguments"); + assert(number_of_arguments <= 3, "cannot have more than 3 arguments"); + + const Register tmp = Rtemp; + assert_different_registers(oop_result, tmp); + + set_last_Java_frame(SP, FP, true, tmp); + +#ifdef ASSERT + AARCH64_ONLY(if (UseCompressedOops || UseCompressedClassPointers) { verify_heapbase("call_VM_helper: heap base corrupted?"); }); +#endif // ASSERT + +#ifndef AARCH64 +#if R9_IS_SCRATCHED + // Safer to save R9 here since callers may have been written + // assuming R9 survives. This is suboptimal but is not worth + // optimizing for the few platforms where R9 is scratched. + + // Note: cannot save R9 above the saved SP (some calls expect for + // instance the Java stack top at the saved SP) + // => once saved (with set_last_Java_frame), decrease SP before rounding to + // ensure the slot at SP will be free for R9). + sub(SP, SP, 4); + bic(SP, SP, StackAlignmentInBytes - 1); + str(R9, Address(SP, 0)); +#else + bic(SP, SP, StackAlignmentInBytes - 1); +#endif // R9_IS_SCRATCHED +#endif + + mov(R0, Rthread); + call(entry_point, relocInfo::runtime_call_type); + +#ifndef AARCH64 +#if R9_IS_SCRATCHED + ldr(R9, Address(SP, 0)); +#endif + ldr(SP, Address(Rthread, JavaThread::last_Java_sp_offset())); +#endif + + reset_last_Java_frame(tmp); + + // C++ interp handles this in the interpreter + check_and_handle_popframe(); + check_and_handle_earlyret(); + + if (check_exceptions) { + // check for pending exceptions + ldr(tmp, Address(Rthread, Thread::pending_exception_offset())); +#ifdef AARCH64 + Label L; + cbz(tmp, L); + mov_pc_to(Rexception_pc); + b(StubRoutines::forward_exception_entry()); + bind(L); +#else + cmp(tmp, 0); + mov(Rexception_pc, PC, ne); + b(StubRoutines::forward_exception_entry(), ne); +#endif // AARCH64 + } + + // get oop result if there is one and reset the value in the thread + if (oop_result->is_valid()) { + get_vm_result(oop_result, tmp); + } +} + +void MacroAssembler::call_VM(Register oop_result, address entry_point, bool check_exceptions) { + call_VM_helper(oop_result, entry_point, 0, check_exceptions); +} + + +void MacroAssembler::call_VM(Register oop_result, address entry_point, Register arg_1, bool check_exceptions) { + assert (arg_1 == R1, "fixed register for arg_1"); + call_VM_helper(oop_result, entry_point, 1, check_exceptions); +} + + +void MacroAssembler::call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, bool check_exceptions) { + assert (arg_1 == R1, "fixed register for arg_1"); + assert (arg_2 == R2, "fixed register for arg_2"); + call_VM_helper(oop_result, entry_point, 2, check_exceptions); +} + + +void MacroAssembler::call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions) { + assert (arg_1 == R1, "fixed register for arg_1"); + assert (arg_2 == R2, "fixed register for arg_2"); + assert (arg_3 == R3, "fixed register for arg_3"); + call_VM_helper(oop_result, entry_point, 3, check_exceptions); +} + + +void MacroAssembler::call_VM(Register oop_result, Register last_java_sp, address entry_point, int number_of_arguments, bool check_exceptions) { + // Not used on ARM + Unimplemented(); +} + + +void MacroAssembler::call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, bool check_exceptions) { + // Not used on ARM + Unimplemented(); +} + + +void MacroAssembler::call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, bool check_exceptions) { +// Not used on ARM + Unimplemented(); +} + + +void MacroAssembler::call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions) { + // Not used on ARM + Unimplemented(); +} + +// Raw call, without saving/restoring registers, exception handling, etc. +// Mainly used from various stubs. +void MacroAssembler::call_VM(address entry_point, bool save_R9_if_scratched) { + const Register tmp = Rtemp; // Rtemp free since scratched by call + set_last_Java_frame(SP, FP, true, tmp); +#if R9_IS_SCRATCHED + if (save_R9_if_scratched) { + // Note: Saving also R10 for alignment. + push(RegisterSet(R9, R10)); + } +#endif + mov(R0, Rthread); + call(entry_point, relocInfo::runtime_call_type); +#if R9_IS_SCRATCHED + if (save_R9_if_scratched) { + pop(RegisterSet(R9, R10)); + } +#endif + reset_last_Java_frame(tmp); +} + +void MacroAssembler::call_VM_leaf(address entry_point) { + call_VM_leaf_helper(entry_point, 0); +} + +void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1) { + assert (arg_1 == R0, "fixed register for arg_1"); + call_VM_leaf_helper(entry_point, 1); +} + +void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1, Register arg_2) { + assert (arg_1 == R0, "fixed register for arg_1"); + assert (arg_2 == R1, "fixed register for arg_2"); + call_VM_leaf_helper(entry_point, 2); +} + +void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3) { + assert (arg_1 == R0, "fixed register for arg_1"); + assert (arg_2 == R1, "fixed register for arg_2"); + assert (arg_3 == R2, "fixed register for arg_3"); + call_VM_leaf_helper(entry_point, 3); +} + +void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3, Register arg_4) { + assert (arg_1 == R0, "fixed register for arg_1"); + assert (arg_2 == R1, "fixed register for arg_2"); + assert (arg_3 == R2, "fixed register for arg_3"); + assert (arg_4 == R3, "fixed register for arg_4"); + call_VM_leaf_helper(entry_point, 4); +} + +void MacroAssembler::get_vm_result(Register oop_result, Register tmp) { + assert_different_registers(oop_result, tmp); + ldr(oop_result, Address(Rthread, JavaThread::vm_result_offset())); + str(zero_register(tmp), Address(Rthread, JavaThread::vm_result_offset())); + verify_oop(oop_result); +} + +void MacroAssembler::get_vm_result_2(Register metadata_result, Register tmp) { + assert_different_registers(metadata_result, tmp); + ldr(metadata_result, Address(Rthread, JavaThread::vm_result_2_offset())); + str(zero_register(tmp), Address(Rthread, JavaThread::vm_result_2_offset())); +} + +void MacroAssembler::add_rc(Register dst, Register arg1, RegisterOrConstant arg2) { + if (arg2.is_register()) { + add(dst, arg1, arg2.as_register()); + } else { + add(dst, arg1, arg2.as_constant()); + } +} + +void MacroAssembler::add_slow(Register rd, Register rn, int c) { +#ifdef AARCH64 + if (c == 0) { + if (rd != rn) { + mov(rd, rn); + } + return; + } + if (c < 0) { + sub_slow(rd, rn, -c); + return; + } + if (c > right_n_bits(24)) { + guarantee(rd != rn, "no large add_slow with only one register"); + mov_slow(rd, c); + add(rd, rn, rd); + } else { + int lo = c & right_n_bits(12); + int hi = (c >> 12) & right_n_bits(12); + if (lo != 0) { + add(rd, rn, lo, lsl0); + } + if (hi != 0) { + add(rd, (lo == 0) ? rn : rd, hi, lsl12); + } + } +#else + // This function is used in compiler for handling large frame offsets + if ((c < 0) && (((-c) & ~0x3fc) == 0)) { + return sub(rd, rn, (-c)); + } + int low = c & 0x3fc; + if (low != 0) { + add(rd, rn, low); + rn = rd; + } + if (c & ~0x3fc) { + assert(AsmOperand::is_rotated_imm(c & ~0x3fc), "unsupported add_slow offset %d", c); + add(rd, rn, c & ~0x3fc); + } else if (rd != rn) { + assert(c == 0, ""); + mov(rd, rn); // need to generate at least one move! + } +#endif // AARCH64 +} + +void MacroAssembler::sub_slow(Register rd, Register rn, int c) { +#ifdef AARCH64 + if (c <= 0) { + add_slow(rd, rn, -c); + return; + } + if (c > right_n_bits(24)) { + guarantee(rd != rn, "no large sub_slow with only one register"); + mov_slow(rd, c); + sub(rd, rn, rd); + } else { + int lo = c & right_n_bits(12); + int hi = (c >> 12) & right_n_bits(12); + if (lo != 0) { + sub(rd, rn, lo, lsl0); + } + if (hi != 0) { + sub(rd, (lo == 0) ? rn : rd, hi, lsl12); + } + } +#else + // This function is used in compiler for handling large frame offsets + if ((c < 0) && (((-c) & ~0x3fc) == 0)) { + return add(rd, rn, (-c)); + } + int low = c & 0x3fc; + if (low != 0) { + sub(rd, rn, low); + rn = rd; + } + if (c & ~0x3fc) { + assert(AsmOperand::is_rotated_imm(c & ~0x3fc), "unsupported sub_slow offset %d", c); + sub(rd, rn, c & ~0x3fc); + } else if (rd != rn) { + assert(c == 0, ""); + mov(rd, rn); // need to generate at least one move! + } +#endif // AARCH64 +} + +void MacroAssembler::mov_slow(Register rd, address addr) { + // do *not* call the non relocated mov_related_address + mov_slow(rd, (intptr_t)addr); +} + +void MacroAssembler::mov_slow(Register rd, const char *str) { + mov_slow(rd, (intptr_t)str); +} + +#ifdef AARCH64 + +// Common code for mov_slow and instr_count_for_mov_slow. +// Returns number of instructions of mov_slow pattern, +// generating it if non-null MacroAssembler is given. +int MacroAssembler::mov_slow_helper(Register rd, intptr_t c, MacroAssembler* masm) { + // This code pattern is matched in NativeIntruction::is_mov_slow. + // Update it at modifications. + + const intx mask = right_n_bits(16); + // 1 movz instruction + for (int base_shift = 0; base_shift < 64; base_shift += 16) { + if ((c & ~(mask << base_shift)) == 0) { + if (masm != NULL) { + masm->movz(rd, ((uintx)c) >> base_shift, base_shift); + } + return 1; + } + } + // 1 movn instruction + for (int base_shift = 0; base_shift < 64; base_shift += 16) { + if (((~c) & ~(mask << base_shift)) == 0) { + if (masm != NULL) { + masm->movn(rd, ((uintx)(~c)) >> base_shift, base_shift); + } + return 1; + } + } + // 1 orr instruction + { + LogicalImmediate imm(c, false); + if (imm.is_encoded()) { + if (masm != NULL) { + masm->orr(rd, ZR, imm); + } + return 1; + } + } + // 1 movz/movn + up to 3 movk instructions + int zeroes = 0; + int ones = 0; + for (int base_shift = 0; base_shift < 64; base_shift += 16) { + int part = (c >> base_shift) & mask; + if (part == 0) { + ++zeroes; + } else if (part == mask) { + ++ones; + } + } + int def_bits = 0; + if (ones > zeroes) { + def_bits = mask; + } + int inst_count = 0; + for (int base_shift = 0; base_shift < 64; base_shift += 16) { + int part = (c >> base_shift) & mask; + if (part != def_bits) { + if (masm != NULL) { + if (inst_count > 0) { + masm->movk(rd, part, base_shift); + } else { + if (def_bits == 0) { + masm->movz(rd, part, base_shift); + } else { + masm->movn(rd, ~part & mask, base_shift); + } + } + } + inst_count++; + } + } + assert((1 <= inst_count) && (inst_count <= 4), "incorrect number of instructions"); + return inst_count; +} + +void MacroAssembler::mov_slow(Register rd, intptr_t c) { +#ifdef ASSERT + int off = offset(); +#endif + (void) mov_slow_helper(rd, c, this); + assert(offset() - off == instr_count_for_mov_slow(c) * InstructionSize, "size mismatch"); +} + +// Counts instructions generated by mov_slow(rd, c). +int MacroAssembler::instr_count_for_mov_slow(intptr_t c) { + return mov_slow_helper(noreg, c, NULL); +} + +int MacroAssembler::instr_count_for_mov_slow(address c) { + return mov_slow_helper(noreg, (intptr_t)c, NULL); +} + +#else + +void MacroAssembler::mov_slow(Register rd, intptr_t c, AsmCondition cond) { + if (AsmOperand::is_rotated_imm(c)) { + mov(rd, c, cond); + } else if (AsmOperand::is_rotated_imm(~c)) { + mvn(rd, ~c, cond); + } else if (VM_Version::supports_movw()) { + movw(rd, c & 0xffff, cond); + if ((unsigned int)c >> 16) { + movt(rd, (unsigned int)c >> 16, cond); + } + } else { + // Find first non-zero bit + int shift = 0; + while ((c & (3 << shift)) == 0) { + shift += 2; + } + // Put the least significant part of the constant + int mask = 0xff << shift; + mov(rd, c & mask, cond); + // Add up to 3 other parts of the constant; + // each of them can be represented as rotated_imm + if (c & (mask << 8)) { + orr(rd, rd, c & (mask << 8), cond); + } + if (c & (mask << 16)) { + orr(rd, rd, c & (mask << 16), cond); + } + if (c & (mask << 24)) { + orr(rd, rd, c & (mask << 24), cond); + } + } +} + +#endif // AARCH64 + +void MacroAssembler::mov_oop(Register rd, jobject o, int oop_index, +#ifdef AARCH64 + bool patchable +#else + AsmCondition cond +#endif + ) { + + if (o == NULL) { +#ifdef AARCH64 + if (patchable) { + nop(); + } + mov(rd, ZR); +#else + mov(rd, 0, cond); +#endif + return; + } + + if (oop_index == 0) { + oop_index = oop_recorder()->allocate_oop_index(o); + } + relocate(oop_Relocation::spec(oop_index)); + +#ifdef AARCH64 + if (patchable) { + nop(); + } + ldr(rd, pc()); +#else + if (VM_Version::supports_movw()) { + movw(rd, 0, cond); + movt(rd, 0, cond); + } else { + ldr(rd, Address(PC), cond); + // Extra nop to handle case of large offset of oop placeholder (see NativeMovConstReg::set_data). + nop(); + } +#endif +} + +void MacroAssembler::mov_metadata(Register rd, Metadata* o, int metadata_index AARCH64_ONLY_ARG(bool patchable)) { + if (o == NULL) { +#ifdef AARCH64 + if (patchable) { + nop(); + } +#endif + mov(rd, 0); + return; + } + + if (metadata_index == 0) { + metadata_index = oop_recorder()->allocate_metadata_index(o); + } + relocate(metadata_Relocation::spec(metadata_index)); + +#ifdef AARCH64 + if (patchable) { + nop(); + } +#ifdef COMPILER2 + if (!patchable && VM_Version::prefer_moves_over_load_literal()) { + mov_slow(rd, (address)o); + return; + } +#endif + ldr(rd, pc()); +#else + if (VM_Version::supports_movw()) { + movw(rd, ((int)o) & 0xffff); + movt(rd, (unsigned int)o >> 16); + } else { + ldr(rd, Address(PC)); + // Extra nop to handle case of large offset of metadata placeholder (see NativeMovConstReg::set_data). + nop(); + } +#endif // AARCH64 +} + +void MacroAssembler::mov_float(FloatRegister fd, jfloat c NOT_AARCH64_ARG(AsmCondition cond)) { + Label skip_constant; + union { + jfloat f; + jint i; + } accessor; + accessor.f = c; + +#ifdef AARCH64 + // TODO-AARCH64 - try to optimize loading of float constants with fmov and/or mov_slow + Label L; + ldr_s(fd, target(L)); + b(skip_constant); + bind(L); + emit_int32(accessor.i); + bind(skip_constant); +#else + flds(fd, Address(PC), cond); + b(skip_constant); + emit_int32(accessor.i); + bind(skip_constant); +#endif // AARCH64 +} + +void MacroAssembler::mov_double(FloatRegister fd, jdouble c NOT_AARCH64_ARG(AsmCondition cond)) { + Label skip_constant; + union { + jdouble d; + jint i[2]; + } accessor; + accessor.d = c; + +#ifdef AARCH64 + // TODO-AARCH64 - try to optimize loading of double constants with fmov + Label L; + ldr_d(fd, target(L)); + b(skip_constant); + align(wordSize); + bind(L); + emit_int32(accessor.i[0]); + emit_int32(accessor.i[1]); + bind(skip_constant); +#else + fldd(fd, Address(PC), cond); + b(skip_constant); + emit_int32(accessor.i[0]); + emit_int32(accessor.i[1]); + bind(skip_constant); +#endif // AARCH64 +} + +void MacroAssembler::ldr_global_s32(Register reg, address address_of_global) { + intptr_t addr = (intptr_t) address_of_global; +#ifdef AARCH64 + assert((addr & 0x3) == 0, "address should be aligned"); + + // FIXME: TODO + if (false && page_reachable_from_cache(address_of_global)) { + assert(false,"TODO: relocate"); + //relocate(); + adrp(reg, address_of_global); + ldrsw(reg, Address(reg, addr & 0xfff)); + } else { + mov_slow(reg, addr & ~0x3fff); + ldrsw(reg, Address(reg, addr & 0x3fff)); + } +#else + mov_slow(reg, addr & ~0xfff); + ldr(reg, Address(reg, addr & 0xfff)); +#endif +} + +void MacroAssembler::ldr_global_ptr(Register reg, address address_of_global) { +#ifdef AARCH64 + intptr_t addr = (intptr_t) address_of_global; + assert ((addr & 0x7) == 0, "address should be aligned"); + mov_slow(reg, addr & ~0x7fff); + ldr(reg, Address(reg, addr & 0x7fff)); +#else + ldr_global_s32(reg, address_of_global); +#endif +} + +void MacroAssembler::ldrb_global(Register reg, address address_of_global) { + intptr_t addr = (intptr_t) address_of_global; + mov_slow(reg, addr & ~0xfff); + ldrb(reg, Address(reg, addr & 0xfff)); +} + +void MacroAssembler::zero_extend(Register rd, Register rn, int bits) { +#ifdef AARCH64 + switch (bits) { + case 8: uxtb(rd, rn); break; + case 16: uxth(rd, rn); break; + case 32: mov_w(rd, rn); break; + default: ShouldNotReachHere(); + } +#else + if (bits <= 8) { + andr(rd, rn, (1 << bits) - 1); + } else if (bits >= 24) { + bic(rd, rn, -1 << bits); + } else { + mov(rd, AsmOperand(rn, lsl, 32 - bits)); + mov(rd, AsmOperand(rd, lsr, 32 - bits)); + } +#endif +} + +void MacroAssembler::sign_extend(Register rd, Register rn, int bits) { +#ifdef AARCH64 + switch (bits) { + case 8: sxtb(rd, rn); break; + case 16: sxth(rd, rn); break; + case 32: sxtw(rd, rn); break; + default: ShouldNotReachHere(); + } +#else + mov(rd, AsmOperand(rn, lsl, 32 - bits)); + mov(rd, AsmOperand(rd, asr, 32 - bits)); +#endif +} + +#ifndef AARCH64 + +void MacroAssembler::long_move(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmCondition cond) { + if (rd_lo != rn_hi) { + if (rd_lo != rn_lo) { mov(rd_lo, rn_lo, cond); } + if (rd_hi != rn_hi) { mov(rd_hi, rn_hi, cond); } + } else if (rd_hi != rn_lo) { + if (rd_hi != rn_hi) { mov(rd_hi, rn_hi, cond); } + if (rd_lo != rn_lo) { mov(rd_lo, rn_lo, cond); } + } else { + eor(rd_lo, rd_hi, rd_lo, cond); + eor(rd_hi, rd_lo, rd_hi, cond); + eor(rd_lo, rd_hi, rd_lo, cond); + } +} + +void MacroAssembler::long_shift(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmShift shift, Register count) { + Register tmp; + if (rd_lo != rn_lo && rd_lo != rn_hi && rd_lo != count) { + tmp = rd_lo; + } else { + tmp = rd_hi; + } + assert_different_registers(tmp, count, rn_lo, rn_hi); + + subs(tmp, count, 32); + if (shift == lsl) { + assert_different_registers(rd_hi, rn_lo); + assert_different_registers(count, rd_hi); + mov(rd_hi, AsmOperand(rn_lo, shift, tmp), pl); + rsb(tmp, count, 32, mi); + if (rd_hi == rn_hi) { + mov(rd_hi, AsmOperand(rn_hi, lsl, count), mi); + orr(rd_hi, rd_hi, AsmOperand(rn_lo, lsr, tmp), mi); + } else { + mov(rd_hi, AsmOperand(rn_lo, lsr, tmp), mi); + orr(rd_hi, rd_hi, AsmOperand(rn_hi, lsl, count), mi); + } + mov(rd_lo, AsmOperand(rn_lo, shift, count)); + } else { + assert_different_registers(rd_lo, rn_hi); + assert_different_registers(rd_lo, count); + mov(rd_lo, AsmOperand(rn_hi, shift, tmp), pl); + rsb(tmp, count, 32, mi); + if (rd_lo == rn_lo) { + mov(rd_lo, AsmOperand(rn_lo, lsr, count), mi); + orr(rd_lo, rd_lo, AsmOperand(rn_hi, lsl, tmp), mi); + } else { + mov(rd_lo, AsmOperand(rn_hi, lsl, tmp), mi); + orr(rd_lo, rd_lo, AsmOperand(rn_lo, lsr, count), mi); + } + mov(rd_hi, AsmOperand(rn_hi, shift, count)); + } +} + +void MacroAssembler::long_shift(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmShift shift, int count) { + assert(count != 0 && (count & ~63) == 0, "must be"); + + if (shift == lsl) { + assert_different_registers(rd_hi, rn_lo); + if (count >= 32) { + mov(rd_hi, AsmOperand(rn_lo, lsl, count - 32)); + mov(rd_lo, 0); + } else { + mov(rd_hi, AsmOperand(rn_hi, lsl, count)); + orr(rd_hi, rd_hi, AsmOperand(rn_lo, lsr, 32 - count)); + mov(rd_lo, AsmOperand(rn_lo, lsl, count)); + } + } else { + assert_different_registers(rd_lo, rn_hi); + if (count >= 32) { + if (count == 32) { + mov(rd_lo, rn_hi); + } else { + mov(rd_lo, AsmOperand(rn_hi, shift, count - 32)); + } + if (shift == asr) { + mov(rd_hi, AsmOperand(rn_hi, asr, 0)); + } else { + mov(rd_hi, 0); + } + } else { + mov(rd_lo, AsmOperand(rn_lo, lsr, count)); + orr(rd_lo, rd_lo, AsmOperand(rn_hi, lsl, 32 - count)); + mov(rd_hi, AsmOperand(rn_hi, shift, count)); + } + } +} +#endif // !AARCH64 + +void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file, int line) { + // This code pattern is matched in NativeIntruction::skip_verify_oop. + // Update it at modifications. + if (!VerifyOops) return; + + char buffer[64]; +#ifdef COMPILER1 + if (CommentedAssembly) { + snprintf(buffer, sizeof(buffer), "verify_oop at %d", offset()); + block_comment(buffer); + } +#endif + const char* msg_buffer = NULL; + { + ResourceMark rm; + stringStream ss; + ss.print("%s at offset %d (%s:%d)", s, offset(), file, line); + msg_buffer = code_string(ss.as_string()); + } + + save_all_registers(); + + if (reg != R2) { + mov(R2, reg); // oop to verify + } + mov(R1, SP); // register save area + + Label done; + InlinedString Lmsg(msg_buffer); + ldr_literal(R0, Lmsg); // message + + // call indirectly to solve generation ordering problem + ldr_global_ptr(Rtemp, StubRoutines::verify_oop_subroutine_entry_address()); + call(Rtemp); + + restore_all_registers(); + + b(done); +#ifdef COMPILER2 + int off = offset(); +#endif + bind_literal(Lmsg); +#ifdef COMPILER2 + if (offset() - off == 1 * wordSize) { + // no padding, so insert nop for worst-case sizing + nop(); + } +#endif + bind(done); +} + +void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* file, int line) { + if (!VerifyOops) return; + + const char* msg_buffer = NULL; + { + ResourceMark rm; + stringStream ss; + if ((addr.base() == SP) && (addr.index()==noreg)) { + ss.print("verify_oop_addr SP[%d]: %s", (int)addr.disp(), s); + } else { + ss.print("verify_oop_addr: %s", s); + } + ss.print(" (%s:%d)", file, line); + msg_buffer = code_string(ss.as_string()); + } + + int push_size = save_all_registers(); + + if (addr.base() == SP) { + // computes an addr that takes into account the push + if (addr.index() != noreg) { + Register new_base = addr.index() == R2 ? R1 : R2; // avoid corrupting the index + add(new_base, SP, push_size); + addr = addr.rebase(new_base); + } else { + addr = addr.plus_disp(push_size); + } + } + + ldr(R2, addr); // oop to verify + mov(R1, SP); // register save area + + Label done; + InlinedString Lmsg(msg_buffer); + ldr_literal(R0, Lmsg); // message + + // call indirectly to solve generation ordering problem + ldr_global_ptr(Rtemp, StubRoutines::verify_oop_subroutine_entry_address()); + call(Rtemp); + + restore_all_registers(); + + b(done); + bind_literal(Lmsg); + bind(done); +} + +void MacroAssembler::null_check(Register reg, Register tmp, int offset) { + if (needs_explicit_null_check(offset)) { +#ifdef AARCH64 + ldr(ZR, Address(reg)); +#else + assert_different_registers(reg, tmp); + if (tmp == noreg) { + tmp = Rtemp; + assert((! Thread::current()->is_Compiler_thread()) || + (! (ciEnv::current()->task() == NULL)) || + (! (ciEnv::current()->comp_level() == CompLevel_full_optimization)), + "Rtemp not available in C2"); // explicit tmp register required + // XXX: could we mark the code buffer as not compatible with C2 ? + } + ldr(tmp, Address(reg)); +#endif + } +} + +// Puts address of allocated object into register `obj` and end of allocated object into register `obj_end`. +void MacroAssembler::eden_allocate(Register obj, Register obj_end, Register tmp1, Register tmp2, + RegisterOrConstant size_expression, Label& slow_case) { + if (!Universe::heap()->supports_inline_contig_alloc()) { + b(slow_case); + return; + } + + CollectedHeap* ch = Universe::heap(); + + const Register top_addr = tmp1; + const Register heap_end = tmp2; + + if (size_expression.is_register()) { + assert_different_registers(obj, obj_end, top_addr, heap_end, size_expression.as_register()); + } else { + assert_different_registers(obj, obj_end, top_addr, heap_end); + } + + bool load_const = AARCH64_ONLY(false) NOT_AARCH64(VM_Version::supports_movw() ); // TODO-AARCH64 check performance + if (load_const) { + mov_address(top_addr, (address)Universe::heap()->top_addr(), symbolic_Relocation::eden_top_reference); + } else { + ldr(top_addr, Address(Rthread, JavaThread::heap_top_addr_offset())); + } + // Calculate new heap_top by adding the size of the object + Label retry; + bind(retry); + +#ifdef AARCH64 + ldxr(obj, top_addr); +#else + ldr(obj, Address(top_addr)); +#endif // AARCH64 + + ldr(heap_end, Address(top_addr, (intptr_t)ch->end_addr() - (intptr_t)ch->top_addr())); + add_rc(obj_end, obj, size_expression); + // Check if obj_end wrapped around, i.e., obj_end < obj. If yes, jump to the slow case. + cmp(obj_end, obj); + b(slow_case, lo); + // Update heap_top if allocation succeeded + cmp(obj_end, heap_end); + b(slow_case, hi); + +#ifdef AARCH64 + stxr(heap_end/*scratched*/, obj_end, top_addr); + cbnz_w(heap_end, retry); +#else + atomic_cas_bool(obj, obj_end, top_addr, 0, heap_end/*scratched*/); + b(retry, ne); +#endif // AARCH64 +} + +// Puts address of allocated object into register `obj` and end of allocated object into register `obj_end`. +void MacroAssembler::tlab_allocate(Register obj, Register obj_end, Register tmp1, + RegisterOrConstant size_expression, Label& slow_case) { + const Register tlab_end = tmp1; + assert_different_registers(obj, obj_end, tlab_end); + + ldr(obj, Address(Rthread, JavaThread::tlab_top_offset())); + ldr(tlab_end, Address(Rthread, JavaThread::tlab_end_offset())); + add_rc(obj_end, obj, size_expression); + cmp(obj_end, tlab_end); + b(slow_case, hi); + str(obj_end, Address(Rthread, JavaThread::tlab_top_offset())); +} + +void MacroAssembler::tlab_refill(Register top, Register tmp1, Register tmp2, + Register tmp3, Register tmp4, + Label& try_eden, Label& slow_case) { + if (!Universe::heap()->supports_inline_contig_alloc()) { + b(slow_case); + return; + } + + InlinedAddress intArrayKlass_addr((address)Universe::intArrayKlassObj_addr()); + Label discard_tlab, do_refill; + ldr(top, Address(Rthread, JavaThread::tlab_top_offset())); + ldr(tmp1, Address(Rthread, JavaThread::tlab_end_offset())); + ldr(tmp2, Address(Rthread, JavaThread::tlab_refill_waste_limit_offset())); + + // Calculate amount of free space + sub(tmp1, tmp1, top); + // Retain tlab and allocate in shared space + // if the amount of free space in tlab is too large to discard + cmp(tmp2, AsmOperand(tmp1, lsr, LogHeapWordSize)); + b(discard_tlab, ge); + + // Increment waste limit to prevent getting stuck on this slow path + mov_slow(tmp3, ThreadLocalAllocBuffer::refill_waste_limit_increment()); + add(tmp2, tmp2, tmp3); + str(tmp2, Address(Rthread, JavaThread::tlab_refill_waste_limit_offset())); + if (TLABStats) { + ldr_u32(tmp2, Address(Rthread, JavaThread::tlab_slow_allocations_offset())); + add_32(tmp2, tmp2, 1); + str_32(tmp2, Address(Rthread, JavaThread::tlab_slow_allocations_offset())); + } + b(try_eden); + bind_literal(intArrayKlass_addr); + + bind(discard_tlab); + if (TLABStats) { + ldr_u32(tmp2, Address(Rthread, JavaThread::tlab_number_of_refills_offset())); + ldr_u32(tmp3, Address(Rthread, JavaThread::tlab_fast_refill_waste_offset())); + add_32(tmp2, tmp2, 1); + add_32(tmp3, tmp3, AsmOperand(tmp1, lsr, LogHeapWordSize)); + str_32(tmp2, Address(Rthread, JavaThread::tlab_number_of_refills_offset())); + str_32(tmp3, Address(Rthread, JavaThread::tlab_fast_refill_waste_offset())); + } + // If tlab is currently allocated (top or end != null) + // then fill [top, end + alignment_reserve) with array object + cbz(top, do_refill); + + // Set up the mark word + mov_slow(tmp2, (intptr_t)markOopDesc::prototype()->copy_set_hash(0x2)); + str(tmp2, Address(top, oopDesc::mark_offset_in_bytes())); + // Set klass to intArrayKlass and the length to the remaining space + ldr_literal(tmp2, intArrayKlass_addr); + add(tmp1, tmp1, ThreadLocalAllocBuffer::alignment_reserve_in_bytes() - + typeArrayOopDesc::header_size(T_INT) * HeapWordSize); + Register klass = tmp2; + ldr(klass, Address(tmp2)); + logical_shift_right(tmp1, tmp1, LogBytesPerInt); // divide by sizeof(jint) + str_32(tmp1, Address(top, arrayOopDesc::length_offset_in_bytes())); + store_klass(klass, top); // blows klass: + klass = noreg; + + ldr(tmp1, Address(Rthread, JavaThread::tlab_start_offset())); + sub(tmp1, top, tmp1); // size of tlab's allocated portion + incr_allocated_bytes(tmp1, tmp2); + + bind(do_refill); + // Refill the tlab with an eden allocation + ldr(tmp1, Address(Rthread, JavaThread::tlab_size_offset())); + logical_shift_left(tmp4, tmp1, LogHeapWordSize); + eden_allocate(top, tmp1, tmp2, tmp3, tmp4, slow_case); + str(top, Address(Rthread, JavaThread::tlab_start_offset())); + str(top, Address(Rthread, JavaThread::tlab_top_offset())); + +#ifdef ASSERT + // Verify that tmp1 contains tlab_end + ldr(tmp2, Address(Rthread, JavaThread::tlab_size_offset())); + add(tmp2, top, AsmOperand(tmp2, lsl, LogHeapWordSize)); + cmp(tmp1, tmp2); + breakpoint(ne); +#endif + + sub(tmp1, tmp1, ThreadLocalAllocBuffer::alignment_reserve_in_bytes()); + str(tmp1, Address(Rthread, JavaThread::tlab_end_offset())); + + if (ZeroTLAB) { + // clobbers start and tmp + // top must be preserved! + add(tmp1, tmp1, ThreadLocalAllocBuffer::alignment_reserve_in_bytes()); + ldr(tmp2, Address(Rthread, JavaThread::tlab_start_offset())); + zero_memory(tmp2, tmp1, tmp3); + } +} + +// Fills memory regions [start..end] with zeroes. Clobbers `start` and `tmp` registers. +void MacroAssembler::zero_memory(Register start, Register end, Register tmp) { + Label loop; + const Register ptr = start; + +#ifdef AARCH64 + // TODO-AARCH64 - compare performance of 2x word zeroing with simple 1x + const Register size = tmp; + Label remaining, done; + + sub(size, end, start); + +#ifdef ASSERT + { Label L; + tst(size, wordSize - 1); + b(L, eq); + stop("size is not a multiple of wordSize"); + bind(L); + } +#endif // ASSERT + + subs(size, size, wordSize); + b(remaining, le); + + // Zero by 2 words per iteration. + bind(loop); + subs(size, size, 2*wordSize); + stp(ZR, ZR, Address(ptr, 2*wordSize, post_indexed)); + b(loop, gt); + + bind(remaining); + b(done, ne); + str(ZR, Address(ptr)); + bind(done); +#else + mov(tmp, 0); + bind(loop); + cmp(ptr, end); + str(tmp, Address(ptr, wordSize, post_indexed), lo); + b(loop, lo); +#endif // AARCH64 +} + +void MacroAssembler::incr_allocated_bytes(RegisterOrConstant size_in_bytes, Register tmp) { +#ifdef AARCH64 + ldr(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset()))); + add_rc(tmp, tmp, size_in_bytes); + str(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset()))); +#else + // Bump total bytes allocated by this thread + Label done; + + ldr(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset()))); + adds(tmp, tmp, size_in_bytes); + str(tmp, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset())), cc); + b(done, cc); + + // Increment the high word and store single-copy atomically (that is an unlikely scenario on typical embedded systems as it means >4GB has been allocated) + // To do so ldrd/strd instructions used which require an even-odd pair of registers. Such a request could be difficult to satisfy by + // allocating those registers on a higher level, therefore the routine is ready to allocate a pair itself. + Register low, high; + // Select ether R0/R1 or R2/R3 + + if (size_in_bytes.is_register() && (size_in_bytes.as_register() == R0 || size_in_bytes.as_register() == R1)) { + low = R2; + high = R3; + } else { + low = R0; + high = R1; + } + push(RegisterSet(low, high)); + + ldrd(low, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset()))); + adds(low, low, size_in_bytes); + adc(high, high, 0); + strd(low, Address(Rthread, in_bytes(JavaThread::allocated_bytes_offset()))); + + pop(RegisterSet(low, high)); + + bind(done); +#endif // AARCH64 +} + +void MacroAssembler::arm_stack_overflow_check(int frame_size_in_bytes, Register tmp) { + // Version of AbstractAssembler::generate_stack_overflow_check optimized for ARM + if (UseStackBanging) { + const int page_size = os::vm_page_size(); + + sub_slow(tmp, SP, JavaThread::stack_shadow_zone_size()); + strb(R0, Address(tmp)); +#ifdef AARCH64 + for (; frame_size_in_bytes >= page_size; frame_size_in_bytes -= page_size) { + sub(tmp, tmp, page_size); + strb(R0, Address(tmp)); + } +#else + for (; frame_size_in_bytes >= page_size; frame_size_in_bytes -= 0xff0) { + strb(R0, Address(tmp, -0xff0, pre_indexed)); + } +#endif // AARCH64 + } +} + +void MacroAssembler::arm_stack_overflow_check(Register Rsize, Register tmp) { + if (UseStackBanging) { + Label loop; + + mov(tmp, SP); + add_slow(Rsize, Rsize, JavaThread::stack_shadow_zone_size() - os::vm_page_size()); +#ifdef AARCH64 + sub(tmp, tmp, Rsize); + bind(loop); + subs(Rsize, Rsize, os::vm_page_size()); + strb(ZR, Address(tmp, Rsize)); +#else + bind(loop); + subs(Rsize, Rsize, 0xff0); + strb(R0, Address(tmp, -0xff0, pre_indexed)); +#endif // AARCH64 + b(loop, hi); + } +} + +void MacroAssembler::stop(const char* msg) { + // This code pattern is matched in NativeIntruction::is_stop. + // Update it at modifications. +#ifdef COMPILER1 + if (CommentedAssembly) { + block_comment("stop"); + } +#endif + + InlinedAddress Ldebug(CAST_FROM_FN_PTR(address, MacroAssembler::debug)); + InlinedString Lmsg(msg); + + // save all registers for further inspection + save_all_registers(); + + ldr_literal(R0, Lmsg); // message + mov(R1, SP); // register save area + +#ifdef AARCH64 + ldr_literal(Rtemp, Ldebug); + br(Rtemp); +#else + ldr_literal(PC, Ldebug); // call MacroAssembler::debug +#endif // AARCH64 + +#if defined(COMPILER2) && defined(AARCH64) + int off = offset(); +#endif + bind_literal(Lmsg); + bind_literal(Ldebug); +#if defined(COMPILER2) && defined(AARCH64) + if (offset() - off == 2 * wordSize) { + // no padding, so insert nop for worst-case sizing + nop(); + } +#endif +} + +void MacroAssembler::warn(const char* msg) { +#ifdef COMPILER1 + if (CommentedAssembly) { + block_comment("warn"); + } +#endif + + InlinedAddress Lwarn(CAST_FROM_FN_PTR(address, warning)); + InlinedString Lmsg(msg); + Label done; + + int push_size = save_caller_save_registers(); + +#ifdef AARCH64 + // TODO-AARCH64 - get rid of extra debug parameters + mov(R1, LR); + mov(R2, FP); + add(R3, SP, push_size); +#endif + + ldr_literal(R0, Lmsg); // message + ldr_literal(LR, Lwarn); // call warning + + call(LR); + + restore_caller_save_registers(); + + b(done); + bind_literal(Lmsg); + bind_literal(Lwarn); + bind(done); +} + + +int MacroAssembler::save_all_registers() { + // This code pattern is matched in NativeIntruction::is_save_all_registers. + // Update it at modifications. +#ifdef AARCH64 + const Register tmp = Rtemp; + raw_push(R30, ZR); + for (int i = 28; i >= 0; i -= 2) { + raw_push(as_Register(i), as_Register(i+1)); + } + mov_pc_to(tmp); + str(tmp, Address(SP, 31*wordSize)); + ldr(tmp, Address(SP, tmp->encoding()*wordSize)); + return 32*wordSize; +#else + push(RegisterSet(R0, R12) | RegisterSet(LR) | RegisterSet(PC)); + return 15*wordSize; +#endif // AARCH64 +} + +void MacroAssembler::restore_all_registers() { +#ifdef AARCH64 + for (int i = 0; i <= 28; i += 2) { + raw_pop(as_Register(i), as_Register(i+1)); + } + raw_pop(R30, ZR); +#else + pop(RegisterSet(R0, R12) | RegisterSet(LR)); // restore registers + add(SP, SP, wordSize); // discard saved PC +#endif // AARCH64 +} + +int MacroAssembler::save_caller_save_registers() { +#ifdef AARCH64 + for (int i = 0; i <= 16; i += 2) { + raw_push(as_Register(i), as_Register(i+1)); + } + raw_push(R18, LR); + return 20*wordSize; +#else +#if R9_IS_SCRATCHED + // Save also R10 to preserve alignment + push(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(LR) | RegisterSet(R9,R10)); + return 8*wordSize; +#else + push(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(LR)); + return 6*wordSize; +#endif +#endif // AARCH64 +} + +void MacroAssembler::restore_caller_save_registers() { +#ifdef AARCH64 + raw_pop(R18, LR); + for (int i = 16; i >= 0; i -= 2) { + raw_pop(as_Register(i), as_Register(i+1)); + } +#else +#if R9_IS_SCRATCHED + pop(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(LR) | RegisterSet(R9,R10)); +#else + pop(RegisterSet(R0, R3) | RegisterSet(R12) | RegisterSet(LR)); +#endif +#endif // AARCH64 +} + +void MacroAssembler::debug(const char* msg, const intx* registers) { + // In order to get locks to work, we need to fake a in_VM state + JavaThread* thread = JavaThread::current(); + thread->set_thread_state(_thread_in_vm); + + if (ShowMessageBoxOnError) { + ttyLocker ttyl; + if (CountBytecodes || TraceBytecodes || StopInterpreterAt) { + BytecodeCounter::print(); + } + if (os::message_box(msg, "Execution stopped, print registers?")) { +#ifdef AARCH64 + // saved registers: R0-R30, PC + const int nregs = 32; +#else + // saved registers: R0-R12, LR, PC + const int nregs = 15; + const Register regs[nregs] = {R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, LR, PC}; +#endif // AARCH64 + + for (int i = 0; i < nregs AARCH64_ONLY(-1); i++) { + tty->print_cr("%s = " INTPTR_FORMAT, AARCH64_ONLY(as_Register(i)) NOT_AARCH64(regs[i])->name(), registers[i]); + } + +#ifdef AARCH64 + tty->print_cr("pc = " INTPTR_FORMAT, registers[nregs-1]); +#endif // AARCH64 + + // derive original SP value from the address of register save area + tty->print_cr("%s = " INTPTR_FORMAT, SP->name(), p2i(®isters[nregs])); + } + BREAKPOINT; + } else { + ::tty->print_cr("=============== DEBUG MESSAGE: %s ================\n", msg); + } + assert(false, "DEBUG MESSAGE: %s", msg); + fatal("%s", msg); // returning from MacroAssembler::debug is not supported +} + +void MacroAssembler::unimplemented(const char* what) { + const char* buf = NULL; + { + ResourceMark rm; + stringStream ss; + ss.print("unimplemented: %s", what); + buf = code_string(ss.as_string()); + } + stop(buf); +} + + +// Implementation of FixedSizeCodeBlock + +FixedSizeCodeBlock::FixedSizeCodeBlock(MacroAssembler* masm, int size_in_instrs, bool enabled) : +_masm(masm), _start(masm->pc()), _size_in_instrs(size_in_instrs), _enabled(enabled) { +} + +FixedSizeCodeBlock::~FixedSizeCodeBlock() { + if (_enabled) { + address curr_pc = _masm->pc(); + + assert(_start < curr_pc, "invalid current pc"); + guarantee(curr_pc <= _start + _size_in_instrs * Assembler::InstructionSize, "code block is too long"); + + int nops_count = (_start - curr_pc) / Assembler::InstructionSize + _size_in_instrs; + for (int i = 0; i < nops_count; i++) { + _masm->nop(); + } + } +} + +#ifdef AARCH64 + +// Serializes memory. +// tmp register is not used on AArch64, this parameter is provided solely for better compatibility with 32-bit ARM +void MacroAssembler::membar(Membar_mask_bits order_constraint, Register tmp) { + if (!os::is_MP()) return; + + // TODO-AARCH64 investigate dsb vs dmb effects + if (order_constraint == StoreStore) { + dmb(DMB_st); + } else if ((order_constraint & ~(LoadLoad | LoadStore)) == 0) { + dmb(DMB_ld); + } else { + dmb(DMB_all); + } +} + +#else + +// Serializes memory. Potentially blows flags and reg. +// tmp is a scratch for v6 co-processor write op (could be noreg for other architecure versions) +// preserve_flags takes a longer path in LoadStore case (dmb rather then control dependency) to preserve status flags. Optional. +// load_tgt is an ordered load target in a LoadStore case only, to create dependency between the load operation and conditional branch. Optional. +void MacroAssembler::membar(Membar_mask_bits order_constraint, + Register tmp, + bool preserve_flags, + Register load_tgt) { + if (!os::is_MP()) return; + + if (order_constraint == StoreStore) { + dmb(DMB_st, tmp); + } else if ((order_constraint & StoreLoad) || + (order_constraint & LoadLoad) || + (order_constraint & StoreStore) || + (load_tgt == noreg) || + preserve_flags) { + dmb(DMB_all, tmp); + } else { + // LoadStore: speculative stores reordeing is prohibited + + // By providing an ordered load target register, we avoid an extra memory load reference + Label not_taken; + bind(not_taken); + cmp(load_tgt, load_tgt); + b(not_taken, ne); + } +} + +#endif // AARCH64 + +// If "allow_fallthrough_on_failure" is false, we always branch to "slow_case" +// on failure, so fall-through can only mean success. +// "one_shot" controls whether we loop and retry to mitigate spurious failures. +// This is only needed for C2, which for some reason does not rety, +// while C1/interpreter does. +// TODO: measure if it makes a difference + +void MacroAssembler::cas_for_lock_acquire(Register oldval, Register newval, + Register base, Register tmp, Label &slow_case, + bool allow_fallthrough_on_failure, bool one_shot) +{ + + bool fallthrough_is_success = false; + + // ARM Litmus Test example does prefetching here. + // TODO: investigate if it helps performance + + // The last store was to the displaced header, so to prevent + // reordering we must issue a StoreStore or Release barrier before + // the CAS store. + +#ifdef AARCH64 + + Register Rscratch = tmp; + Register Roop = base; + Register mark = oldval; + Register Rbox = newval; + Label loop; + + assert(oopDesc::mark_offset_in_bytes() == 0, "must be"); + + // Instead of StoreStore here, we use store-release-exclusive below + + bind(loop); + + ldaxr(tmp, base); // acquire + cmp(tmp, oldval); + b(slow_case, ne); + stlxr(tmp, newval, base); // release + if (one_shot) { + cmp_w(tmp, 0); + } else { + cbnz_w(tmp, loop); + fallthrough_is_success = true; + } + + // MemBarAcquireLock would normally go here, but + // we already do ldaxr+stlxr above, which has + // Sequential Consistency + +#else + membar(MacroAssembler::StoreStore, noreg); + + if (one_shot) { + ldrex(tmp, Address(base, oopDesc::mark_offset_in_bytes())); + cmp(tmp, oldval); + strex(tmp, newval, Address(base, oopDesc::mark_offset_in_bytes()), eq); + cmp(tmp, 0, eq); + } else { + atomic_cas_bool(oldval, newval, base, oopDesc::mark_offset_in_bytes(), tmp); + } + + // MemBarAcquireLock barrier + // According to JSR-133 Cookbook, this should be LoadLoad | LoadStore, + // but that doesn't prevent a load or store from floating up between + // the load and store in the CAS sequence, so play it safe and + // do a full fence. + membar(Membar_mask_bits(LoadLoad | LoadStore | StoreStore | StoreLoad), noreg); +#endif + if (!fallthrough_is_success && !allow_fallthrough_on_failure) { + b(slow_case, ne); + } +} + +void MacroAssembler::cas_for_lock_release(Register oldval, Register newval, + Register base, Register tmp, Label &slow_case, + bool allow_fallthrough_on_failure, bool one_shot) +{ + + bool fallthrough_is_success = false; + + assert_different_registers(oldval,newval,base,tmp); + +#ifdef AARCH64 + Label loop; + + assert(oopDesc::mark_offset_in_bytes() == 0, "must be"); + + bind(loop); + ldxr(tmp, base); + cmp(tmp, oldval); + b(slow_case, ne); + // MemBarReleaseLock barrier + stlxr(tmp, newval, base); + if (one_shot) { + cmp_w(tmp, 0); + } else { + cbnz_w(tmp, loop); + fallthrough_is_success = true; + } +#else + // MemBarReleaseLock barrier + // According to JSR-133 Cookbook, this should be StoreStore | LoadStore, + // but that doesn't prevent a load or store from floating down between + // the load and store in the CAS sequence, so play it safe and + // do a full fence. + membar(Membar_mask_bits(LoadLoad | LoadStore | StoreStore | StoreLoad), tmp); + + if (one_shot) { + ldrex(tmp, Address(base, oopDesc::mark_offset_in_bytes())); + cmp(tmp, oldval); + strex(tmp, newval, Address(base, oopDesc::mark_offset_in_bytes()), eq); + cmp(tmp, 0, eq); + } else { + atomic_cas_bool(oldval, newval, base, oopDesc::mark_offset_in_bytes(), tmp); + } +#endif + if (!fallthrough_is_success && !allow_fallthrough_on_failure) { + b(slow_case, ne); + } + + // ExitEnter + // According to JSR-133 Cookbook, this should be StoreLoad, the same + // barrier that follows volatile store. + // TODO: Should be able to remove on armv8 if volatile loads + // use the load-acquire instruction. + membar(StoreLoad, noreg); +} + +#ifndef PRODUCT + +// Preserves flags and all registers. +// On SMP the updated value might not be visible to external observers without a sychronization barrier +void MacroAssembler::cond_atomic_inc32(AsmCondition cond, int* counter_addr) { + if (counter_addr != NULL) { + InlinedAddress counter_addr_literal((address)counter_addr); + Label done, retry; + if (cond != al) { + b(done, inverse(cond)); + } + +#ifdef AARCH64 + raw_push(R0, R1); + raw_push(R2, ZR); + + ldr_literal(R0, counter_addr_literal); + + bind(retry); + ldxr_w(R1, R0); + add_w(R1, R1, 1); + stxr_w(R2, R1, R0); + cbnz_w(R2, retry); + + raw_pop(R2, ZR); + raw_pop(R0, R1); +#else + push(RegisterSet(R0, R3) | RegisterSet(Rtemp)); + ldr_literal(R0, counter_addr_literal); + + mrs(CPSR, Rtemp); + + bind(retry); + ldr_s32(R1, Address(R0)); + add(R2, R1, 1); + atomic_cas_bool(R1, R2, R0, 0, R3); + b(retry, ne); + + msr(CPSR_fsxc, Rtemp); + + pop(RegisterSet(R0, R3) | RegisterSet(Rtemp)); +#endif // AARCH64 + + b(done); + bind_literal(counter_addr_literal); + + bind(done); + } +} + +#endif // !PRODUCT + + +// Building block for CAS cases of biased locking: makes CAS and records statistics. +// The slow_case label is used to transfer control if CAS fails. Otherwise leaves condition codes set. +void MacroAssembler::biased_locking_enter_with_cas(Register obj_reg, Register old_mark_reg, Register new_mark_reg, + Register tmp, Label& slow_case, int* counter_addr) { + + cas_for_lock_acquire(old_mark_reg, new_mark_reg, obj_reg, tmp, slow_case); +#ifdef ASSERT + breakpoint(ne); // Fallthrough only on success +#endif +#ifndef PRODUCT + if (counter_addr != NULL) { + cond_atomic_inc32(al, counter_addr); + } +#endif // !PRODUCT +} + +int MacroAssembler::biased_locking_enter(Register obj_reg, Register swap_reg, Register tmp_reg, + bool swap_reg_contains_mark, + Register tmp2, + Label& done, Label& slow_case, + BiasedLockingCounters* counters) { + // obj_reg must be preserved (at least) if the bias locking fails + // tmp_reg is a temporary register + // swap_reg was used as a temporary but contained a value + // that was used afterwards in some call pathes. Callers + // have been fixed so that swap_reg no longer needs to be + // saved. + // Rtemp in no longer scratched + + assert(UseBiasedLocking, "why call this otherwise?"); + assert_different_registers(obj_reg, swap_reg, tmp_reg, tmp2); + guarantee(swap_reg!=tmp_reg, "invariant"); + assert(tmp_reg != noreg, "must supply tmp_reg"); + +#ifndef PRODUCT + if (PrintBiasedLockingStatistics && (counters == NULL)) { + counters = BiasedLocking::counters(); + } +#endif + + assert(markOopDesc::age_shift == markOopDesc::lock_bits + markOopDesc::biased_lock_bits, "biased locking makes assumptions about bit layout"); + Address mark_addr(obj_reg, oopDesc::mark_offset_in_bytes()); + + // Biased locking + // See whether the lock is currently biased toward our thread and + // whether the epoch is still valid + // Note that the runtime guarantees sufficient alignment of JavaThread + // pointers to allow age to be placed into low bits + // First check to see whether biasing is even enabled for this object + Label cas_label; + + // The null check applies to the mark loading, if we need to load it. + // If the mark has already been loaded in swap_reg then it has already + // been performed and the offset is irrelevant. + int null_check_offset = offset(); + if (!swap_reg_contains_mark) { + ldr(swap_reg, mark_addr); + } + + // On MP platform loads could return 'stale' values in some cases. + // That is acceptable since either CAS or slow case path is taken in the worst case. + + andr(tmp_reg, swap_reg, (uintx)markOopDesc::biased_lock_mask_in_place); + cmp(tmp_reg, markOopDesc::biased_lock_pattern); + + b(cas_label, ne); + + // The bias pattern is present in the object's header. Need to check + // whether the bias owner and the epoch are both still current. + load_klass(tmp_reg, obj_reg); + ldr(tmp_reg, Address(tmp_reg, Klass::prototype_header_offset())); + orr(tmp_reg, tmp_reg, Rthread); + eor(tmp_reg, tmp_reg, swap_reg); + +#ifdef AARCH64 + ands(tmp_reg, tmp_reg, ~((uintx) markOopDesc::age_mask_in_place)); +#else + bics(tmp_reg, tmp_reg, ((int) markOopDesc::age_mask_in_place)); +#endif // AARCH64 + +#ifndef PRODUCT + if (counters != NULL) { + cond_atomic_inc32(eq, counters->biased_lock_entry_count_addr()); + } +#endif // !PRODUCT + + b(done, eq); + + Label try_revoke_bias; + Label try_rebias; + + // At this point we know that the header has the bias pattern and + // that we are not the bias owner in the current epoch. We need to + // figure out more details about the state of the header in order to + // know what operations can be legally performed on the object's + // header. + + // If the low three bits in the xor result aren't clear, that means + // the prototype header is no longer biased and we have to revoke + // the bias on this object. + tst(tmp_reg, (uintx)markOopDesc::biased_lock_mask_in_place); + b(try_revoke_bias, ne); + + // Biasing is still enabled for this data type. See whether the + // epoch of the current bias is still valid, meaning that the epoch + // bits of the mark word are equal to the epoch bits of the + // prototype header. (Note that the prototype header's epoch bits + // only change at a safepoint.) If not, attempt to rebias the object + // toward the current thread. Note that we must be absolutely sure + // that the current epoch is invalid in order to do this because + // otherwise the manipulations it performs on the mark word are + // illegal. + tst(tmp_reg, (uintx)markOopDesc::epoch_mask_in_place); + b(try_rebias, ne); + + // tmp_reg has the age, epoch and pattern bits cleared + // The remaining (owner) bits are (Thread ^ current_owner) + + // The epoch of the current bias is still valid but we know nothing + // about the owner; it might be set or it might be clear. Try to + // acquire the bias of the object using an atomic operation. If this + // fails we will go in to the runtime to revoke the object's bias. + // Note that we first construct the presumed unbiased header so we + // don't accidentally blow away another thread's valid bias. + + // Note that we know the owner is not ourself. Hence, success can + // only happen when the owner bits is 0 + +#ifdef AARCH64 + // Bit mask biased_lock + age + epoch is not a valid AArch64 logical immediate, as it has + // cleared bit in the middle (cms bit). So it is loaded with separate instruction. + mov(tmp2, (markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place)); + andr(swap_reg, swap_reg, tmp2); +#else + // until the assembler can be made smarter, we need to make some assumptions about the values + // so we can optimize this: + assert((markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place) == 0x1ff, "biased bitmasks changed"); + + mov(swap_reg, AsmOperand(swap_reg, lsl, 23)); + mov(swap_reg, AsmOperand(swap_reg, lsr, 23)); // markOop with thread bits cleared (for CAS) +#endif // AARCH64 + + orr(tmp_reg, swap_reg, Rthread); // new mark + + biased_locking_enter_with_cas(obj_reg, swap_reg, tmp_reg, tmp2, slow_case, + (counters != NULL) ? counters->anonymously_biased_lock_entry_count_addr() : NULL); + + // If the biasing toward our thread failed, this means that + // another thread succeeded in biasing it toward itself and we + // need to revoke that bias. The revocation will occur in the + // interpreter runtime in the slow case. + + b(done); + + bind(try_rebias); + + // At this point we know the epoch has expired, meaning that the + // current "bias owner", if any, is actually invalid. Under these + // circumstances _only_, we are allowed to use the current header's + // value as the comparison value when doing the cas to acquire the + // bias in the current epoch. In other words, we allow transfer of + // the bias from one thread to another directly in this situation. + + // tmp_reg low (not owner) bits are (age: 0 | pattern&epoch: prototype^swap_reg) + + eor(tmp_reg, tmp_reg, swap_reg); // OK except for owner bits (age preserved !) + + // owner bits 'random'. Set them to Rthread. +#ifdef AARCH64 + mov(tmp2, (markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place)); + andr(tmp_reg, tmp_reg, tmp2); +#else + mov(tmp_reg, AsmOperand(tmp_reg, lsl, 23)); + mov(tmp_reg, AsmOperand(tmp_reg, lsr, 23)); +#endif // AARCH64 + + orr(tmp_reg, tmp_reg, Rthread); // new mark + + biased_locking_enter_with_cas(obj_reg, swap_reg, tmp_reg, tmp2, slow_case, + (counters != NULL) ? counters->rebiased_lock_entry_count_addr() : NULL); + + // If the biasing toward our thread failed, then another thread + // succeeded in biasing it toward itself and we need to revoke that + // bias. The revocation will occur in the runtime in the slow case. + + b(done); + + bind(try_revoke_bias); + + // The prototype mark in the klass doesn't have the bias bit set any + // more, indicating that objects of this data type are not supposed + // to be biased any more. We are going to try to reset the mark of + // this object to the prototype value and fall through to the + // CAS-based locking scheme. Note that if our CAS fails, it means + // that another thread raced us for the privilege of revoking the + // bias of this particular object, so it's okay to continue in the + // normal locking code. + + // tmp_reg low (not owner) bits are (age: 0 | pattern&epoch: prototype^swap_reg) + + eor(tmp_reg, tmp_reg, swap_reg); // OK except for owner bits (age preserved !) + + // owner bits 'random'. Clear them +#ifdef AARCH64 + mov(tmp2, (markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place)); + andr(tmp_reg, tmp_reg, tmp2); +#else + mov(tmp_reg, AsmOperand(tmp_reg, lsl, 23)); + mov(tmp_reg, AsmOperand(tmp_reg, lsr, 23)); +#endif // AARCH64 + + biased_locking_enter_with_cas(obj_reg, swap_reg, tmp_reg, tmp2, cas_label, + (counters != NULL) ? counters->revoked_lock_entry_count_addr() : NULL); + + // Fall through to the normal CAS-based lock, because no matter what + // the result of the above CAS, some thread must have succeeded in + // removing the bias bit from the object's header. + + bind(cas_label); + + return null_check_offset; +} + + +void MacroAssembler::biased_locking_exit(Register obj_reg, Register tmp_reg, Label& done) { + assert(UseBiasedLocking, "why call this otherwise?"); + + // Check for biased locking unlock case, which is a no-op + // Note: we do not have to check the thread ID for two reasons. + // First, the interpreter checks for IllegalMonitorStateException at + // a higher level. Second, if the bias was revoked while we held the + // lock, the object could not be rebiased toward another thread, so + // the bias bit would be clear. + ldr(tmp_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes())); + + andr(tmp_reg, tmp_reg, (uintx)markOopDesc::biased_lock_mask_in_place); + cmp(tmp_reg, markOopDesc::biased_lock_pattern); + b(done, eq); +} + +#ifdef AARCH64 + +void MacroAssembler::load_sized_value(Register dst, Address src, size_t size_in_bytes, bool is_signed) { + switch (size_in_bytes) { + case 8: ldr(dst, src); break; + case 4: is_signed ? ldr_s32(dst, src) : ldr_u32(dst, src); break; + case 2: is_signed ? ldrsh(dst, src) : ldrh(dst, src); break; + case 1: is_signed ? ldrsb(dst, src) : ldrb(dst, src); break; + default: ShouldNotReachHere(); + } +} + +void MacroAssembler::store_sized_value(Register src, Address dst, size_t size_in_bytes) { + switch (size_in_bytes) { + case 8: str(src, dst); break; + case 4: str_32(src, dst); break; + case 2: strh(src, dst); break; + case 1: strb(src, dst); break; + default: ShouldNotReachHere(); + } +} + +#else + +void MacroAssembler::load_sized_value(Register dst, Address src, + size_t size_in_bytes, bool is_signed, AsmCondition cond) { + switch (size_in_bytes) { + case 4: ldr(dst, src, cond); break; + case 2: is_signed ? ldrsh(dst, src, cond) : ldrh(dst, src, cond); break; + case 1: is_signed ? ldrsb(dst, src, cond) : ldrb(dst, src, cond); break; + default: ShouldNotReachHere(); + } +} + + +void MacroAssembler::store_sized_value(Register src, Address dst, size_t size_in_bytes, AsmCondition cond) { + switch (size_in_bytes) { + case 4: str(src, dst, cond); break; + case 2: strh(src, dst, cond); break; + case 1: strb(src, dst, cond); break; + default: ShouldNotReachHere(); + } +} +#endif // AARCH64 + +// Look up the method for a megamorphic invokeinterface call. +// The target method is determined by . +// The receiver klass is in Rklass. +// On success, the result will be in method_result, and execution falls through. +// On failure, execution transfers to the given label. +void MacroAssembler::lookup_interface_method(Register Rklass, + Register Rinterf, + Register Rindex, + Register method_result, + Register temp_reg1, + Register temp_reg2, + Label& L_no_such_interface) { + + assert_different_registers(Rklass, Rinterf, temp_reg1, temp_reg2, Rindex); + + Register Ritable = temp_reg1; + + // Compute start of first itableOffsetEntry (which is at the end of the vtable) + const int base = in_bytes(Klass::vtable_start_offset()); + const int scale = exact_log2(vtableEntry::size_in_bytes()); + ldr_s32(temp_reg2, Address(Rklass, Klass::vtable_length_offset())); // Get length of vtable + add(Ritable, Rklass, base); + add(Ritable, Ritable, AsmOperand(temp_reg2, lsl, scale)); + + Label entry, search; + + b(entry); + + bind(search); + add(Ritable, Ritable, itableOffsetEntry::size() * HeapWordSize); + + bind(entry); + + // Check that the entry is non-null. A null entry means that the receiver + // class doesn't implement the interface, and wasn't the same as the + // receiver class checked when the interface was resolved. + + ldr(temp_reg2, Address(Ritable, itableOffsetEntry::interface_offset_in_bytes())); + cbz(temp_reg2, L_no_such_interface); + + cmp(Rinterf, temp_reg2); + b(search, ne); + + ldr_s32(temp_reg2, Address(Ritable, itableOffsetEntry::offset_offset_in_bytes())); + add(temp_reg2, temp_reg2, Rklass); // Add offset to Klass* + assert(itableMethodEntry::size() * HeapWordSize == wordSize, "adjust the scaling in the code below"); + assert(itableMethodEntry::method_offset_in_bytes() == 0, "adjust the offset in the code below"); + + ldr(method_result, Address::indexed_ptr(temp_reg2, Rindex)); +} + +#ifdef COMPILER2 +// TODO: 8 bytes at a time? pre-fetch? +// Compare char[] arrays aligned to 4 bytes. +void MacroAssembler::char_arrays_equals(Register ary1, Register ary2, + Register limit, Register result, + Register chr1, Register chr2, Label& Ldone) { + Label Lvector, Lloop; + + // Note: limit contains number of bytes (2*char_elements) != 0. + tst(limit, 0x2); // trailing character ? + b(Lvector, eq); + + // compare the trailing char + sub(limit, limit, sizeof(jchar)); + ldrh(chr1, Address(ary1, limit)); + ldrh(chr2, Address(ary2, limit)); + cmp(chr1, chr2); + mov(result, 0, ne); // not equal + b(Ldone, ne); + + // only one char ? + tst(limit, limit); + mov(result, 1, eq); + b(Ldone, eq); + + // word by word compare, dont't need alignment check + bind(Lvector); + + // Shift ary1 and ary2 to the end of the arrays, negate limit + add(ary1, limit, ary1); + add(ary2, limit, ary2); + neg(limit, limit); + + bind(Lloop); + ldr_u32(chr1, Address(ary1, limit)); + ldr_u32(chr2, Address(ary2, limit)); + cmp_32(chr1, chr2); + mov(result, 0, ne); // not equal + b(Ldone, ne); + adds(limit, limit, 2*sizeof(jchar)); + b(Lloop, ne); + + // Caller should set it: + // mov(result_reg, 1); //equal +} +#endif + +void MacroAssembler::inc_counter(address counter_addr, Register tmpreg1, Register tmpreg2) { + mov_slow(tmpreg1, counter_addr); + ldr_s32(tmpreg2, tmpreg1); + add_32(tmpreg2, tmpreg2, 1); + str_32(tmpreg2, tmpreg1); +} + +void MacroAssembler::floating_cmp(Register dst) { +#ifdef AARCH64 + NOT_TESTED(); + cset(dst, gt); // 1 if '>', else 0 + csinv(dst, dst, ZR, ge); // previous value if '>=', else -1 +#else + vmrs(dst, FPSCR); + orr(dst, dst, 0x08000000); + eor(dst, dst, AsmOperand(dst, lsl, 3)); + mov(dst, AsmOperand(dst, asr, 30)); +#endif +} + +void MacroAssembler::restore_default_fp_mode() { +#ifdef AARCH64 + msr(SysReg_FPCR, ZR); +#else +#ifndef __SOFTFP__ + // Round to Near mode, IEEE compatible, masked exceptions + mov(Rtemp, 0); + vmsr(FPSCR, Rtemp); +#endif // !__SOFTFP__ +#endif // AARCH64 +} + +#ifndef AARCH64 +// 24-bit word range == 26-bit byte range +bool check26(int offset) { + // this could be simplified, but it mimics encoding and decoding + // an actual branch insrtuction + int off1 = offset << 6 >> 8; + int encoded = off1 & ((1<<24)-1); + int decoded = encoded << 8 >> 6; + return offset == decoded; +} +#endif // !AARCH64 + +// Perform some slight adjustments so the default 32MB code cache +// is fully reachable. +static inline address first_cache_address() { + return CodeCache::low_bound() + sizeof(HeapBlock::Header); +} +static inline address last_cache_address() { + return CodeCache::high_bound() - Assembler::InstructionSize; +} + +#ifdef AARCH64 +// Can we reach target using ADRP? +bool MacroAssembler::page_reachable_from_cache(address target) { + intptr_t cl = (intptr_t)first_cache_address() & ~0xfff; + intptr_t ch = (intptr_t)last_cache_address() & ~0xfff; + intptr_t addr = (intptr_t)target & ~0xfff; + + intptr_t loffset = addr - cl; + intptr_t hoffset = addr - ch; + return is_imm_in_range(loffset >> 12, 21, 0) && is_imm_in_range(hoffset >> 12, 21, 0); +} +#endif + +// Can we reach target using unconditional branch or call from anywhere +// in the code cache (because code can be relocated)? +bool MacroAssembler::_reachable_from_cache(address target) { +#ifdef __thumb__ + if ((1 & (intptr_t)target) != 0) { + // Return false to avoid 'b' if we need switching to THUMB mode. + return false; + } +#endif + + address cl = first_cache_address(); + address ch = last_cache_address(); + + if (ForceUnreachable) { + // Only addresses from CodeCache can be treated as reachable. + if (target < CodeCache::low_bound() || CodeCache::high_bound() < target) { + return false; + } + } + + intptr_t loffset = (intptr_t)target - (intptr_t)cl; + intptr_t hoffset = (intptr_t)target - (intptr_t)ch; + +#ifdef AARCH64 + return is_offset_in_range(loffset, 26) && is_offset_in_range(hoffset, 26); +#else + return check26(loffset - 8) && check26(hoffset - 8); +#endif +} + +bool MacroAssembler::reachable_from_cache(address target) { + assert(CodeCache::contains(pc()), "not supported"); + return _reachable_from_cache(target); +} + +// Can we reach the entire code cache from anywhere else in the code cache? +bool MacroAssembler::_cache_fully_reachable() { + address cl = first_cache_address(); + address ch = last_cache_address(); + return _reachable_from_cache(cl) && _reachable_from_cache(ch); +} + +bool MacroAssembler::cache_fully_reachable() { + assert(CodeCache::contains(pc()), "not supported"); + return _cache_fully_reachable(); +} + +void MacroAssembler::jump(address target, relocInfo::relocType rtype, Register scratch NOT_AARCH64_ARG(AsmCondition cond)) { + assert((rtype == relocInfo::runtime_call_type) || (rtype == relocInfo::none), "not supported"); + if (reachable_from_cache(target)) { + relocate(rtype); + b(target NOT_AARCH64_ARG(cond)); + return; + } + + // Note: relocate is not needed for the code below, + // encoding targets in absolute format. + if (ignore_non_patchable_relocations()) { + rtype = relocInfo::none; + } + +#ifdef AARCH64 + assert (scratch != noreg, "should be specified"); + InlinedAddress address_literal(target, rtype); + ldr_literal(scratch, address_literal); + br(scratch); + int off = offset(); + bind_literal(address_literal); +#ifdef COMPILER2 + if (offset() - off == wordSize) { + // no padding, so insert nop for worst-case sizing + nop(); + } +#endif +#else + if (VM_Version::supports_movw() && (scratch != noreg) && (rtype == relocInfo::none)) { + // Note: this version cannot be (atomically) patched + mov_slow(scratch, (intptr_t)target, cond); + bx(scratch, cond); + } else { + Label skip; + InlinedAddress address_literal(target); + if (cond != al) { + b(skip, inverse(cond)); + } + relocate(rtype); + ldr_literal(PC, address_literal); + bind_literal(address_literal); + bind(skip); + } +#endif // AARCH64 +} + +// Similar to jump except that: +// - near calls are valid only if any destination in the cache is near +// - no movt/movw (not atomically patchable) +void MacroAssembler::patchable_jump(address target, relocInfo::relocType rtype, Register scratch NOT_AARCH64_ARG(AsmCondition cond)) { + assert((rtype == relocInfo::runtime_call_type) || (rtype == relocInfo::none), "not supported"); + if (cache_fully_reachable()) { + // Note: this assumes that all possible targets (the initial one + // and the addressed patched to) are all in the code cache. + assert(CodeCache::contains(target), "target might be too far"); + relocate(rtype); + b(target NOT_AARCH64_ARG(cond)); + return; + } + + // Discard the relocation information if not needed for CacheCompiledCode + // since the next encodings are all in absolute format. + if (ignore_non_patchable_relocations()) { + rtype = relocInfo::none; + } + +#ifdef AARCH64 + assert (scratch != noreg, "should be specified"); + InlinedAddress address_literal(target); + relocate(rtype); + ldr_literal(scratch, address_literal); + br(scratch); + int off = offset(); + bind_literal(address_literal); +#ifdef COMPILER2 + if (offset() - off == wordSize) { + // no padding, so insert nop for worst-case sizing + nop(); + } +#endif +#else + { + Label skip; + InlinedAddress address_literal(target); + if (cond != al) { + b(skip, inverse(cond)); + } + relocate(rtype); + ldr_literal(PC, address_literal); + bind_literal(address_literal); + bind(skip); + } +#endif // AARCH64 +} + +void MacroAssembler::call(address target, RelocationHolder rspec NOT_AARCH64_ARG(AsmCondition cond)) { + Register scratch = LR; + assert(rspec.type() == relocInfo::runtime_call_type || rspec.type() == relocInfo::none, "not supported"); + if (reachable_from_cache(target)) { + relocate(rspec); + bl(target NOT_AARCH64_ARG(cond)); + return; + } + + // Note: relocate is not needed for the code below, + // encoding targets in absolute format. + if (ignore_non_patchable_relocations()) { + // This assumes the information was needed only for relocating the code. + rspec = RelocationHolder::none; + } + +#ifndef AARCH64 + if (VM_Version::supports_movw() && (rspec.type() == relocInfo::none)) { + // Note: this version cannot be (atomically) patched + mov_slow(scratch, (intptr_t)target, cond); + blx(scratch, cond); + return; + } +#endif + + { + Label ret_addr; +#ifndef AARCH64 + if (cond != al) { + b(ret_addr, inverse(cond)); + } +#endif + + +#ifdef AARCH64 + // TODO-AARCH64: make more optimal implementation + // [ Keep in sync with MacroAssembler::call_size ] + assert(rspec.type() == relocInfo::none, "call reloc not implemented"); + mov_slow(scratch, target); + blr(scratch); +#else + InlinedAddress address_literal(target); + relocate(rspec); + adr(LR, ret_addr); + ldr_literal(PC, address_literal); + + bind_literal(address_literal); + bind(ret_addr); +#endif + } +} + +#if defined(AARCH64) && defined(COMPILER2) +int MacroAssembler::call_size(address target, bool far, bool patchable) { + // FIXME: mov_slow is variable-length + if (!far) return 1; // bl + if (patchable) return 2; // ldr; blr + return instr_count_for_mov_slow((intptr_t)target) + 1; +} +#endif + +int MacroAssembler::patchable_call(address target, RelocationHolder const& rspec, bool c2) { + assert(rspec.type() == relocInfo::static_call_type || + rspec.type() == relocInfo::none || + rspec.type() == relocInfo::opt_virtual_call_type, "not supported"); + + // Always generate the relocation information, needed for patching + relocate(rspec); // used by NativeCall::is_call_before() + if (cache_fully_reachable()) { + // Note: this assumes that all possible targets (the initial one + // and the addresses patched to) are all in the code cache. + assert(CodeCache::contains(target), "target might be too far"); + bl(target); + } else { +#if defined(AARCH64) && defined(COMPILER2) + if (c2) { + // return address needs to match call_size(). + // no need to trash Rtemp + int off = offset(); + Label skip_literal; + InlinedAddress address_literal(target); + ldr_literal(LR, address_literal); + blr(LR); + int ret_addr_offset = offset(); + assert(offset() - off == call_size(target, true, true) * InstructionSize, "need to fix call_size()"); + b(skip_literal); + int off2 = offset(); + bind_literal(address_literal); + if (offset() - off2 == wordSize) { + // no padding, so insert nop for worst-case sizing + nop(); + } + bind(skip_literal); + return ret_addr_offset; + } +#endif + Label ret_addr; + InlinedAddress address_literal(target); +#ifdef AARCH64 + ldr_literal(Rtemp, address_literal); + adr(LR, ret_addr); + br(Rtemp); +#else + adr(LR, ret_addr); + ldr_literal(PC, address_literal); +#endif + bind_literal(address_literal); + bind(ret_addr); + } + return offset(); +} + + +void MacroAssembler::load_mirror(Register mirror, Register method, Register tmp) { + const int mirror_offset = in_bytes(Klass::java_mirror_offset()); + ldr(tmp, Address(method, Method::const_offset())); + ldr(tmp, Address(tmp, ConstMethod::constants_offset())); + ldr(tmp, Address(tmp, ConstantPool::pool_holder_offset_in_bytes())); + ldr(mirror, Address(tmp, mirror_offset)); +} + +/////////////////////////////////////////////////////////////////////////////// + +// Compressed pointers + +#ifdef AARCH64 + +void MacroAssembler::load_klass(Register dst_klass, Register src_oop) { + if (UseCompressedClassPointers) { + ldr_w(dst_klass, Address(src_oop, oopDesc::klass_offset_in_bytes())); + decode_klass_not_null(dst_klass); + } else { + ldr(dst_klass, Address(src_oop, oopDesc::klass_offset_in_bytes())); + } +} + +#else + +void MacroAssembler::load_klass(Register dst_klass, Register src_oop, AsmCondition cond) { + ldr(dst_klass, Address(src_oop, oopDesc::klass_offset_in_bytes()), cond); +} + +#endif // AARCH64 + +// Blows src_klass. +void MacroAssembler::store_klass(Register src_klass, Register dst_oop) { +#ifdef AARCH64 + if (UseCompressedClassPointers) { + assert(src_klass != dst_oop, "not enough registers"); + encode_klass_not_null(src_klass); + str_w(src_klass, Address(dst_oop, oopDesc::klass_offset_in_bytes())); + return; + } +#endif // AARCH64 + str(src_klass, Address(dst_oop, oopDesc::klass_offset_in_bytes())); +} + +#ifdef AARCH64 + +void MacroAssembler::store_klass_gap(Register dst) { + if (UseCompressedClassPointers) { + str_w(ZR, Address(dst, oopDesc::klass_gap_offset_in_bytes())); + } +} + +#endif // AARCH64 + + +void MacroAssembler::load_heap_oop(Register dst, Address src) { +#ifdef AARCH64 + if (UseCompressedOops) { + ldr_w(dst, src); + decode_heap_oop(dst); + return; + } +#endif // AARCH64 + ldr(dst, src); +} + +// Blows src and flags. +void MacroAssembler::store_heap_oop(Register src, Address dst) { +#ifdef AARCH64 + if (UseCompressedOops) { + assert(!dst.uses(src), "not enough registers"); + encode_heap_oop(src); + str_w(src, dst); + return; + } +#endif // AARCH64 + str(src, dst); +} + +void MacroAssembler::store_heap_oop_null(Register src, Address dst) { +#ifdef AARCH64 + if (UseCompressedOops) { + str_w(src, dst); + return; + } +#endif // AARCH64 + str(src, dst); +} + + +#ifdef AARCH64 + +// Algorithm must match oop.inline.hpp encode_heap_oop. +void MacroAssembler::encode_heap_oop(Register dst, Register src) { + // This code pattern is matched in NativeIntruction::skip_encode_heap_oop. + // Update it at modifications. + assert (UseCompressedOops, "must be compressed"); + assert (Universe::heap() != NULL, "java heap should be initialized"); +#ifdef ASSERT + verify_heapbase("MacroAssembler::encode_heap_oop: heap base corrupted?"); +#endif + verify_oop(src); + if (Universe::narrow_oop_base() == NULL) { + if (Universe::narrow_oop_shift() != 0) { + assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + _lsr(dst, src, Universe::narrow_oop_shift()); + } else if (dst != src) { + mov(dst, src); + } + } else { + tst(src, src); + csel(dst, Rheap_base, src, eq); + sub(dst, dst, Rheap_base); + if (Universe::narrow_oop_shift() != 0) { + assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + _lsr(dst, dst, Universe::narrow_oop_shift()); + } + } +} + +// Same algorithm as oop.inline.hpp decode_heap_oop. +void MacroAssembler::decode_heap_oop(Register dst, Register src) { +#ifdef ASSERT + verify_heapbase("MacroAssembler::decode_heap_oop: heap base corrupted?"); +#endif + assert(Universe::narrow_oop_shift() == 0 || LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + if (Universe::narrow_oop_base() != NULL) { + tst(src, src); + add(dst, Rheap_base, AsmOperand(src, lsl, Universe::narrow_oop_shift())); + csel(dst, dst, ZR, ne); + } else { + _lsl(dst, src, Universe::narrow_oop_shift()); + } + verify_oop(dst); +} + +#ifdef COMPILER2 +// Algorithm must match oop.inline.hpp encode_heap_oop. +// Must preserve condition codes, or C2 encodeHeapOop_not_null rule +// must be changed. +void MacroAssembler::encode_heap_oop_not_null(Register dst, Register src) { + assert (UseCompressedOops, "must be compressed"); + assert (Universe::heap() != NULL, "java heap should be initialized"); +#ifdef ASSERT + verify_heapbase("MacroAssembler::encode_heap_oop: heap base corrupted?"); +#endif + verify_oop(src); + if (Universe::narrow_oop_base() == NULL) { + if (Universe::narrow_oop_shift() != 0) { + assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + _lsr(dst, src, Universe::narrow_oop_shift()); + } else if (dst != src) { + mov(dst, src); + } + } else { + sub(dst, src, Rheap_base); + if (Universe::narrow_oop_shift() != 0) { + assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + _lsr(dst, dst, Universe::narrow_oop_shift()); + } + } +} + +// Same algorithm as oops.inline.hpp decode_heap_oop. +// Must preserve condition codes, or C2 decodeHeapOop_not_null rule +// must be changed. +void MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) { +#ifdef ASSERT + verify_heapbase("MacroAssembler::decode_heap_oop: heap base corrupted?"); +#endif + assert(Universe::narrow_oop_shift() == 0 || LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + if (Universe::narrow_oop_base() != NULL) { + add(dst, Rheap_base, AsmOperand(src, lsl, Universe::narrow_oop_shift())); + } else { + _lsl(dst, src, Universe::narrow_oop_shift()); + } + verify_oop(dst); +} + +void MacroAssembler::set_narrow_klass(Register dst, Klass* k) { + assert(UseCompressedClassPointers, "should only be used for compressed header"); + assert(oop_recorder() != NULL, "this assembler needs an OopRecorder"); + int klass_index = oop_recorder()->find_index(k); + RelocationHolder rspec = metadata_Relocation::spec(klass_index); + + // Relocation with special format (see relocInfo_arm.hpp). + relocate(rspec); + narrowKlass encoded_k = Klass::encode_klass(k); + movz(dst, encoded_k & 0xffff, 0); + movk(dst, (encoded_k >> 16) & 0xffff, 16); +} + +void MacroAssembler::set_narrow_oop(Register dst, jobject obj) { + assert(UseCompressedOops, "should only be used for compressed header"); + assert(oop_recorder() != NULL, "this assembler needs an OopRecorder"); + int oop_index = oop_recorder()->find_index(obj); + RelocationHolder rspec = oop_Relocation::spec(oop_index); + + relocate(rspec); + movz(dst, 0xffff, 0); + movk(dst, 0xffff, 16); +} + +#endif // COMPILER2 + +// Must preserve condition codes, or C2 encodeKlass_not_null rule +// must be changed. +void MacroAssembler::encode_klass_not_null(Register r) { + if (Universe::narrow_klass_base() != NULL) { + // Use Rheap_base as a scratch register in which to temporarily load the narrow_klass_base. + assert(r != Rheap_base, "Encoding a klass in Rheap_base"); + mov_slow(Rheap_base, Universe::narrow_klass_base()); + sub(r, r, Rheap_base); + } + if (Universe::narrow_klass_shift() != 0) { + assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + _lsr(r, r, Universe::narrow_klass_shift()); + } + if (Universe::narrow_klass_base() != NULL) { + reinit_heapbase(); + } +} + +// Must preserve condition codes, or C2 encodeKlass_not_null rule +// must be changed. +void MacroAssembler::encode_klass_not_null(Register dst, Register src) { + if (dst == src) { + encode_klass_not_null(src); + return; + } + if (Universe::narrow_klass_base() != NULL) { + mov_slow(dst, (int64_t)Universe::narrow_klass_base()); + sub(dst, src, dst); + if (Universe::narrow_klass_shift() != 0) { + assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + _lsr(dst, dst, Universe::narrow_klass_shift()); + } + } else { + if (Universe::narrow_klass_shift() != 0) { + assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + _lsr(dst, src, Universe::narrow_klass_shift()); + } else { + mov(dst, src); + } + } +} + +// Function instr_count_for_decode_klass_not_null() counts the instructions +// generated by decode_klass_not_null(register r) and reinit_heapbase(), +// when (Universe::heap() != NULL). Hence, if the instructions they +// generate change, then this method needs to be updated. +int MacroAssembler::instr_count_for_decode_klass_not_null() { + assert(UseCompressedClassPointers, "only for compressed klass ptrs"); + assert(Universe::heap() != NULL, "java heap should be initialized"); + if (Universe::narrow_klass_base() != NULL) { + return instr_count_for_mov_slow(Universe::narrow_klass_base()) + // mov_slow + 1 + // add + instr_count_for_mov_slow(Universe::narrow_ptrs_base()); // reinit_heapbase() = mov_slow + } else { + if (Universe::narrow_klass_shift() != 0) { + return 1; + } + } + return 0; +} + +// Must preserve condition codes, or C2 decodeKlass_not_null rule +// must be changed. +void MacroAssembler::decode_klass_not_null(Register r) { + int off = offset(); + assert(UseCompressedClassPointers, "should only be used for compressed headers"); + assert(Universe::heap() != NULL, "java heap should be initialized"); + assert(r != Rheap_base, "Decoding a klass in Rheap_base"); + // Cannot assert, instr_count_for_decode_klass_not_null() counts instructions. + // Also do not verify_oop as this is called by verify_oop. + if (Universe::narrow_klass_base() != NULL) { + // Use Rheap_base as a scratch register in which to temporarily load the narrow_klass_base. + mov_slow(Rheap_base, Universe::narrow_klass_base()); + add(r, Rheap_base, AsmOperand(r, lsl, Universe::narrow_klass_shift())); + reinit_heapbase(); + } else { + if (Universe::narrow_klass_shift() != 0) { + assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + _lsl(r, r, Universe::narrow_klass_shift()); + } + } + assert((offset() - off) == (instr_count_for_decode_klass_not_null() * InstructionSize), "need to fix instr_count_for_decode_klass_not_null"); +} + +// Must preserve condition codes, or C2 decodeKlass_not_null rule +// must be changed. +void MacroAssembler::decode_klass_not_null(Register dst, Register src) { + if (src == dst) { + decode_klass_not_null(src); + return; + } + + assert(UseCompressedClassPointers, "should only be used for compressed headers"); + assert(Universe::heap() != NULL, "java heap should be initialized"); + assert(src != Rheap_base, "Decoding a klass in Rheap_base"); + assert(dst != Rheap_base, "Decoding a klass into Rheap_base"); + // Also do not verify_oop as this is called by verify_oop. + if (Universe::narrow_klass_base() != NULL) { + mov_slow(dst, Universe::narrow_klass_base()); + add(dst, dst, AsmOperand(src, lsl, Universe::narrow_klass_shift())); + } else { + _lsl(dst, src, Universe::narrow_klass_shift()); + } +} + + +void MacroAssembler::reinit_heapbase() { + if (UseCompressedOops || UseCompressedClassPointers) { + if (Universe::heap() != NULL) { + mov_slow(Rheap_base, Universe::narrow_ptrs_base()); + } else { + ldr_global_ptr(Rheap_base, (address)Universe::narrow_ptrs_base_addr()); + } + } +} + +#ifdef ASSERT +void MacroAssembler::verify_heapbase(const char* msg) { + // This code pattern is matched in NativeIntruction::skip_verify_heapbase. + // Update it at modifications. + assert (UseCompressedOops, "should be compressed"); + assert (Universe::heap() != NULL, "java heap should be initialized"); + if (CheckCompressedOops) { + Label ok; + str(Rthread, Address(Rthread, in_bytes(JavaThread::in_top_frame_unsafe_section_offset()))); + raw_push(Rtemp, ZR); + mrs(Rtemp, Assembler::SysReg_NZCV); + str(Rtemp, Address(SP, 1 * wordSize)); + mov_slow(Rtemp, Universe::narrow_ptrs_base()); + cmp(Rheap_base, Rtemp); + b(ok, eq); + stop(msg); + bind(ok); + ldr(Rtemp, Address(SP, 1 * wordSize)); + msr(Assembler::SysReg_NZCV, Rtemp); + raw_pop(Rtemp, ZR); + str(ZR, Address(Rthread, in_bytes(JavaThread::in_top_frame_unsafe_section_offset()))); + } +} +#endif // ASSERT + +#endif // AARCH64 + +#ifdef COMPILER2 +void MacroAssembler::fast_lock(Register Roop, Register Rbox, Register Rscratch, Register Rscratch2 AARCH64_ONLY_ARG(Register Rscratch3)) +{ + assert(VM_Version::supports_ldrex(), "unsupported, yet?"); + + Register Rmark = Rscratch2; + + assert(Roop != Rscratch, ""); + assert(Roop != Rmark, ""); + assert(Rbox != Rscratch, ""); + assert(Rbox != Rmark, ""); + + Label fast_lock, done; + + if (UseBiasedLocking && !UseOptoBiasInlining) { + Label failed; +#ifdef AARCH64 + biased_locking_enter(Roop, Rmark, Rscratch, false, Rscratch3, done, failed); +#else + biased_locking_enter(Roop, Rmark, Rscratch, false, noreg, done, failed); +#endif + bind(failed); + } + + ldr(Rmark, Address(Roop, oopDesc::mark_offset_in_bytes())); + tst(Rmark, markOopDesc::unlocked_value); + b(fast_lock, ne); + + // Check for recursive lock + // See comments in InterpreterMacroAssembler::lock_object for + // explanations on the fast recursive locking check. +#ifdef AARCH64 + intptr_t mask = ((intptr_t)3) - ((intptr_t)os::vm_page_size()); + Assembler::LogicalImmediate imm(mask, false); + mov(Rscratch, SP); + sub(Rscratch, Rmark, Rscratch); + ands(Rscratch, Rscratch, imm); + b(done, ne); // exit with failure + str(Rscratch, Address(Rbox, BasicLock::displaced_header_offset_in_bytes())); // set to zero + b(done); + +#else + // -1- test low 2 bits + movs(Rscratch, AsmOperand(Rmark, lsl, 30)); + // -2- test (hdr - SP) if the low two bits are 0 + sub(Rscratch, Rmark, SP, eq); + movs(Rscratch, AsmOperand(Rscratch, lsr, exact_log2(os::vm_page_size())), eq); + // If still 'eq' then recursive locking OK + str(Rscratch, Address(Rbox, BasicLock::displaced_header_offset_in_bytes()), eq); // set to zero + b(done); +#endif + + bind(fast_lock); + str(Rmark, Address(Rbox, BasicLock::displaced_header_offset_in_bytes())); + + bool allow_fallthrough_on_failure = true; + bool one_shot = true; + cas_for_lock_acquire(Rmark, Rbox, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot); + + bind(done); + +} + +void MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscratch, Register Rscratch2 AARCH64_ONLY_ARG(Register Rscratch3)) +{ + assert(VM_Version::supports_ldrex(), "unsupported, yet?"); + + Register Rmark = Rscratch2; + + assert(Roop != Rscratch, ""); + assert(Roop != Rmark, ""); + assert(Rbox != Rscratch, ""); + assert(Rbox != Rmark, ""); + + Label done; + + if (UseBiasedLocking && !UseOptoBiasInlining) { + biased_locking_exit(Roop, Rscratch, done); + } + + ldr(Rmark, Address(Rbox, BasicLock::displaced_header_offset_in_bytes())); + // If hdr is NULL, we've got recursive locking and there's nothing more to do + cmp(Rmark, 0); + b(done, eq); + + // Restore the object header + bool allow_fallthrough_on_failure = true; + bool one_shot = true; + cas_for_lock_release(Rmark, Rbox, Roop, Rscratch, done, allow_fallthrough_on_failure, one_shot); + + bind(done); + +} +#endif // COMPILER2 + diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.hpp b/hotspot/src/cpu/arm/vm/macroAssembler_arm.hpp new file mode 100644 index 00000000000..770bba6c8a1 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/macroAssembler_arm.hpp @@ -0,0 +1,1390 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_HPP +#define CPU_ARM_VM_MACROASSEMBLER_ARM_HPP + +#include "code/relocInfo.hpp" +#include "code/relocInfo_ext.hpp" + +class BiasedLockingCounters; + +// Introduced AddressLiteral and its subclasses to ease portability from +// x86 and avoid relocation issues +class AddressLiteral VALUE_OBJ_CLASS_SPEC { + RelocationHolder _rspec; + // Typically we use AddressLiterals we want to use their rval + // However in some situations we want the lval (effect address) of the item. + // We provide a special factory for making those lvals. + bool _is_lval; + + address _target; + + private: + static relocInfo::relocType reloc_for_target(address target) { + // Used for ExternalAddress or when the type is not specified + // Sometimes ExternalAddress is used for values which aren't + // exactly addresses, like the card table base. + // external_word_type can't be used for values in the first page + // so just skip the reloc in that case. + return external_word_Relocation::can_be_relocated(target) ? relocInfo::external_word_type : relocInfo::none; + } + + void set_rspec(relocInfo::relocType rtype); + + protected: + // creation + AddressLiteral() + : _is_lval(false), + _target(NULL) + {} + + public: + + AddressLiteral(address target, relocInfo::relocType rtype) { + _is_lval = false; + _target = target; + set_rspec(rtype); + } + + AddressLiteral(address target, RelocationHolder const& rspec) + : _rspec(rspec), + _is_lval(false), + _target(target) + {} + + AddressLiteral(address target) { + _is_lval = false; + _target = target; + set_rspec(reloc_for_target(target)); + } + + AddressLiteral addr() { + AddressLiteral ret = *this; + ret._is_lval = true; + return ret; + } + + private: + + address target() { return _target; } + bool is_lval() { return _is_lval; } + + relocInfo::relocType reloc() const { return _rspec.type(); } + const RelocationHolder& rspec() const { return _rspec; } + + friend class Assembler; + friend class MacroAssembler; + friend class Address; + friend class LIR_Assembler; + friend class InlinedAddress; +}; + +class ExternalAddress: public AddressLiteral { + + public: + + ExternalAddress(address target) : AddressLiteral(target) {} + +}; + +class InternalAddress: public AddressLiteral { + + public: + + InternalAddress(address target) : AddressLiteral(target, relocInfo::internal_word_type) {} + +}; + +// Inlined constants, for use with ldr_literal / bind_literal +// Note: InlinedInteger not supported (use move_slow(Register,int[,cond])) +class InlinedLiteral: StackObj { + public: + Label label; // need to be public for direct access with & + InlinedLiteral() { + } +}; + +class InlinedMetadata: public InlinedLiteral { + private: + Metadata *_data; + + public: + InlinedMetadata(Metadata *data): InlinedLiteral() { + _data = data; + } + Metadata *data() { return _data; } +}; + +// Currently unused +// class InlinedOop: public InlinedLiteral { +// private: +// jobject _jobject; +// +// public: +// InlinedOop(jobject target): InlinedLiteral() { +// _jobject = target; +// } +// jobject jobject() { return _jobject; } +// }; + +class InlinedAddress: public InlinedLiteral { + private: + AddressLiteral _literal; + + public: + + InlinedAddress(jobject object): InlinedLiteral(), _literal((address)object, relocInfo::oop_type) { + ShouldNotReachHere(); // use mov_oop (or implement InlinedOop) + } + + InlinedAddress(Metadata *data): InlinedLiteral(), _literal((address)data, relocInfo::metadata_type) { + ShouldNotReachHere(); // use InlinedMetadata or mov_metadata + } + + InlinedAddress(address target, const RelocationHolder &rspec): InlinedLiteral(), _literal(target, rspec) { + assert(rspec.type() != relocInfo::oop_type, "Do not use InlinedAddress for oops"); + assert(rspec.type() != relocInfo::metadata_type, "Do not use InlinedAddress for metadatas"); + } + + InlinedAddress(address target, relocInfo::relocType rtype): InlinedLiteral(), _literal(target, rtype) { + assert(rtype != relocInfo::oop_type, "Do not use InlinedAddress for oops"); + assert(rtype != relocInfo::metadata_type, "Do not use InlinedAddress for metadatas"); + } + + // Note: default is relocInfo::none for InlinedAddress + InlinedAddress(address target): InlinedLiteral(), _literal(target, relocInfo::none) { + } + + address target() { return _literal.target(); } + + const RelocationHolder& rspec() const { return _literal.rspec(); } +}; + +class InlinedString: public InlinedLiteral { + private: + const char* _msg; + + public: + InlinedString(const char* msg): InlinedLiteral() { + _msg = msg; + } + const char* msg() { return _msg; } +}; + +class MacroAssembler: public Assembler { +protected: + + // Support for VM calls + // + + // This is the base routine called by the different versions of call_VM_leaf. + void call_VM_leaf_helper(address entry_point, int number_of_arguments); + + // This is the base routine called by the different versions of call_VM. The interpreter + // may customize this version by overriding it for its purposes (e.g., to save/restore + // additional registers when doing a VM call). + virtual void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions); + + // These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code. + // The implementation is only non-empty for the InterpreterMacroAssembler, + // as only the interpreter handles PopFrame and ForceEarlyReturn requests. + virtual void check_and_handle_popframe() {} + virtual void check_and_handle_earlyret() {} + +public: + + MacroAssembler(CodeBuffer* code) : Assembler(code) {} + + // By default, we do not need relocation information for non + // patchable absolute addresses. However, when needed by some + // extensions, ignore_non_patchable_relocations can be modified, + // returning false to preserve all relocation information. + inline bool ignore_non_patchable_relocations() { return true; } + + // Initially added to the Assembler interface as a pure virtual: + // RegisterConstant delayed_value(..) + // for: + // 6812678 macro assembler needs delayed binding of a few constants (for 6655638) + // this was subsequently modified to its present name and return type + virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset); + +#ifdef AARCH64 +# define NOT_IMPLEMENTED() unimplemented("NYI at " __FILE__ ":" XSTR(__LINE__)) +# define NOT_TESTED() warn("Not tested at " __FILE__ ":" XSTR(__LINE__)) +#endif + + void align(int modulus); + + // Support for VM calls + // + // It is imperative that all calls into the VM are handled via the call_VM methods. + // They make sure that the stack linkage is setup correctly. call_VM's correspond + // to ENTRY/ENTRY_X entry points while call_VM_leaf's correspond to LEAF entry points. + + void call_VM(Register oop_result, address entry_point, bool check_exceptions = true); + void call_VM(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true); + void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, bool check_exceptions = true); + void call_VM(Register oop_result, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions = true); + + // The following methods are required by templateTable.cpp, + // but not used on ARM. + void call_VM(Register oop_result, Register last_java_sp, address entry_point, int number_of_arguments = 0, bool check_exceptions = true); + void call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, bool check_exceptions = true); + void call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, bool check_exceptions = true); + void call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions = true); + + // Note: The super_call_VM calls are not used on ARM + + // Raw call, without saving/restoring registers, exception handling, etc. + // Mainly used from various stubs. + // Note: if 'save_R9_if_scratched' is true, call_VM may on some + // platforms save values on the stack. Set it to false (and handle + // R9 in the callers) if the top of the stack must not be modified + // by call_VM. + void call_VM(address entry_point, bool save_R9_if_scratched); + + void call_VM_leaf(address entry_point); + void call_VM_leaf(address entry_point, Register arg_1); + void call_VM_leaf(address entry_point, Register arg_1, Register arg_2); + void call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3); + void call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3, Register arg_4); + + void get_vm_result(Register oop_result, Register tmp); + void get_vm_result_2(Register metadata_result, Register tmp); + + // Always sets/resets sp, which default to SP if (last_sp == noreg) + // Optionally sets/resets fp (use noreg to avoid setting it) + // Always sets/resets pc on AArch64; optionally sets/resets pc on 32-bit ARM depending on save_last_java_pc flag + // Note: when saving PC, set_last_Java_frame returns PC's offset in the code section + // (for oop_maps offset computation) + int set_last_Java_frame(Register last_sp, Register last_fp, bool save_last_java_pc, Register tmp); + void reset_last_Java_frame(Register tmp); + // status set in set_last_Java_frame for reset_last_Java_frame + bool _fp_saved; + bool _pc_saved; + +#ifdef PRODUCT +#define BLOCK_COMMENT(str) /* nothing */ +#define STOP(error) __ stop(error) +#else +#define BLOCK_COMMENT(str) __ block_comment(str) +#define STOP(error) __ block_comment(error); __ stop(error) +#endif + + void lookup_virtual_method(Register recv_klass, + Register vtable_index, + Register method_result); + + // Test sub_klass against super_klass, with fast and slow paths. + + // The fast path produces a tri-state answer: yes / no / maybe-slow. + // One of the three labels can be NULL, meaning take the fall-through. + // No registers are killed, except temp_regs. + void check_klass_subtype_fast_path(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp_reg2, + Label* L_success, + Label* L_failure, + Label* L_slow_path); + + // 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. + // temp_reg3 can be noreg, if no temps are available. + // Updates the sub's secondary super cache as necessary. + // If set_cond_codes: + // - condition codes will be Z on success, NZ on failure. + // - temp_reg will be 0 on success, non-0 on failure + void check_klass_subtype_slow_path(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp_reg2, + Register temp_reg3, // auto assigned if noreg + Label* L_success, + Label* L_failure, + bool set_cond_codes = false); + + // Simplified, combined version, good for typical uses. + // temp_reg3 can be noreg, if no temps are available. It is used only on slow path. + // Falls through on failure. + void check_klass_subtype(Register sub_klass, + Register super_klass, + Register temp_reg, + Register temp_reg2, + Register temp_reg3, // auto assigned on slow path if noreg + Label& L_success); + + // Returns address of receiver parameter, using tmp as base register. tmp and params_count can be the same. + Address receiver_argument_address(Register params_base, Register params_count, Register tmp); + + void _verify_oop(Register reg, const char* s, const char* file, int line); + void _verify_oop_addr(Address addr, const char * s, const char* file, int line); + + // TODO: verify method and klass metadata (compare against vptr?) + void _verify_method_ptr(Register reg, const char * msg, const char * file, int line) {} + void _verify_klass_ptr(Register reg, const char * msg, const char * file, int line) {} + +#define verify_oop(reg) _verify_oop(reg, "broken oop " #reg, __FILE__, __LINE__) +#define verify_oop_addr(addr) _verify_oop_addr(addr, "broken oop ", __FILE__, __LINE__) +#define verify_method_ptr(reg) _verify_method_ptr(reg, "broken method " #reg, __FILE__, __LINE__) +#define verify_klass_ptr(reg) _verify_klass_ptr(reg, "broken klass " #reg, __FILE__, __LINE__) + + void null_check(Register reg, Register tmp, int offset = -1); + inline void null_check(Register reg) { null_check(reg, noreg, -1); } // for C1 lir_null_check + + // Puts address of allocated object into register `obj` and end of allocated object into register `obj_end`. + void eden_allocate(Register obj, Register obj_end, Register tmp1, Register tmp2, + RegisterOrConstant size_expression, Label& slow_case); + void tlab_allocate(Register obj, Register obj_end, Register tmp1, + RegisterOrConstant size_expression, Label& slow_case); + + void tlab_refill(Register top, Register tmp1, Register tmp2, Register tmp3, Register tmp4, + Label& try_eden, Label& slow_case); + void zero_memory(Register start, Register end, Register tmp); + + void incr_allocated_bytes(RegisterOrConstant size_in_bytes, Register tmp); + + static bool needs_explicit_null_check(intptr_t offset); + + void arm_stack_overflow_check(int frame_size_in_bytes, Register tmp); + void arm_stack_overflow_check(Register Rsize, Register tmp); + + void bang_stack_with_offset(int offset) { + ShouldNotReachHere(); + } + + // Biased locking support + // lock_reg and obj_reg must be loaded up with the appropriate values. + // swap_reg must be supplied. + // tmp_reg must be supplied. + // Optional slow case is for implementations (interpreter and C1) which branch to + // slow case directly. If slow_case is NULL, then leaves condition + // codes set (for C2's Fast_Lock node) and jumps to done label. + // Falls through for the fast locking attempt. + // Returns offset of first potentially-faulting instruction for null + // check info (currently consumed only by C1). If + // swap_reg_contains_mark is true then returns -1 as it is assumed + // the calling code has already passed any potential faults. + // Notes: + // - swap_reg and tmp_reg are scratched + // - Rtemp was (implicitly) scratched and can now be specified as the tmp2 + int biased_locking_enter(Register obj_reg, Register swap_reg, Register tmp_reg, + bool swap_reg_contains_mark, + Register tmp2, + Label& done, Label& slow_case, + BiasedLockingCounters* counters = NULL); + void biased_locking_exit(Register obj_reg, Register temp_reg, Label& done); + + // Building block for CAS cases of biased locking: makes CAS and records statistics. + // Optional slow_case label is used to transfer control if CAS fails. Otherwise leaves condition codes set. + void biased_locking_enter_with_cas(Register obj_reg, Register old_mark_reg, Register new_mark_reg, + Register tmp, Label& slow_case, int* counter_addr); + +#ifndef AARCH64 + void nop() { + mov(R0, R0); + } + + void push(Register rd, AsmCondition cond = al) { + assert(rd != SP, "unpredictable instruction"); + str(rd, Address(SP, -wordSize, pre_indexed), cond); + } + + void push(RegisterSet reg_set, AsmCondition cond = al) { + assert(!reg_set.contains(SP), "unpredictable instruction"); + stmdb(SP, reg_set, writeback, cond); + } + + void pop(Register rd, AsmCondition cond = al) { + assert(rd != SP, "unpredictable instruction"); + ldr(rd, Address(SP, wordSize, post_indexed), cond); + } + + void pop(RegisterSet reg_set, AsmCondition cond = al) { + assert(!reg_set.contains(SP), "unpredictable instruction"); + ldmia(SP, reg_set, writeback, cond); + } + + void fpushd(FloatRegister fd, AsmCondition cond = al) { + fstmdbd(SP, FloatRegisterSet(fd), writeback, cond); + } + + void fpushs(FloatRegister fd, AsmCondition cond = al) { + fstmdbs(SP, FloatRegisterSet(fd), writeback, cond); + } + + void fpopd(FloatRegister fd, AsmCondition cond = al) { + fldmiad(SP, FloatRegisterSet(fd), writeback, cond); + } + + void fpops(FloatRegister fd, AsmCondition cond = al) { + fldmias(SP, FloatRegisterSet(fd), writeback, cond); + } +#endif // !AARCH64 + + // Order access primitives + enum Membar_mask_bits { + StoreStore = 1 << 3, + LoadStore = 1 << 2, + StoreLoad = 1 << 1, + LoadLoad = 1 << 0 + }; + +#ifdef AARCH64 + // tmp register is not used on AArch64, this parameter is provided solely for better compatibility with 32-bit ARM + void membar(Membar_mask_bits order_constraint, Register tmp = noreg); +#else + void membar(Membar_mask_bits mask, + Register tmp, + bool preserve_flags = true, + Register load_tgt = noreg); +#endif + + void breakpoint(AsmCondition cond = al); + void stop(const char* msg); + // prints msg and continues + void warn(const char* msg); + void unimplemented(const char* what = ""); + void should_not_reach_here() { stop("should not reach here"); } + static void debug(const char* msg, const intx* registers); + + // Create a walkable frame to help tracking down who called this code. + // Returns the frame size in words. + int should_not_call_this() { + raw_push(FP, LR); + should_not_reach_here(); + flush(); + return 2; // frame_size_in_words (FP+LR) + } + + int save_all_registers(); + void restore_all_registers(); + int save_caller_save_registers(); + void restore_caller_save_registers(); + + void add_rc(Register dst, Register arg1, RegisterOrConstant arg2); + + // add_slow and mov_slow are used to manipulate offsets larger than 1024, + // these functions are not expected to handle all possible constants, + // only those that can really occur during compilation + void add_slow(Register rd, Register rn, int c); + void sub_slow(Register rd, Register rn, int c); + +#ifdef AARCH64 + static int mov_slow_helper(Register rd, intptr_t c, MacroAssembler* masm /* optional */); +#endif + + void mov_slow(Register rd, intptr_t c NOT_AARCH64_ARG(AsmCondition cond = al)); + void mov_slow(Register rd, const char *string); + void mov_slow(Register rd, address addr); + + void patchable_mov_oop(Register rd, jobject o, int oop_index) { + mov_oop(rd, o, oop_index AARCH64_ONLY_ARG(true)); + } + void mov_oop(Register rd, jobject o, int index = 0 + AARCH64_ONLY_ARG(bool patchable = false) + NOT_AARCH64_ARG(AsmCondition cond = al)); + + + void patchable_mov_metadata(Register rd, Metadata* o, int index) { + mov_metadata(rd, o, index AARCH64_ONLY_ARG(true)); + } + void mov_metadata(Register rd, Metadata* o, int index = 0 AARCH64_ONLY_ARG(bool patchable = false)); + + void mov_float(FloatRegister fd, jfloat c NOT_AARCH64_ARG(AsmCondition cond = al)); + void mov_double(FloatRegister fd, jdouble c NOT_AARCH64_ARG(AsmCondition cond = al)); + +#ifdef AARCH64 + int mov_pc_to(Register rd) { + Label L; + adr(rd, L); + bind(L); + return offset(); + } +#endif + + // Note: this variant of mov_address assumes the address moves with + // the code. Do *not* implement it with non-relocated instructions, + // unless PC-relative. +#ifdef AARCH64 + void mov_relative_address(Register rd, address addr) { + adr(rd, addr); + } +#else + void mov_relative_address(Register rd, address addr, AsmCondition cond = al) { + int offset = addr - pc() - 8; + assert((offset & 3) == 0, "bad alignment"); + if (offset >= 0) { + assert(AsmOperand::is_rotated_imm(offset), "addr too far"); + add(rd, PC, offset, cond); + } else { + assert(AsmOperand::is_rotated_imm(-offset), "addr too far"); + sub(rd, PC, -offset, cond); + } + } +#endif // AARCH64 + + // Runtime address that may vary from one execution to another. The + // symbolic_reference describes what the address is, allowing + // the address to be resolved in a different execution context. + // Warning: do not implement as a PC relative address. + void mov_address(Register rd, address addr, symbolic_Relocation::symbolic_reference t) { + mov_address(rd, addr, RelocationHolder::none); + } + + // rspec can be RelocationHolder::none (for ignored symbolic_Relocation). + // In that case, the address is absolute and the generated code need + // not be relocable. + void mov_address(Register rd, address addr, RelocationHolder const& rspec) { + assert(rspec.type() != relocInfo::runtime_call_type, "do not use mov_address for runtime calls"); + assert(rspec.type() != relocInfo::static_call_type, "do not use mov_address for relocable calls"); + if (rspec.type() == relocInfo::none) { + // absolute address, relocation not needed + mov_slow(rd, (intptr_t)addr); + return; + } +#ifndef AARCH64 + if (VM_Version::supports_movw()) { + relocate(rspec); + int c = (int)addr; + movw(rd, c & 0xffff); + if ((unsigned int)c >> 16) { + movt(rd, (unsigned int)c >> 16); + } + return; + } +#endif + Label skip_literal; + InlinedAddress addr_literal(addr, rspec); + ldr_literal(rd, addr_literal); + b(skip_literal); + bind_literal(addr_literal); + // AARCH64 WARNING: because of alignment padding, extra padding + // may be required to get a consistent size for C2, or rules must + // overestimate size see MachEpilogNode::size + bind(skip_literal); + } + + // Note: Do not define mov_address for a Label + // + // Load from addresses potentially within the code are now handled + // InlinedLiteral subclasses (to allow more flexibility on how the + // ldr_literal is performed). + + void ldr_literal(Register rd, InlinedAddress& L) { + assert(L.rspec().type() != relocInfo::runtime_call_type, "avoid ldr_literal for calls"); + assert(L.rspec().type() != relocInfo::static_call_type, "avoid ldr_literal for calls"); + relocate(L.rspec()); +#ifdef AARCH64 + ldr(rd, target(L.label)); +#else + ldr(rd, Address(PC, target(L.label) - pc() - 8)); +#endif + } + + void ldr_literal(Register rd, InlinedString& L) { + const char* msg = L.msg(); + if (code()->consts()->contains((address)msg)) { + // string address moves with the code +#ifdef AARCH64 + ldr(rd, (address)msg); +#else + ldr(rd, Address(PC, ((address)msg) - pc() - 8)); +#endif + return; + } + // Warning: use external strings with care. They are not relocated + // if the code moves. If needed, use code_string to move them + // to the consts section. +#ifdef AARCH64 + ldr(rd, target(L.label)); +#else + ldr(rd, Address(PC, target(L.label) - pc() - 8)); +#endif + } + + void ldr_literal(Register rd, InlinedMetadata& L) { + // relocation done in the bind_literal for metadatas +#ifdef AARCH64 + ldr(rd, target(L.label)); +#else + ldr(rd, Address(PC, target(L.label) - pc() - 8)); +#endif + } + + void bind_literal(InlinedAddress& L) { + AARCH64_ONLY(align(wordSize)); + bind(L.label); + assert(L.rspec().type() != relocInfo::metadata_type, "Must use InlinedMetadata"); + // We currently do not use oop 'bound' literals. + // If the code evolves and the following assert is triggered, + // we need to implement InlinedOop (see InlinedMetadata). + assert(L.rspec().type() != relocInfo::oop_type, "Inlined oops not supported"); + // Note: relocation is handled by relocate calls in ldr_literal + AbstractAssembler::emit_address((address)L.target()); + } + + void bind_literal(InlinedString& L) { + const char* msg = L.msg(); + if (code()->consts()->contains((address)msg)) { + // The Label should not be used; avoid binding it + // to detect errors. + return; + } + AARCH64_ONLY(align(wordSize)); + bind(L.label); + AbstractAssembler::emit_address((address)L.msg()); + } + + void bind_literal(InlinedMetadata& L) { + AARCH64_ONLY(align(wordSize)); + bind(L.label); + relocate(metadata_Relocation::spec_for_immediate()); + AbstractAssembler::emit_address((address)L.data()); + } + + void load_mirror(Register mirror, Register method, Register tmp); + + // Porting layer between 32-bit ARM and AArch64 + +#define COMMON_INSTR_1(common_mnemonic, aarch64_mnemonic, arm32_mnemonic, arg_type) \ + void common_mnemonic(arg_type arg) { \ + AARCH64_ONLY(aarch64_mnemonic) NOT_AARCH64(arm32_mnemonic) (arg); \ + } + +#define COMMON_INSTR_2(common_mnemonic, aarch64_mnemonic, arm32_mnemonic, arg1_type, arg2_type) \ + void common_mnemonic(arg1_type arg1, arg2_type arg2) { \ + AARCH64_ONLY(aarch64_mnemonic) NOT_AARCH64(arm32_mnemonic) (arg1, arg2); \ + } + +#define COMMON_INSTR_3(common_mnemonic, aarch64_mnemonic, arm32_mnemonic, arg1_type, arg2_type, arg3_type) \ + void common_mnemonic(arg1_type arg1, arg2_type arg2, arg3_type arg3) { \ + AARCH64_ONLY(aarch64_mnemonic) NOT_AARCH64(arm32_mnemonic) (arg1, arg2, arg3); \ + } + + COMMON_INSTR_1(jump, br, bx, Register) + COMMON_INSTR_1(call, blr, blx, Register) + + COMMON_INSTR_2(cbz_32, cbz_w, cbz, Register, Label&) + COMMON_INSTR_2(cbnz_32, cbnz_w, cbnz, Register, Label&) + + COMMON_INSTR_2(ldr_u32, ldr_w, ldr, Register, Address) + COMMON_INSTR_2(ldr_s32, ldrsw, ldr, Register, Address) + COMMON_INSTR_2(str_32, str_w, str, Register, Address) + + COMMON_INSTR_2(mvn_32, mvn_w, mvn, Register, Register) + COMMON_INSTR_2(cmp_32, cmp_w, cmp, Register, Register) + COMMON_INSTR_2(neg_32, neg_w, neg, Register, Register) + COMMON_INSTR_2(clz_32, clz_w, clz, Register, Register) + COMMON_INSTR_2(rbit_32, rbit_w, rbit, Register, Register) + + COMMON_INSTR_2(cmp_32, cmp_w, cmp, Register, int) + COMMON_INSTR_2(cmn_32, cmn_w, cmn, Register, int) + + COMMON_INSTR_3(add_32, add_w, add, Register, Register, Register) + COMMON_INSTR_3(sub_32, sub_w, sub, Register, Register, Register) + COMMON_INSTR_3(subs_32, subs_w, subs, Register, Register, Register) + COMMON_INSTR_3(mul_32, mul_w, mul, Register, Register, Register) + COMMON_INSTR_3(and_32, andr_w, andr, Register, Register, Register) + COMMON_INSTR_3(orr_32, orr_w, orr, Register, Register, Register) + COMMON_INSTR_3(eor_32, eor_w, eor, Register, Register, Register) + + COMMON_INSTR_3(add_32, add_w, add, Register, Register, AsmOperand) + COMMON_INSTR_3(sub_32, sub_w, sub, Register, Register, AsmOperand) + COMMON_INSTR_3(orr_32, orr_w, orr, Register, Register, AsmOperand) + COMMON_INSTR_3(eor_32, eor_w, eor, Register, Register, AsmOperand) + COMMON_INSTR_3(and_32, andr_w, andr, Register, Register, AsmOperand) + + + COMMON_INSTR_3(add_32, add_w, add, Register, Register, int) + COMMON_INSTR_3(adds_32, adds_w, adds, Register, Register, int) + COMMON_INSTR_3(sub_32, sub_w, sub, Register, Register, int) + COMMON_INSTR_3(subs_32, subs_w, subs, Register, Register, int) + + COMMON_INSTR_2(tst_32, tst_w, tst, Register, unsigned int) + COMMON_INSTR_2(tst_32, tst_w, tst, Register, AsmOperand) + + COMMON_INSTR_3(and_32, andr_w, andr, Register, Register, uint) + COMMON_INSTR_3(orr_32, orr_w, orr, Register, Register, uint) + COMMON_INSTR_3(eor_32, eor_w, eor, Register, Register, uint) + + COMMON_INSTR_1(cmp_zero_float, fcmp0_s, fcmpzs, FloatRegister) + COMMON_INSTR_1(cmp_zero_double, fcmp0_d, fcmpzd, FloatRegister) + + COMMON_INSTR_2(ldr_float, ldr_s, flds, FloatRegister, Address) + COMMON_INSTR_2(str_float, str_s, fsts, FloatRegister, Address) + COMMON_INSTR_2(mov_float, fmov_s, fcpys, FloatRegister, FloatRegister) + COMMON_INSTR_2(neg_float, fneg_s, fnegs, FloatRegister, FloatRegister) + COMMON_INSTR_2(abs_float, fabs_s, fabss, FloatRegister, FloatRegister) + COMMON_INSTR_2(sqrt_float, fsqrt_s, fsqrts, FloatRegister, FloatRegister) + COMMON_INSTR_2(cmp_float, fcmp_s, fcmps, FloatRegister, FloatRegister) + + COMMON_INSTR_3(add_float, fadd_s, fadds, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(sub_float, fsub_s, fsubs, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(mul_float, fmul_s, fmuls, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(div_float, fdiv_s, fdivs, FloatRegister, FloatRegister, FloatRegister) + + COMMON_INSTR_2(ldr_double, ldr_d, fldd, FloatRegister, Address) + COMMON_INSTR_2(str_double, str_d, fstd, FloatRegister, Address) + COMMON_INSTR_2(mov_double, fmov_d, fcpyd, FloatRegister, FloatRegister) + COMMON_INSTR_2(neg_double, fneg_d, fnegd, FloatRegister, FloatRegister) + COMMON_INSTR_2(cmp_double, fcmp_d, fcmpd, FloatRegister, FloatRegister) + COMMON_INSTR_2(abs_double, fabs_d, fabsd, FloatRegister, FloatRegister) + COMMON_INSTR_2(sqrt_double, fsqrt_d, fsqrtd, FloatRegister, FloatRegister) + + COMMON_INSTR_3(add_double, fadd_d, faddd, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(sub_double, fsub_d, fsubd, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(mul_double, fmul_d, fmuld, FloatRegister, FloatRegister, FloatRegister) + COMMON_INSTR_3(div_double, fdiv_d, fdivd, FloatRegister, FloatRegister, FloatRegister) + + COMMON_INSTR_2(convert_f2d, fcvt_ds, fcvtds, FloatRegister, FloatRegister) + COMMON_INSTR_2(convert_d2f, fcvt_sd, fcvtsd, FloatRegister, FloatRegister) + + COMMON_INSTR_2(mov_fpr2gpr_float, fmov_ws, fmrs, Register, FloatRegister) + +#undef COMMON_INSTR_1 +#undef COMMON_INSTR_2 +#undef COMMON_INSTR_3 + + +#ifdef AARCH64 + + void mov(Register dst, Register src, AsmCondition cond) { + if (cond == al) { + mov(dst, src); + } else { + csel(dst, src, dst, cond); + } + } + + // Propagate other overloaded "mov" methods from Assembler. + void mov(Register dst, Register src) { Assembler::mov(dst, src); } + void mov(Register rd, int imm) { Assembler::mov(rd, imm); } + + void mov(Register dst, int imm, AsmCondition cond) { + assert(imm == 0 || imm == 1, ""); + if (imm == 0) { + mov(dst, ZR, cond); + } else if (imm == 1) { + csinc(dst, dst, ZR, inverse(cond)); + } else if (imm == -1) { + csinv(dst, dst, ZR, inverse(cond)); + } else { + fatal("illegal mov(R%d,%d,cond)", dst->encoding(), imm); + } + } + + void movs(Register dst, Register src) { adds(dst, src, 0); } + +#else // AARCH64 + + void tbz(Register rt, int bit, Label& L) { + assert(0 <= bit && bit < BitsPerWord, "bit number is out of range"); + tst(rt, 1 << bit); + b(L, eq); + } + + void tbnz(Register rt, int bit, Label& L) { + assert(0 <= bit && bit < BitsPerWord, "bit number is out of range"); + tst(rt, 1 << bit); + b(L, ne); + } + + void cbz(Register rt, Label& L) { + cmp(rt, 0); + b(L, eq); + } + + void cbz(Register rt, address target) { + cmp(rt, 0); + b(target, eq); + } + + void cbnz(Register rt, Label& L) { + cmp(rt, 0); + b(L, ne); + } + + void ret(Register dst = LR) { + bx(dst); + } + +#endif // AARCH64 + + Register zero_register(Register tmp) { +#ifdef AARCH64 + return ZR; +#else + mov(tmp, 0); + return tmp; +#endif + } + + void logical_shift_left(Register dst, Register src, int shift) { +#ifdef AARCH64 + _lsl(dst, src, shift); +#else + mov(dst, AsmOperand(src, lsl, shift)); +#endif + } + + void logical_shift_left_32(Register dst, Register src, int shift) { +#ifdef AARCH64 + _lsl_w(dst, src, shift); +#else + mov(dst, AsmOperand(src, lsl, shift)); +#endif + } + + void logical_shift_right(Register dst, Register src, int shift) { +#ifdef AARCH64 + _lsr(dst, src, shift); +#else + mov(dst, AsmOperand(src, lsr, shift)); +#endif + } + + void arith_shift_right(Register dst, Register src, int shift) { +#ifdef AARCH64 + _asr(dst, src, shift); +#else + mov(dst, AsmOperand(src, asr, shift)); +#endif + } + + void asr_32(Register dst, Register src, int shift) { +#ifdef AARCH64 + _asr_w(dst, src, shift); +#else + mov(dst, AsmOperand(src, asr, shift)); +#endif + } + + // If holds, compares r1 and r2. Otherwise, flags are set so that does not hold. + void cond_cmp(Register r1, Register r2, AsmCondition cond) { +#ifdef AARCH64 + ccmp(r1, r2, flags_for_condition(inverse(cond)), cond); +#else + cmp(r1, r2, cond); +#endif + } + + // If holds, compares r and imm. Otherwise, flags are set so that does not hold. + void cond_cmp(Register r, int imm, AsmCondition cond) { +#ifdef AARCH64 + ccmp(r, imm, flags_for_condition(inverse(cond)), cond); +#else + cmp(r, imm, cond); +#endif + } + + void align_reg(Register dst, Register src, int align) { + assert (is_power_of_2(align), "should be"); +#ifdef AARCH64 + andr(dst, src, ~(uintx)(align-1)); +#else + bic(dst, src, align-1); +#endif + } + + void prefetch_read(Address addr) { +#ifdef AARCH64 + prfm(pldl1keep, addr); +#else + pld(addr); +#endif + } + + void raw_push(Register r1, Register r2) { +#ifdef AARCH64 + stp(r1, r2, Address(SP, -2*wordSize, pre_indexed)); +#else + assert(r1->encoding() < r2->encoding(), "should be ordered"); + push(RegisterSet(r1) | RegisterSet(r2)); +#endif + } + + void raw_pop(Register r1, Register r2) { +#ifdef AARCH64 + ldp(r1, r2, Address(SP, 2*wordSize, post_indexed)); +#else + assert(r1->encoding() < r2->encoding(), "should be ordered"); + pop(RegisterSet(r1) | RegisterSet(r2)); +#endif + } + + void raw_push(Register r1, Register r2, Register r3) { +#ifdef AARCH64 + raw_push(r1, r2); + raw_push(r3, ZR); +#else + assert(r1->encoding() < r2->encoding() && r2->encoding() < r3->encoding(), "should be ordered"); + push(RegisterSet(r1) | RegisterSet(r2) | RegisterSet(r3)); +#endif + } + + void raw_pop(Register r1, Register r2, Register r3) { +#ifdef AARCH64 + raw_pop(r3, ZR); + raw_pop(r1, r2); +#else + assert(r1->encoding() < r2->encoding() && r2->encoding() < r3->encoding(), "should be ordered"); + pop(RegisterSet(r1) | RegisterSet(r2) | RegisterSet(r3)); +#endif + } + + // Restores registers r1 and r2 previously saved by raw_push(r1, r2, ret_addr) and returns by ret_addr. Clobbers LR. + void raw_pop_and_ret(Register r1, Register r2) { +#ifdef AARCH64 + raw_pop(r1, r2, LR); + ret(); +#else + raw_pop(r1, r2, PC); +#endif + } + + void indirect_jump(Address addr, Register scratch) { +#ifdef AARCH64 + ldr(scratch, addr); + br(scratch); +#else + ldr(PC, addr); +#endif + } + + void indirect_jump(InlinedAddress& literal, Register scratch) { +#ifdef AARCH64 + ldr_literal(scratch, literal); + br(scratch); +#else + ldr_literal(PC, literal); +#endif + } + +#ifndef AARCH64 + void neg(Register dst, Register src) { + rsb(dst, src, 0); + } +#endif + + void branch_if_negative_32(Register r, Label& L) { + // Note about branch_if_negative_32() / branch_if_any_negative_32() implementation for AArch64: + // tbnz is not used instead of tst & b.mi because destination may be out of tbnz range (+-32KB) + // since these methods are used in LIR_Assembler::emit_arraycopy() to jump to stub entry. + tst_32(r, r); + b(L, mi); + } + + void branch_if_any_negative_32(Register r1, Register r2, Register tmp, Label& L) { +#ifdef AARCH64 + orr_32(tmp, r1, r2); + tst_32(tmp, tmp); +#else + orrs(tmp, r1, r2); +#endif + b(L, mi); + } + + void branch_if_any_negative_32(Register r1, Register r2, Register r3, Register tmp, Label& L) { + orr_32(tmp, r1, r2); +#ifdef AARCH64 + orr_32(tmp, tmp, r3); + tst_32(tmp, tmp); +#else + orrs(tmp, tmp, r3); +#endif + b(L, mi); + } + + void add_ptr_scaled_int32(Register dst, Register r1, Register r2, int shift) { +#ifdef AARCH64 + add(dst, r1, r2, ex_sxtw, shift); +#else + add(dst, r1, AsmOperand(r2, lsl, shift)); +#endif + } + + void sub_ptr_scaled_int32(Register dst, Register r1, Register r2, int shift) { +#ifdef AARCH64 + sub(dst, r1, r2, ex_sxtw, shift); +#else + sub(dst, r1, AsmOperand(r2, lsl, shift)); +#endif + } + + + // klass oop manipulations if compressed + +#ifdef AARCH64 + void load_klass(Register dst_klass, Register src_oop); +#else + void load_klass(Register dst_klass, Register src_oop, AsmCondition cond = al); +#endif // AARCH64 + + void store_klass(Register src_klass, Register dst_oop); + +#ifdef AARCH64 + void store_klass_gap(Register dst); +#endif // AARCH64 + + // oop manipulations + + void load_heap_oop(Register dst, Address src); + void store_heap_oop(Register src, Address dst); + void store_heap_oop(Address dst, Register src) { + store_heap_oop(src, dst); + } + void store_heap_oop_null(Register src, Address dst); + +#ifdef AARCH64 + void encode_heap_oop(Register dst, Register src); + void encode_heap_oop(Register r) { + encode_heap_oop(r, r); + } + void decode_heap_oop(Register dst, Register src); + void decode_heap_oop(Register r) { + decode_heap_oop(r, r); + } + +#ifdef COMPILER2 + void encode_heap_oop_not_null(Register dst, Register src); + void decode_heap_oop_not_null(Register dst, Register src); + + void set_narrow_klass(Register dst, Klass* k); + void set_narrow_oop(Register dst, jobject obj); +#endif + + void encode_klass_not_null(Register r); + void encode_klass_not_null(Register dst, Register src); + void decode_klass_not_null(Register r); + void decode_klass_not_null(Register dst, Register src); + + void reinit_heapbase(); + +#ifdef ASSERT + void verify_heapbase(const char* msg); +#endif // ASSERT + + static int instr_count_for_mov_slow(intptr_t c); + static int instr_count_for_mov_slow(address addr); + static int instr_count_for_decode_klass_not_null(); +#endif // AARCH64 + + void ldr_global_ptr(Register reg, address address_of_global); + void ldr_global_s32(Register reg, address address_of_global); + void ldrb_global(Register reg, address address_of_global); + + // address_placeholder_instruction is invalid instruction and is used + // as placeholder in code for address of label + enum { address_placeholder_instruction = 0xFFFFFFFF }; + + void emit_address(Label& L) { + assert(!L.is_bound(), "otherwise address will not be patched"); + target(L); // creates relocation which will be patched later + + assert ((offset() & (wordSize-1)) == 0, "should be aligned by word size"); + +#ifdef AARCH64 + emit_int32(address_placeholder_instruction); + emit_int32(address_placeholder_instruction); +#else + AbstractAssembler::emit_address((address)address_placeholder_instruction); +#endif + } + + void b(address target, AsmCondition cond = al) { + Assembler::b(target, cond); \ + } + void b(Label& L, AsmCondition cond = al) { + // internal jumps + Assembler::b(target(L), cond); + } + + void bl(address target NOT_AARCH64_ARG(AsmCondition cond = al)) { + Assembler::bl(target NOT_AARCH64_ARG(cond)); + } + void bl(Label& L NOT_AARCH64_ARG(AsmCondition cond = al)) { + // internal calls + Assembler::bl(target(L) NOT_AARCH64_ARG(cond)); + } + +#ifndef AARCH64 + void adr(Register dest, Label& L, AsmCondition cond = al) { + int delta = target(L) - pc() - 8; + if (delta >= 0) { + add(dest, PC, delta, cond); + } else { + sub(dest, PC, -delta, cond); + } + } +#endif // !AARCH64 + + // Variable-length jump and calls. We now distinguish only the + // patchable case from the other cases. Patchable must be + // distinguised from relocable. Relocable means the generated code + // containing the jump/call may move. Patchable means that the + // targeted address may be changed later. + + // Non patchable versions. + // - used only for relocInfo::runtime_call_type and relocInfo::none + // - may use relative or absolute format (do not use relocInfo::none + // if the generated code may move) + // - the implementation takes into account switch to THUMB mode if the + // destination is a THUMB address + // - the implementation supports far targets + // + // To reduce regression risk, scratch still defaults to noreg on + // arm32. This results in patchable instructions. However, if + // patching really matters, the call sites should be modified and + // use patchable_call or patchable_jump. If patching is not required + // and if a register can be cloberred, it should be explicitly + // specified to allow future optimizations. + void jump(address target, + relocInfo::relocType rtype = relocInfo::runtime_call_type, + Register scratch = AARCH64_ONLY(Rtemp) NOT_AARCH64(noreg) +#ifndef AARCH64 + , AsmCondition cond = al +#endif + ); + + void call(address target, + RelocationHolder rspec + NOT_AARCH64_ARG(AsmCondition cond = al)); + + void call(address target, + relocInfo::relocType rtype = relocInfo::runtime_call_type + NOT_AARCH64_ARG(AsmCondition cond = al)) { + call(target, Relocation::spec_simple(rtype) NOT_AARCH64_ARG(cond)); + } + + void jump(AddressLiteral dest) { + jump(dest.target(), dest.reloc()); + } +#ifndef AARCH64 + void jump(address dest, relocInfo::relocType rtype, AsmCondition cond) { + jump(dest, rtype, Rtemp, cond); + } +#endif + + void call(AddressLiteral dest) { + call(dest.target(), dest.reloc()); + } + + // Patchable version: + // - set_destination can be used to atomically change the target + // + // The targets for patchable_jump and patchable_call must be in the + // code cache. + // [ including possible extensions of the code cache, like AOT code ] + // + // To reduce regression risk, scratch still defaults to noreg on + // arm32. If a register can be cloberred, it should be explicitly + // specified to allow future optimizations. + void patchable_jump(address target, + relocInfo::relocType rtype = relocInfo::runtime_call_type, + Register scratch = AARCH64_ONLY(Rtemp) NOT_AARCH64(noreg) +#ifndef AARCH64 + , AsmCondition cond = al +#endif + ); + + // patchable_call may scratch Rtemp + int patchable_call(address target, + RelocationHolder const& rspec, + bool c2 = false); + + int patchable_call(address target, + relocInfo::relocType rtype, + bool c2 = false) { + return patchable_call(target, Relocation::spec_simple(rtype), c2); + } + +#if defined(AARCH64) && defined(COMPILER2) + static int call_size(address target, bool far, bool patchable); +#endif + +#ifdef AARCH64 + static bool page_reachable_from_cache(address target); +#endif + static bool _reachable_from_cache(address target); + static bool _cache_fully_reachable(); + bool cache_fully_reachable(); + bool reachable_from_cache(address target); + + void zero_extend(Register rd, Register rn, int bits); + void sign_extend(Register rd, Register rn, int bits); + + inline void zap_high_non_significant_bits(Register r) { +#ifdef AARCH64 + if(ZapHighNonSignificantBits) { + movk(r, 0xBAAD, 48); + movk(r, 0xF00D, 32); + } +#endif + } + +#ifndef AARCH64 + void long_move(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmCondition cond = al); + void long_shift(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmShift shift, Register count); + void long_shift(Register rd_lo, Register rd_hi, + Register rn_lo, Register rn_hi, + AsmShift shift, int count); + + void atomic_cas(Register tmpreg1, Register tmpreg2, Register oldval, Register newval, Register base, int offset); + void atomic_cas_bool(Register oldval, Register newval, Register base, int offset, Register tmpreg); + void atomic_cas64(Register temp_lo, Register temp_hi, Register temp_result, Register oldval_lo, Register oldval_hi, Register newval_lo, Register newval_hi, Register base, int offset); +#endif // !AARCH64 + + void cas_for_lock_acquire(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false); + void cas_for_lock_release(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false); + +#ifndef PRODUCT + // Preserves flags and all registers. + // On SMP the updated value might not be visible to external observers without a sychronization barrier + void cond_atomic_inc32(AsmCondition cond, int* counter_addr); +#endif // !PRODUCT + + // unconditional non-atomic increment + void inc_counter(address counter_addr, Register tmpreg1, Register tmpreg2); + void inc_counter(int* counter_addr, Register tmpreg1, Register tmpreg2) { + inc_counter((address) counter_addr, tmpreg1, tmpreg2); + } + + void pd_patch_instruction(address branch, address target); + + // Loading and storing values by size and signed-ness; + // size must not exceed wordSize (i.e. 8-byte values are not supported on 32-bit ARM); + // each of these calls generates exactly one load or store instruction, + // so src can be pre- or post-indexed address. +#ifdef AARCH64 + void load_sized_value(Register dst, Address src, size_t size_in_bytes, bool is_signed); + void store_sized_value(Register src, Address dst, size_t size_in_bytes); +#else + // 32-bit ARM variants also support conditional execution + void load_sized_value(Register dst, Address src, size_t size_in_bytes, bool is_signed, AsmCondition cond = al); + void store_sized_value(Register src, Address dst, size_t size_in_bytes, AsmCondition cond = al); +#endif + + void lookup_interface_method(Register recv_klass, + Register intf_klass, + Register itable_index, + Register method_result, + Register temp_reg1, + Register temp_reg2, + Label& L_no_such_interface); + + // Compare char[] arrays aligned to 4 bytes. + void char_arrays_equals(Register ary1, Register ary2, + Register limit, Register result, + Register chr1, Register chr2, Label& Ldone); + + + void floating_cmp(Register dst); + + // improved x86 portability (minimizing source code changes) + + void ldr_literal(Register rd, AddressLiteral addr) { + relocate(addr.rspec()); +#ifdef AARCH64 + ldr(rd, addr.target()); +#else + ldr(rd, Address(PC, addr.target() - pc() - 8)); +#endif + } + + void lea(Register Rd, AddressLiteral addr) { + // Never dereferenced, as on x86 (lval status ignored) + mov_address(Rd, addr.target(), addr.rspec()); + } + + void restore_default_fp_mode(); + +#ifdef COMPILER2 +#ifdef AARCH64 + // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file. + void fast_lock(Register obj, Register box, Register scratch, Register scratch2, Register scratch3); + void fast_unlock(Register obj, Register box, Register scratch, Register scratch2, Register scratch3); +#else + void fast_lock(Register obj, Register box, Register scratch, Register scratch2); + void fast_unlock(Register obj, Register box, Register scratch, Register scratch2); +#endif +#endif + +#ifdef AARCH64 + +#define F(mnemonic) \ + void mnemonic(Register rt, address target) { \ + Assembler::mnemonic(rt, target); \ + } \ + void mnemonic(Register rt, Label& L) { \ + Assembler::mnemonic(rt, target(L)); \ + } + + F(cbz_w); + F(cbnz_w); + F(cbz); + F(cbnz); + +#undef F + +#define F(mnemonic) \ + void mnemonic(Register rt, int bit, address target) { \ + Assembler::mnemonic(rt, bit, target); \ + } \ + void mnemonic(Register rt, int bit, Label& L) { \ + Assembler::mnemonic(rt, bit, target(L)); \ + } + + F(tbz); + F(tbnz); +#undef F + +#endif // AARCH64 + +}; + + +// The purpose of this class is to build several code fragments of the same size +// in order to allow fast table branch. + +class FixedSizeCodeBlock VALUE_OBJ_CLASS_SPEC { +public: + FixedSizeCodeBlock(MacroAssembler* masm, int size_in_instrs, bool enabled); + ~FixedSizeCodeBlock(); + +private: + MacroAssembler* _masm; + address _start; + int _size_in_instrs; + bool _enabled; +}; + + +#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_HPP + diff --git a/hotspot/src/cpu/arm/vm/macroAssembler_arm.inline.hpp b/hotspot/src/cpu/arm/vm/macroAssembler_arm.inline.hpp new file mode 100644 index 00000000000..14c844ce84d --- /dev/null +++ b/hotspot/src/cpu/arm/vm/macroAssembler_arm.inline.hpp @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP +#define CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP + +#include "asm/assembler.inline.hpp" +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" +#include "runtime/handles.inline.hpp" + +inline void MacroAssembler::pd_patch_instruction(address branch, address target) { + int instr = *(int*)branch; + int new_offset = (int)(target - branch NOT_AARCH64(- 8)); + assert((new_offset & 3) == 0, "bad alignment"); + +#ifdef AARCH64 + if ((instr & (0x1f << 26)) == (0b00101 << 26)) { + // Unconditional B or BL + assert (is_offset_in_range(new_offset, 26), "offset is too large"); + *(int*)branch = (instr & ~right_n_bits(26)) | encode_offset(new_offset, 26, 0); + } else if ((instr & (0xff << 24)) == (0b01010100 << 24) && (instr & (1 << 4)) == 0) { + // Conditional B + assert (is_offset_in_range(new_offset, 19), "offset is too large"); + *(int*)branch = (instr & ~(right_n_bits(19) << 5)) | encode_offset(new_offset, 19, 5); + } else if ((instr & (0b111111 << 25)) == (0b011010 << 25)) { + // Compare & branch CBZ/CBNZ + assert (is_offset_in_range(new_offset, 19), "offset is too large"); + *(int*)branch = (instr & ~(right_n_bits(19) << 5)) | encode_offset(new_offset, 19, 5); + } else if ((instr & (0b111111 << 25)) == (0b011011 << 25)) { + // Test & branch TBZ/TBNZ + assert (is_offset_in_range(new_offset, 14), "offset is too large"); + *(int*)branch = (instr & ~(right_n_bits(14) << 5)) | encode_offset(new_offset, 14, 5); + } else if ((instr & (0b111011 << 24)) == (0b011000 << 24)) { + // LDR (literal) + unsigned opc = ((unsigned)instr >> 30); + assert (opc != 0b01 || ((uintx)target & 7) == 0, "ldr target should be aligned"); + assert (is_offset_in_range(new_offset, 19), "offset is too large"); + *(int*)branch = (instr & ~(right_n_bits(19) << 5)) | encode_offset(new_offset, 19, 5); + } else if (((instr & (1 << 31)) == 0) && ((instr & (0b11111 << 24)) == (0b10000 << 24))) { + // ADR + assert (is_imm_in_range(new_offset, 21, 0), "offset is too large"); + instr = (instr & ~(right_n_bits(2) << 29)) | (new_offset & 3) << 29; + *(int*)branch = (instr & ~(right_n_bits(19) << 5)) | encode_imm(new_offset >> 2, 19, 0, 5); + } else if((unsigned int)instr == address_placeholder_instruction) { + // address + assert (*(unsigned int *)(branch + InstructionSize) == address_placeholder_instruction, "address placeholder occupies two instructions"); + *(intx*)branch = (intx)target; + } else { + ::tty->print_cr("=============== instruction: 0x%x ================\n", instr); + Unimplemented(); // TODO-AARCH64 + } +#else + if ((instr & 0x0e000000) == 0x0a000000) { + // B or BL instruction + assert(new_offset < 0x2000000 && new_offset > -0x2000000, "encoding constraint"); + *(int*)branch = (instr & 0xff000000) | ((unsigned int)new_offset << 6 >> 8); + } else if((unsigned int)instr == address_placeholder_instruction) { + // address + *(int*)branch = (int)target; + } else if ((instr & 0x0fff0000) == 0x028f0000 || ((instr & 0x0fff0000) == 0x024f0000)) { + // ADR + int encoding = 0x8 << 20; // ADD + if (new_offset < 0) { + encoding = 0x4 << 20; // SUB + new_offset = -new_offset; + } + AsmOperand o(new_offset); + *(int*)branch = (instr & 0xff0ff000) | encoding | o.encoding(); + } else { + // LDR Rd, [PC, offset] instruction + assert((instr & 0x0f7f0000) == 0x051f0000, "Must be ldr_literal"); + assert(new_offset < 4096 && new_offset > -4096, "encoding constraint"); + if (new_offset >= 0) { + *(int*)branch = (instr & 0xff0ff000) | 9 << 20 | new_offset; + } else { + *(int*)branch = (instr & 0xff0ff000) | 1 << 20 | -new_offset; + } + } +#endif // AARCH64 +} + +#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP diff --git a/hotspot/src/cpu/arm/vm/metaspaceShared_arm.cpp b/hotspot/src/cpu/arm/vm/metaspaceShared_arm.cpp new file mode 100644 index 00000000000..1cda4dff24e --- /dev/null +++ b/hotspot/src/cpu/arm/vm/metaspaceShared_arm.cpp @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "asm/macroAssembler.hpp" +#include "assembler_arm.inline.hpp" +#include "memory/metaspaceShared.hpp" + +// Generate the self-patching vtable method: +// +// This method will be called (as any other Klass virtual method) with +// the Klass itself as the first argument. Example: +// +// oop obj; +// int size = obj->klass()->oop_size(this); +// +// for which the virtual method call is Klass::oop_size(); +// +// The dummy method is called with the Klass object as the first +// operand, and an object as the second argument. +// + +//===================================================================== + +// All of the dummy methods in the vtable are essentially identical, +// differing only by an ordinal constant, and they bear no relationship +// to the original method which the caller intended. Also, there needs +// to be 'vtbl_list_size' instances of the vtable in order to +// differentiate between the 'vtable_list_size' original Klass objects. + +#define __ masm-> + +void MetaspaceShared::generate_vtable_methods(void** vtbl_list, + void** vtable, + char** md_top, + char* md_end, + char** mc_top, + char* mc_end) { + intptr_t vtable_bytes = (num_virtuals * vtbl_list_size) * sizeof(void*); + *(intptr_t *)(*md_top) = vtable_bytes; + *md_top += sizeof(intptr_t); + void** dummy_vtable = (void**)*md_top; + *vtable = dummy_vtable; + *md_top += vtable_bytes; + + CodeBuffer cb((unsigned char*)*mc_top, mc_end - *mc_top); + MacroAssembler* masm = new MacroAssembler(&cb); + + for (int i = 0; i < vtbl_list_size; ++i) { + Label common_code; + for (int j = 0; j < num_virtuals; ++j) { + dummy_vtable[num_virtuals * i + j] = (void*) __ pc(); + __ mov(Rtemp, j); // Rtemp contains an index of a virtual method in the table + __ b(common_code); + } + + InlinedAddress vtable_address((address)&vtbl_list[i]); + __ bind(common_code); + const Register tmp2 = AARCH64_ONLY(Rtemp2) NOT_AARCH64(R4); + assert_different_registers(Rtemp, tmp2); +#ifndef AARCH64 + __ push(tmp2); +#endif // !AARCH64 + // Do not use ldr_global since the code must be portable across all ARM architectures + __ ldr_literal(tmp2, vtable_address); + __ ldr(tmp2, Address(tmp2)); // get correct vtable address + __ ldr(Rtemp, Address::indexed_ptr(tmp2, Rtemp)); // get real method pointer + __ str(tmp2, Address(R0)); // update vtable. R0 = "this" +#ifndef AARCH64 + __ pop(tmp2); +#endif // !AARCH64 + __ jump(Rtemp); + __ bind_literal(vtable_address); + } + + __ flush(); + *mc_top = (char*) __ pc(); +} diff --git a/hotspot/src/cpu/arm/vm/methodHandles_arm.cpp b/hotspot/src/cpu/arm/vm/methodHandles_arm.cpp new file mode 100644 index 00000000000..15317969319 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/methodHandles_arm.cpp @@ -0,0 +1,587 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +// This file mirror as much as possible methodHandles_x86.cpp to ease +// cross platform development for JSR292. +// Last synchronization: changeset f8c9417e3571 + +#include "precompiled.hpp" +#include "classfile/javaClasses.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/methodHandles.hpp" + +#define __ _masm-> + +#ifdef PRODUCT +#define BLOCK_COMMENT(str) /* nothing */ +#else +#define BLOCK_COMMENT(str) __ block_comment(str) +#endif + +#define BIND(label) bind(label); BLOCK_COMMENT(#label ":") + +void MethodHandles::load_klass_from_Class(MacroAssembler* _masm, Register klass_reg, Register temp1, Register temp2) { + if (VerifyMethodHandles) { + verify_klass(_masm, klass_reg, temp1, temp2, SystemDictionary::WK_KLASS_ENUM_NAME(java_lang_Class), + "MH argument is a Class"); + } + __ ldr(klass_reg, Address(klass_reg, java_lang_Class::klass_offset_in_bytes())); +} + +#ifdef ASSERT +static int check_nonzero(const char* xname, int x) { + assert(x != 0, "%s should be nonzero", xname); + return x; +} +#define NONZERO(x) check_nonzero(#x, x) +#else //ASSERT +#define NONZERO(x) (x) +#endif //ASSERT + +#ifdef ASSERT +void MethodHandles::verify_klass(MacroAssembler* _masm, + Register obj, Register temp1, Register temp2, SystemDictionary::WKID klass_id, + const char* error_message) { + InstanceKlass** klass_addr = SystemDictionary::well_known_klass_addr(klass_id); + KlassHandle klass = SystemDictionary::well_known_klass(klass_id); + Label L_ok, L_bad; + BLOCK_COMMENT("verify_klass {"); + __ verify_oop(obj); + __ cbz(obj, L_bad); + __ load_klass(temp1, obj); + __ lea(temp2, ExternalAddress((address) klass_addr)); + __ ldr(temp2, temp2); // the cmpptr on x86 dereferences the AddressLiteral (not lea) + __ cmp(temp1, temp2); + __ b(L_ok, eq); + intptr_t super_check_offset = klass->super_check_offset(); + __ ldr(temp1, Address(temp1, super_check_offset)); + __ cmp(temp1, temp2); + __ b(L_ok, eq); + + __ bind(L_bad); + __ stop(error_message); + __ BIND(L_ok); + BLOCK_COMMENT("} verify_klass"); +} + +void MethodHandles::verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) { + Label L; + BLOCK_COMMENT("verify_ref_kind {"); + __ ldr_u32(temp, Address(member_reg, NONZERO(java_lang_invoke_MemberName::flags_offset_in_bytes()))); + __ logical_shift_right(temp, temp, java_lang_invoke_MemberName::MN_REFERENCE_KIND_SHIFT); + __ andr(temp, temp, (unsigned)java_lang_invoke_MemberName::MN_REFERENCE_KIND_MASK); + __ cmp(temp, ref_kind); + __ b(L, eq); + { char* buf = NEW_C_HEAP_ARRAY(char, 100, mtInternal); + jio_snprintf(buf, 100, "verify_ref_kind expected %x", ref_kind); + if (ref_kind == JVM_REF_invokeVirtual || + ref_kind == JVM_REF_invokeSpecial) + // could do this for all ref_kinds, but would explode assembly code size + trace_method_handle(_masm, buf); + __ stop(buf); + } + BLOCK_COMMENT("} verify_ref_kind"); + __ bind(L); +} + +#endif //ASSERT + +void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, bool for_compiler_entry) { + Label L_no_such_method; + __ cbz(Rmethod, L_no_such_method); + + // Note: JVMTI overhead seems small enough compared to invocation + // cost and is not worth the complexity or code size overhead of + // supporting several variants of each adapter. + if (!for_compiler_entry && (JvmtiExport::can_post_interpreter_events())) { + // JVMTI events, such as single-stepping, are implemented partly by avoiding running + // compiled code in threads for which the event is enabled. Check here for + // interp_only_mode if these events CAN be enabled. + __ ldr_s32(Rtemp, Address(Rthread, JavaThread::interp_only_mode_offset())); +#ifdef AARCH64 + Label L; + __ cbz(Rtemp, L); + __ indirect_jump(Address(Rmethod, Method::interpreter_entry_offset()), Rtemp); + __ bind(L); +#else + __ cmp(Rtemp, 0); + __ ldr(PC, Address(Rmethod, Method::interpreter_entry_offset()), ne); +#endif // AARCH64 + } + const ByteSize entry_offset = for_compiler_entry ? Method::from_compiled_offset() : + Method::from_interpreted_offset(); + + __ indirect_jump(Address(Rmethod, entry_offset), Rtemp); + + __ bind(L_no_such_method); + // throw exception + __ jump(StubRoutines::throw_AbstractMethodError_entry(), relocInfo::runtime_call_type, Rtemp); +} + +void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm, + Register recv, Register tmp, + bool for_compiler_entry) { + BLOCK_COMMENT("jump_to_lambda_form {"); + // This is the initial entry point of a lazy method handle. + // After type checking, it picks up the invoker from the LambdaForm. + assert_different_registers(recv, tmp, Rmethod); + + // Load the invoker, as MH -> MH.form -> LF.vmentry + __ load_heap_oop(tmp, Address(recv, NONZERO(java_lang_invoke_MethodHandle::form_offset_in_bytes()))); + __ verify_oop(tmp); + + __ load_heap_oop(tmp, Address(tmp, NONZERO(java_lang_invoke_LambdaForm::vmentry_offset_in_bytes()))); + __ verify_oop(tmp); + + // the following assumes that a Method* is normally compressed in the vmtarget field: + __ ldr(Rmethod, Address(tmp, NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes()))); + + if (VerifyMethodHandles && !for_compiler_entry) { + // make sure recv is already on stack + __ ldr(tmp, Address(Rmethod, Method::const_offset())); + __ load_sized_value(tmp, + Address(tmp, ConstMethod::size_of_parameters_offset()), + sizeof(u2), /*is_signed*/ false); + // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), ""); + Label L; + __ ldr(tmp, __ receiver_argument_address(Rparams, tmp, tmp)); + __ cmp(tmp, recv); + __ b(L, eq); + __ stop("receiver not on stack"); + __ bind(L); + } + + jump_from_method_handle(_masm, for_compiler_entry); + BLOCK_COMMENT("} jump_to_lambda_form"); +} + + +// Code generation +address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler* _masm, + vmIntrinsics::ID iid) { + const bool not_for_compiler_entry = false; // this is the interpreter entry + assert(is_signature_polymorphic(iid), "expected invoke iid"); + if (iid == vmIntrinsics::_invokeGeneric || + iid == vmIntrinsics::_compiledLambdaForm) { + // Perhaps surprisingly, the user-visible names, and linkToCallSite, are not directly used. + // They are linked to Java-generated adapters via MethodHandleNatives.linkMethod. + // They all require an extra argument. + __ should_not_reach_here(); // empty stubs make SG sick + return NULL; + } + + // Rmethod: Method* + // Rparams (SP on 32-bit ARM): pointer to parameters + // Rsender_sp (R4/R19): sender SP (must preserve; see prepare_to_jump_from_interpreted) + // R5_mh: receiver method handle (must load from sp[MethodTypeForm.vmslots]) + // R1, R2, Rtemp: garbage temp, blown away + + // Use same name as x86 to ease future merges + Register rdx_temp = R2_tmp; + Register rdx_param_size = rdx_temp; // size of parameters + Register rax_temp = R1_tmp; + Register rcx_mh = R5_mh; // MH receiver; dies quickly and is recycled + Register rbx_method = Rmethod; // eventual target of this invocation + Register rdi_temp = Rtemp; + + // here's where control starts out: + __ align(CodeEntryAlignment); + address entry_point = __ pc(); + + if (VerifyMethodHandles) { + Label L; + BLOCK_COMMENT("verify_intrinsic_id {"); + __ ldrh(rdi_temp, Address(rbx_method, Method::intrinsic_id_offset_in_bytes())); + __ sub_slow(rdi_temp, rdi_temp, (int) iid); + __ cbz(rdi_temp, L); + if (iid == vmIntrinsics::_linkToVirtual || + iid == vmIntrinsics::_linkToSpecial) { + // could do this for all kinds, but would explode assembly code size + trace_method_handle(_masm, "bad Method*::intrinsic_id"); + } + __ stop("bad Method*::intrinsic_id"); + __ bind(L); + BLOCK_COMMENT("} verify_intrinsic_id"); + } + + // First task: Find out how big the argument list is. + Address rdx_first_arg_addr; + int ref_kind = signature_polymorphic_intrinsic_ref_kind(iid); + assert(ref_kind != 0 || iid == vmIntrinsics::_invokeBasic, "must be _invokeBasic or a linkTo intrinsic"); + if (ref_kind == 0 || MethodHandles::ref_kind_has_receiver(ref_kind)) { + __ ldr(rdx_param_size, Address(rbx_method, Method::const_offset())); + __ load_sized_value(rdx_param_size, + Address(rdx_param_size, ConstMethod::size_of_parameters_offset()), + sizeof(u2), /*is_signed*/ false); + // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), ""); + rdx_first_arg_addr = __ receiver_argument_address(Rparams, rdx_param_size, rdi_temp); + } else { + DEBUG_ONLY(rdx_param_size = noreg); + } + + if (!is_signature_polymorphic_static(iid)) { + __ ldr(rcx_mh, rdx_first_arg_addr); + DEBUG_ONLY(rdx_param_size = noreg); + } + + // rdx_first_arg_addr is live! + + trace_method_handle_interpreter_entry(_masm, iid); + + if (iid == vmIntrinsics::_invokeBasic) { + generate_method_handle_dispatch(_masm, iid, rcx_mh, noreg, not_for_compiler_entry); + + } else { + // Adjust argument list by popping the trailing MemberName argument. + Register rcx_recv = noreg; + if (MethodHandles::ref_kind_has_receiver(ref_kind)) { + // Load the receiver (not the MH; the actual MemberName's receiver) up from the interpreter stack. + __ ldr(rcx_recv = rcx_mh, rdx_first_arg_addr); + DEBUG_ONLY(rdx_param_size = noreg); + } + Register rbx_member = rbx_method; // MemberName ptr; incoming method ptr is dead now +#ifdef AARCH64 + __ ldr(rbx_member, Address(Rparams, Interpreter::stackElementSize, post_indexed)); +#else + __ pop(rbx_member); +#endif + generate_method_handle_dispatch(_masm, iid, rcx_recv, rbx_member, not_for_compiler_entry); + } + return entry_point; +} + +void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm, + vmIntrinsics::ID iid, + Register receiver_reg, + Register member_reg, + bool for_compiler_entry) { + assert(is_signature_polymorphic(iid), "expected invoke iid"); + // Use same name as x86 to ease future merges + Register rbx_method = Rmethod; // eventual target of this invocation + // temps used in this code are not used in *either* compiled or interpreted calling sequences + Register temp1 = (for_compiler_entry ? saved_last_sp_register() : R1_tmp); + Register temp2 = AARCH64_ONLY(R9) NOT_AARCH64(R8); + Register temp3 = Rtemp; // R12/R16 + Register temp4 = AARCH64_ONLY(Rtemp2) NOT_AARCH64(R5); + if (for_compiler_entry) { + assert(receiver_reg == (iid == vmIntrinsics::_linkToStatic ? noreg : j_rarg0), "only valid assignment"); +#ifdef AARCH64 + assert_different_registers(temp1, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7); + assert_different_registers(temp2, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7); + assert_different_registers(temp3, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7); + assert_different_registers(temp4, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7); +#else + assert_different_registers(temp1, j_rarg0, j_rarg1, j_rarg2, j_rarg3); + assert_different_registers(temp2, j_rarg0, j_rarg1, j_rarg2, j_rarg3); + assert_different_registers(temp3, j_rarg0, j_rarg1, j_rarg2, j_rarg3); + assert_different_registers(temp4, j_rarg0, j_rarg1, j_rarg2, j_rarg3); +#endif // AARCH64 + } + assert_different_registers(temp1, temp2, temp3, receiver_reg); + assert_different_registers(temp1, temp2, temp3, temp4, member_reg); + if (!for_compiler_entry) + assert_different_registers(temp1, temp2, temp3, temp4, saved_last_sp_register()); // don't trash lastSP + + if (iid == vmIntrinsics::_invokeBasic) { + // indirect through MH.form.exactInvoker.vmtarget + jump_to_lambda_form(_masm, receiver_reg, temp3, for_compiler_entry); + + } else { + // The method is a member invoker used by direct method handles. + if (VerifyMethodHandles) { + // make sure the trailing argument really is a MemberName (caller responsibility) + verify_klass(_masm, member_reg, temp2, temp3, SystemDictionary::WK_KLASS_ENUM_NAME(java_lang_invoke_MemberName), + "MemberName required for invokeVirtual etc."); + } + + Address member_clazz( member_reg, NONZERO(java_lang_invoke_MemberName::clazz_offset_in_bytes())); + Address member_vmindex( member_reg, NONZERO(java_lang_invoke_MemberName::vmindex_offset_in_bytes())); + Address member_vmtarget(member_reg, NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes())); + + Register temp1_recv_klass = temp1; + if (iid != vmIntrinsics::_linkToStatic) { + if (iid == vmIntrinsics::_linkToSpecial) { + // Don't actually load the klass; just null-check the receiver. + __ null_check(receiver_reg, temp3); + } else { + // load receiver klass itself + __ null_check(receiver_reg, temp3, oopDesc::klass_offset_in_bytes()); + __ load_klass(temp1_recv_klass, receiver_reg); + __ verify_klass_ptr(temp1_recv_klass); + } + BLOCK_COMMENT("check_receiver {"); + // The receiver for the MemberName must be in receiver_reg. + // Check the receiver against the MemberName.clazz + if (VerifyMethodHandles && iid == vmIntrinsics::_linkToSpecial) { + // Did not load it above... + __ load_klass(temp1_recv_klass, receiver_reg); + __ verify_klass_ptr(temp1_recv_klass); + } + // Check the receiver against the MemberName.clazz + if (VerifyMethodHandles && iid != vmIntrinsics::_linkToInterface) { + Label L_ok; + Register temp2_defc = temp2; + __ load_heap_oop(temp2_defc, member_clazz); + load_klass_from_Class(_masm, temp2_defc, temp3, temp4); + __ verify_klass_ptr(temp2_defc); +#ifdef AARCH64 + // TODO-AARCH64 + __ b(L_ok); +#else + __ check_klass_subtype(temp1_recv_klass, temp2_defc, temp3, temp4, noreg, L_ok); +#endif + // If we get here, the type check failed! + __ stop("receiver class disagrees with MemberName.clazz"); + __ bind(L_ok); + } + BLOCK_COMMENT("} check_receiver"); + } + if (iid == vmIntrinsics::_linkToSpecial || + iid == vmIntrinsics::_linkToStatic) { + DEBUG_ONLY(temp1_recv_klass = noreg); // these guys didn't load the recv_klass + } + + // Live registers at this point: + // member_reg - MemberName that was the extra argument + // temp1_recv_klass - klass of stacked receiver, if needed + + Label L_incompatible_class_change_error; + switch (iid) { + case vmIntrinsics::_linkToSpecial: + if (VerifyMethodHandles) { + verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3); + } + __ ldr(Rmethod, member_vmtarget); + break; + + case vmIntrinsics::_linkToStatic: + if (VerifyMethodHandles) { + verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3); + } + __ ldr(Rmethod, member_vmtarget); + break; + + case vmIntrinsics::_linkToVirtual: + { + // same as TemplateTable::invokevirtual, + // minus the CP setup and profiling: + + if (VerifyMethodHandles) { + verify_ref_kind(_masm, JVM_REF_invokeVirtual, member_reg, temp3); + } + + // pick out the vtable index from the MemberName, and then we can discard it: + Register temp2_index = temp2; + __ ldr(temp2_index, member_vmindex); + + if (VerifyMethodHandles) { + Label L_index_ok; + __ cmp(temp2_index, 0); + __ b(L_index_ok, ge); + __ stop("no virtual index"); + __ bind(L_index_ok); + } + + // Note: The verifier invariants allow us to ignore MemberName.clazz and vmtarget + // at this point. And VerifyMethodHandles has already checked clazz, if needed. + + // get target Method* & entry point + __ lookup_virtual_method(temp1_recv_klass, temp2_index, Rmethod); + break; + } + + case vmIntrinsics::_linkToInterface: + { + // same as TemplateTable::invokeinterface + // (minus the CP setup and profiling, with different argument motion) + if (VerifyMethodHandles) { + verify_ref_kind(_masm, JVM_REF_invokeInterface, member_reg, temp3); + } + + Register temp3_intf = temp3; + __ load_heap_oop(temp3_intf, member_clazz); + load_klass_from_Class(_masm, temp3_intf, temp2, temp4); + __ verify_klass_ptr(temp3_intf); + + Register rbx_index = rbx_method; + __ ldr(rbx_index, member_vmindex); + if (VerifyMethodHandles) { + Label L; + __ cmp(rbx_index, 0); + __ b(L, ge); + __ stop("invalid vtable index for MH.invokeInterface"); + __ bind(L); + } + + // given intf, index, and recv klass, dispatch to the implementation method + Label L_no_such_interface; + __ lookup_interface_method(temp1_recv_klass, temp3_intf, + // note: next two args must be the same: + rbx_index, rbx_method, + temp2, temp4, + L_incompatible_class_change_error); + break; + } + + default: + fatal("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid)); + break; + } + + // Live at this point: + // Rmethod (target method) + // Rsender_sp, Rparams (if interpreted) + // register arguments (if compiled) + + // After figuring out which concrete method to call, jump into it. + __ verify_method_ptr(Rmethod); + jump_from_method_handle(_masm, for_compiler_entry); + + if (iid == vmIntrinsics::_linkToInterface) { + __ bind(L_incompatible_class_change_error); + __ jump(StubRoutines::throw_IncompatibleClassChangeError_entry(), relocInfo::runtime_call_type, Rtemp); + } + } +} + + +#ifndef PRODUCT +enum { + ARG_LIMIT = 255, SLOP = 4, + // use this parameter for checking for garbage stack movements: + UNREASONABLE_STACK_MOVE = (ARG_LIMIT + SLOP) + // the slop defends against false alarms due to fencepost errors +}; + +#ifdef AARCH64 +const int trace_mh_nregs = 32; // R0-R30, PC +#else +const int trace_mh_nregs = 15; +const Register trace_mh_regs[trace_mh_nregs] = + {R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, LR, PC}; +#endif // AARCH64 + +void trace_method_handle_stub(const char* adaptername, + intptr_t* saved_regs, + intptr_t* saved_bp, + oop mh) { + // called as a leaf from native code: do not block the JVM! + bool has_mh = (strstr(adaptername, "/static") == NULL && + strstr(adaptername, "linkTo") == NULL); // static linkers don't have MH + intptr_t* entry_sp = (intptr_t*) &saved_regs[trace_mh_nregs]; // just after the saved regs + intptr_t* saved_sp = (intptr_t*) saved_regs[Rsender_sp->encoding()]; // save of Rsender_sp + intptr_t* last_sp = (intptr_t*) saved_bp[AARCH64_ONLY(frame::interpreter_frame_stack_top_offset) NOT_AARCH64(frame::interpreter_frame_last_sp_offset)]; + intptr_t* base_sp = last_sp; + + intptr_t mh_reg = (intptr_t)saved_regs[R5_mh->encoding()]; + const char* mh_reg_name = "R5_mh"; + if (!has_mh) mh_reg_name = "R5"; + tty->print_cr("MH %s %s=" PTR_FORMAT " sp=(" PTR_FORMAT "+" INTX_FORMAT ") stack_size=" INTX_FORMAT " bp=" PTR_FORMAT, + adaptername, mh_reg_name, mh_reg, + (intptr_t)entry_sp, (intptr_t)saved_sp - (intptr_t)entry_sp, (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp); + + if (last_sp != saved_sp && last_sp != NULL) + tty->print_cr("*** last_sp=" INTPTR_FORMAT, p2i(last_sp)); + if (Verbose) { + tty->print(" reg dump: "); + int i; + for (i = 0; i < trace_mh_nregs; i++) { + if (i > 0 && i % AARCH64_ONLY(2) NOT_AARCH64(4) == 0) + tty->print("\n + dump: "); +#ifdef AARCH64 + const char* reg_name = (i == trace_mh_nregs-1) ? "pc" : as_Register(i)->name(); +#else + const char* reg_name = trace_mh_regs[i]->name(); +#endif + tty->print(" %s: " INTPTR_FORMAT, reg_name, p2i((void *)saved_regs[i])); + } + tty->cr(); + } + + if (Verbose) { + // dump last frame (from JavaThread::print_frame_layout) + + // Note: code is robust but the dumped informationm may not be + // 100% correct, particularly with respect to the dumped + // "unextended_sp". Getting it right for all trace_method_handle + // call paths is not worth the complexity/risk. The correct slot + // will be identified by *Rsender_sp anyway in the dump. + JavaThread* p = JavaThread::active(); + + ResourceMark rm; + PRESERVE_EXCEPTION_MARK; + FrameValues values; + + intptr_t* dump_fp = (intptr_t *) saved_bp; + address dump_pc = (address) saved_regs[trace_mh_nregs-2]; // LR (with LR,PC last in saved_regs) + frame dump_frame((intptr_t *)entry_sp, dump_fp, dump_pc); + + dump_frame.describe(values, 1); + // mark Rsender_sp if seems valid + if (has_mh) { + if ((saved_sp >= entry_sp - UNREASONABLE_STACK_MOVE) && (saved_sp < dump_fp)) { + values.describe(-1, saved_sp, "*Rsender_sp"); + } + } + + // Note: the unextended_sp may not be correct + tty->print_cr(" stack layout:"); + values.print(p); + } + if (Verbose) { + if (has_mh && mh->is_oop()) { + mh->print(); + if (java_lang_invoke_MethodHandle::is_instance(mh)) { + if (java_lang_invoke_MethodHandle::form_offset_in_bytes() != 0) + java_lang_invoke_MethodHandle::form(mh)->print(); + } + } + } +} + +void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) { + if (!TraceMethodHandles) return; + BLOCK_COMMENT("trace_method_handle {"); + // register saving + // must correspond to trace_mh_nregs and trace_mh_regs defined above + int push_size = __ save_all_registers(); + assert(trace_mh_nregs*wordSize == push_size,"saved register count mismatch"); + + __ mov_slow(R0, adaptername); + __ mov(R1, SP); // entry_sp (after pushes) + __ mov(R2, FP); + if (R5_mh != R3) { + assert_different_registers(R0, R1, R2, R5_mh); + __ mov(R3, R5_mh); + } + + __ call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), R0, R1, R2, R3); + + __ restore_all_registers(); + BLOCK_COMMENT("} trace_method_handle"); +} +#endif //PRODUCT diff --git a/hotspot/src/cpu/arm/vm/methodHandles_arm.hpp b/hotspot/src/cpu/arm/vm/methodHandles_arm.hpp new file mode 100644 index 00000000000..c03ac0390b4 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/methodHandles_arm.hpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +// Platform-specific definitions for method handles. +// These definitions are inlined into class MethodHandles. + +// Adapters +enum /* platform_dependent_constants */ { + adapter_code_size = 18000 NOT_PRODUCT(+ 30000) +}; + +// Additional helper methods for MethodHandles code generation: +public: + static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg, Register temp1, Register temp2); + + static void verify_klass(MacroAssembler* _masm, + Register obj, Register temp1, Register temp2, SystemDictionary::WKID klass_id, + const char* error_message = "wrong klass") NOT_DEBUG_RETURN; + + static void verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) NOT_DEBUG_RETURN; + + // Similar to InterpreterMacroAssembler::jump_from_interpreted. + // Takes care of special dispatch from single stepping too. + // Rmethod should contain target methodOop. + static void jump_from_method_handle(MacroAssembler* _masm, bool for_compiler_entry); + + static void jump_to_lambda_form(MacroAssembler* _masm, + Register recv, Register tmp, + bool for_compiler_entry); + + static Register saved_last_sp_register() { + // Should be in sharedRuntime, not here. + return Rsender_sp; + } diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm.hpp b/hotspot/src/cpu/arm/vm/nativeInst_arm.hpp new file mode 100644 index 00000000000..88bcee9ed06 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/nativeInst_arm.hpp @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_NATIVEINST_ARM_HPP +#define CPU_ARM_VM_NATIVEINST_ARM_HPP + +#include "asm/macroAssembler.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" + + +#ifdef AARCH64 +#include "nativeInst_arm_64.hpp" +#else +#include "nativeInst_arm_32.hpp" +#endif + + +#endif // CPU_ARM_VM_NATIVEINST_ARM_HPP diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_32.cpp b/hotspot/src/cpu/arm/vm/nativeInst_arm_32.cpp new file mode 100644 index 00000000000..77694f6bfc9 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/nativeInst_arm_32.cpp @@ -0,0 +1,339 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "assembler_arm.inline.hpp" +#include "code/codeCache.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_arm.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/ostream.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#include "code/icBuffer.hpp" + +int NativeMovRegMem::offset() const { + switch (kind()) { + case instr_ldr_str: + return encoding() & 0xfff; + case instr_ldrh_strh: + return (encoding() & 0x0f) | ((encoding() >> 4) & 0xf0); + case instr_fld_fst: + return (encoding() & 0xff) << 2; + default: + ShouldNotReachHere(); + return 0; + } +} + +void NativeMovRegMem::set_offset(int x) { + assert(x >= 0 && x < 65536, "encoding constraint"); + const int Rt = Rtemp->encoding(); + + // If offset is too large to be placed into single ldr/str instruction, we replace + // ldr Rd, [Rn, #offset] + // nop + // with + // add Rtemp, Rn, #offset_hi + // ldr Rd, [Rtemp, #offset_lo] + switch (kind()) { + case instr_ldr_str: + if (x < 4096) { + set_encoding((encoding() & 0xfffff000) | x); + } else { + NativeInstruction* next = nativeInstruction_at(next_raw_instruction_address()); + assert(next->is_nop(), "must be"); + next->set_encoding((encoding() & 0xfff0f000) | Rt << 16 | (x & 0xfff)); + this->set_encoding((encoding() & 0x000f0000) | Rt << 12 | x >> 12 | 0xe2800a00); + } + break; + case instr_ldrh_strh: + if (x < 256) { + set_encoding((encoding() & 0xfffff0f0) | (x & 0x0f) | (x & 0xf0) << 4); + } else { + NativeInstruction* next = nativeInstruction_at(next_raw_instruction_address()); + assert(next->is_nop(), "must be"); + next->set_encoding((encoding() & 0xfff0f0f0) | Rt << 16 | (x & 0x0f) | (x & 0xf0) << 4); + this->set_encoding((encoding() & 0x000f0000) | Rt << 12 | x >> 8 | 0xe2800c00); + } + break; + case instr_fld_fst: + if (x < 1024) { + set_encoding((encoding() & 0xffffff00) | (x >> 2)); + } else { + NativeInstruction* next = nativeInstruction_at(next_raw_instruction_address()); + assert(next->is_nop(), "must be"); + next->set_encoding((encoding() & 0xfff0ff00) | Rt << 16 | ((x >> 2) & 0xff)); + this->set_encoding((encoding() & 0x000f0000) | Rt << 12 | x >> 10 | 0xe2800b00); + } + break; + default: + ShouldNotReachHere(); + } +} + +intptr_t NativeMovConstReg::data() const { + RawNativeInstruction* next = next_raw(); + if (is_movw()) { + // Oop embedded in movw/movt instructions + assert(VM_Version::supports_movw(), "must be"); + return (this->encoding() & 0x00000fff) | (this->encoding() & 0x000f0000) >> 4 | + (next->encoding() & 0x00000fff) << 16 | (next->encoding() & 0x000f0000) << 12; + } else { + // Oop is loaded from oops section or inlined in the code + int oop_offset; + if (is_ldr_literal()) { + // ldr Rd, [PC, #offset] + oop_offset = ldr_offset(); + } else { + assert(next->is_ldr(), "must be"); + oop_offset = (this->encoding() & 0xff) << 12 | (next->encoding() & 0xfff); + if (is_add_pc()) { + // add Rd, PC, #offset_hi + // ldr Rd, [Rd, #offset_lo] + assert(next->encoding() & (1 << 23), "sign mismatch"); + // offset OK (both positive) + } else { + assert(is_sub_pc(), "must be"); + // sub Rd, PC, #offset_hi + // ldr Rd, [Rd, -#offset_lo] + assert(!(next->encoding() & (1 << 23)), "sign mismatch"); + // negative offsets + oop_offset = -oop_offset; + } + } + return *(int*)(instruction_address() + 8 + oop_offset); + } +} + +void NativeMovConstReg::set_data(intptr_t x, address pc) { + // Find and replace the oop corresponding to this instruction in oops section + RawNativeInstruction* next = next_raw(); + oop* oop_addr = NULL; + Metadata** metadata_addr = NULL; + CodeBlob* cb = CodeCache::find_blob(instruction_address()); + if (cb != NULL) { + nmethod* nm = cb->as_nmethod_or_null(); + if (nm != NULL) { + RelocIterator iter(nm, instruction_address(), next->instruction_address()); + while (iter.next()) { + if (iter.type() == relocInfo::oop_type) { + oop_addr = iter.oop_reloc()->oop_addr(); + *oop_addr = cast_to_oop(x); + break; + } else if (iter.type() == relocInfo::metadata_type) { + metadata_addr = iter.metadata_reloc()->metadata_addr(); + *metadata_addr = (Metadata*)x; + break; + } + } + } + } + + if (is_movw()) { + // data embedded in movw/movt instructions + assert(VM_Version::supports_movw(), "must be"); + unsigned int lo = (unsigned int)x; + unsigned int hi = (unsigned int)(x >> 16); + this->set_encoding((this->encoding() & 0xfff0f000) | (lo & 0xf000) << 4 | (lo & 0xfff)); + next->set_encoding((next->encoding() & 0xfff0f000) | (hi & 0xf000) << 4 | (hi & 0xfff)); + } else if (oop_addr == NULL & metadata_addr == NULL) { + // A static ldr_literal (without oop or metadata relocation) + assert(is_ldr_literal(), "must be"); + int offset = ldr_offset(); + oop_addr = (oop*)(instruction_address() + 8 + offset); + *oop_addr = cast_to_oop(x); + } else { + // data is loaded from oop or metadata section + int offset; + + address addr = oop_addr != NULL ? (address)oop_addr : (address)metadata_addr; + + if(pc == 0) { + offset = addr - instruction_address() - 8; + } else { + offset = addr - pc - 8; + } + + int sign = (offset >= 0) ? (1 << 23) : 0; + int delta = (offset >= 0) ? offset : (-offset); + assert(delta < 0x100000, "within accessible range"); + if (is_ldr_literal()) { + // fix the ldr with the real offset to the oop/metadata table + assert(next->is_nop(), "must be"); + if (delta < 4096) { + // ldr Rd, [PC, #offset] + set_encoding((encoding() & 0xff7ff000) | delta | sign); + assert(ldr_offset() == offset, "check encoding"); + } else { + int cc = encoding() & 0xf0000000; + int Rd = (encoding() >> 12) & 0xf; + int Rt = Rd; + assert(Rt != 0xf, "Illegal destination register"); // or fix by using Rtemp + // move the ldr, fixing delta_lo and the source register + next->set_encoding((encoding() & 0xff70f000) | (Rt << 16) | (delta & 0xfff) | sign); + assert(next->is_ldr(), "must be"); + if (offset > 0) { + // add Rt, PC, #delta_hi + // ldr Rd, [Rt, #delta_lo] + this->set_encoding((Rt << 12) | (delta >> 12) | 0x028f0a00 | cc); + assert(is_add_pc(), "must be"); + } else { + // sub Rt, PC, #delta_hi + // ldr Rd, [Rt, -#delta_lo] + this->set_encoding((Rt << 12) | (delta >> 12) | 0x024f0a00 | cc); + assert(is_sub_pc(), "must be"); + } + } + } else { + assert(is_pc_rel(), "must be"); + assert(next->is_ldr(), "must be"); + if (offset > 0) { + // add Rt, PC, #delta_hi + this->set_encoding((this->encoding() & 0xf00ff000) | 0x02800a00 | (delta >> 12)); + assert(is_add_pc(), "must be"); + } else { + // sub Rt, PC, #delta_hi + this->set_encoding((this->encoding() & 0xf00ff000) | 0x02400a00 | (delta >> 12)); + assert(is_sub_pc(), "must be"); + } + // ldr Rd, Rt, #delta_lo (or -#delta_lo) + next->set_encoding((next->encoding() & 0xff7ff000) | (delta & 0xfff) | sign); + } + } +} + +void NativeMovConstReg::set_pc_relative_offset(address addr, address pc) { + int offset; + if (pc == 0) { + offset = addr - instruction_address() - 8; + } else { + offset = addr - pc - 8; + } + + RawNativeInstruction* next = next_raw(); + + int sign = (offset >= 0) ? (1 << 23) : 0; + int delta = (offset >= 0) ? offset : (-offset); + assert(delta < 0x100000, "within accessible range"); + if (is_ldr_literal()) { + if (delta < 4096) { + // ldr Rd, [PC, #offset] + set_encoding((encoding() & 0xff7ff000) | delta | sign); + assert(ldr_offset() == offset, "check encoding"); + } else { + assert(next->is_nop(), "must be"); + int cc = encoding() & 0xf0000000; + int Rd = (encoding() >> 12) & 0xf; + int Rt = Rd; + assert(Rt != 0xf, "Illegal destination register"); // or fix by using Rtemp + // move the ldr, fixing delta_lo and the source register + next->set_encoding((encoding() & 0xff70f000) | (Rt << 16) | (delta & 0xfff) | sign); + assert(next->is_ldr(), "must be"); + if (offset > 0) { + // add Rt, PC, #delta_hi + // ldr Rd, [Rt, #delta_lo] + this->set_encoding((Rt << 12) | (delta >> 12) | 0x028f0a00 | cc); + assert(is_add_pc(), "must be"); + } else { + // sub Rt, PC, #delta_hi + // ldr Rd, [Rt, -#delta_lo] + this->set_encoding((Rt << 12) | (delta >> 12) | 0x024f0a00 | cc); + assert(is_sub_pc(), "must be"); + } + } + } else { + assert(is_pc_rel(), "must be"); + assert(next->is_ldr(), "must be"); + if (offset > 0) { + // add Rt, PC, #delta_hi + this->set_encoding((this->encoding() & 0xf00ff000) | 0x02800a00 | (delta >> 12)); + assert(is_add_pc(), "must be"); + } else { + // sub Rt, PC, #delta_hi + this->set_encoding((this->encoding() & 0xf00ff000) | 0x02400a00 | (delta >> 12)); + assert(is_sub_pc(), "must be"); + } + // ldr Rd, Rt, #delta_lo (or -#delta_lo) + next->set_encoding((next->encoding() & 0xff7ff000) | (delta & 0xfff) | sign); + } +} + +void RawNativeJump::check_verified_entry_alignment(address entry, address verified_entry) { +} + +void RawNativeJump::patch_verified_entry(address entry, address verified_entry, address dest) { + assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be"); + int *a = (int *)verified_entry; + a[0] = zombie_illegal_instruction; // always illegal + ICache::invalidate_range((address)&a[0], sizeof a[0]); +} + +void NativeGeneralJump::insert_unconditional(address code_pos, address entry) { + int offset = (int)(entry - code_pos - 8); + assert(offset < 0x2000000 && offset > -0x2000000, "encoding constraint"); + nativeInstruction_at(code_pos)->set_encoding(0xea000000 | ((unsigned int)offset << 6 >> 8)); +} + +static address raw_call_for(address return_address) { + CodeBlob* cb = CodeCache::find_blob(return_address); + nmethod* nm = cb->as_nmethod_or_null(); + if (nm == NULL) { + ShouldNotReachHere(); + return NULL; + } + // Look back 4 instructions, to allow for ic_call + address begin = MAX2(return_address - 4*NativeInstruction::instruction_size, nm->code_begin()); + RelocIterator iter(nm, begin, return_address); + while (iter.next()) { + Relocation* reloc = iter.reloc(); + if (reloc->is_call()) { + address call = reloc->addr(); + if (nativeInstruction_at(call)->is_call()) { + if (nativeCall_at(call)->return_address() == return_address) { + return call; + } + } else { + // Some "calls" are really jumps + assert(nativeInstruction_at(call)->is_jump(), "must be call or jump"); + } + } + } + return NULL; +} + +bool RawNativeCall::is_call_before(address return_address) { + return (raw_call_for(return_address) != NULL); +} + +NativeCall* rawNativeCall_before(address return_address) { + address call = raw_call_for(return_address); + assert(call != NULL, "must be"); + return nativeCall_at(call); +} + diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_32.hpp b/hotspot/src/cpu/arm/vm/nativeInst_arm_32.hpp new file mode 100644 index 00000000000..45a32c90c67 --- /dev/null +++ b/hotspot/src/cpu/arm/vm/nativeInst_arm_32.hpp @@ -0,0 +1,432 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_NATIVEINST_ARM_32_HPP +#define CPU_ARM_VM_NATIVEINST_ARM_32_HPP + +#include "asm/macroAssembler.hpp" +#include "code/codeCache.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" +#include "runtime/thread.hpp" +#include "register_arm.hpp" + +// ------------------------------------------------------------------- + +// Some experimental projects extend the ARM back-end by implementing +// what the front-end usually assumes is a single native instruction +// with a sequence of instructions. +// +// The 'Raw' variants are the low level initial code (usually one +// instruction wide but some of them were already composed +// instructions). They should be used only by the back-end. +// +// The non-raw classes are the front-end entry point, hiding potential +// back-end extensions or the actual instructions size. +class NativeInstruction; + +class RawNativeInstruction VALUE_OBJ_CLASS_SPEC { + public: + + enum ARM_specific { + instruction_size = Assembler::InstructionSize + }; + + enum InstructionKind { + instr_ldr_str = 0x50, + instr_ldrh_strh = 0x10, + instr_fld_fst = 0xd0 + }; + + // illegal instruction used by NativeJump::patch_verified_entry + // permanently undefined (UDF): 0xe << 28 | 0b1111111 << 20 | 0b1111 << 4 + static const int zombie_illegal_instruction = 0xe7f000f0; + + static int decode_rotated_imm12(int encoding) { + int base = encoding & 0xff; + int right_rotation = (encoding & 0xf00) >> 7; + int left_rotation = 32 - right_rotation; + int val = (base >> right_rotation) | (base << left_rotation); + return val; + } + + address addr_at(int offset) const { return (address)this + offset; } + address instruction_address() const { return addr_at(0); } + address next_raw_instruction_address() const { return addr_at(instruction_size); } + + static RawNativeInstruction* at(address address) { + return (RawNativeInstruction*)address; + } + RawNativeInstruction* next_raw() const { + return at(next_raw_instruction_address()); + } + + public: + int encoding() const { return *(int*)this; } + + void set_encoding(int value) { + int old = *(int*)this; + if (old != value) { + *(int*)this = value; + ICache::invalidate_word((address)this); + } + } + + InstructionKind kind() const { + return (InstructionKind) ((encoding() >> 20) & 0xf2); + } + + bool is_nop() const { return encoding() == (int)0xe1a00000; } + bool is_b() const { return (encoding() & 0x0f000000) == 0x0a000000; } + bool is_bx() const { return (encoding() & 0x0ffffff0) == 0x012fff10; } + bool is_bl() const { return (encoding() & 0x0f000000) == 0x0b000000; } + bool is_blx() const { return (encoding() & 0x0ffffff0) == 0x012fff30; } + bool is_fat_call() const { + return (is_add_lr() && next_raw()->is_jump()); + } + bool is_ldr_call() const { + return (is_add_lr() && next_raw()->is_ldr_pc()); + } + bool is_jump() const { return is_b() || is_ldr_pc(); } + bool is_call() const { return is_bl() || is_fat_call(); } + bool is_branch() const { return is_b() || is_bl(); } + bool is_far_branch() const { return is_movw() || is_ldr_literal(); } + bool is_ldr_literal() const { + // ldr Rx, [PC, #offset] for positive or negative offsets + return (encoding() & 0x0f7f0000) == 0x051f0000; + } + bool is_ldr() const { + // ldr Rd, [Rn, #offset] for positive or negative offsets + return (encoding() & 0x0f700000) == 0x05100000; + } + int ldr_offset() const { + assert(is_ldr(), "must be"); + int offset = encoding() & 0xfff; + if (encoding() & (1 << 23)) { + // positive offset + } else { + // negative offset + offset = -offset; + } + return offset; + } + // is_ldr_pc: ldr PC, PC, #offset + bool is_ldr_pc() const { return (encoding() & 0x0f7ff000) == 0x051ff000; } + // is_setting_pc(): ldr PC, Rxx, #offset + bool is_setting_pc() const { return (encoding() & 0x0f70f000) == 0x0510f000; } + bool is_add_lr() const { return (encoding() & 0x0ffff000) == 0x028fe000; } + bool is_add_pc() const { return (encoding() & 0x0fff0000) == 0x028f0000; } + bool is_sub_pc() const { return (encoding() & 0x0fff0000) == 0x024f0000; } + bool is_pc_rel() const { return is_add_pc() || is_sub_pc(); } + bool is_movw() const { return (encoding() & 0x0ff00000) == 0x03000000; } + bool is_movt() const { return (encoding() & 0x0ff00000) == 0x03400000; } + // c2 doesn't use fixed registers for safepoint poll address + bool is_safepoint_poll() const { return (encoding() & 0xfff0ffff) == 0xe590c000; } + // For unit tests + static void test() {} + +}; + +inline RawNativeInstruction* rawNativeInstruction_at(address address) { + return (RawNativeInstruction*)address; +} + +// Base class exported to the front-end +class NativeInstruction: public RawNativeInstruction { +public: + static NativeInstruction* at(address address) { + return (NativeInstruction*)address; + } + +public: + // No need to consider indirections while parsing NativeInstruction + address next_instruction_address() const { + return next_raw_instruction_address(); + } + + // next() is no longer defined to avoid confusion. + // + // The front end and most classes except for those defined in nativeInst_arm + // or relocInfo_arm should only use next_instruction_address(), skipping + // over composed instruction and ignoring back-end extensions. + // + // The back-end can use next_raw() when it knows the instruction sequence + // and only wants to skip a single native instruction. +}; + +inline NativeInstruction* nativeInstruction_at(address address) { + return (NativeInstruction*)address; +} + +// ------------------------------------------------------------------- +// Raw b() or bl() instructions, not used by the front-end. +class RawNativeBranch: public RawNativeInstruction { + public: + + address destination(int adj = 0) const { + return instruction_address() + (encoding() << 8 >> 6) + 8 + adj; + } + + void set_destination(address dest) { + int new_offset = (int)(dest - instruction_address() - 8); + assert(new_offset < 0x2000000 && new_offset > -0x2000000, "encoding constraint"); + set_encoding((encoding() & 0xff000000) | ((unsigned int)new_offset << 6 >> 8)); + } +}; + +inline RawNativeBranch* rawNativeBranch_at(address address) { + assert(rawNativeInstruction_at(address)->is_branch(), "must be"); + return (RawNativeBranch*)address; +} + +class NativeBranch: public RawNativeBranch { +}; + +inline NativeBranch* nativeBranch_at(address address) { + return (NativeBranch *) rawNativeBranch_at(address); +} + +// ------------------------------------------------------------------- +// NativeGeneralJump is for patchable internal (near) jumps +// It is used directly by the front-end and must be a single instruction wide +// (to support patching to other kind of instructions). +class NativeGeneralJump: public RawNativeInstruction { + public: + + address jump_destination() const { + return rawNativeBranch_at(instruction_address())->destination(); + } + + void set_jump_destination(address dest) { + return rawNativeBranch_at(instruction_address())->set_destination(dest); + } + + static void insert_unconditional(address code_pos, address entry); + + static void replace_mt_safe(address instr_addr, address code_buffer) { + assert(((int)instr_addr & 3) == 0 && ((int)code_buffer & 3) == 0, "must be aligned"); + // Writing a word is atomic on ARM, so no MT-safe tricks are needed + rawNativeInstruction_at(instr_addr)->set_encoding(*(int*)code_buffer); + } +}; + +inline NativeGeneralJump* nativeGeneralJump_at(address address) { + assert(rawNativeInstruction_at(address)->is_jump(), "must be"); + return (NativeGeneralJump*)address; +} + +// ------------------------------------------------------------------- +class RawNativeJump: public NativeInstruction { + public: + + address jump_destination(int adj = 0) const { + address a; + if (is_b()) { + a = rawNativeBranch_at(instruction_address())->destination(adj); + // Jump destination -1 is encoded as a jump to self + if (a == instruction_address()) { + return (address)-1; + } + } else { + assert(is_ldr_pc(), "must be"); + int offset = this->ldr_offset(); + a = *(address*)(instruction_address() + 8 + offset); + } + return a; + } + + void set_jump_destination(address dest) { + address a; + if (is_b()) { + // Jump destination -1 is encoded as a jump to self + if (dest == (address)-1) { + dest = instruction_address(); + } + rawNativeBranch_at(instruction_address())->set_destination(dest); + } else { + assert(is_ldr_pc(), "must be"); + int offset = this->ldr_offset(); + *(address*)(instruction_address() + 8 + offset) = dest; + OrderAccess::storeload(); // overkill if caller holds lock? + } + } + + static void check_verified_entry_alignment(address entry, address verified_entry); + + static void patch_verified_entry(address entry, address verified_entry, address dest); + +}; + +inline RawNativeJump* rawNativeJump_at(address address) { + assert(rawNativeInstruction_at(address)->is_jump(), "must be"); + return (RawNativeJump*)address; +} + +// ------------------------------------------------------------------- +class RawNativeCall: public NativeInstruction { + // See IC calls in LIR_Assembler::ic_call(): ARM v5/v6 doesn't use a + // single bl for IC calls. + + public: + + address return_address() const { + if (is_bl()) { + return addr_at(instruction_size); + } else { + assert(is_fat_call(), "must be"); + int offset = encoding() & 0xff; + return addr_at(offset + 8); + } + } + + address destination(int adj = 0) const { + if (is_bl()) { + return rawNativeBranch_at(instruction_address())->destination(adj); + } else { + assert(is_add_lr(), "must be"); // fat_call + RawNativeJump *next = rawNativeJump_at(next_raw_instruction_address()); + return next->jump_destination(adj); + } + } + + void set_destination(address dest) { + if (is_bl()) { + return rawNativeBranch_at(instruction_address())->set_destination(dest); + } else { + assert(is_add_lr(), "must be"); // fat_call + RawNativeJump *next = rawNativeJump_at(next_raw_instruction_address()); + return next->set_jump_destination(dest); + } + } + + void set_destination_mt_safe(address dest) { + assert(CodeCache::contains(dest), "external destination might be too far"); + set_destination(dest); + } + + void verify() { + assert(RawNativeInstruction::is_call() || (!VM_Version::supports_movw() && RawNativeInstruction::is_jump()), "must be"); + } + + void verify_alignment() { + // Nothing to do on ARM + } + + static bool is_call_before(address return_address); +}; + +inline RawNativeCall* rawNativeCall_at(address address) { + assert(rawNativeInstruction_at(address)->is_call(), "must be"); + return (RawNativeCall*)address; +} + +NativeCall* rawNativeCall_before(address return_address); + +// ------------------------------------------------------------------- +// NativeMovRegMem need not be extended with indirection support. +// (field access patching is handled differently in that case) +class NativeMovRegMem: public NativeInstruction { + public: + + int offset() const; + void set_offset(int x); + + void add_offset_in_bytes(int add_offset) { + set_offset(offset() + add_offset); + } + +}; + +inline NativeMovRegMem* nativeMovRegMem_at(address address) { + NativeMovRegMem* instr = (NativeMovRegMem*)address; + assert(instr->kind() == NativeInstruction::instr_ldr_str || + instr->kind() == NativeInstruction::instr_ldrh_strh || + instr->kind() == NativeInstruction::instr_fld_fst, "must be"); + return instr; +} + +// ------------------------------------------------------------------- +// NativeMovConstReg is primarily for loading oops and metadata +class NativeMovConstReg: public NativeInstruction { + public: + + intptr_t data() const; + void set_data(intptr_t x, address pc = 0); + bool is_pc_relative() { + return !is_movw(); + } + void set_pc_relative_offset(address addr, address pc); + address next_instruction_address() const { + // NOTE: CompiledStaticCall::set_to_interpreted() calls this but + // are restricted to single-instruction ldr. No need to jump over + // several instructions. + assert(is_ldr_literal(), "Should only use single-instructions load"); + return next_raw_instruction_address(); + } +}; + +inline NativeMovConstReg* nativeMovConstReg_at(address address) { + NativeInstruction* ni = nativeInstruction_at(address); + assert(ni->is_ldr_literal() || ni->is_pc_rel() || + ni->is_movw() && VM_Version::supports_movw(), "must be"); + return (NativeMovConstReg*)address; +} + +// ------------------------------------------------------------------- +// Front end classes, hiding experimental back-end extensions. + +// Extension to support indirections +class NativeJump: public RawNativeJump { + public: +}; + +inline NativeJump* nativeJump_at(address address) { + assert(nativeInstruction_at(address)->is_jump(), "must be"); + return (NativeJump*)address; +} + +class NativeCall: public RawNativeCall { +public: + // NativeCall::next_instruction_address() is used only to define the + // range where to look for the relocation information. We need not + // walk over composed instructions (as long as the relocation information + // is associated to the first instruction). + address next_instruction_address() const { + return next_raw_instruction_address(); + } + +}; + +inline NativeCall* nativeCall_at(address address) { + assert(nativeInstruction_at(address)->is_call() || + (!VM_Version::supports_movw() && nativeInstruction_at(address)->is_jump()), "must be"); + return (NativeCall*)address; +} + +inline NativeCall* nativeCall_before(address return_address) { + return (NativeCall *) rawNativeCall_before(return_address); +} + +#endif // CPU_ARM_VM_NATIVEINST_ARM_32_HPP diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_64.cpp b/hotspot/src/cpu/arm/vm/nativeInst_arm_64.cpp new file mode 100644 index 00000000000..fe1b8be977c --- /dev/null +++ b/hotspot/src/cpu/arm/vm/nativeInst_arm_64.cpp @@ -0,0 +1,243 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "assembler_arm.inline.hpp" +#include "code/codeCache.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_arm.hpp" +#include "oops/klass.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/ostream.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif + +void RawNativeInstruction::verify() { + // make sure code pattern is actually an instruction address + address addr = instruction_address(); + if (addr == NULL || ((intptr_t)addr & (instruction_size - 1)) != 0) { + fatal("not an instruction address"); + } +} + +void NativeMovRegMem::set_offset(int x) { + int scale = get_offset_scale(); + assert((x & right_n_bits(scale)) == 0, "offset should be aligned"); + guarantee((x >> 24) == 0, "encoding constraint"); + + if (Assembler::is_unsigned_imm_in_range(x, 12, scale)) { + set_unsigned_imm(x, 12, get_offset_scale(), 10); + return; + } + + // If offset is too large to be placed into single ldr/str instruction, we replace + // ldr/str Rt, [Rn, #offset] + // nop + // with + // add LR, Rn, #offset_hi + // ldr/str Rt, [LR, #offset_lo] + + // Note: Rtemp cannot be used as a temporary register as it could be used + // for value being stored (see LIR_Assembler::reg2mem). + // Patchable NativeMovRegMem instructions are generated in LIR_Assembler::mem2reg and LIR_Assembler::reg2mem + // which do not use LR, so it is free. Also, it does not conflict with LR usages in c1_LIRGenerator_arm.cpp. + const int tmp = LR->encoding(); + const int rn = (encoding() >> 5) & 0x1f; + + NativeInstruction* next = nativeInstruction_at(next_raw_instruction_address()); + assert(next->is_nop(), "must be"); + + next->set_encoding((encoding() & 0xffc0001f) | Assembler::encode_unsigned_imm((x & 0xfff), 12, scale, 10) | tmp << 5); + this->set_encoding(0x91400000 | Assembler::encode_unsigned_imm((x >> 12), 12, 0, 10) | rn << 5 | tmp); +} + +intptr_t NativeMovConstReg::_data() const { +#ifdef COMPILER2 + if (is_movz()) { + // narrow constant or ic call cached value + RawNativeInstruction* ni = next_raw(); + assert(ni->is_movk(), "movz;movk expected"); + uint lo16 = (encoding() >> 5) & 0xffff; + intptr_t hi = 0; + int i = 0; + while (ni->is_movk() && i < 3) { + uint hi16 = (ni->encoding() >> 5) & 0xffff; + int shift = ((ni->encoding() >> 21) & 0x3) << 4; + hi |= (intptr_t)hi16 << shift; + ni = ni->next_raw(); + ++i; + } + return lo16 | hi; + } +#endif + return (intptr_t)(nativeLdrLiteral_at(instruction_address())->literal_value()); +} + +static void raw_set_data(RawNativeInstruction* si, intptr_t x, oop* oop_addr, Metadata** metadata_addr) { +#ifdef COMPILER2 + if (si->is_movz()) { + // narrow constant or ic call cached value + uintptr_t nx = 0; + int val_size = 32; + if (oop_addr != NULL) { + narrowOop encoded_oop = oopDesc::encode_heap_oop(*oop_addr); + nx = encoded_oop; + } else if (metadata_addr != NULL) { + assert((*metadata_addr)->is_klass(), "expected Klass"); + narrowKlass encoded_k = Klass::encode_klass((Klass *)*metadata_addr); + nx = encoded_k; + } else { + nx = x; + val_size = 64; + } + RawNativeInstruction* ni = si->next_raw(); + uint lo16 = nx & 0xffff; + int shift = 16; + int imm16 = 0xffff << 5; + si->set_encoding((si->encoding() & ~imm16) | (lo16 << 5)); + while (shift < val_size) { + assert(ni->is_movk(), "movk expected"); + assert((((ni->encoding() >> 21) & 0x3) << 4) == shift, "wrong shift"); + uint hi16 = (nx >> shift) & 0xffff; + ni->set_encoding((ni->encoding() & ~imm16) | (hi16 << 5)); + shift += 16; + ni = ni->next_raw(); + } + return; + } +#endif + + assert(si->is_ldr_literal(), "should be"); + + if (oop_addr == NULL && metadata_addr == NULL) { + // A static ldr_literal without oop_relocation + nativeLdrLiteral_at(si->instruction_address())->set_literal_value((address)x); + } else { + // Oop is loaded from oops section + address addr = oop_addr != NULL ? (address)oop_addr : (address)metadata_addr; + int offset = addr - si->instruction_address(); + + assert((((intptr_t)addr) & 0x7) == 0, "target address should be aligned"); + assert((offset & 0x3) == 0, "offset should be aligned"); + + guarantee(Assembler::is_offset_in_range(offset, 19), "offset is not in range"); + nativeLdrLiteral_at(si->instruction_address())->set_literal_address(si->instruction_address() + offset); + } +} + +void NativeMovConstReg::set_data(intptr_t x) { + // Find and replace the oop corresponding to this instruction in oops section + oop* oop_addr = NULL; + Metadata** metadata_addr = NULL; + CodeBlob* cb = CodeCache::find_blob(instruction_address()); + { + nmethod* nm = cb->as_nmethod_or_null(); + if (nm != NULL) { + RelocIterator iter(nm, instruction_address(), next_raw()->instruction_address()); + while (iter.next()) { + if (iter.type() == relocInfo::oop_type) { + oop_addr = iter.oop_reloc()->oop_addr(); + *oop_addr = cast_to_oop(x); + break; + } else if (iter.type() == relocInfo::metadata_type) { + metadata_addr = iter.metadata_reloc()->metadata_addr(); + *metadata_addr = (Metadata*)x; + break; + } + } + } + } + raw_set_data(adjust(this), x, oop_addr, metadata_addr); +} + +void NativeJump::check_verified_entry_alignment(address entry, address verified_entry) { +} + +void NativeJump::patch_verified_entry(address entry, address verified_entry, address dest) { + assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be"); + + NativeInstruction* instr = nativeInstruction_at(verified_entry); + assert(instr->is_nop() || instr->encoding() == zombie_illegal_instruction, "required for MT-safe patching"); + instr->set_encoding(zombie_illegal_instruction); +} + +void NativeGeneralJump::replace_mt_safe(address instr_addr, address code_buffer) { + assert (nativeInstruction_at(instr_addr)->is_b(), "MT-safe patching of arbitrary instructions is not allowed"); + assert (nativeInstruction_at(code_buffer)->is_nop(), "MT-safe patching of arbitrary instructions is not allowed"); + nativeInstruction_at(instr_addr)->set_encoding(*(int*)code_buffer); +} + +void NativeGeneralJump::insert_unconditional(address code_pos, address entry) { + // Insert at code_pos unconditional B instruction jumping to entry + intx offset = entry - code_pos; + assert (Assembler::is_offset_in_range(offset, 26), "offset is out of range"); + + NativeInstruction* instr = nativeInstruction_at(code_pos); + assert (instr->is_b() || instr->is_nop(), "MT-safe patching of arbitrary instructions is not allowed"); + + instr->set_encoding(0x5 << 26 | Assembler::encode_offset(offset, 26, 0)); +} + +static address call_for(address return_address) { + CodeBlob* cb = CodeCache::find_blob(return_address); + nmethod* nm = cb->as_nmethod_or_null(); + if (nm == NULL) { + ShouldNotReachHere(); + return NULL; + } + + // Look back 8 instructions (for LIR_Assembler::ic_call and MacroAssembler::patchable_call) + address begin = return_address - 8*NativeInstruction::instruction_size; + if (begin < nm->code_begin()) { + begin = nm->code_begin(); + } + RelocIterator iter(nm, begin, return_address); + while (iter.next()) { + Relocation* reloc = iter.reloc(); + if (reloc->is_call()) { + address call = reloc->addr(); + if (nativeInstruction_at(call)->is_call()) { + if (nativeCall_at(call)->return_address() == return_address) { + return call; + } + } + } + } + + return NULL; +} + +bool NativeCall::is_call_before(address return_address) { + return (call_for(return_address) != NULL); +} + +NativeCall* nativeCall_before(address return_address) { + assert(NativeCall::is_call_before(return_address), "must be"); + return nativeCall_at(call_for(return_address)); +} + diff --git a/hotspot/src/cpu/arm/vm/nativeInst_arm_64.hpp b/hotspot/src/cpu/arm/vm/nativeInst_arm_64.hpp new file mode 100644 index 00000000000..159d5df772a --- /dev/null +++ b/hotspot/src/cpu/arm/vm/nativeInst_arm_64.hpp @@ -0,0 +1,772 @@ +/* + * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_ARM_VM_NATIVEINST_ARM_64_HPP +#define CPU_ARM_VM_NATIVEINST_ARM_64_HPP + +#include "asm/macroAssembler.hpp" +#include "code/codeCache.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" + +// ------------------------------------------------------------------- + +// Some experimental projects extend the ARM back-end by implementing +// what the front-end usually assumes is a single native instruction +// with a sequence of instructions. +// +// The 'Raw' variants are the low level initial code (usually one +// instruction wide but some of them were already composed +// instructions). They should be used only by the back-end. +// +// The non-raw classes are the front-end entry point, hiding potential +// back-end extensions or the actual instructions size. +class NativeInstruction; + +class RawNativeInstruction VALUE_OBJ_CLASS_SPEC { + public: + + enum ARM_specific { + instruction_size = Assembler::InstructionSize, + instruction_size_in_bits = instruction_size * BitsPerByte, + }; + + // illegal instruction used by NativeJump::patch_verified_entry + static const int zombie_illegal_instruction = 0xd4000542; // hvc #42 + + address addr_at(int offset) const { return (address)this + offset; } + address instruction_address() const { return addr_at(0); } + address next_raw_instruction_address() const { return addr_at(instruction_size); } + + static RawNativeInstruction* at(address address) { + return (RawNativeInstruction*)address; + } + + RawNativeInstruction* next_raw() const { + return at(next_raw_instruction_address()); + } + + int encoding() const { + return *(int*)this; + } + + void set_encoding(int value) { + int old = encoding(); + if (old != value) { + *(int*)this = value; + ICache::invalidate_word((address)this); + } + } + + bool is_nop() const { return encoding() == (int)0xd503201f; } + bool is_b() const { return (encoding() & 0xfc000000) == 0x14000000; } // unconditional branch + bool is_b_cond() const { return (encoding() & 0xff000010) == 0x54000000; } // conditional branch + bool is_bl() const { return (encoding() & 0xfc000000) == 0x94000000; } + bool is_br() const { return (encoding() & 0xfffffc1f) == 0xd61f0000; } + bool is_blr() const { return (encoding() & 0xfffffc1f) == 0xd63f0000; } + bool is_ldr_literal() const { return (encoding() & 0xff000000) == 0x58000000; } + bool is_adr_aligned() const { return (encoding() & 0xff000000) == 0x10000000; } // adr Xn,

- * 

-     * [41] Attribute ::= Name Eq AttValue
-     *
- *

- * Note: This method assumes that the next - * character on the stream is the first character of the attribute - * name. - *

- * Note: This method uses the fAttributeQName and - * fQName variables. The contents of these variables will be - * destroyed. - * - * @param attributes The attributes list for the scanned attribute. - */ - - /** - * protected void scanAttribute(AttributeIteratorImpl attributes) - * throws IOException, XNIException { - * if (DEBUG_START_END_ELEMENT) System.out.println(">>> scanAttribute()"); - * - * - * // name - * if (fNamespaces) { - * fEntityScanner.scanQName(fAttributeQName); - * } - * else { - * String name = fEntityScanner.scanName(); - * fAttributeQName.setValues(null, name, name, null); - * } - * - * // equals - * fEntityScanner.skipSpaces(); - * if (!fEntityScanner.skipChar('=')) { - * reportFatalError("EqRequiredInAttribute", - * new Object[]{fAttributeQName.rawname}); - * } - * fEntityScanner.skipSpaces(); - * - * - * // content - * int oldLen = attributes.getLength(); - */ - /**xxx there is one check of duplicate attribute that has been removed. - * attributes.addAttribute(fAttributeQName, XMLSymbols.fCDATASymbol, null); - * - * // WFC: Unique Att Spec - * if (oldLen == attributes.getLength()) { - * reportFatalError("AttributeNotUnique", - * new Object[]{fCurrentElement.rawname, - * fAttributeQName.rawname}); - * } - */ - - /* - //REVISIT: one more case needs to be included: external PE and standalone is no - boolean isVC = fHasExternalDTD && !fStandalone; - scanAttributeValue(fTempString, fTempString2, - fAttributeQName.rawname, attributes, - oldLen, isVC); - - //attributes.setValue(oldLen, fTempString.toString()); - //attributes.setNonNormalizedValue(oldLen, fTempString2.toString()); - //attributes.setSpecified(oldLen, true); - - AttributeImpl attribute = new AttributeImpl(fAttributeQName.prefix,fAttributeQName.localpart,fAttributeQName.uri,fTempString.toString(),fTempString2.toString(),XMLSymbols.fCDATASymbol,true); - fAttributes.addAttribute(attribute); - if (DEBUG_START_END_ELEMENT) System.out.println("<<< scanAttribute()"); - } // scanAttribute(XMLAttributes) - - */ - /** return the attribute iterator implementation */ public XMLAttributesIteratorImpl getAttributeIterator(){ if(dtdGrammarUtil != null && fAddDefaultAttr){ @@ -2624,7 +2551,7 @@ public class XMLDocumentFragmentScannerImpl null); } setScannerState(SCANNER_STATE_COMMENT); - } else if (fEntityScanner.skipString(cdata)) { + } else if (fEntityScanner.skipString(CDATA)) { fCDataStart = true; setScannerState(SCANNER_STATE_CDATA ); } else if (!scanForDoctypeHook()) { @@ -2710,62 +2637,56 @@ public class XMLDocumentFragmentScannerImpl public int next() throws IOException, XNIException { while (true) { try { - if(DEBUG_NEXT){ - System.out.println("NOW IN FragmentContentDriver"); - System.out.println("Entering the FragmentContentDriver with = " + getScannerStateName(fScannerState)); - } //decide the actual sub state of the scanner.For more information refer to the javadoc of //decideSubState. - switch (fScannerState) { - case SCANNER_STATE_CONTENT: { - final int ch = fEntityScanner.peekChar(); - if (ch == '<') { - fEntityScanner.scanChar(null); - setScannerState(SCANNER_STATE_START_OF_MARKUP); - } else if (ch == '&') { - fEntityScanner.scanChar(NameType.REFERENCE); - setScannerState(SCANNER_STATE_REFERENCE) ; //XMLEvent.ENTITY_REFERENCE ); //SCANNER_STATE_REFERENCE - break; - } else { - //element content is there.. - setScannerState(SCANNER_STATE_CHARACTER_DATA); - break; - } + if (fScannerState == SCANNER_STATE_CONTENT) { + final int ch = fEntityScanner.peekChar(); + if (ch == '<') { + fEntityScanner.scanChar(null); + setScannerState(SCANNER_STATE_START_OF_MARKUP); + } else if (ch == '&') { + fEntityScanner.scanChar(NameType.REFERENCE); + setScannerState(SCANNER_STATE_REFERENCE) ; + } else { + //element content is there.. + setScannerState(SCANNER_STATE_CHARACTER_DATA); } + } - case SCANNER_STATE_START_OF_MARKUP: { - startOfMarkup(); - break; - }//case: SCANNER_STATE_START_OF_MARKUP + if (fScannerState == SCANNER_STATE_START_OF_MARKUP) { + startOfMarkup(); + } - }//end of switch //decideSubState() ; //do some special handling if isCoalesce is set to true. - if(fIsCoalesce){ + if (fIsCoalesce) { fUsebuffer = true ; //if the last section was character data - if(fLastSectionWasCharacterData){ + if (fLastSectionWasCharacterData) { - //if we dont encounter any CDATA or ENTITY REFERENCE and current state is also not SCANNER_STATE_CHARACTER_DATA + //if we dont encounter any CDATA or ENTITY REFERENCE and + //current state is also not SCANNER_STATE_CHARACTER_DATA //return the last scanned charactrer data. - if((fScannerState != SCANNER_STATE_CDATA) && (fScannerState != SCANNER_STATE_REFERENCE) - && (fScannerState != SCANNER_STATE_CHARACTER_DATA)){ + if ((fScannerState != SCANNER_STATE_CDATA) + && (fScannerState != SCANNER_STATE_REFERENCE) + && (fScannerState != SCANNER_STATE_CHARACTER_DATA)) { fLastSectionWasCharacterData = false; return XMLEvent.CHARACTERS; } }//if last section was CDATA or ENTITY REFERENCE //xxx: there might be another entity reference or CDATA after this //blah blah &<blah blah - else if((fLastSectionWasCData || fLastSectionWasEntityReference)){ + else if ((fLastSectionWasCData || fLastSectionWasEntityReference)) { //and current state is not SCANNER_STATE_CHARACTER_DATA //or SCANNER_STATE_CDATA or SCANNER_STATE_REFERENCE //this means there is nothing more to be coalesced. //return the CHARACTERS event. - if((fScannerState != SCANNER_STATE_CDATA) && (fScannerState != SCANNER_STATE_REFERENCE) - && (fScannerState != SCANNER_STATE_CHARACTER_DATA)){ + if ((fScannerState != SCANNER_STATE_CDATA) + && (fScannerState != SCANNER_STATE_REFERENCE) + && (fScannerState != SCANNER_STATE_CHARACTER_DATA)){ fLastSectionWasCData = false; fLastSectionWasEntityReference = false; @@ -2774,11 +2695,6 @@ public class XMLDocumentFragmentScannerImpl } } - - if(DEBUG_NEXT){ - System.out.println("Actual scanner state set by decideSubState is = " + getScannerStateName(fScannerState)); - } - switch(fScannerState){ case XMLEvent.START_DOCUMENT : @@ -2786,7 +2702,6 @@ public class XMLDocumentFragmentScannerImpl case SCANNER_STATE_START_ELEMENT_TAG :{ - //xxx this function returns true when element is empty.. can be linked to end element event. //returns true if the element is empty fEmptyElement = scanStartElement() ; //if the element is empty the next event is "end element" @@ -2800,15 +2715,16 @@ public class XMLDocumentFragmentScannerImpl } case SCANNER_STATE_CHARACTER_DATA: { - if(DEBUG_COALESCE){ - System.out.println("fLastSectionWasCData = " + fLastSectionWasCData); - System.out.println("fIsCoalesce = " + fIsCoalesce); - } - //if last section was either entity reference or cdata or character data we should be using buffer - fUsebuffer = fLastSectionWasEntityReference || fLastSectionWasCData || fLastSectionWasCharacterData ; - //When coalesce is set to true and last state was REFERENCE or CDATA or CHARACTER_DATA, buffer should not be cleared. - if( fIsCoalesce && (fLastSectionWasEntityReference || fLastSectionWasCData || fLastSectionWasCharacterData) ){ + //if last section was either entity reference or cdata or + //character data we should be using buffer + fUsebuffer = fLastSectionWasEntityReference || fLastSectionWasCData + || fLastSectionWasCharacterData ; + + //When coalesce is set to true and last state was REFERENCE or + //CDATA or CHARACTER_DATA, buffer should not be cleared. + if( fIsCoalesce && (fLastSectionWasEntityReference || + fLastSectionWasCData || fLastSectionWasCharacterData) ){ fLastSectionWasEntityReference = false; fLastSectionWasCData = false; fLastSectionWasCharacterData = true ; @@ -2822,9 +2738,7 @@ public class XMLDocumentFragmentScannerImpl //scanContent sets the correct co-ordinates as per the content read fTempString.length = 0; int c = fEntityScanner.scanContent(fTempString); - if(DEBUG){ - System.out.println("fTempString = " + fTempString); - } + if(fEntityScanner.skipChar('<', null)){ //check if we have reached end of element if(fEntityScanner.skipChar('/', NameType.ELEMENTEND)){ @@ -2841,21 +2755,17 @@ public class XMLDocumentFragmentScannerImpl setScannerState(SCANNER_STATE_START_OF_MARKUP); //there can be cdata ahead if coalesce is true we should call again if(fIsCoalesce){ - fUsebuffer = true; fLastSectionWasCharacterData = true; - fContentBuffer.append(fTempString); - fTempString.length = 0; + bufferContent(); continue; } } - //in case last section was either entity reference or cdata or character data -- we should be using buffer + //in case last section was either entity reference or + //cdata or character data -- we should be using buffer if(fUsebuffer){ - fContentBuffer.append(fTempString); - fTempString.length = 0; - } - if(DEBUG){ - System.out.println("NOT USING THE BUFFER, STRING = " + fTempString.toString()); + bufferContent(); } + if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){ if(DEBUG)System.out.println("Return SPACE EVENT"); return XMLEvent.SPACE; @@ -2863,13 +2773,7 @@ public class XMLDocumentFragmentScannerImpl return XMLEvent.CHARACTERS; } else{ - fUsebuffer = true ; - if(DEBUG){ - System.out.println("fContentBuffer = " + fContentBuffer); - System.out.println("fTempString = " + fTempString); - } - fContentBuffer.append(fTempString); - fTempString.length = 0; + bufferContent(); } if (c == '\r') { if(DEBUG){ @@ -2969,7 +2873,8 @@ public class XMLDocumentFragmentScannerImpl setScannerState(SCANNER_STATE_CONTENT); //check the case when there is comment after single element document // and some comment after this - return (fMarkupDepth == 0 && elementDepthIsZeroHook() ) ? XMLEvent.END_ELEMENT : XMLEvent.END_ELEMENT ; + return (fMarkupDepth == 0 && elementDepthIsZeroHook() ) ? + XMLEvent.END_ELEMENT : XMLEvent.END_ELEMENT ; } else if(scanEndElement() == 0) { //It is last element of the document @@ -3093,7 +2998,8 @@ public class XMLDocumentFragmentScannerImpl if(fScannerState == SCANNER_STATE_REFERENCE){ setScannerState(SCANNER_STATE_CONTENT); - if (fReplaceEntityReferences && fEntityStore.isDeclaredEntity(fCurrentEntityName)) { + if (fReplaceEntityReferences && + fEntityStore.isDeclaredEntity(fCurrentEntityName)) { // Skip the entity reference, we don't care continue; } @@ -3126,7 +3032,8 @@ public class XMLDocumentFragmentScannerImpl fStringBuffer.append((char)fEntityScanner.scanChar(null)); } } - String target = fSymbolTable.addSymbol(fStringBuffer.ch, fStringBuffer.offset, fStringBuffer.length); + String target = fSymbolTable.addSymbol(fStringBuffer.ch, + fStringBuffer.offset, fStringBuffer.length); fContentBuffer.clear(); scanPIData(target, fContentBuffer); } @@ -3269,7 +3176,8 @@ public class XMLDocumentFragmentScannerImpl */ protected XMLString getString(){ - if(fAttributeCacheUsedCount < initialCacheCount || fAttributeCacheUsedCount < attributeValueCache.size()){ + if(fAttributeCacheUsedCount < initialCacheCount || + fAttributeCacheUsedCount < attributeValueCache.size()){ return attributeValueCache.get(fAttributeCacheUsedCount++); } else{ XMLString str = new XMLString(); @@ -3299,13 +3207,20 @@ public class XMLDocumentFragmentScannerImpl fAttributes.refresh(); } if(fScannerState == SCANNER_STATE_CHARACTER_DATA){ - //since fTempString directly matches to the underlying main buffer - //store the data into buffer - fContentBuffer.append(fTempString); - //clear the XMLString so that data can't be added again. - fTempString.length = 0; - fUsebuffer = true; + bufferContent(); } } + /** + * Since 'TempString' shares the buffer (a char array) with the CurrentEntity, + * when the cursor position reaches the end, that is, before the buffer is + * being loaded with new data, the content in the TempString needs to be + * copied into the ContentBuffer. + */ + private void bufferContent() { + fContentBuffer.append(fTempString); + //clear the XMLString so that data can't be added again. + fTempString.length = 0; + fUsebuffer = true; + } } // class XMLDocumentFragmentScannerImpl diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java index 1c7cc3d6407..1226fe319ff 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java @@ -733,9 +733,6 @@ public class XMLDocumentScannerImpl public int next() throws IOException, XNIException { - if(DEBUG_NEXT){ - System.out.println("NOW IN XMLDeclDriver"); - } // next driver is prolog regardless of whether there // is an XMLDecl in this document @@ -745,7 +742,7 @@ public class XMLDocumentScannerImpl //System.out.println("fEntityScanner = " + fEntityScanner); // scan XMLDecl try { - if (fEntityScanner.skipString(xmlDecl)) { + if (fEntityScanner.skipString(XMLDECL)) { if (fEntityScanner.peekChar() == ' ') { fMarkupDepth++; scanXMLDeclOrTextDecl(false); @@ -797,11 +794,7 @@ public class XMLDocumentScannerImpl */ public int next() throws IOException, XNIException { - //System.out.println("here in next"); - if(DEBUG_NEXT){ - System.out.println("NOW IN PrologDriver"); - } try { do { switch (fScannerState) { @@ -1014,17 +1007,9 @@ public class XMLDocumentScannerImpl // public int next() throws IOException, XNIException{ - // throw new XNIException("DTD Parsing is currently not supported"); - if(DEBUG_NEXT){ - System.out.println("Now in DTD Driver"); - } dispatch(true); - if(DEBUG_NEXT){ - System.out.println("After calling dispatch(true) -- At this point whole DTD is read."); - } - //xxx: remove this hack and align this with reusing DTD components //currently this routine will only be executed from Stax if(fPropertyManager != null){ @@ -1380,10 +1365,9 @@ public class XMLDocumentScannerImpl break; } } - }while(fScannerState == SCANNER_STATE_START_OF_MARKUP || fScannerState == SCANNER_STATE_TRAILING_MISC); - if(DEBUG_NEXT){ - System.out.println("State set by deciding while loop [TrailingMiscellaneous] is = " + getScannerStateName(fScannerState)); - } + } while(fScannerState == SCANNER_STATE_START_OF_MARKUP || + fScannerState == SCANNER_STATE_TRAILING_MISC); + switch (fScannerState){ case SCANNER_STATE_PI: { fContentBuffer.clear(); diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java index eb16a26a85d..2cf99ab4cf6 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java @@ -967,7 +967,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { */ public void setEntityHandler(com.sun.org.apache.xerces.internal.impl.XMLEntityHandler entityHandler) { - fEntityHandler = (XMLEntityHandler) entityHandler; + fEntityHandler = entityHandler; } // setEntityHandler(XMLEntityHandler) //this function returns StaxXMLInputSource @@ -1266,11 +1266,11 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { for (int i = size; i >= 0; i--) { Entity activeEntity = i == size ? fCurrentEntity - : (Entity)fEntityStack.elementAt(i); + : fEntityStack.elementAt(i); if (activeEntity.name == entityName) { String path = entityName; for (int j = i + 1; j < size; j++) { - activeEntity = (Entity)fEntityStack.elementAt(j); + activeEntity = fEntityStack.elementAt(j); path = path + " -> " + activeEntity.name; } path = path + " -> " + fCurrentEntity.name; @@ -1704,7 +1704,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * are recognized by this component. */ public String[] getRecognizedFeatures() { - return (String[])(RECOGNIZED_FEATURES.clone()); + return RECOGNIZED_FEATURES.clone(); } // getRecognizedFeatures():String[] /** @@ -1824,7 +1824,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * are recognized by this component. */ public String[] getRecognizedProperties() { - return (String[])(RECOGNIZED_PROPERTIES.clone()); + return RECOGNIZED_PROPERTIES.clone(); } // getRecognizedProperties():String[] /** * Returns the default state for a feature, or null if this @@ -2952,7 +2952,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { public CharacterBuffer getBuffer(boolean external) { if (external) { if (fExternalTop > -1) { - return (CharacterBuffer)fExternalBufferPool[fExternalTop--]; + return fExternalBufferPool[fExternalTop--]; } else { return new CharacterBuffer(true, fExternalBufferSize); @@ -2960,7 +2960,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } else { if (fInternalTop > -1) { - return (CharacterBuffer)fInternalBufferPool[fInternalTop--]; + return fInternalBufferPool[fInternalTop--]; } else { return new CharacterBuffer(false, fInternalBufferSize); diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java index 9b961b31040..d937f53c6a0 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java @@ -25,42 +25,44 @@ package com.sun.org.apache.xerces.internal.impl; +import com.sun.org.apache.xerces.internal.util.NamespaceContextWrapper; +import com.sun.org.apache.xerces.internal.util.NamespaceSupport; +import com.sun.org.apache.xerces.internal.util.SymbolTable; +import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl; +import com.sun.org.apache.xerces.internal.util.XMLChar; +import com.sun.org.apache.xerces.internal.util.XMLStringBuffer; +import com.sun.org.apache.xerces.internal.xni.XNIException; +import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource; import com.sun.xml.internal.stream.Entity; import com.sun.xml.internal.stream.StaxErrorReporter; import com.sun.xml.internal.stream.XMLEntityStorage; +import com.sun.xml.internal.stream.dtd.nonvalidating.DTDGrammar; +import com.sun.xml.internal.stream.dtd.nonvalidating.XMLNotationDecl; import com.sun.xml.internal.stream.events.EntityDeclarationImpl; import com.sun.xml.internal.stream.events.NotationDeclarationImpl; -import javax.xml.namespace.NamespaceContext; -import com.sun.org.apache.xerces.internal.xni.XNIException; -import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource; -import javax.xml.XMLConstants; -import javax.xml.namespace.QName; -import javax.xml.stream.Location; -import javax.xml.stream.events.XMLEvent; -import com.sun.org.apache.xerces.internal.util.NamespaceContextWrapper; -import com.sun.org.apache.xerces.internal.util.SymbolTable; -import com.sun.xml.internal.stream.dtd.nonvalidating.XMLNotationDecl; -import com.sun.xml.internal.stream.dtd.nonvalidating.DTDGrammar; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.xml.XMLConstants; +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.stream.Location; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -import com.sun.org.apache.xerces.internal.util.XMLChar; -import com.sun.org.apache.xerces.internal.util.XMLStringBuffer; -import com.sun.org.apache.xerces.internal.util.NamespaceSupport; -import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl; +import javax.xml.stream.events.EntityDeclaration; +import javax.xml.stream.events.NotationDeclaration; +import javax.xml.stream.events.XMLEvent; -/** This class implements javax.xml.stream.XMLStreamReader. It makes use of XML*Scanner classes to - * derive most of its functionality. If desired, Application can reuse this instance by calling - * reset() and setInputSource(). +/** + * This class implements javax.xml.stream.XMLStreamReader. It makes use of + * XML*Scanner classes to derive most of its functionality. If desired, + * Application can reuse this instance by calling reset() and setInputSource(). * * @author Neeraj Bajaj Sun Microsystems,Inc. * @author K.Venugopal Sun Microsystems,Inc. @@ -68,49 +70,68 @@ import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl; */ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { - /** Property identifier: entity manager. */ - protected static final String ENTITY_MANAGER = - Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY; + /** + * Property identifier: entity manager. + */ + protected static final String ENTITY_MANAGER + = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY; - /** Property identifier: Error Reporter. */ - protected static final String ERROR_REPORTER = - Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY; + /** + * Property identifier: Error Reporter. + */ + protected static final String ERROR_REPORTER + = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY; - /** Property identifier: Symbol table. */ - protected static final String SYMBOL_TABLE = - Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; + /** + * Property identifier: Symbol table. + */ + protected static final String SYMBOL_TABLE + = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; - protected static final String READER_IN_DEFINED_STATE = - Constants.READER_IN_DEFINED_STATE; + protected static final String READER_IN_DEFINED_STATE + = Constants.READER_IN_DEFINED_STATE; private SymbolTable fSymbolTable = new SymbolTable(); - /** Document scanner. */ + /** + * Document scanner. + */ protected XMLDocumentScannerImpl fScanner = new XMLNSDocumentScannerImpl(); - //make Global NamespaceContextWrapper object, fScanner.getNamespaceContext() is dynamic object and ita value changes - //as per the state of the parser. - protected NamespaceContextWrapper fNamespaceContextWrapper = new NamespaceContextWrapper((NamespaceSupport)fScanner.getNamespaceContext()) ; + //make Global NamespaceContextWrapper object, fScanner.getNamespaceContext() + //is dynamic object and ita value changes as per the state of the parser. + protected NamespaceContextWrapper fNamespaceContextWrapper = + new NamespaceContextWrapper((NamespaceSupport) fScanner.getNamespaceContext()); protected XMLEntityManager fEntityManager = new XMLEntityManager(); protected StaxErrorReporter fErrorReporter = new StaxErrorReporter(); - - /** Entity scanner, this alwasy works on last entity that was opened. */ + /** + * Entity scanner, this alwasy works on last entity that was opened. + */ protected XMLEntityScanner fEntityScanner = null; - /** Input Source */ + /** + * Input Source + */ protected XMLInputSource fInputSource = null; - /** Store properties*/ - protected PropertyManager fPropertyManager = null ; + /** + * Store properties + */ + protected PropertyManager fPropertyManager = null; - /** current event type */ - private int fEventType ; - /** debug flag*/ - static final boolean DEBUG = false ; - /** more to scan */ + /** + * current event type + */ + private int fEventType; + /** + * debug flag + */ + static final boolean DEBUG = false; + /** + * more to scan + */ private boolean fReuse = true; - private boolean fReaderInDefinedState = true ; - private boolean fBindNamespaces = true; + private boolean fReaderInDefinedState = true; private String fDTDDecl = null; private String versionStr = null; @@ -119,24 +140,25 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @param props * @throws XMLStreamException */ - public XMLStreamReaderImpl(InputStream inputStream, PropertyManager props) throws XMLStreamException { + public XMLStreamReaderImpl(InputStream inputStream, PropertyManager props) throws XMLStreamException { init(props); //publicId, systemid, baseSystemId, inputStream, enocding - XMLInputSource inputSource = new XMLInputSource(null,null,null,inputStream,null); + XMLInputSource inputSource = new XMLInputSource(null, null, null, inputStream, null); //pass the input source to document scanner impl. setInputSource(inputSource); } - public XMLDocumentScannerImpl getScanner(){ + public XMLDocumentScannerImpl getScanner() { System.out.println("returning scanner"); return fScanner; } + /** * @param systemid * @param props * @throws XMLStreamException */ - public XMLStreamReaderImpl(String systemid, PropertyManager props) throws XMLStreamException { + public XMLStreamReaderImpl(String systemid, PropertyManager props) throws XMLStreamException { init(props); //publicId, systemid, baseSystemId, inputStream, enocding XMLInputSource inputSource = new XMLInputSource(null, systemid, null, false); @@ -144,17 +166,18 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { setInputSource(inputSource); } - /** * @param inputStream * @param encoding * @param props * @throws XMLStreamException */ - public XMLStreamReaderImpl(InputStream inputStream, String encoding, PropertyManager props ) throws XMLStreamException { + public XMLStreamReaderImpl(InputStream inputStream, String encoding, PropertyManager props) + throws XMLStreamException { init(props); //publicId, systemid, baseSystemId, inputStream, enocding - XMLInputSource inputSource = new XMLInputSource(null,null,null, new BufferedInputStream(inputStream),encoding ); + XMLInputSource inputSource = new XMLInputSource(null, null, null, + new BufferedInputStream(inputStream), encoding); //pass the input source to document scanner impl. setInputSource(inputSource); } @@ -164,11 +187,13 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @param props * @throws XMLStreamException */ - public XMLStreamReaderImpl(Reader reader, PropertyManager props) throws XMLStreamException { + public XMLStreamReaderImpl(Reader reader, PropertyManager props) + throws XMLStreamException { init(props); //publicId, systemid, baseSystemId, inputStream, enocding //xxx: Using buffered reader - XMLInputSource inputSource = new XMLInputSource(null,null,null,new BufferedReader(reader),null); + XMLInputSource inputSource = new XMLInputSource(null, null, null, + new BufferedReader(reader), null); //pass the input source to document scanner impl. setInputSource(inputSource); } @@ -178,7 +203,8 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @param props * @throws XMLStreamException */ - public XMLStreamReaderImpl(XMLInputSource inputSource, PropertyManager props) throws XMLStreamException { + public XMLStreamReaderImpl(XMLInputSource inputSource, PropertyManager props) + throws XMLStreamException { init(props); //pass the input source to document scanner impl. setInputSource(inputSource); @@ -188,34 +214,36 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @param inputSource * @throws XMLStreamException */ - public void setInputSource(XMLInputSource inputSource ) throws XMLStreamException { + public final void setInputSource(XMLInputSource inputSource) throws XMLStreamException { //once setInputSource() is called this instance is busy parsing the inputsource supplied //this instances is free for reuse if parser has reached END_DOCUMENT state or application has //called close() fReuse = false; - try{ + try { - fScanner.setInputSource(inputSource) ; + fScanner.setInputSource(inputSource); //XMLStreamReader should be in defined state - if(fReaderInDefinedState){ + if (fReaderInDefinedState) { fEventType = fScanner.next(); - if (versionStr == null) + if (versionStr == null) { versionStr = getVersion(); + } - if (fEventType == XMLStreamConstants.START_DOCUMENT && versionStr != null && versionStr.equals("1.1")){ + if (fEventType == XMLStreamConstants.START_DOCUMENT && versionStr != null + && versionStr.equals("1.1")) { switchToXML11Scanner(); } } - }catch(java.io.IOException ex){ + } catch (java.io.IOException ex) { throw new XMLStreamException(ex); - } catch(XNIException ex){ //Issue 56 XNIException not caught + } catch (XNIException ex) { //Issue 56 XNIException not caught throw new XMLStreamException(ex.getMessage(), getLocation(), ex.getException()); } }//setInputSource - void init(PropertyManager propertyManager) throws XMLStreamException { + final void init(PropertyManager propertyManager) throws XMLStreamException { fPropertyManager = propertyManager; //set Stax internal properties -- Note that these instances are being created in XMLReaderImpl. //1.SymbolTable @@ -223,23 +251,23 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { //3.XMLEntityManager //4. call reset() //1. - propertyManager.setProperty(SYMBOL_TABLE, fSymbolTable ) ; + propertyManager.setProperty(SYMBOL_TABLE, fSymbolTable); //2. - propertyManager.setProperty(ERROR_REPORTER, fErrorReporter ) ; + propertyManager.setProperty(ERROR_REPORTER, fErrorReporter); //3. propertyManager.setProperty(ENTITY_MANAGER, fEntityManager); //4. reset(); } - /** This function tells if this instances is available for reuse. - * One must call reset() and setInputSource() to be able to reuse - * this instance. + /** + * This function tells if this instances is available for reuse. One must + * call reset() and setInputSource() to be able to reuse this instance. */ - public boolean canReuse(){ - if(DEBUG){ + public boolean canReuse() { + if (DEBUG) { System.out.println("fReuse = " + fReuse); - System.out.println("fEventType = " + getEventTypeString(fEventType) ); + System.out.println("fEventType = " + getEventTypeString(fEventType)); } //when parsing begins, fReuse is set to false //fReuse is set to 'true' when application calls close() @@ -249,9 +277,9 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { /** * Resets this instance so that this instance is ready for reuse. */ - public void reset(){ + public void reset() { fReuse = true; - fEventType = 0 ; + fEventType = 0; //reset entity manager fEntityManager.reset(fPropertyManager); //reset the scanner @@ -259,26 +287,30 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { //REVISIT:this is too ugly -- we are getting XMLEntityManager and XMLEntityReader from //property manager, it should be only XMLEntityManager fDTDDecl = null; - fEntityScanner = (XMLEntityScanner)fEntityManager.getEntityScanner() ; - //default value for this property is true. However, this should be false when using XMLEventReader... Ugh.. - //because XMLEventReader should not have defined state. - fReaderInDefinedState = ((Boolean)fPropertyManager.getProperty(READER_IN_DEFINED_STATE)).booleanValue(); - fBindNamespaces = ((Boolean)fPropertyManager.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue(); + fEntityScanner = fEntityManager.getEntityScanner(); + //default value for this property is true. However, this should be false + //when using XMLEventReader, because XMLEventReader should not have defined state. + fReaderInDefinedState = ((Boolean) fPropertyManager.getProperty(READER_IN_DEFINED_STATE)); versionStr = null; } - - /** Frees any resources associated with this Reader. This method does not close the underlying input source. - * @throws XMLStreamException if there are errors freeing associated resources + /** + * Frees any resources associated with this Reader. This method does not + * close the underlying input source. + * + * @throws XMLStreamException if there are errors freeing associated + * resources */ public void close() throws XMLStreamException { //xxx: Check what this function is intended to do. //reset(); - fReuse = true ; + fReuse = true; } - - /** Returns the character encoding declared on the xml declaration Returns null if none was declared + /** + * Returns the character encoding declared on the xml declaration Returns + * null if none was declared + * * @return the encoding declared in the document or null */ public String getCharacterEncodingScheme() { @@ -286,7 +318,6 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { } - /** * @return */ @@ -294,37 +325,45 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return fEntityScanner.getColumnNumber(); }//getColumnNumber - /** Return input encoding if known or null if unknown. + /** + * Return input encoding if known or null if unknown. + * * @return the encoding of this instance or null */ public String getEncoding() { return fEntityScanner.getEncoding(); }//getEncoding - /** Returns the current value of the parse event as a string, this returns the string value of a CHARACTERS event, returns the value of a COMMENT, the replacement value for an ENTITY_REFERENCE, the string value of a CDATA section, the string value for a SPACE event, or the String value of the internal subset of the DTD. If an ENTITY_REFERENCE has been resolved, any character data will be reported as CHARACTERS events. + /** + * Returns the current value of the parse event as a string, this returns + * the string value of a CHARACTERS event, returns the value of a COMMENT, + * the replacement value for an ENTITY_REFERENCE, the string value of a + * CDATA section, the string value for a SPACE event, or the String value of + * the internal subset of the DTD. If an ENTITY_REFERENCE has been resolved, + * any character data will be reported as CHARACTERS events. + * * @return the current text or null */ public int getEventType() { - return fEventType ; + return fEventType; }//getEventType /** * @return */ public int getLineNumber() { - return fEntityScanner.getLineNumber() ; + return fEntityScanner.getLineNumber(); }//getLineNumber public String getLocalName() { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT){ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { //xxx check whats the value of fCurrentElement - return fScanner.getElementQName().localpart ; - } - else if(fEventType == XMLEvent.ENTITY_REFERENCE){ + return fScanner.getElementQName().localpart; + } else if (fEventType == XMLEvent.ENTITY_REFERENCE) { return fScanner.getEntityName(); } - throw new IllegalStateException("Method getLocalName() cannot be called for " + - getEventTypeString(fEventType) + " event."); + throw new IllegalStateException("Method getLocalName() cannot be called for " + + getEventTypeString(fEventType) + " event."); }//getLocalName() /** @@ -332,115 +371,119 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { */ public String getNamespaceURI() { //doesn't take care of Attribute as separte event - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT){ - return fScanner.getElementQName().uri ; + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { + return fScanner.getElementQName().uri; } - return null ; + return null; }//getNamespaceURI - /** Get the data section of a processing instruction + /** + * Get the data section of a processing instruction + * * @return the data or null */ - public String getPIData() { - if( fEventType == XMLEvent.PROCESSING_INSTRUCTION){ + if (fEventType == XMLEvent.PROCESSING_INSTRUCTION) { return fScanner.getPIData().toString(); + } else { + throw new java.lang.IllegalStateException("Current state of the parser is " + getEventTypeString(fEventType) + + " But Expected state is " + XMLEvent.PROCESSING_INSTRUCTION); } - else throw new java.lang.IllegalStateException("Current state of the parser is " + getEventTypeString(fEventType) + - " But Expected state is " + XMLEvent.PROCESSING_INSTRUCTION ) ; }//getPIData - - /** Get the target of a processing instruction + /** + * Get the target of a processing instruction + * * @return the target or null */ public String getPITarget() { - if( fEventType == XMLEvent.PROCESSING_INSTRUCTION){ + if (fEventType == XMLEvent.PROCESSING_INSTRUCTION) { return fScanner.getPITarget(); + } else { + throw new java.lang.IllegalStateException("Current state of the parser is " + getEventTypeString(fEventType) + + " But Expected state is " + XMLEvent.PROCESSING_INSTRUCTION); } - else throw new java.lang.IllegalStateException("Current state of the parser is " + getEventTypeString(fEventType) + - " But Expected state is " + XMLEvent.PROCESSING_INSTRUCTION ) ; }//getPITarget - /** - * @return the prefix of the current event, or null if the event does - * not have a prefix. For START_ELEMENT and END_ELEMENT, return - * XMLConstants.DEFAULT_NS_PREFIX when no prefix is available. - */ + * @return the prefix of the current event, or null if the event does not + * have a prefix. For START_ELEMENT and END_ELEMENT, return + * XMLConstants.DEFAULT_NS_PREFIX when no prefix is available. + */ public String getPrefix() { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT){ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { String prefix = fScanner.getElementQName().prefix; return prefix == null ? XMLConstants.DEFAULT_NS_PREFIX : prefix; } - return null ; + return null; }//getPrefix() - - /** * @return */ public char[] getTextCharacters() { - if( fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT - || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE){ - return fScanner.getCharacterData().ch; - } else{ - throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " - + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) - + " , " + getEventTypeString(XMLEvent.SPACE) +" valid for getTextCharacters() " ) ; - } + if (fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT + || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE) { + return fScanner.getCharacterData().ch; + } else { + throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) + + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " + + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) + + " , " + getEventTypeString(XMLEvent.SPACE) + " valid for getTextCharacters() "); + } } /** * @return */ public int getTextLength() { - if( fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT - || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE){ - return fScanner.getCharacterData().length; - } else{ - throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " - + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) - + " , " + getEventTypeString(XMLEvent.SPACE) +" valid for getTextLength() " ) ; - } + if (fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT + || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE) { + return fScanner.getCharacterData().length; + } else { + throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) + + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " + + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) + + " , " + getEventTypeString(XMLEvent.SPACE) + " valid for getTextLength() "); + } - } + } /** * @return */ public int getTextStart() { - if( fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE){ - return fScanner.getCharacterData().offset; - } else{ - throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " - + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) - + " , " + getEventTypeString(XMLEvent.SPACE) +" valid for getTextStart() " ) ; - } + if (fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT + || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE) { + return fScanner.getCharacterData().offset; + } else { + throw new IllegalStateException("Current state = " + getEventTypeString(fEventType) + + " is not among the states " + getEventTypeString(XMLEvent.CHARACTERS) + " , " + + getEventTypeString(XMLEvent.COMMENT) + " , " + getEventTypeString(XMLEvent.CDATA) + + " , " + getEventTypeString(XMLEvent.SPACE) + " valid for getTextStart() "); + } } /** * @return */ public String getValue() { - if(fEventType == XMLEvent.PROCESSING_INSTRUCTION){ + if (fEventType == XMLEvent.PROCESSING_INSTRUCTION) { return fScanner.getPIData().toString(); - } else if(fEventType == XMLEvent.COMMENT){ + } else if (fEventType == XMLEvent.COMMENT) { return fScanner.getComment(); - } else if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT){ - return fScanner.getElementQName().localpart ; - } else if(fEventType == XMLEvent.CHARACTERS){ + } else if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { + return fScanner.getElementQName().localpart; + } else if (fEventType == XMLEvent.CHARACTERS) { return fScanner.getCharacterData().toString(); } return null; }//getValue() - /** Get the XML language version of the current document being parsed */ + /** + * Get the XML language version of the current document being parsed + */ public String getVersion() { //apply SAP's patch: the default version in the scanner was set to 1.0 because of DOM and SAX //so this patch is a workaround of the difference between StAX and DOM @@ -455,14 +498,16 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @return */ public boolean hasAttributes() { - return fScanner.getAttributeIterator().getLength() > 0 ? true : false ; + return fScanner.getAttributeIterator().getLength() > 0 ? true : false; } - /** this Funtion returns true if the current event has name */ + /** + * this Funtion returns true if the current event has name + */ public boolean hasName() { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { return true; - } else { + } else { return false; } }//hasName() @@ -473,7 +518,9 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { */ public boolean hasNext() throws XMLStreamException { //the scanner returns -1 when it detects a broken stream - if (fEventType == -1) return false; + if (fEventType == -1) { + return false; + } //we can check in scanners if the scanner state is not set to //terminating, we still have more events. return fEventType != XMLEvent.END_DOCUMENT; @@ -483,9 +530,9 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * @return */ public boolean hasValue() { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT - || fEventType == XMLEvent.ENTITY_REFERENCE || fEventType == XMLEvent.PROCESSING_INSTRUCTION - || fEventType == XMLEvent.COMMENT || fEventType == XMLEvent.CHARACTERS) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT + || fEventType == XMLEvent.ENTITY_REFERENCE || fEventType == XMLEvent.PROCESSING_INSTRUCTION + || fEventType == XMLEvent.COMMENT || fEventType == XMLEvent.CHARACTERS) { return true; } else { return false; @@ -515,18 +562,19 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { } /** - * Returns true if the cursor points to a character data event that consists of all whitespace - * Application calling this method needs to cache the value and avoid calling this method again - * for the same event. + * Returns true if the cursor points to a character data event that consists + * of all whitespace Application calling this method needs to cache the + * value and avoid calling this method again for the same event. + * * @return */ public boolean isWhiteSpace() { - if(isCharacters() || (fEventType == XMLStreamConstants.CDATA)){ - char [] ch = this.getTextCharacters(); + if (isCharacters() || (fEventType == XMLStreamConstants.CDATA)) { + char[] ch = this.getTextCharacters(); final int start = this.getTextStart(); final int end = start + this.getTextLength(); - for (int i = start; i < end; i++){ - if(!XMLChar.isSpace(ch[i])){ + for (int i = start; i < end; i++) { + if (!XMLChar.isSpace(ch[i])) { return false; } } @@ -535,18 +583,18 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return false; } - - /** * @throws XMLStreamException * @return */ public int next() throws XMLStreamException { - if( !hasNext() ) { + if (!hasNext()) { if (fEventType != -1) { - throw new java.util.NoSuchElementException( "END_DOCUMENT reached: no more elements on the stream." ); + throw new java.util.NoSuchElementException( + "END_DOCUMENT reached: no more elements on the stream."); } else { - throw new XMLStreamException( "Error processing input source. The input stream is not complete." ); + throw new XMLStreamException( + "Error processing input source. The input stream is not complete."); } } try { @@ -566,14 +614,14 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { } catch (IOException ex) { // if this error occured trying to resolve the external DTD subset // and IS_VALIDATING == false, then this is not an XML error - if (fScanner.fScannerState == fScanner.SCANNER_STATE_DTD_EXTERNAL) { + if (fScanner.fScannerState == XMLDocumentScannerImpl.SCANNER_STATE_DTD_EXTERNAL) { Boolean isValidating = (Boolean) fPropertyManager.getProperty( XMLInputFactory.IS_VALIDATING); if (isValidating != null && !isValidating.booleanValue()) { // ignore the error, set scanner to known state fEventType = XMLEvent.DTD; - fScanner.setScannerState(fScanner.SCANNER_STATE_PROLOG); + fScanner.setScannerState(XMLDocumentScannerImpl.SCANNER_STATE_PROLOG); fScanner.setDriver(fScanner.fPrologDriver); if (fDTDDecl == null || fDTDDecl.length() == 0) { @@ -597,10 +645,11 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { } } //next() - private void switchToXML11Scanner() throws IOException{ + private void switchToXML11Scanner() throws IOException { int oldEntityDepth = fScanner.fEntityDepth; - com.sun.org.apache.xerces.internal.xni.NamespaceContext oldNamespaceContext = fScanner.fNamespaceContext; + com.sun.org.apache.xerces.internal.xni.NamespaceContext oldNamespaceContext + = fScanner.fNamespaceContext; fScanner = new XML11NSDocumentScannerImpl(); @@ -617,10 +666,8 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { fEventType = fScanner.next(); } - - final static String getEventTypeString(int eventType) { - switch (eventType){ + switch (eventType) { case XMLEvent.START_ELEMENT: return "START_ELEMENT"; case XMLEvent.END_ELEMENT: @@ -649,10 +696,11 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return "UNKNOWN_EVENT_TYPE, " + String.valueOf(eventType); } - /** Returns the count of attributes on this START_ELEMENT, - * this method is only valid on a START_ELEMENT or ATTRIBUTE. This - * count excludes namespace definitions. Attribute indices are - * zero-based. + /** + * Returns the count of attributes on this START_ELEMENT, this method is + * only valid on a START_ELEMENT or ATTRIBUTE. This count excludes namespace + * definitions. Attribute indices are zero-based. + * * @return returns the number of attributes * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ @@ -661,31 +709,32 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { //does length includes namespace declarations ? //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { - return fScanner.getAttributeIterator().getLength() ; - } else{ - throw new java.lang.IllegalStateException( "Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeCount()") ; + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + return fScanner.getAttributeIterator().getLength(); + } else { + throw new java.lang.IllegalStateException("Current state is not among the states " + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeCount()"); } }//getAttributeCount - /** Returns the localName of the attribute at the provided - * index + /** + * Returns the localName of the attribute at the provided index + * * @param index the position of the attribute * @return the localName of the attribute * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public QName getAttributeName(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { - return convertXNIQNametoJavaxQName(fScanner.getAttributeIterator().getQualifiedName(index)) ; - } else{ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + return convertXNIQNametoJavaxQName(fScanner.getAttributeIterator().getQualifiedName(index)); + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeName()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeName()"); } }//getAttributeName @@ -695,51 +744,54 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { */ public String getAttributeLocalName(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { - return fScanner.getAttributeIterator().getLocalName(index) ; - } else{ - throw new java.lang.IllegalStateException() ; + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + return fScanner.getAttributeIterator().getLocalName(index); + } else { + throw new java.lang.IllegalStateException(); } }//getAttributeName - /** Returns the namespace of the attribute at the provided - * index + /** + * Returns the namespace of the attribute at the provided index + * * @param index the position of the attribute * @return the namespace URI (can be null) * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public String getAttributeNamespace(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { return fScanner.getAttributeIterator().getURI(index); - } else{ + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeNamespace()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeNamespace()"); } }//getAttributeNamespace - /** Returns the prefix of this attribute at the - * provided index + /** + * Returns the prefix of this attribute at the provided index + * * @param index the position of the attribute * @return the prefix of the attribute * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public String getAttributePrefix(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { return fScanner.getAttributeIterator().getPrefix(index); - } else{ + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributePrefix()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributePrefix()"); } }//getAttributePrefix - /** Returns the qname of the attribute at the provided index + /** + * Returns the qname of the attribute at the provided index * * @param index the position of the attribute * @return the QName of the attribute @@ -747,53 +799,55 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { */ public javax.xml.namespace.QName getAttributeQName(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { // create new object at runtime.. - String localName = fScanner.getAttributeIterator().getLocalName(index) ; - String uri = fScanner.getAttributeIterator().getURI(index) ; - return new javax.xml.namespace.QName(uri, localName) ; - } else{ + String localName = fScanner.getAttributeIterator().getLocalName(index); + String uri = fScanner.getAttributeIterator().getURI(index); + return new javax.xml.namespace.QName(uri, localName); + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeQName()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeQName()"); } }//getAttributeQName - /** Returns the XML type of the attribute at the provided - * index + /** + * Returns the XML type of the attribute at the provided index + * * @param index the position of the attribute * @return the XML type of the attribute * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public String getAttributeType(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { - return fScanner.getAttributeIterator().getType(index) ; - } else{ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + return fScanner.getAttributeIterator().getType(index); + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeType()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeType()"); } }//getAttributeType - /** Returns the value of the attribute at the - * index + /** + * Returns the value of the attribute at the index + * * @param index the position of the attribute * @return the attribute value * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public String getAttributeValue(int index) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { - return fScanner.getAttributeIterator().getValue(index) ; - } else{ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + return fScanner.getAttributeIterator().getValue(index); + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeValue()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeValue()"); } }//getAttributeValue @@ -805,67 +859,69 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { */ public String getAttributeValue(String namespaceURI, String localName) { //State should be either START_ELEMENT or ATTRIBUTE - if( fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.ATTRIBUTE) { XMLAttributesImpl attributes = fScanner.getAttributeIterator(); if (namespaceURI == null) { //sjsxp issue 70 - return attributes.getValue(attributes.getIndexByLocalName(localName)) ; + return attributes.getValue(attributes.getIndexByLocalName(localName)); } else { return fScanner.getAttributeIterator().getValue( - namespaceURI.length() == 0 ? null : namespaceURI, localName) ; + namespaceURI.length() == 0 ? null : namespaceURI, localName); } - } else{ + } else { throw new java.lang.IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for getAttributeValue()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for getAttributeValue()"); } } - /** Reads the content of a text-only element. Precondition: - * the current event is START_ELEMENT. Postcondition: - * The current event is the corresponding END_ELEMENT. - * @throws XMLStreamException if the current event is not a START_ELEMENT or if - * a non text element is encountered + /** + * Reads the content of a text-only element. Precondition: the current event + * is START_ELEMENT. Postcondition: The current event is the corresponding + * END_ELEMENT. + * + * @throws XMLStreamException if the current event is not a START_ELEMENT or + * if a non text element is encountered */ public String getElementText() throws XMLStreamException { - if(getEventType() != XMLStreamConstants.START_ELEMENT) { + if (getEventType() != XMLStreamConstants.START_ELEMENT) { throw new XMLStreamException( - "parser must be on START_ELEMENT to read next text", getLocation()); + "parser must be on START_ELEMENT to read next text", getLocation()); } int eventType = next(); - StringBuffer content = new StringBuffer(); - while(eventType != XMLStreamConstants.END_ELEMENT ) { - if(eventType == XMLStreamConstants.CHARACTERS - || eventType == XMLStreamConstants.CDATA - || eventType == XMLStreamConstants.SPACE - || eventType == XMLStreamConstants.ENTITY_REFERENCE) { + StringBuilder content = new StringBuilder(); + while (eventType != XMLStreamConstants.END_ELEMENT) { + if (eventType == XMLStreamConstants.CHARACTERS + || eventType == XMLStreamConstants.CDATA + || eventType == XMLStreamConstants.SPACE + || eventType == XMLStreamConstants.ENTITY_REFERENCE) { content.append(getText()); - } else if(eventType == XMLStreamConstants.PROCESSING_INSTRUCTION - || eventType == XMLStreamConstants.COMMENT) { + } else if (eventType == XMLStreamConstants.PROCESSING_INSTRUCTION + || eventType == XMLStreamConstants.COMMENT) { // skipping - } else if(eventType == XMLStreamConstants.END_DOCUMENT) { - throw new XMLStreamException("unexpected end of document when reading element text content"); - } else if(eventType == XMLStreamConstants.START_ELEMENT) { + } else if (eventType == XMLStreamConstants.END_DOCUMENT) { throw new XMLStreamException( - "elementGetText() function expects text only elment but START_ELEMENT was encountered.", getLocation()); + "unexpected end of document when reading element text content"); + } else if (eventType == XMLStreamConstants.START_ELEMENT) { + throw new XMLStreamException("elementGetText() function expects text " + + "only elment but START_ELEMENT was encountered.", getLocation()); } else { throw new XMLStreamException( - "Unexpected event type "+ eventType, getLocation()); + "Unexpected event type " + eventType, getLocation()); } eventType = next(); } return content.toString(); } - /** Return the current location of the processor. - * If the Location is unknown the processor should return - * an implementation of Location that returns -1 for the - * location and null for the publicId and systemId. - * The location information is only valid until next() is - * called. + /** + * Return the current location of the processor. If the Location is unknown + * the processor should return an implementation of Location that returns -1 + * for the location and null for the publicId and systemId. The location + * information is only valid until next() is called. */ public Location getLocation() { return new Location() { @@ -874,11 +930,12 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { int _offset = fEntityScanner.getCharacterOffset(); int _columnNumber = fEntityScanner.getColumnNumber(); int _lineNumber = fEntityScanner.getLineNumber(); - public String getLocationURI(){ + + public String getLocationURI() { return _systemId; } - public int getCharacterOffset(){ + public int getCharacterOffset() { return _offset; } @@ -886,224 +943,256 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return _columnNumber; } - public int getLineNumber(){ + public int getLineNumber() { return _lineNumber; } - public String getPublicId(){ + public String getPublicId() { return _publicId; } - public String getSystemId(){ + public String getSystemId() { return _systemId; } - public String toString(){ - StringBuffer sbuffer = new StringBuffer() ; + public String toString() { + StringBuilder sbuffer = new StringBuilder(); sbuffer.append("Line number = " + getLineNumber()); - sbuffer.append("\n") ; + sbuffer.append("\n"); sbuffer.append("Column number = " + getColumnNumber()); - sbuffer.append("\n") ; + sbuffer.append("\n"); sbuffer.append("System Id = " + getSystemId()); - sbuffer.append("\n") ; + sbuffer.append("\n"); sbuffer.append("Public Id = " + getPublicId()); - sbuffer.append("\n") ; + sbuffer.append("\n"); sbuffer.append("Location Uri= " + getLocationURI()); - sbuffer.append("\n") ; + sbuffer.append("\n"); sbuffer.append("CharacterOffset = " + getCharacterOffset()); - sbuffer.append("\n") ; + sbuffer.append("\n"); return sbuffer.toString(); } - } ; + }; } - /** Returns a QName for the current START_ELEMENT or END_ELEMENT event + /** + * Returns a QName for the current START_ELEMENT or END_ELEMENT event + * * @return the QName for the current START_ELEMENT or END_ELEMENT event */ public javax.xml.namespace.QName getName() { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT) { return convertXNIQNametoJavaxQName(fScanner.getElementQName()); - else - throw new java.lang.IllegalStateException("Illegal to call getName() "+ - "when event type is "+ getEventTypeString(fEventType) + "." - + " Valid states are " + getEventTypeString(XMLEvent.START_ELEMENT) + ", " - + getEventTypeString(XMLEvent.END_ELEMENT)); + } else { + throw new java.lang.IllegalStateException("Illegal to call getName() " + + "when event type is " + getEventTypeString(fEventType) + "." + + " Valid states are " + getEventTypeString(XMLEvent.START_ELEMENT) + ", " + + getEventTypeString(XMLEvent.END_ELEMENT)); + } } - /** Returns a read only namespace context for the current - * position. The context is transient and only valid until - * a call to next() changes the state of the reader. + /** + * Returns a read only namespace context for the current position. The + * context is transient and only valid until a call to next() changes the + * state of the reader. + * * @return return a namespace context */ public NamespaceContext getNamespaceContext() { - return fNamespaceContextWrapper ; + return fNamespaceContextWrapper; } - /** Returns the count of namespaces declared on this START_ELEMENT or END_ELEMENT, - * this method is only valid on a START_ELEMENT, END_ELEMENT or NAMESPACE. On - * an END_ELEMENT the count is of the namespaces that are about to go - * out of scope. This is the equivalent of the information reported - * by SAX callback for an end element event. - * @return returns the number of namespace declarations on this specific element - * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT or NAMESPACE + /** + * Returns the count of namespaces declared on this START_ELEMENT or + * END_ELEMENT, this method is only valid on a START_ELEMENT, END_ELEMENT or + * NAMESPACE. On an END_ELEMENT the count is of the namespaces that are + * about to go out of scope. This is the equivalent of the information + * reported by SAX callback for an end element event. + * + * @return returns the number of namespace declarations on this specific + * element + * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT + * or NAMESPACE */ public int getNamespaceCount() { //namespaceContext is dynamic object. //REVISIT: check if it specifies all conditions mentioned in the javadoc - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT || fEventType == XMLEvent.NAMESPACE){ - return fScanner.getNamespaceContext().getDeclaredPrefixCount() ; - } else{ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT + || fEventType == XMLEvent.NAMESPACE) { + return fScanner.getNamespaceContext().getDeclaredPrefixCount(); + } else { throw new IllegalStateException("Current event state is " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) - + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " - + getEventTypeString(XMLEvent.NAMESPACE) - + " valid for getNamespaceCount()." ); + + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) + + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " + + getEventTypeString(XMLEvent.NAMESPACE) + + " valid for getNamespaceCount()."); } } - /** Returns the prefix for the namespace declared at the - * index. Returns null if this is the default namespace - * declaration + /** + * Returns the prefix for the namespace declared at the index. Returns null + * if this is the default namespace declaration * * @param index the position of the namespace declaration * @return returns the namespace prefix - * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT or NAMESPACE + * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT + * or NAMESPACE */ public String getNamespacePrefix(int index) { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT || fEventType == XMLEvent.NAMESPACE){ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT + || fEventType == XMLEvent.NAMESPACE) { //namespaceContext is dynamic object. - String prefix = fScanner.getNamespaceContext().getDeclaredPrefixAt(index) ; - return prefix.equals("") ? null : prefix ; - } - else{ + String prefix = fScanner.getNamespaceContext().getDeclaredPrefixAt(index); + return prefix.equals("") ? null : prefix; + } else { throw new IllegalStateException("Current state " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) - + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " - + getEventTypeString(XMLEvent.NAMESPACE) - + " valid for getNamespacePrefix()." ); + + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) + + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " + + getEventTypeString(XMLEvent.NAMESPACE) + + " valid for getNamespacePrefix()."); } } - /** Returns the uri for the namespace declared at the - * index. + /** + * Returns the uri for the namespace declared at the index. * * @param index the position of the namespace declaration * @return returns the namespace uri - * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT or NAMESPACE + * @throws IllegalStateException if this is not a START_ELEMENT, END_ELEMENT + * or NAMESPACE */ public String getNamespaceURI(int index) { - if(fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT || fEventType == XMLEvent.NAMESPACE){ + if (fEventType == XMLEvent.START_ELEMENT || fEventType == XMLEvent.END_ELEMENT + || fEventType == XMLEvent.NAMESPACE) { //namespaceContext is dynamic object. - return fScanner.getNamespaceContext().getURI(fScanner.getNamespaceContext().getDeclaredPrefixAt(index)); - } - else{ + return fScanner.getNamespaceContext().getURI(fScanner.getNamespaceContext() + .getDeclaredPrefixAt(index)); + } else { throw new IllegalStateException("Current state " + getEventTypeString(fEventType) - + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) - + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " - + getEventTypeString(XMLEvent.NAMESPACE) - + " valid for getNamespaceURI()." ); + + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) + + ", " + getEventTypeString(XMLEvent.END_ELEMENT) + ", " + + getEventTypeString(XMLEvent.NAMESPACE) + + " valid for getNamespaceURI()."); } } - /** Get the value of a feature/property from the underlying implementation + /** + * Get the value of a feature/property from the underlying implementation + * * @param name The name of the property, may not be null * @return The value of the property * @throws IllegalArgumentException if name is null */ public Object getProperty(java.lang.String name) throws java.lang.IllegalArgumentException { - if(name == null) throw new java.lang.IllegalArgumentException() ; - if (fPropertyManager != null ){ - if(name.equals(fPropertyManager.STAX_NOTATIONS)){ + if (name == null) { + throw new java.lang.IllegalArgumentException(); + } + if (fPropertyManager != null) { + if (name.equals(PropertyManager.STAX_NOTATIONS)) { return getNotationDecls(); - }else if(name.equals(fPropertyManager.STAX_ENTITIES)){ + } else if (name.equals(PropertyManager.STAX_ENTITIES)) { return getEntityDecls(); - }else + } else { return fPropertyManager.getProperty(name); + } } return null; } - /** Returns the current value of the parse event as a string, - * this returns the string value of a CHARACTERS event, - * returns the value of a COMMENT, the replacement value - * for an ENTITY_REFERENCE, - * or the String value of the DTD + /** + * Returns the current value of the parse event as a string, this returns + * the string value of a CHARACTERS event, returns the value of a COMMENT, + * the replacement value for an ENTITY_REFERENCE, or the String value of the + * DTD + * * @return the current text or null - * @throws java.lang.IllegalStateException if this state is not - * a valid text state. + * @throws java.lang.IllegalStateException if this state is not a valid text + * state. */ public String getText() { - if( fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT - || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE){ + if (fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT + || fEventType == XMLEvent.CDATA || fEventType == XMLEvent.SPACE) { //this requires creation of new string //fEventType == XMLEvent.ENTITY_REFERENCE - return fScanner.getCharacterData().toString() ; - } else if(fEventType == XMLEvent.ENTITY_REFERENCE){ + return fScanner.getCharacterData().toString(); + } else if (fEventType == XMLEvent.ENTITY_REFERENCE) { String name = fScanner.getEntityName(); - if(name != null){ - if(fScanner.foundBuiltInRefs) + if (name != null) { + if (fScanner.foundBuiltInRefs) { return fScanner.getCharacterData().toString(); + } XMLEntityStorage entityStore = fEntityManager.getEntityStore(); Entity en = entityStore.getEntity(name); - if(en == null) + if (en == null) { return null; - if(en.isExternal()) - return ((Entity.ExternalEntity)en).entityLocation.getExpandedSystemId(); - else - return ((Entity.InternalEntity)en).text; - }else - return null; - } - else if(fEventType == XMLEvent.DTD){ - if(fDTDDecl != null){ - return fDTDDecl; } - XMLStringBuffer tmpBuffer = fScanner.getDTDDecl(); - fDTDDecl = tmpBuffer.toString(); + if (en.isExternal()) { + return ((Entity.ExternalEntity) en).entityLocation.getExpandedSystemId(); + } else { + return ((Entity.InternalEntity) en).text; + } + } else { + return null; + } + } else if (fEventType == XMLEvent.DTD) { + if (fDTDDecl != null) { return fDTDDecl; - } else{ - throw new IllegalStateException("Current state " + getEventTypeString(fEventType) - + " is not among the states" + getEventTypeString(XMLEvent.CHARACTERS) + ", " - + getEventTypeString(XMLEvent.COMMENT) + ", " - + getEventTypeString(XMLEvent.CDATA) + ", " - + getEventTypeString(XMLEvent.SPACE) + ", " - + getEventTypeString(XMLEvent.ENTITY_REFERENCE) + ", " - + getEventTypeString(XMLEvent.DTD) + " valid for getText() " ) ; + } + XMLStringBuffer tmpBuffer = fScanner.getDTDDecl(); + fDTDDecl = tmpBuffer.toString(); + return fDTDDecl; + } else { + throw new IllegalStateException("Current state " + getEventTypeString(fEventType) + + " is not among the states" + getEventTypeString(XMLEvent.CHARACTERS) + ", " + + getEventTypeString(XMLEvent.COMMENT) + ", " + + getEventTypeString(XMLEvent.CDATA) + ", " + + getEventTypeString(XMLEvent.SPACE) + ", " + + getEventTypeString(XMLEvent.ENTITY_REFERENCE) + ", " + + getEventTypeString(XMLEvent.DTD) + " valid for getText() "); } }//getText - - /** Test if the current event is of the given type and if the namespace and name match the current namespace and name of the current event. - * If the namespaceURI is null it is not checked for equality, if the localName is null it is not checked for equality. + /** + * Test if the current event is of the given type and if the namespace and + * name match the current namespace and name of the current event. If the + * namespaceURI is null it is not checked for equality, if the localName is + * null it is not checked for equality. + * * @param type the event type * @param namespaceURI the uri of the event, may be null * @param localName the localName of the event, may be null * @throws XMLStreamException if the required values are not matched. */ public void require(int type, String namespaceURI, String localName) throws XMLStreamException { - if( type != fEventType) - throw new XMLStreamException("Event type " + getEventTypeString(type) + " specified did " + - "not match with current parser event " + getEventTypeString(fEventType)); - if( namespaceURI != null && !namespaceURI.equals(getNamespaceURI()) ) - throw new XMLStreamException("Namespace URI " + namespaceURI +" specified did not match " + - "with current namespace URI"); - if(localName != null && !localName.equals(getLocalName())) - throw new XMLStreamException("LocalName " + localName +" specified did not match with " + - "current local name"); + if (type != fEventType) { + throw new XMLStreamException("Event type " + getEventTypeString(type) + " specified did " + + "not match with current parser event " + getEventTypeString(fEventType)); + } + if (namespaceURI != null && !namespaceURI.equals(getNamespaceURI())) { + throw new XMLStreamException("Namespace URI " + namespaceURI + " specified did not match " + + "with current namespace URI"); + } + if (localName != null && !localName.equals(getLocalName())) { + throw new XMLStreamException("LocalName " + localName + " specified did not match with " + + "current local name"); + } return; } - /** Gets the the text associated with a CHARACTERS, SPACE or CDATA event. - * Text starting a "sourceStart" is copied into "destination" starting at "targetStart". - * Up to "length" characters are copied. The number of characters actually copied is returned. + /** + * Gets the the text associated with a CHARACTERS, SPACE or CDATA event. + * Text starting a "sourceStart" is copied into "destination" starting at + * "targetStart". Up to "length" characters are copied. The number of + * characters actually copied is returned. * - * The "sourceStart" argument must be greater or equal to 0 and less than or equal to - * the number of characters associated with the event. Usually, one requests text starting at a "sourceStart" of 0. - * If the number of characters actually copied is less than the "length", then there is no more text. - * Otherwise, subsequent calls need to be made until all text has been retrieved. For example: + * The "sourceStart" argument must be greater or equal to 0 and less than or + * equal to the number of characters associated with the event. Usually, one + * requests text starting at a "sourceStart" of 0. If the number of + * characters actually copied is less than the "length", then there is no + * more text. Otherwise, subsequent calls need to be made until all text has + * been retrieved. For example: * * * int length = 1024; @@ -1116,30 +1205,36 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { * if (nCopied < length) * break; * } - * - * XMLStreamException may be thrown if there are any XML errors in the underlying source. - * The "targetStart" argument must be greater than or equal to 0 and less than the length of "target", - * Length must be greater than 0 and "targetStart + length" must be less than or equal to length of "target". + * XMLStreamException may be thrown if there are any XML errors in + * the underlying source. The "targetStart" argument must be greater than or + * equal to 0 and less than the length of "target", Length must be greater + * than 0 and "targetStart + length" must be less than or equal to length of + * "target". * - * @param sourceStart the index of the first character in the source array to copy + * @param sourceStart the index of the first character in the source array + * to copy * @param target the destination array * @param targetStart the start offset in the target array * @param length the number of characters to copy * @return the number of characters actually copied - * @throws XMLStreamException if the underlying XML source is not well-formed - * @throws IndexOutOfBoundsException if targetStart < 0 or > than the length of target - * @throws IndexOutOfBoundwhile(isCharacters()) ;sException if length < 0 or targetStart + length > length of target + * @throws XMLStreamException if the underlying XML source is not + * well-formed + * @throws IndexOutOfBoundsException if targetStart < 0 or > than the length + * of target + * @throws IndexOutOfBoundwhile(isCharacters()) ;sException if length < 0 or targetStart + length + * > length of target * @throws UnsupportedOperationException if this method is not supported * @throws NullPointerException is if target is null */ - public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) throws XMLStreamException { + public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) + throws XMLStreamException { - if(target == null){ - throw new NullPointerException("target char array can't be null") ; + if (target == null) { + throw new NullPointerException("target char array can't be null"); } - if(targetStart < 0 || length < 0 || sourceStart < 0 || targetStart >= target.length || - (targetStart + length ) > target.length) { + if (targetStart < 0 || length < 0 || sourceStart < 0 || targetStart >= target.length + || (targetStart + length) > target.length) { throw new IndexOutOfBoundsException(); } @@ -1148,97 +1243,105 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { int copiedLength = 0; //int presentDataLen = getTextLength() - (getTextStart()+sourceStart); int available = getTextLength() - sourceStart; - if(available < 0){ - throw new IndexOutOfBoundsException("sourceStart is greater than" + - "number of characters associated with this event"); + if (available < 0) { + throw new IndexOutOfBoundsException("sourceStart is greater than" + + "number of characters associated with this event"); } - if(available < length){ + if (available < length) { copiedLength = available; - } else{ + } else { copiedLength = length; } - System.arraycopy(getTextCharacters(), getTextStart() + sourceStart , target, targetStart, copiedLength); + System.arraycopy(getTextCharacters(), getTextStart() + sourceStart, target, targetStart, copiedLength); return copiedLength; } - /** Return true if the current event has text, false otherwise - * The following events have text: - * CHARACTERS,DTD ,ENTITY_REFERENCE, COMMENT + /** + * Return true if the current event has text, false otherwise The following + * events have text: CHARACTERS,DTD ,ENTITY_REFERENCE, COMMENT */ public boolean hasText() { - if(DEBUG) pr("XMLReaderImpl#EVENT TYPE = " + fEventType ) ; - if( fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT || fEventType == XMLEvent.CDATA) { + if (DEBUG) { + pr("XMLReaderImpl#EVENT TYPE = " + fEventType); + } + if (fEventType == XMLEvent.CHARACTERS || fEventType == XMLEvent.COMMENT + || fEventType == XMLEvent.CDATA) { return fScanner.getCharacterData().length > 0; - } else if(fEventType == XMLEvent.ENTITY_REFERENCE) { + } else if (fEventType == XMLEvent.ENTITY_REFERENCE) { String name = fScanner.getEntityName(); - if(name != null){ - if(fScanner.foundBuiltInRefs) + if (name != null) { + if (fScanner.foundBuiltInRefs) { return true; + } XMLEntityStorage entityStore = fEntityManager.getEntityStore(); Entity en = entityStore.getEntity(name); - if(en == null) + if (en == null) { return false; - if(en.isExternal()){ - return ((Entity.ExternalEntity)en).entityLocation.getExpandedSystemId() != null; - } else{ - return ((Entity.InternalEntity)en).text != null ; } - }else + if (en.isExternal()) { + return ((Entity.ExternalEntity) en).entityLocation.getExpandedSystemId() != null; + } else { + return ((Entity.InternalEntity) en).text != null; + } + } else { return false; - } else { - if(fEventType == XMLEvent.DTD) - return fScanner.fSeenDoctypeDecl; + } + } else if (fEventType == XMLEvent.DTD) { + return fScanner.fSeenDoctypeDecl; } return false; } - /** Returns a boolean which indicates if this - * attribute was created by default + /** + * Returns a boolean which indicates if this attribute was created by + * default + * * @param index the position of the attribute * @return true if this is a default attribute * @throws IllegalStateException if this is not a START_ELEMENT or ATTRIBUTE */ public boolean isAttributeSpecified(int index) { //check that current state should be either START_ELEMENT or ATTRIBUTE - if( (fEventType == XMLEvent.START_ELEMENT) || (fEventType == XMLEvent.ATTRIBUTE)){ - return fScanner.getAttributeIterator().isSpecified(index) ; - } else{ + if ((fEventType == XMLEvent.START_ELEMENT) || (fEventType == XMLEvent.ATTRIBUTE)) { + return fScanner.getAttributeIterator().isSpecified(index); + } else { throw new IllegalStateException("Current state is not among the states " - + getEventTypeString(XMLEvent.START_ELEMENT) + " , " - + getEventTypeString(XMLEvent.ATTRIBUTE) - + "valid for isAttributeSpecified()") ; + + getEventTypeString(XMLEvent.START_ELEMENT) + " , " + + getEventTypeString(XMLEvent.ATTRIBUTE) + + "valid for isAttributeSpecified()"); } } - /** Returns true if the cursor points to a character data event + /** + * Returns true if the cursor points to a character data event + * * @return true if the cursor points to character data, false otherwise */ public boolean isCharacters() { - return fEventType == XMLEvent.CHARACTERS ; + return fEventType == XMLEvent.CHARACTERS; } - /** Skips any insignificant events (COMMENT and PROCESSING_INSTRUCTION) - * until a START_ELEMENT or - * END_ELEMENT is reached. If other than space characters are - * encountered, an exception is thrown. This method should - * be used when processing element-only content because - * the parser is not able to recognize ignorable whitespace if - * then DTD is missing or not interpreted. + /** + * Skips any insignificant events (COMMENT and PROCESSING_INSTRUCTION) until + * a START_ELEMENT or END_ELEMENT is reached. If other than space characters + * are encountered, an exception is thrown. This method should be used when + * processing element-only content because the parser is not able to + * recognize ignorable whitespace if then DTD is missing or not interpreted. + * * @return the event type of the element read * @throws XMLStreamException if the current event is not white space */ public int nextTag() throws XMLStreamException { int eventType = next(); - while((eventType == XMLStreamConstants.CHARACTERS && isWhiteSpace()) // skip whitespace - || (eventType == XMLStreamConstants.CDATA && isWhiteSpace()) - // skip whitespace - || eventType == XMLStreamConstants.SPACE - || eventType == XMLStreamConstants.PROCESSING_INSTRUCTION - || eventType == XMLStreamConstants.COMMENT - ) { + while ((eventType == XMLStreamConstants.CHARACTERS && isWhiteSpace()) // skip whitespace + || (eventType == XMLStreamConstants.CDATA && isWhiteSpace()) + // skip whitespace + || eventType == XMLStreamConstants.SPACE + || eventType == XMLStreamConstants.PROCESSING_INSTRUCTION + || eventType == XMLStreamConstants.COMMENT) { eventType = next(); } @@ -1253,87 +1356,100 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return eventType; } - /** Checks if standalone was set in the document + /** + * Checks if standalone was set in the document + * * @return true if standalone was set in the document, or false otherwise */ public boolean standaloneSet() { //xxx: it requires if the standalone was set in the document ? This is different that if the document // is standalone - return fScanner.standaloneSet() ; + return fScanner.standaloneSet(); } /** * @param qname * @return */ - public javax.xml.namespace.QName convertXNIQNametoJavaxQName(com.sun.org.apache.xerces.internal.xni.QName qname){ - if (qname == null) return null; + public javax.xml.namespace.QName convertXNIQNametoJavaxQName( + com.sun.org.apache.xerces.internal.xni.QName qname) { + if (qname == null) { + return null; + } //xxx: prefix definition ? - if(qname.prefix == null){ - return new javax.xml.namespace.QName(qname.uri, qname.localpart) ; - } else{ - return new javax.xml.namespace.QName(qname.uri, qname.localpart, qname.prefix) ; + if (qname.prefix == null) { + return new javax.xml.namespace.QName(qname.uri, qname.localpart); + } else { + return new javax.xml.namespace.QName(qname.uri, qname.localpart, qname.prefix); } } - /** Return the uri for the given prefix. - * The uri returned depends on the current state of the processor. + /** + * Return the uri for the given prefix. The uri returned depends on the + * current state of the processor. * - *

NOTE:The 'xml' prefix is bound as defined in - * Namespaces in XML + *

+ * NOTE:The 'xml' prefix is bound as defined in + * Namespaces in + * XML * specification to "http://www.w3.org/XML/1998/namespace". * - *

NOTE: The 'xmlns' prefix must be resolved to following namespace + *

+ * NOTE: The 'xmlns' prefix must be resolved to following + * namespace * http://www.w3.org/2000/xmlns/ + * * @return the uri bound to the given prefix or null if it is not bound * @param prefix The prefix to lookup, may not be null * @throws IllegalStateException - if the prefix is null */ public String getNamespaceURI(String prefix) { - if(prefix == null) throw new java.lang.IllegalArgumentException("prefix cannot be null.") ; + if (prefix == null) { + throw new java.lang.IllegalArgumentException("prefix cannot be null."); + } //first add the string to symbol table.. since internally identity comparisons are done. - return fScanner.getNamespaceContext().getURI(fSymbolTable.addSymbol(prefix)) ; + return fScanner.getNamespaceContext().getURI(fSymbolTable.addSymbol(prefix)); } //xxx: this function is not being used. - protected void setPropertyManager(PropertyManager propertyManager){ - fPropertyManager = propertyManager ; + protected void setPropertyManager(PropertyManager propertyManager) { + fPropertyManager = propertyManager; //REVISIT: we were supplying hashmap ealier - fScanner.setProperty("stax-properties",propertyManager); - fScanner.setPropertyManager(propertyManager) ; + fScanner.setProperty("stax-properties", propertyManager); + fScanner.setPropertyManager(propertyManager); } /** * @return returns the reference to property manager. */ - protected PropertyManager getPropertyManager(){ - return fPropertyManager ; + protected PropertyManager getPropertyManager() { + return fPropertyManager; } static void pr(String str) { - System.out.println(str) ; + System.out.println(str); } - protected List getEntityDecls(){ - if(fEventType == XMLStreamConstants.DTD){ + protected List getEntityDecls() { + if (fEventType == XMLStreamConstants.DTD) { XMLEntityStorage entityStore = fEntityManager.getEntityStore(); - ArrayList list = null; - if(entityStore.hasEntities()){ + ArrayList list = null; + Map entities = entityStore.getEntities(); + if (entities.size() > 0) { EntityDeclarationImpl decl = null; - list = new ArrayList(entityStore.getEntitySize()); - Enumeration enu = entityStore.getEntityKeys(); - while(enu.hasMoreElements()){ - String key = (String)enu.nextElement(); - Entity en = (Entity)entityStore.getEntity(key); + list = new ArrayList<>(entities.size()); + for (Map.Entry entry : entities.entrySet()) { + String key = entry.getKey(); + Entity en = entry.getValue(); decl = new EntityDeclarationImpl(); decl.setEntityName(key); - if(en.isExternal()){ - decl.setXMLResourceIdentifier(((Entity.ExternalEntity)en).entityLocation); - decl.setNotationName(((Entity.ExternalEntity)en).notation); + if (en.isExternal()) { + decl.setXMLResourceIdentifier(((Entity.ExternalEntity) en).entityLocation); + decl.setNotationName(((Entity.ExternalEntity) en).notation); + } else { + decl.setEntityReplacementText(((Entity.InternalEntity) en).text); } - else - decl.setEntityReplacementText(((Entity.InternalEntity)en).text); list.add(decl); } } @@ -1342,19 +1458,20 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return null; } - protected List getNotationDecls(){ - if(fEventType == XMLStreamConstants.DTD){ - if(fScanner.fDTDScanner == null) return null; - DTDGrammar grammar = ((XMLDTDScannerImpl)(fScanner.fDTDScanner)).getGrammar(); - if(grammar == null) return null; - List notations = grammar.getNotationDecls(); - - Iterator it = notations.iterator(); - ArrayList list = new ArrayList(); - while(it.hasNext()){ - XMLNotationDecl ni = (XMLNotationDecl)it.next(); - if(ni!= null){ - list.add(new NotationDeclarationImpl(ni)); + protected List getNotationDecls() { + if (fEventType == XMLStreamConstants.DTD) { + if (fScanner.fDTDScanner == null) { + return null; + } + DTDGrammar grammar = ((XMLDTDScannerImpl) (fScanner.fDTDScanner)).getGrammar(); + if (grammar == null) { + return null; + } + List notations = grammar.getNotationDecls(); + ArrayList list = new ArrayList<>(); + for (XMLNotationDecl notation : notations) { + if (notation != null) { + list.add(new NotationDeclarationImpl(notation)); } } return list; @@ -1362,6 +1479,4 @@ public class XMLStreamReaderImpl implements javax.xml.stream.XMLStreamReader { return null; } - - }//XMLReaderImpl diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java index dc7f85fe48f..f7ed5d07333 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java @@ -20,6 +20,8 @@ package com.sun.org.apache.xerces.internal.utils; +import java.util.function.Supplier; + /** * This class is duplicated for each JAXP subpackage so keep it in sync. * It is package private and therefore is not exposed as part of the JAXP @@ -61,9 +63,9 @@ public final class ObjectFactory { } // isDebugEnabled() /** Prints a message to standard error if debugging is enabled. */ - private static void debugPrintln(String msg) { + private static void debugPrintln(Supplier msgGen) { if (DEBUG) { - System.err.println("XERCES: " + msg); + System.err.println("XERCES: " + msgGen.get()); } } // debugPrintln(String) @@ -155,8 +157,8 @@ public final class ObjectFactory { try{ Class providerClass = findProviderClass(className, cl, doFallback); Object instance = providerClass.newInstance(); - if (DEBUG) debugPrintln("created new instance of " + providerClass + - " using ClassLoader: " + cl); + debugPrintln(()->"created new instance of " + providerClass + + " using ClassLoader: " + cl); return instance; } catch (ClassNotFoundException x) { throw new ConfigurationError( diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java index 9d8e2c77961..c3ee8d40b9a 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java @@ -93,9 +93,11 @@ public abstract class SerializerBase protected AttributesImplSerializer m_attributes = new AttributesImplSerializer(); /** - * Tells if we're in an EntityRef event. + * Tells if we're in an EntityRef event, true if it's greater than 0. Use + * integer type to handle nested entity reference, increase m_inEntityRef in + * startEntity, decrease m_inEntityRef in endEntity. */ - protected boolean m_inEntityRef = false; + protected int m_inEntityRef = 0; /** This flag is set while receiving events from the external DTD */ protected boolean m_inExternalDTD = false; @@ -144,7 +146,7 @@ public abstract class SerializerBase /** * Amount to indent. */ - protected int m_indentAmount = 0; + protected int m_indentAmount = 4; /** * Tells the XML version, for writing out to the XML decl. @@ -444,12 +446,23 @@ public abstract class SerializerBase public void endEntity(String name) throws org.xml.sax.SAXException { if (name.equals("[dtd]")) m_inExternalDTD = false; - m_inEntityRef = false; + + if (!m_inExternalDTD) + m_inEntityRef--; if (m_tracer != null) this.fireEndEntity(name); } + /** + * This method checks if current node is in entity reference. + * + * @return True if current node is in entity reference. + */ + protected boolean isInEntityRef() { + return m_inEntityRef > 0; + } + /** * Flush and close the underlying java.io.Writer. This method applies to * ToStream serializers, not ToSAXHandler serializers. @@ -1139,8 +1152,8 @@ public abstract class SerializerBase this.m_doctypePublic = null; this.m_doctypeSystem = null; this.m_doIndent = false; - this.m_indentAmount = 0; - this.m_inEntityRef = false; + this.m_indentAmount = 4; + this.m_inEntityRef = 0; this.m_inExternalDTD = false; this.m_mediatype = null; this.m_needToCallStartDocument = true; diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java index f43faee48d0..502a8b8debb 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java @@ -1,17 +1,15 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. */ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * 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, @@ -19,23 +17,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: ToHTMLStream.java,v 1.2.4.1 2005/09/15 08:15:26 suresh_emailid Exp $ - */ + package com.sun.org.apache.xml.internal.serializer; import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.util.Properties; import javax.xml.transform.Result; -import com.sun.org.apache.xml.internal.serializer.utils.MsgKey; -import com.sun.org.apache.xml.internal.serializer.utils.Utils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import com.sun.org.apache.xml.internal.serializer.utils.MsgKey; +import com.sun.org.apache.xml.internal.serializer.utils.Utils; + /** * This serializer takes a series of SAX or * SAX-like events and writes its output @@ -52,9 +47,8 @@ public final class ToHTMLStream extends ToStream /** This flag is set while receiving events from the DTD */ protected boolean m_inDTD = false; - /** True if the current element is a block element. (seems like - * this needs to be a stack. -sb). */ - private boolean m_inBlockElem = false; + /** True if the previous element is a block element. */ + private boolean m_isprevblock = false; /** * Map that tells which XML characters should have special treatment, and it @@ -723,7 +717,7 @@ public final class ToHTMLStream extends ToStream */ public final void endDocument() throws org.xml.sax.SAXException { - + flushCharactersBuffer(); flushPending(); if (m_doIndent && !m_isprevtext) { @@ -743,26 +737,48 @@ public final class ToHTMLStream extends ToStream } /** - * Receive notification of the beginning of an element. + * If the previous is an inline element, won't insert a new line before the + * text. + * + */ + protected boolean shouldIndentForText() { + return super.shouldIndentForText() && m_isprevblock; + } + + /** + * Only check m_doIndent, disregard m_ispreserveSpace. + * + * @return True if the content should be formatted. + */ + protected boolean shouldFormatOutput() { + return m_doIndent; + } + + /** + * Receive notification of the beginning of an element. * * - * @param namespaceURI - * @param localName - * @param name The element type name. - * @param atts The attributes attached to the element, if any. - * @throws org.xml.sax.SAXException Any SAX exception, possibly - * wrapping another exception. - * @see #endElement - * @see org.xml.sax.AttributeList + * @param namespaceURI + * @param localName + * @param name + * The element type name. + * @param atts + * The attributes attached to the element, if any. + * @throws org.xml.sax.SAXException + * Any SAX exception, possibly wrapping another exception. + * @see #endElement + * @see org.xml.sax.AttributeList */ public void startElement( String namespaceURI, String localName, String name, Attributes atts) - throws org.xml.sax.SAXException + throws SAXException { - + // will add extra one if having namespace but no matter + m_childNodeNum++; + flushCharactersBuffer(); ElemContext elemContext = m_elemContext; // clean up any pending things first @@ -800,22 +816,18 @@ public final class ToHTMLStream extends ToStream // deal with indentation issues first if (m_doIndent) { - boolean isBlockElement = (elemFlags & ElemDesc.BLOCK) != 0; - if (m_ispreserve) - m_ispreserve = false; - else if ( - (null != elemContext.m_elementName) - && (!m_inBlockElem - || isBlockElement) /* && !isWhiteSpaceSensitive */ - ) + if ((elemContext.m_elementName != null) + // If this element is a block element, + // or if this is not a block element, then if the + // previous is neither a text nor an inline + && (isBlockElement || (!(m_isprevtext || !m_isprevblock)))) { m_startNewLine = true; indent(); - } - m_inBlockElem = !isBlockElement; + m_isprevblock = isBlockElement; } // save any attributes for later processing @@ -827,7 +839,8 @@ public final class ToHTMLStream extends ToStream writer.write('<'); writer.write(name); - + m_childNodeNumStack.push(m_childNodeNum); + m_childNodeNum = 0; if (m_tracer != null) firePseudoAttributes(); @@ -850,6 +863,15 @@ public final class ToHTMLStream extends ToStream m_elemContext = elemContext; elemContext.m_elementDesc = elemDesc; elemContext.m_isRaw = (elemFlags & ElemDesc.RAW) != 0; + + // set m_startNewLine for the next element + if (m_doIndent) { + // elemFlags is equivalent to m_elemContext.m_elementDesc.getFlags(), + // in this branch m_elemContext.m_elementName is not null + boolean isBlockElement = (elemFlags & ElemDesc.BLOCK) != 0; + if (isBlockElement) + m_startNewLine = true; + } } @@ -893,6 +915,7 @@ public final class ToHTMLStream extends ToStream final String name) throws org.xml.sax.SAXException { + flushCharactersBuffer(); // deal with any pending issues if (m_cdataTagOpen) closeCDATA(); @@ -919,18 +942,18 @@ public final class ToHTMLStream extends ToStream final boolean isBlockElement = (elemFlags&ElemDesc.BLOCK) != 0; boolean shouldIndent = false; - if (m_ispreserve) - { - m_ispreserve = false; - } - else if (m_doIndent && (!m_inBlockElem || isBlockElement)) + // If this element is a block element, + // or if this is not a block element, then if the previous is + // neither a text nor an inline + if (isBlockElement || (!(m_isprevtext || !m_isprevblock))) { m_startNewLine = true; shouldIndent = true; } - if (!elemContext.m_startTagOpen && shouldIndent) + if (!elemContext.m_startTagOpen && shouldIndent && (m_childNodeNum > 1 || !m_isprevtext)) indent(elemContext.m_currentElemDepth - 1); - m_inBlockElem = !isBlockElement; + + m_isprevblock = isBlockElement; } final java.io.Writer writer = m_writer; @@ -974,6 +997,7 @@ public final class ToHTMLStream extends ToStream } } + m_childNodeNum = m_childNodeNumStack.pop(); // clean up because the element has ended if ((elemFlags & ElemDesc.WHITESPACESENSITIVE) != 0) m_ispreserve = true; @@ -1511,7 +1535,7 @@ public final class ToHTMLStream extends ToStream // writer.write(""); // time to generate characters event @@ -1566,7 +1590,6 @@ public final class ToHTMLStream extends ToStream public final void cdata(char ch[], int start, int length) throws org.xml.sax.SAXException { - if ((null != m_elemContext.m_elementName) && (m_elemContext.m_elementName.equalsIgnoreCase("SCRIPT") || m_elemContext.m_elementName.equalsIgnoreCase("STYLE"))) @@ -1617,7 +1640,8 @@ public final class ToHTMLStream extends ToStream public void processingInstruction(String target, String data) throws org.xml.sax.SAXException { - + m_childNodeNum++; + flushCharactersBuffer(); // Process any pending starDocument and startElement first. flushPending(); @@ -1945,10 +1969,8 @@ public final class ToHTMLStream extends ToStream private void initToHTMLStream() { -// m_elementDesc = null; - m_inBlockElem = false; + m_isprevblock = false; m_inDTD = false; -// m_isRawStack.clear(); m_omitMetaTag = false; m_specialEscapeURLs = true; } diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java index 976b4955f45..994a7800d97 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java @@ -29,12 +29,16 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Deque; +import java.util.EmptyStackException; import java.util.Enumeration; -import java.util.Iterator; import java.util.Properties; +import java.util.Queue; import java.util.Set; import java.util.StringTokenizer; -import java.util.ArrayList; import javax.xml.transform.ErrorListener; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; @@ -88,6 +92,29 @@ abstract public class ToStream extends SerializerBase { */ Object m_charToByteConverter = null; + /** + * Used to buffer the text nodes and the entity reference nodes if + * indentation is on. + */ + protected CharacterBuffer m_charactersBuffer = new CharacterBuffer(); + + /** + * Used to decide if a text node is pretty-printed with indentation. + * If m_childNodeNum > 1, the text node will be indented. + * + */ + protected Deque m_childNodeNumStack = new ArrayDeque<>(); + + protected int m_childNodeNum = 0; + + /** + * Used to handle xml:space attribute + * + */ + protected BoolStack m_preserveSpaces = new BoolStack(); + + protected boolean m_ispreserveSpace = false; + /** * Stack to keep track of whether or not we need to * preserve whitespace. @@ -767,12 +794,10 @@ abstract public class ToStream extends SerializerBase { if (m_startNewLine) outputLineSep(); - /* For m_indentAmount > 0 this extra test might be slower - * but Xalan's default value is 0, so this extra test - * will run faster in that situation. + /* + * Default value is 4, so printSpace directly. */ - if (m_indentAmount > 0) - printSpace(depth * m_indentAmount); + printSpace(depth * m_indentAmount); } @@ -1234,7 +1259,6 @@ abstract public class ToStream extends SerializerBase { protected void cdata(char ch[], int start, final int length) throws org.xml.sax.SAXException { - try { final int old_start = start; @@ -1323,7 +1347,7 @@ abstract public class ToStream extends SerializerBase { throws org.xml.sax.SAXException { - if (m_inEntityRef) + if (isInEntityRef()) return; try { @@ -1378,9 +1402,11 @@ abstract public class ToStream extends SerializerBase { // characters to read from array is 0. // Section 7.6.1 of XSLT 1.0 (http://www.w3.org/TR/xslt#value-of) suggest no text node // is created if string is empty. - if (length == 0 || (m_inEntityRef && !m_expandDTDEntities)) + if (length == 0 || (isInEntityRef())) return; - if (m_elemContext.m_startTagOpen) + + final boolean shouldFormat = shouldFormatOutput(); + if (m_elemContext.m_startTagOpen && !shouldFormat) { closeStartTag(); m_elemContext.m_startTagOpen = false; @@ -1407,7 +1433,7 @@ abstract public class ToStream extends SerializerBase { if (m_disableOutputEscapingStates.peekOrFalse() || (!m_escaping)) { charactersRaw(chars, start, length); - + m_isprevtext = true; // time to fire off characters generation event if (m_tracer != null) super.fireCharEvent(chars, start, length); @@ -1415,13 +1441,41 @@ abstract public class ToStream extends SerializerBase { return; } - if (m_elemContext.m_startTagOpen) + if (m_elemContext.m_startTagOpen && !shouldFormat) { closeStartTag(); m_elemContext.m_startTagOpen = false; } + if (shouldFormat) { + m_charactersBuffer.addText(chars, start, length); + } else { + outputCharacters(chars, start, length); + } + // time to fire off characters generation event + if (m_tracer != null) + super.fireCharEvent(chars, start, length); + } + + + /** + * This method checks if the content in current element should be formatted. + * + * @return True if the content should be formatted. + */ + protected boolean shouldFormatOutput() { + return !m_ispreserveSpace && m_doIndent; + } + + /** + * Write out the characters. + * + * @param chars The characters of the text. + * @param start The start position in the char array. + * @param length The number of characters from the char array. + */ + private void outputCharacters(final char chars[], final int start, final int length) throws SAXException { try { int i; @@ -1459,8 +1513,8 @@ abstract public class ToStream extends SerializerBase { m_ispreserve = true; -// int lengthClean; // number of clean characters in a row -// final boolean[] isAsciiClean = m_charInfo.getASCIIClean(); +// int lengthClean; // number of clean characters in a row +// final boolean[] isAsciiClean = m_charInfo.getASCIIClean(); final boolean isXML10 = XMLVERSION10.equals(getVersion()); // we've skipped the leading whitespace, now deal with the rest @@ -1514,11 +1568,54 @@ abstract public class ToStream extends SerializerBase { { throw new SAXException(e); } - - // time to fire off characters generation event - if (m_tracer != null) - super.fireCharEvent(chars, start, length); } + + /** + * Used to flush the buffered characters when indentation is on, this method + * will be called when the next node is traversed. + * + */ + final protected void flushCharactersBuffer() throws SAXException { + try { + if (shouldFormatOutput() && m_charactersBuffer.hasContent()) { + if (m_elemContext.m_startTagOpen) { + closeStartTag(); + m_elemContext.m_startTagOpen = false; + } + + if (m_elemContext.m_isCdataSection) { + /* + * due to cdata-section-elements atribute, we need this as + * cdata + */ + char[] chars = m_charactersBuffer.toChars(); + cdata(chars, 0, chars.length); + return; + } + + m_childNodeNum++; + if (shouldIndentForText()) { + indent(); + m_startNewLine = true; + } + m_charactersBuffer.flush(); + } + } catch (IOException e) { + throw new SAXException(e); + } finally { + m_charactersBuffer.clear(); + } + } + + /** + * True if should indent in flushCharactersBuffer method. + * This method may be overridden in sub-class. + * + */ + protected boolean shouldIndentForText() { + return (shouldIndent() && m_childNodeNum > 1); + } + /** * This method checks if a given character is between C0 or C1 range * of Control characters. @@ -1610,7 +1707,7 @@ abstract public class ToStream extends SerializerBase { */ public void characters(String s) throws org.xml.sax.SAXException { - if (m_inEntityRef && !m_expandDTDEntities) + if (isInEntityRef()) return; final int length = s.length(); if (length > m_charsBuff.length) @@ -1758,9 +1855,12 @@ abstract public class ToStream extends SerializerBase { Attributes atts) throws org.xml.sax.SAXException { - if (m_inEntityRef) + if (isInEntityRef()) return; + m_childNodeNum++; + flushCharactersBuffer(); + if (m_needToCallStartDocument) { startDocumentInternal(); @@ -1812,6 +1912,12 @@ abstract public class ToStream extends SerializerBase { if (atts != null) addAttributes(atts); + m_ispreserveSpace = m_preserveSpaces.peekOrFalse(); + m_preserveSpaces.push(m_ispreserveSpace); + + m_childNodeNumStack.push(m_childNodeNum); + m_childNodeNum = 0; + m_elemContext = m_elemContext.push(namespaceURI,localName,name); m_isprevtext = false; @@ -2019,9 +2125,10 @@ abstract public class ToStream extends SerializerBase { throws org.xml.sax.SAXException { - if (m_inEntityRef) + if (isInEntityRef()) return; + flushCharactersBuffer(); // namespaces declared at the current depth are no longer valid // so get rid of them m_prefixMap.popNamespaces(m_elemContext.m_currentElemDepth, null); @@ -2055,7 +2162,7 @@ abstract public class ToStream extends SerializerBase { if (m_cdataTagOpen) closeCDATA(); - if (shouldIndent()) + if (shouldIndent() && (m_childNodeNum > 1 || !m_isprevtext)) indent(m_elemContext.m_currentElemDepth - 1); writer.write('<'); writer.write('/'); @@ -2073,6 +2180,9 @@ abstract public class ToStream extends SerializerBase { m_ispreserve = m_preserves.isEmpty() ? false : m_preserves.pop(); } + m_ispreserveSpace = m_preserveSpaces.popAndTop(); + m_childNodeNum = m_childNodeNumStack.pop(); + m_isprevtext = false; // fire off the end element event @@ -2208,8 +2318,10 @@ abstract public class ToStream extends SerializerBase { { int start_old = start; - if (m_inEntityRef) + if (isInEntityRef()) return; + m_childNodeNum++; + flushCharactersBuffer(); if (m_elemContext.m_startTagOpen) { closeStartTag(); @@ -2389,6 +2501,9 @@ abstract public class ToStream extends SerializerBase { */ public void startCDATA() throws org.xml.sax.SAXException { + m_childNodeNum++; + flushCharactersBuffer(); + m_cdataStartCalled = true; } @@ -2412,17 +2527,30 @@ abstract public class ToStream extends SerializerBase { if (name.equals("[dtd]")) m_inExternalDTD = true; - if (!m_expandDTDEntities && !m_inExternalDTD) { - /* Only leave the entity as-is if - * we've been told not to expand them - * and this is not the magic [dtd] name. - */ - startNonEscaping(); - characters("&" + name + ';'); - endNonEscaping(); + // if this is not the magic [dtd] name + if (!m_inExternalDTD) { + // if it's not in nested entity reference + if (!isInEntityRef()) { + if (shouldFormatOutput()) { + m_charactersBuffer.addEntityReference(name); + } else { + outputEntityReference(name); + } + } + m_inEntityRef++; } + } - m_inEntityRef = true; + /** + * Write out the entity reference with the form as "&entityName;". + * + * @param name The name of the entity. + */ + private void outputEntityReference(String name) throws SAXException { + startNonEscaping(); + characters("&" + name + ';'); + endNonEscaping(); + m_isprevtext = true; } /** @@ -2523,7 +2651,7 @@ abstract public class ToStream extends SerializerBase { */ protected boolean shouldIndent() { - return m_doIndent && (!m_ispreserve && !m_isprevtext) && (m_elemContext.m_currentElemDepth > 0 || m_isStandalone); + return shouldFormatOutput() && (m_elemContext.m_currentElemDepth > 0 || m_isStandalone); } /** @@ -2814,11 +2942,38 @@ abstract public class ToStream extends SerializerBase { String type, String value, boolean xslAttribute) + { + if (m_charactersBuffer.isAnyCharactersBuffered()) { + /* + * If stylesheet includes xsl:copy-of an attribute node, XSLTC will + * fire an addAttribute event. When a text node is handling in + * ToStream, addAttribute has no effect. But closeStartTag call is + * delayed to flushCharactersBuffer() method if the text node is + * buffered, so here we ignore the attribute to avoid corrupting the + * start tag content. + * + */ + return m_attributes.getIndex(rawName) < 0; + } else { + return doAddAttributeAlways(uri, localName, rawName, type, value, xslAttribute); + } + } + + /** + * Does really add the attribute to the set of attributes. + */ + private boolean doAddAttributeAlways( + String uri, + String localName, + String rawName, + String type, + String value, + boolean xslAttribute) { boolean was_added; int index; //if (uri == null || localName == null || uri.length() == 0) - index = m_attributes.getIndex(rawName); + index = m_attributes.getIndex(rawName); // Don't use 'localName' as it gives incorrect value, rely only on 'rawName' /*else { index = m_attributes.getIndex(uri, localName); @@ -2923,12 +3078,26 @@ abstract public class ToStream extends SerializerBase { e.printStackTrace(); } } + m_attributes.addAttribute(uri, localName, rawName, type, value); was_added = true; if (m_tracer != null){ firePseudoAttributes(); } } + + if (rawName.equals("xml:space")) { + if (value.equals("preserve")) { + m_ispreserveSpace = true; + if (m_preserveSpaces.size() > 0) + m_preserveSpaces.setTop(m_ispreserveSpace); + } else if (value.equals("default")) { + m_ispreserveSpace = false; + if (m_preserveSpaces.size() > 0) + m_preserveSpaces.setTop(m_ispreserveSpace); + } + } + return was_added; } @@ -3059,10 +3228,14 @@ abstract public class ToStream extends SerializerBase { // this.m_format = null; this.m_inDoctype = false; this.m_ispreserve = false; - this.m_ispreserve = false; + this.m_preserves.clear(); + this.m_ispreserveSpace = false; + this.m_preserveSpaces.clear(); + this.m_childNodeNum = 0; + this.m_childNodeNumStack.clear(); + this.m_charactersBuffer.clear(); this.m_isprevtext = false; this.m_isUTF8 = false; // ?? used anywhere ?? - this.m_preserves.clear(); this.m_shouldFlush = true; this.m_spaceBeforeClose = false; this.m_startNewLine = false; @@ -3238,6 +3411,129 @@ abstract public class ToStream extends SerializerBase { } } + /** + * This inner class is used to buffer the text nodes and the entity + * reference nodes if indentation is on. There is only one CharacterBuffer + * instance in ToStream, it contains a queue of GenericCharacters, + * GenericCharacters can be a text node or an entity reference node. The + * text nodes and entity reference nodes are joined together and then are + * flushed. + */ + private class CharacterBuffer { + /** + * GenericCharacters is immutable. + */ + private abstract class GenericCharacters { + /** + * @return True if having any character other than whitespace or + * line feed. + */ + abstract boolean hasContent(); + + abstract void flush() throws SAXException; + + /** + * Converts this GenericCharacters to a new character array. + */ + abstract char[] toChars(); + } + + private Queue bufferedCharacters = new ArrayDeque<>(); + + /** + * Append a text node to the buffer. + */ + public void addText(final char chars[], final int start, final int length) { + bufferedCharacters.add(new GenericCharacters() { + char[] text; + + { + text = Arrays.copyOfRange(chars, start, start + length); + } + + boolean hasContent() { + for (int i = 0; i < text.length; i++) { + if (!isWhiteSpace(text[i])) { + return true; + } + } + return false; + } + + void flush() throws SAXException { + outputCharacters(text, 0, text.length); + } + + char[] toChars() { + return text; + } + + boolean isWhiteSpace(char ch) { + return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r'; + } + + }); + } + + /** + * Append an entity reference to the buffer. + */ + public void addEntityReference(String entityName) { + bufferedCharacters.add(new GenericCharacters() { + boolean hasContent() { + return true; + } + + void flush() throws SAXException { + outputEntityReference(entityName); + } + + char[] toChars() { + return ("&" + entityName + ";").toCharArray(); + } + }); + } + + /** + * @return True if any GenericCharacters is already buffered. + */ + public boolean isAnyCharactersBuffered() { + return !bufferedCharacters.isEmpty(); + } + + /** + * @return True if any buffered GenericCharacters has content. + */ + public boolean hasContent() { + return bufferedCharacters.stream().anyMatch(GenericCharacters::hasContent); + } + + /** + * Flush all buffered GenericCharacters. + */ + public void flush() throws SAXException { + GenericCharacters element; + while ((element = bufferedCharacters.poll()) != null) + element.flush(); + } + + /** + * Converts all buffered GenericCharacters to a new character array. + */ + public char[] toChars() { + return bufferedCharacters.stream().map(GenericCharacters::toChars) + .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append).toString() + .toCharArray(); + } + + /** + * Clear the buffer. + */ + public void clear() { + bufferedCharacters.clear(); + } + } + // Implement DTDHandler /** * If this method is called, the serializer is used as a diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java index 00463bce33f..681737ebc88 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java @@ -1,15 +1,15 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2001-2004 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, @@ -17,9 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: ToXMLStream.java,v 1.2.4.2 2005/09/15 12:01:25 suresh_emailid Exp $ - */ + package com.sun.org.apache.xml.internal.serializer; import java.io.IOException; @@ -92,6 +90,12 @@ public final class ToXMLStream extends ToStream m_ispreserve = xmlListener.m_ispreserve; m_preserves = xmlListener.m_preserves; + m_ispreserveSpace = xmlListener.m_ispreserveSpace; + m_preserveSpaces = xmlListener.m_preserveSpaces; + m_childNodeNum = xmlListener.m_childNodeNum; + m_childNodeNumStack = xmlListener.m_childNodeNumStack; + m_charactersBuffer = xmlListener.m_charactersBuffer; + m_inEntityRef = xmlListener.m_inEntityRef; m_isprevtext = xmlListener.m_isprevtext; m_doIndent = xmlListener.m_doIndent; setIndentAmount(xmlListener.getIndentAmount()); @@ -124,7 +128,7 @@ public final class ToXMLStream extends ToStream super.startDocumentInternal(); m_needToCallStartDocument = false; - if (m_inEntityRef) + if (isInEntityRef()) return; m_needToOutputDocTypeDecl = true; @@ -197,6 +201,7 @@ public final class ToXMLStream extends ToStream */ public void endDocument() throws org.xml.sax.SAXException { + flushCharactersBuffer(); flushPending(); if (m_doIndent && !m_isprevtext) { @@ -265,9 +270,11 @@ public final class ToXMLStream extends ToStream public void processingInstruction(String target, String data) throws org.xml.sax.SAXException { - if (m_inEntityRef) + if (isInEntityRef()) return; + m_childNodeNum++; + flushCharactersBuffer(); flushPending(); if (target.equals(Result.PI_DISABLE_OUTPUT_ESCAPING)) diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java index f44ca2617ca..68864ca7800 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -368,8 +368,6 @@ final class DOM3TreeWalker { private final void dispatachChars(Node node) throws org.xml.sax.SAXException { if (fSerializer != null) { - this.fSerializer.characters(node); - } else { String data = ((Text) node).getData(); this.fSerializer.characters(data.toCharArray(), 0, data.length()); } @@ -1066,7 +1064,9 @@ final class DOM3TreeWalker { // should we pass entity reference nodes to the filter??? } - if (fLexicalHandler != null) { + // if "entities" is true, or EntityReference node has no children, + // it will be serialized as the form "&entityName;" in the output. + if (fLexicalHandler != null && ((fFeatures & ENTITIES) != 0 || !node.hasChildNodes())) { // startEntity outputs only Text but not Element, Attr, Comment // and PI child nodes. It does so by setting the m_inEntityRef diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties index ff16c65e869..5230e5e99e3 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties @@ -1,11 +1,12 @@ ########################################################################### -# reserved comment block -# DO NOT REMOVE OR ALTER! +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. ########################################################################### -########################################################################### -# Copyright 2003-2004 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); +## +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 # @@ -16,11 +17,9 @@ # 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. -########################################################################## +## # -# $Id: output_html.properties,v 1.2.4.1 2005/09/15 08:15:32 suresh_emailid Exp $ -# -# Specify defaults when method="html". These defaults use output_xml.properties +# Specify defaults when method="html". These defaults use output_xml.properties # as a base. # @@ -39,7 +38,7 @@ version=4.0 # xalan:content-handler="MyContentHandler"/> # ... # Note that the colon after the protocol needs to be escaped. -{http\u003a//xml.apache.org/xalan}indent-amount=0 +{http\u003a//xml.apache.org/xalan}indent-amount=4 {http\u003a//xml.apache.org/xalan}content-handler=com.sun.org.apache.xml.internal.serializer.ToHTMLStream {http\u003a//xml.apache.org/xalan}entities=com/sun/org/apache/xml/internal/serializer/HTMLEntities {http\u003a//xml.apache.org/xalan}use-url-escaping=yes diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java index 6252f22faf2..5462e2a5e97 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java @@ -35,8 +35,6 @@ import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl; import com.sun.org.apache.xerces.internal.utils.SecuritySupport; import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager; import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException; -import java.util.Collections; -import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -142,16 +140,8 @@ public class XMLEntityStorage { return fEntities.get(name); } // getEntity(String) - public boolean hasEntities() { - return (fEntities!=null); - } // getEntity(String) - - public int getEntitySize() { - return fEntities.size(); - } // getEntity(String) - - public Enumeration getEntityKeys() { - return Collections.enumeration(fEntities.keySet()); + public Map getEntities() { + return fEntities; } /** * Adds an internal entity declaration. @@ -310,9 +300,9 @@ public class XMLEntityStorage { fCurrentEntity = fEntityManager.getCurrentEntity(); if (!fEntities.containsKey(name)) { - Entity entity = new Entity.ExternalEntity(name, new XMLResourceIdentifierImpl(publicId, systemId, baseSystemId, null), notation, fInExternalSubset); - // (fCurrentEntity == null) ? fasle : fCurrentEntity.isEntityDeclInExternalSubset()); - // fCurrentEntity.isEntityDeclInExternalSubset()); + Entity entity = new Entity.ExternalEntity(name, + new XMLResourceIdentifierImpl(publicId, systemId, baseSystemId, null), + notation, fInExternalSubset); fEntities.put(name, entity); } else{ @@ -438,7 +428,7 @@ public class XMLEntityStorage { userDir = userDir.replace(separator, '/'); int len = userDir.length(), ch; - StringBuffer buffer = new StringBuffer(len*3); + StringBuilder buffer = new StringBuilder(len*3); // change C:/blah to /C:/blah if (len >= 2 && userDir.charAt(1) == ':') { ch = Character.toUpperCase(userDir.charAt(0)); diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java index b1331b5ef34..566b5c05e78 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java @@ -1,15 +1,16 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, @@ -24,8 +25,6 @@ import com.sun.xml.internal.stream.dtd.nonvalidating.XMLAttributeDecl; import com.sun.xml.internal.stream.dtd.nonvalidating.XMLElementDecl; import com.sun.xml.internal.stream.dtd.nonvalidating.XMLSimpleType; import com.sun.org.apache.xerces.internal.impl.Constants; -import com.sun.org.apache.xerces.internal.impl.XMLEntityManager; -import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter; import com.sun.org.apache.xerces.internal.util.SymbolTable; import com.sun.org.apache.xerces.internal.util.XMLChar; import com.sun.org.apache.xerces.internal.util.XMLSymbols; @@ -33,13 +32,10 @@ import com.sun.org.apache.xerces.internal.xni.Augmentations; import com.sun.org.apache.xerces.internal.xni.QName; import com.sun.org.apache.xerces.internal.xni.NamespaceContext; import com.sun.org.apache.xerces.internal.xni.XMLAttributes; -import com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler; -import com.sun.org.apache.xerces.internal.xni.XMLLocator; import com.sun.org.apache.xerces.internal.xni.XMLString; import com.sun.org.apache.xerces.internal.xni.XNIException; import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager; import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException; -import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentSource; import javax.xml.XMLConstants; /* @@ -96,7 +92,7 @@ public class DTDGrammarUtil { private QName fTempQName = new QName(); /** Temporary string buffers. */ - private StringBuffer fBuffer = new StringBuffer(); + private StringBuilder fBuffer = new StringBuilder(); private NamespaceContext fNamespaceContext = null; @@ -396,7 +392,7 @@ public class DTDGrammarUtil { XMLSymbols.fENTITYSymbol; } case XMLSimpleType.TYPE_ENUMERATION: { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append('('); for (int i = 0; i < attrDecl.simpleType.enumeration.length; i++) { if (i > 0) { diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java index 2cef9fa95d1..fdd45efcf74 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java @@ -1,15 +1,16 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, @@ -34,7 +35,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; /** * A DTD grammar. This class implements the XNI handler interfaces @@ -95,8 +95,8 @@ public class DTDGrammar { protected boolean fReadingExternalDTD = false; /** Symbol table. */ - private SymbolTable fSymbolTable; - private ArrayList notationDecls = new ArrayList(); + private final SymbolTable fSymbolTable; + private final ArrayList notationDecls = new ArrayList<>(); // element declarations @@ -334,18 +334,19 @@ public class DTDGrammar { fSimpleType.clear(); if ( defaultType != null ) { if ( defaultType.equals( "#FIXED") ) { - fSimpleType.defaultType = fSimpleType.DEFAULT_TYPE_FIXED; + fSimpleType.defaultType = XMLSimpleType.DEFAULT_TYPE_FIXED; } else if ( defaultType.equals( "#IMPLIED") ) { - fSimpleType.defaultType = fSimpleType.DEFAULT_TYPE_IMPLIED; + fSimpleType.defaultType = XMLSimpleType.DEFAULT_TYPE_IMPLIED; } else if ( defaultType.equals( "#REQUIRED") ) { - fSimpleType.defaultType = fSimpleType.DEFAULT_TYPE_REQUIRED; + fSimpleType.defaultType = XMLSimpleType.DEFAULT_TYPE_REQUIRED; } } if ( DEBUG ) { System.out.println("defaultvalue = " + defaultValue.toString() ); } - fSimpleType.defaultValue = defaultValue!=null ? defaultValue.toString() : null; - fSimpleType.nonNormalizedDefaultValue = nonNormalizedDefaultValue!=null ? nonNormalizedDefaultValue.toString() : null; + fSimpleType.defaultValue = defaultValue!=null ? defaultValue.toString() : null; + fSimpleType.nonNormalizedDefaultValue = nonNormalizedDefaultValue!=null ? + nonNormalizedDefaultValue.toString() : null; fSimpleType.enumeration = enumeration; if (type.equals("CDATA")) { @@ -731,7 +732,7 @@ public class DTDGrammar { notationDecls.add(notationDecl); } - public List getNotationDecls(){ + public List getNotationDecls() { return notationDecls; } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java index b3e8f5a5e29..faeafddf51d 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java @@ -3,13 +3,14 @@ */ /* - * Copyright 2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java index d0d950f1db9..86731591eb2 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java @@ -3,13 +3,14 @@ */ /* - * Copyright 2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java index a16458312a0..ab68f502f34 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java @@ -3,13 +3,14 @@ */ /* - * Copyright 2005 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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, diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java index 9b815204851..425c43148f3 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,80 +25,88 @@ package com.sun.xml.internal.stream.events; +import java.util.List; import javax.xml.stream.events.DTD; +import javax.xml.stream.events.EntityDeclaration; +import javax.xml.stream.events.NotationDeclaration; import javax.xml.stream.events.XMLEvent; /** * - * @author Neeraj Bajaj, Sun Microsystesm. + * @author Neeraj Bajaj, Sun Microsystesm. * */ -public class DTDEvent extends DummyEvent implements DTD{ +public class DTDEvent extends DummyEvent implements DTD { private String fDoctypeDeclaration; - private java.util.List fNotations; - private java.util.List fEntities; + private List fNotations; + private List fEntities; - /** Creates a new instance of DTDEvent */ + /** + * Creates a new instance of DTDEvent + */ public DTDEvent() { init(); } - public DTDEvent(String doctypeDeclaration){ + public DTDEvent(String doctypeDeclaration) { init(); fDoctypeDeclaration = doctypeDeclaration; } - public void setDocumentTypeDeclaration(String doctypeDeclaration){ + public void setDocumentTypeDeclaration(String doctypeDeclaration) { fDoctypeDeclaration = doctypeDeclaration; } + @Override public String getDocumentTypeDeclaration() { return fDoctypeDeclaration; } //xxx: we can change the signature if the implementation doesn't store the entities in List Datatype. //and then convert that DT to list format here. That way callee dont need to bother about conversion - - public void setEntities(java.util.List entites){ + public void setEntities(List entites) { fEntities = entites; } - public java.util.List getEntities() { + @Override + public List getEntities() { return fEntities; } //xxx: we can change the signature if the implementation doesn't store the entities in List Datatype. //and then convert that DT to list format here. That way callee dont need to bother about conversion - - public void setNotations(java.util.List notations){ + public void setNotations(List notations) { fNotations = notations; } - public java.util.List getNotations() { + @Override + public List getNotations() { return fNotations; } /** - *Returns an implementation defined representation of the DTD. - * This method may return null if no representation is available. + * Returns an implementation defined representation of the DTD. This method + * may return null if no representation is available. * */ + @Override public Object getProcessedDTD() { return null; } - protected void init(){ + protected final void init() { setEventType(XMLEvent.DTD); } - public String toString(){ - return fDoctypeDeclaration ; + @Override + public String toString() { + return fDoctypeDeclaration; } + @Override protected void writeAsEncodedUnicodeEx(java.io.Writer writer) - throws java.io.IOException - { + throws java.io.IOException { writer.write(fDoctypeDeclaration); } } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java index c441d42cb0a..e57a3652a76 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - -package com.sun.xml.internal.stream.events ; +package com.sun.xml.internal.stream.events; import java.util.List; import java.util.ArrayList; @@ -31,35 +30,33 @@ import java.util.ArrayList; import javax.xml.namespace.QName; import javax.xml.stream.events.EndElement; import javax.xml.stream.events.Namespace; -import java.io.Writer; import java.util.Iterator; import javax.xml.stream.events.XMLEvent; import com.sun.xml.internal.stream.util.ReadOnlyIterator; -/** Implementation of EndElement event. +/** + * Implementation of EndElement event. * * @author Neeraj Bajaj Sun Microsystems,Inc. * @author K.Venugopal Sun Microsystems,Inc. */ - public class EndElementEvent extends DummyEvent -implements EndElement { + implements EndElement { - List fNamespaces = null; - QName fQName ; + List fNamespaces = null; + QName fQName; public EndElementEvent() { init(); } - protected void init() { + protected final void init() { setEventType(XMLEvent.END_ELEMENT); - fNamespaces = new ArrayList(); + fNamespaces = new ArrayList<>(); } - - public EndElementEvent(String prefix, String uri, String localpart) { - this(new QName(uri,localpart,prefix)); + public EndElementEvent(String prefix, String uri, String localpart) { + this(new QName(uri, localpart, prefix)); } public EndElementEvent(QName qname) { @@ -67,6 +64,7 @@ implements EndElement { init(); } + @Override public QName getName() { return fQName; } @@ -75,34 +73,36 @@ implements EndElement { this.fQName = qname; } + @Override protected void writeAsEncodedUnicodeEx(java.io.Writer writer) - throws java.io.IOException - { + throws java.io.IOException { writer.write(" 0) { writer.write(prefix); writer.write(':'); - } + } writer.write(fQName.getLocalPart()); writer.write('>'); } - /** Returns an Iterator of namespaces that have gone out - * of scope. Returns an empty iterator if no namespaces have gone - * out of scope. - * @return an Iterator over Namespace interfaces, or an - * empty iterator + /** + * Returns an Iterator of namespaces that have gone out of scope. Returns an + * empty iterator if no namespaces have gone out of scope. + * + * @return an Iterator over Namespace interfaces, or an empty iterator */ - public Iterator getNamespaces() { - if(fNamespaces != null) + @Override + public Iterator getNamespaces() { + if (fNamespaces != null) { fNamespaces.iterator(); - return new ReadOnlyIterator(); + } + return new ReadOnlyIterator<>(); } - void addNamespace(Namespace attr){ - if(attr != null){ - fNamespaces.add(attr); + void addNamespace(Namespace ns) { + if (ns != null) { + fNamespaces.add(ns); } } @@ -113,12 +113,15 @@ implements EndElement { } public String nameAsString() { - if("".equals(fQName.getNamespaceURI())) + if ("".equals(fQName.getNamespaceURI())) { return fQName.getLocalPart(); - if(fQName.getPrefix() != null) + } + + if (fQName.getPrefix() != null) { return "['" + fQName.getNamespaceURI() + "']:" + fQName.getPrefix() + ":" + fQName.getLocalPart(); - else + } else { return "['" + fQName.getNamespaceURI() + "']:" + fQName.getLocalPart(); + } } } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java index 71f6989f961..577385f91a7 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,35 +23,33 @@ * questions. */ -package com.sun.xml.internal.stream.events ; +package com.sun.xml.internal.stream.events; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; +import com.sun.xml.internal.stream.util.ReadOnlyIterator; import java.util.ArrayList; import java.util.Collection; - -import javax.xml.namespace.QName; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.Attribute; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.xml.namespace.NamespaceContext; -import java.io.Writer; -import com.sun.xml.internal.stream.util.ReadOnlyIterator; +import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.events.Attribute; import javax.xml.stream.events.Namespace; +import javax.xml.stream.events.StartElement; -/** Implementation of StartElementEvent. +/** + * Implementation of StartElementEvent. * * @author Neeraj Bajaj Sun Microsystems,Inc. * @author K.Venugopal Sun Microsystems,Inc. */ - public class StartElementEvent extends DummyEvent -implements StartElement { + implements StartElement { - private Map fAttributes; - private List fNamespaces; + private Map fAttributes; + private List fNamespaces; private NamespaceContext fNamespaceContext = null; private QName fQName; @@ -70,12 +68,13 @@ implements StartElement { addNamespaceAttributes(startelement.getNamespaces()); } - protected void init() { + protected final void init() { setEventType(XMLStreamConstants.START_ELEMENT); - fAttributes = new HashMap(); - fNamespaces = new ArrayList(); + fAttributes = new HashMap<>(); + fNamespaces = new ArrayList<>(); } + @Override public QName getName() { return fQName; } @@ -84,50 +83,60 @@ implements StartElement { this.fQName = qname; } - public Iterator getAttributes() { - if(fAttributes != null){ - Collection coll = fAttributes.values(); - return new ReadOnlyIterator(coll.iterator()); + @Override + public Iterator getAttributes() { + if (fAttributes != null) { + Collection coll = fAttributes.values(); + return new ReadOnlyIterator<>(coll.iterator()); } - return new ReadOnlyIterator(); + return new ReadOnlyIterator<>(); } - public Iterator getNamespaces() { - if(fNamespaces != null){ - return new ReadOnlyIterator(fNamespaces.iterator()); + @Override + public Iterator getNamespaces() { + if (fNamespaces != null) { + return new ReadOnlyIterator<>(fNamespaces.iterator()); } - return new ReadOnlyIterator(); + return new ReadOnlyIterator<>(); } + @Override public Attribute getAttributeByName(QName qname) { - if(qname == null) + if (qname == null) { return null; - return (Attribute)fAttributes.get(qname); + } + return fAttributes.get(qname); } - public String getNamespace(){ + public String getNamespace() { return fQName.getNamespaceURI(); } + @Override public String getNamespaceURI(String prefix) { //check that URI was supplied when creating this startElement event and prefix matches - if( getNamespace() != null && fQName.getPrefix().equals(prefix)) return getNamespace(); + if (getNamespace() != null && fQName.getPrefix().equals(prefix)) { + return getNamespace(); + } //else check the namespace context - if(fNamespaceContext != null) + if (fNamespaceContext != null) { return fNamespaceContext.getNamespaceURI(prefix); + } return null; } /** - *

Return a String representation of this + *

+ * Return a String representation of this * StartElement formatted as XML.

* * @return String representation of this - * StartElement formatted as XML. + * StartElement formatted as XML. */ + @Override public String toString() { - StringBuffer startElement = new StringBuffer(); + StringBuilder startElement = new StringBuilder(); // open element startElement.append("<"); @@ -135,10 +144,10 @@ implements StartElement { // add any attributes if (fAttributes != null) { - Iterator it = this.getAttributes(); - Attribute attr = null; + Iterator it = this.getAttributes(); + Attribute attr; while (it.hasNext()) { - attr = (Attribute) it.next(); + attr = it.next(); startElement.append(" "); startElement.append(attr.toString()); } @@ -146,12 +155,12 @@ implements StartElement { // add any namespaces if (fNamespaces != null) { - Iterator it = fNamespaces.iterator(); - Namespace attr = null; + Iterator it = fNamespaces.iterator(); + Namespace ns; while (it.hasNext()) { - attr = (Namespace) it.next(); + ns = it.next(); startElement.append(" "); - startElement.append(attr.toString()); + startElement.append(ns.toString()); } } @@ -162,26 +171,31 @@ implements StartElement { return startElement.toString(); } - /** Return this event as String + /** + * Return this event as String + * * @return String Event returned as string. */ public String nameAsString() { - if("".equals(fQName.getNamespaceURI())) + if ("".equals(fQName.getNamespaceURI())) { return fQName.getLocalPart(); - if(fQName.getPrefix() != null) - return "['" + fQName.getNamespaceURI() + "']:" + fQName.getPrefix() + ":" + fQName.getLocalPart(); - else + } + if (fQName.getPrefix() != null) { + return "['" + fQName.getNamespaceURI() + "']:" + fQName.getPrefix() + + ":" + fQName.getLocalPart(); + } else { return "['" + fQName.getNamespaceURI() + "']:" + fQName.getLocalPart(); + } } - - /** Gets a read-only namespace context. If no context is - * available this method will return an empty namespace context. - * The NamespaceContext contains information about all namespaces - * in scope for this StartElement. + /** + * Gets a read-only namespace context. If no context is available this + * method will return an empty namespace context. The NamespaceContext + * contains information about all namespaces in scope for this StartElement. * * @return the current namespace context */ + @Override public NamespaceContext getNamespaceContext() { return fNamespaceContext; } @@ -190,40 +204,43 @@ implements StartElement { fNamespaceContext = nc; } + @Override protected void writeAsEncodedUnicodeEx(java.io.Writer writer) - throws java.io.IOException - { + throws java.io.IOException { writer.write(toString()); } - void addAttribute(Attribute attr){ - if(attr.isNamespace()){ - fNamespaces.add(attr); - }else{ - fAttributes.put(attr.getName(),attr); + void addAttribute(Attribute attr) { + if (attr.isNamespace()) { + fNamespaces.add((Namespace) attr); + } else { + fAttributes.put(attr.getName(), attr); } } - void addAttributes(Iterator attrs){ - if(attrs == null) + final void addAttributes(Iterator attrs) { + if (attrs == null) { return; - while(attrs.hasNext()){ - Attribute attr = (Attribute)attrs.next(); - fAttributes.put(attr.getName(),attr); + } + while (attrs.hasNext()) { + Attribute attr = attrs.next(); + fAttributes.put(attr.getName(), attr); } } - void addNamespaceAttribute(Namespace attr){ - if(attr == null) + void addNamespaceAttribute(Namespace attr) { + if (attr == null) { return; + } fNamespaces.add(attr); } - void addNamespaceAttributes(Iterator attrs){ - if(attrs == null) + final void addNamespaceAttributes(Iterator attrs) { + if (attrs == null) { return; - while(attrs.hasNext()){ - Namespace attr = (Namespace)attrs.next(); + } + while (attrs.hasNext()) { + Namespace attr = attrs.next(); fNamespaces.add(attr); } } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java index 065a7cd0b71..b59771e63af 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - package com.sun.xml.internal.stream.events; import com.sun.org.apache.xerces.internal.impl.PropertyManager; @@ -34,29 +33,36 @@ import javax.xml.XMLConstants; import javax.xml.namespace.QName; import com.sun.org.apache.xerces.internal.util.NamespaceContextWrapper; import com.sun.org.apache.xerces.internal.util.NamespaceSupport; +import javax.xml.stream.util.XMLEventConsumer; /** * Implementation of XMLEvent Allocator. + * * @author Neeraj.bajaj@sun.com, k.venugopal@sun.com */ public class XMLEventAllocatorImpl implements XMLEventAllocator { - /** Creates a new instance of XMLEventAllocator */ + /** + * Creates a new instance of XMLEventAllocator + */ public XMLEventAllocatorImpl() { } - public javax.xml.stream.events.XMLEvent allocate(javax.xml.stream.XMLStreamReader xMLStreamReader) throws javax.xml.stream.XMLStreamException { - if(xMLStreamReader == null ) + public XMLEvent allocate(XMLStreamReader xMLStreamReader) throws XMLStreamException { + if (xMLStreamReader == null) { throw new XMLStreamException("Reader cannot be null"); + } // allocate is not supposed to change the state of the reader so we shouldn't be calling next. // return getNextEvent(xMLStreamReader); return getXMLEvent(xMLStreamReader); } - public void allocate(javax.xml.stream.XMLStreamReader xMLStreamReader, javax.xml.stream.util.XMLEventConsumer xMLEventConsumer) throws javax.xml.stream.XMLStreamException { + public void allocate(XMLStreamReader xMLStreamReader, XMLEventConsumer xMLEventConsumer) + throws XMLStreamException { XMLEvent currentEvent = getXMLEvent(xMLStreamReader); - if(currentEvent != null ) + if (currentEvent != null) { xMLEventConsumer.add(currentEvent); + } return; } @@ -66,141 +72,149 @@ public class XMLEventAllocatorImpl implements XMLEventAllocator { } //REVISIT: shouldn't we be using XMLEventFactory to create events. - XMLEvent getXMLEvent(XMLStreamReader streamReader){ + XMLEvent getXMLEvent(XMLStreamReader streamReader) { XMLEvent event = null; //returns the current event int eventType = streamReader.getEventType(); - switch(eventType){ + switch (eventType) { - case XMLEvent.START_ELEMENT:{ + case XMLEvent.START_ELEMENT: { StartElementEvent startElementEvent = new StartElementEvent(getQName(streamReader)); - fillAttributes(startElementEvent,streamReader); - //we might have different XMLStreamReader so check every time for the namespace aware property - //we should be setting namespace related values only when isNamespaceAware is 'true' - if( ((Boolean)streamReader.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue() ){ + fillAttributes(startElementEvent, streamReader); + //we might have different XMLStreamReader so check every time for + //the namespace aware property. we should be setting namespace + //related values only when isNamespaceAware is 'true' + if (((Boolean) streamReader.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE))) { fillNamespaceAttributes(startElementEvent, streamReader); - setNamespaceContext(startElementEvent,streamReader); + setNamespaceContext(startElementEvent, streamReader); } startElementEvent.setLocation(streamReader.getLocation()); - event = startElementEvent ; + event = startElementEvent; break; } - case XMLEvent.END_ELEMENT:{ + case XMLEvent.END_ELEMENT: { EndElementEvent endElementEvent = new EndElementEvent(getQName(streamReader)); endElementEvent.setLocation(streamReader.getLocation()); - if( ((Boolean)streamReader.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue() ){ - fillNamespaceAttributes(endElementEvent,streamReader); + if (((Boolean) streamReader.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE))) { + fillNamespaceAttributes(endElementEvent, streamReader); } - event = endElementEvent ; + event = endElementEvent; break; } - case XMLEvent.PROCESSING_INSTRUCTION:{ - ProcessingInstructionEvent piEvent = new ProcessingInstructionEvent(streamReader.getPITarget(),streamReader.getPIData()); + case XMLEvent.PROCESSING_INSTRUCTION: { + ProcessingInstructionEvent piEvent = new ProcessingInstructionEvent( + streamReader.getPITarget(), streamReader.getPIData()); piEvent.setLocation(streamReader.getLocation()); - event = piEvent ; + event = piEvent; break; } - case XMLEvent.CHARACTERS:{ + case XMLEvent.CHARACTERS: { CharacterEvent cDataEvent = new CharacterEvent(streamReader.getText()); cDataEvent.setLocation(streamReader.getLocation()); - event = cDataEvent ; + event = cDataEvent; break; } - case XMLEvent.COMMENT:{ + case XMLEvent.COMMENT: { CommentEvent commentEvent = new CommentEvent(streamReader.getText()); commentEvent.setLocation(streamReader.getLocation()); - event = commentEvent ; + event = commentEvent; break; } - case XMLEvent.START_DOCUMENT:{ + case XMLEvent.START_DOCUMENT: { StartDocumentEvent sdEvent = new StartDocumentEvent(); sdEvent.setVersion(streamReader.getVersion()); sdEvent.setEncoding(streamReader.getEncoding()); - if(streamReader.getCharacterEncodingScheme() != null){ + if (streamReader.getCharacterEncodingScheme() != null) { sdEvent.setDeclaredEncoding(true); - }else{ + } else { sdEvent.setDeclaredEncoding(false); } sdEvent.setStandalone(streamReader.isStandalone()); sdEvent.setLocation(streamReader.getLocation()); - event = sdEvent ; + event = sdEvent; break; } - case XMLEvent.END_DOCUMENT:{ - EndDocumentEvent endDocumentEvent = new EndDocumentEvent() ; + case XMLEvent.END_DOCUMENT: { + EndDocumentEvent endDocumentEvent = new EndDocumentEvent(); endDocumentEvent.setLocation(streamReader.getLocation()); - event = endDocumentEvent ; + event = endDocumentEvent; break; } - case XMLEvent.ENTITY_REFERENCE:{ - EntityReferenceEvent entityEvent = new EntityReferenceEvent(streamReader.getLocalName(), new EntityDeclarationImpl(streamReader.getLocalName(),streamReader.getText())); + case XMLEvent.ENTITY_REFERENCE: { + EntityReferenceEvent entityEvent = new EntityReferenceEvent(streamReader.getLocalName(), + new EntityDeclarationImpl(streamReader.getLocalName(), streamReader.getText())); entityEvent.setLocation(streamReader.getLocation()); event = entityEvent; break; } - case XMLEvent.ATTRIBUTE:{ - event = null ; + case XMLEvent.ATTRIBUTE: { + event = null; break; } - case XMLEvent.DTD:{ + case XMLEvent.DTD: { DTDEvent dtdEvent = new DTDEvent(streamReader.getText()); dtdEvent.setLocation(streamReader.getLocation()); - List entities = (List)streamReader.getProperty(PropertyManager.STAX_ENTITIES); - if (entities != null && entities.size() != 0) dtdEvent.setEntities(entities); - List notations = (List)streamReader.getProperty(PropertyManager.STAX_NOTATIONS); - if (notations != null && notations.size() != 0) dtdEvent.setNotations(notations); + @SuppressWarnings("unchecked") + List entities = (List) + streamReader.getProperty(PropertyManager.STAX_ENTITIES); + if (entities != null && entities.size() != 0) { + dtdEvent.setEntities(entities); + } + @SuppressWarnings("unchecked") + List notations = (List) + streamReader.getProperty(PropertyManager.STAX_NOTATIONS); + if (notations != null && !notations.isEmpty()) { + dtdEvent.setNotations(notations); + } event = dtdEvent; break; } - case XMLEvent.CDATA:{ - CharacterEvent cDataEvent = new CharacterEvent(streamReader.getText(),true); + case XMLEvent.CDATA: { + CharacterEvent cDataEvent = new CharacterEvent(streamReader.getText(), true); cDataEvent.setLocation(streamReader.getLocation()); - event = cDataEvent ; + event = cDataEvent; break; } - case XMLEvent.SPACE:{ - CharacterEvent spaceEvent = new CharacterEvent(streamReader.getText(),false,true); + case XMLEvent.SPACE: { + CharacterEvent spaceEvent = new CharacterEvent(streamReader.getText(), false, true); spaceEvent.setLocation(streamReader.getLocation()); - event = spaceEvent ; + event = spaceEvent; break; } } - return event ; + return event; } //this function is not used.. - protected XMLEvent getNextEvent(XMLStreamReader streamReader) throws XMLStreamException{ + protected XMLEvent getNextEvent(XMLStreamReader streamReader) throws XMLStreamException { //advance the reader to next event. streamReader.next(); return getXMLEvent(streamReader); } - protected void fillAttributes(StartElementEvent event,XMLStreamReader xmlr){ + protected void fillAttributes(StartElementEvent event, XMLStreamReader xmlr) { int len = xmlr.getAttributeCount(); QName qname = null; AttributeImpl attr = null; NamespaceImpl nattr = null; - for(int i=0; i namespaces) { return createEndElement(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart()); } - public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri, String localName) { + @Override + public javax.xml.stream.events.EndElement createEndElement( + String prefix, String namespaceUri, String localName) { EndElementEvent event = new EndElementEvent(prefix, namespaceUri, localName); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri, String localName, java.util.Iterator namespaces) { + @Override + public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri, + String localName, Iterator namespaces) { EndElementEvent event = new EndElementEvent(prefix, namespaceUri, localName); if(namespaces!=null){ while(namespaces.hasNext()) - event.addNamespace((Namespace)namespaces.next()); + event.addNamespace(namespaces.next()); } if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.EntityReference createEntityReference(String name, EntityDeclaration entityDeclaration) { + @Override + public EntityReference createEntityReference(String name, EntityDeclaration entityDeclaration) { EntityReferenceEvent event = new EntityReferenceEvent(name, entityDeclaration); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.Characters createIgnorableSpace(String content) { + @Override + public Characters createIgnorableSpace(String content) { CharacterEvent event = new CharacterEvent(content, false, true); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.Namespace createNamespace(String namespaceURI) { + @Override + public Namespace createNamespace(String namespaceURI) { NamespaceImpl event = new NamespaceImpl(namespaceURI); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.Namespace createNamespace(String prefix, String namespaceURI) { + @Override + public Namespace createNamespace(String prefix, String namespaceURI) { NamespaceImpl event = new NamespaceImpl(prefix, namespaceURI); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.ProcessingInstruction createProcessingInstruction(String target, String data) { + @Override + public ProcessingInstruction createProcessingInstruction(String target, String data) { ProcessingInstructionEvent event = new ProcessingInstructionEvent(target, data); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.Characters createSpace(String content) { + @Override + public Characters createSpace(String content) { CharacterEvent event = new CharacterEvent(content); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartDocument createStartDocument() { + @Override + public StartDocument createStartDocument() { StartDocumentEvent event = new StartDocumentEvent(); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartDocument createStartDocument(String encoding) { + @Override + public StartDocument createStartDocument(String encoding) { StartDocumentEvent event = new StartDocumentEvent(encoding); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartDocument createStartDocument(String encoding, String version) { + @Override + public StartDocument createStartDocument(String encoding, String version) { StartDocumentEvent event = new StartDocumentEvent(encoding, version); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartDocument createStartDocument(String encoding, String version, boolean standalone) { + @Override + public StartDocument createStartDocument(String encoding, String version, boolean standalone) { StartDocumentEvent event = new StartDocumentEvent(encoding, version, standalone); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartElement createStartElement(javax.xml.namespace.QName name, java.util.Iterator attributes, java.util.Iterator namespaces) { - return createStartElement(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart(), attributes, namespaces); + @Override + public StartElement createStartElement(QName name, Iterator attributes, + Iterator namespaces) { + return createStartElement(name.getPrefix(), name.getNamespaceURI(), + name.getLocalPart(), attributes, namespaces); } - public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName) { + @Override + public StartElement createStartElement(String prefix, String namespaceUri, String localName) { StartElementEvent event = new StartElementEvent(prefix, namespaceUri, localName); if(location != null)event.setLocation(location); return event; } - public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName, java.util.Iterator attributes, java.util.Iterator namespaces) { + @Override + public StartElement createStartElement(String prefix, String namespaceUri, + String localName, Iterator attributes, + Iterator namespaces) { return createStartElement(prefix, namespaceUri, localName, attributes, namespaces, null); } - public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName, java.util.Iterator attributes, java.util.Iterator namespaces, javax.xml.namespace.NamespaceContext context) { + @Override + public StartElement createStartElement(String prefix, String namespaceUri, + String localName, Iterator attributes, + Iterator namespaces, NamespaceContext context) { StartElementEvent elem = new StartElementEvent(prefix, namespaceUri, localName); elem.addAttributes(attributes); elem.addNamespaceAttributes(namespaces); @@ -194,6 +237,7 @@ public class XMLEventFactoryImpl extends XMLEventFactory { return elem; } + @Override public void setLocation(javax.xml.stream.Location location) { this.location = location; } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java index c1fd3c7dd4a..3106d15742e 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,35 +31,32 @@ package com.sun.xml.internal.stream.util; import java.util.Iterator; -public class ReadOnlyIterator implements Iterator { +public class ReadOnlyIterator implements Iterator { - Iterator iterator = null; + Iterator iterator = null; public ReadOnlyIterator(){ } - public ReadOnlyIterator(Iterator itr){ + public ReadOnlyIterator(Iterator itr){ iterator = itr; } - /** - * @return - */ + @Override public boolean hasNext() { if(iterator != null) return iterator.hasNext(); return false; } - /** - * @return - */ - public Object next() { + @Override + public T next() { if(iterator != null) return iterator.next(); return null; } + @Override public void remove() { throw new UnsupportedOperationException("Remove operation is not supported"); } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java index 25bdf6b966d..edb3edae53d 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java @@ -39,15 +39,15 @@ import java.lang.ref.*; * @author Santiago.PericasGeertsen@sun.com */ public class ThreadLocalBufferAllocator { - private static ThreadLocal tlba = new ThreadLocal(); + private static ThreadLocal tlba = new ThreadLocal<>(); public static BufferAllocator getBufferAllocator() { - SoftReference bAllocatorRef = (SoftReference) tlba.get(); + SoftReference bAllocatorRef = tlba.get(); if (bAllocatorRef == null || bAllocatorRef.get() == null) { bAllocatorRef = new SoftReference(new BufferAllocator()); tlba.set(bAllocatorRef); } - return (BufferAllocator) bAllocatorRef.get(); + return bAllocatorRef.get(); } } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java index 552e0301d13..7ee48af13d7 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java @@ -89,7 +89,7 @@ public final class UTF8OutputStreamWriter extends Writer { // Otherwise, encode char as defined in UTF-8 if (c < 0x80) { // 1 byte, 7 bits - out.write((int) c); + out.write(c); } else if (c < 0x800) { // 2 bytes, 11 bits diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java index 75500e8965b..e92508f6423 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java @@ -26,9 +26,12 @@ package com.sun.xml.internal.stream.writers; import java.util.Iterator; +import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; import javax.xml.stream.events.Attribute; import javax.xml.stream.events.Characters; import javax.xml.stream.events.Comment; @@ -39,24 +42,24 @@ import javax.xml.stream.events.ProcessingInstruction; import javax.xml.stream.events.StartDocument; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.XMLStreamWriter; /** * - * @author Neeraj Bajaj, Sun Microsystems. + * @author Neeraj Bajaj, Sun Microsystems. * */ -public class XMLEventWriterImpl implements XMLEventWriter{ +public class XMLEventWriterImpl implements XMLEventWriter { //delegate everything to XMLStreamWriter.. - private final XMLStreamWriterBase fStreamWriter ; + private final XMLStreamWriterBase fStreamWriter; private static final boolean DEBUG = false; + /** * * @param streamWriter */ - public XMLEventWriterImpl(XMLStreamWriter streamWriter){ - fStreamWriter = (XMLStreamWriterBase)streamWriter; + public XMLEventWriterImpl(XMLStreamWriter streamWriter) { + fStreamWriter = (XMLStreamWriterBase) streamWriter; } /** @@ -64,9 +67,11 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @param xMLEventReader * @throws XMLStreamException */ - public void add(javax.xml.stream.XMLEventReader xMLEventReader) throws javax.xml.stream.XMLStreamException { - if(xMLEventReader == null) throw new XMLStreamException("Event reader shouldn't be null"); - while(xMLEventReader.hasNext()){ + public void add(XMLEventReader xMLEventReader) throws XMLStreamException { + if (xMLEventReader == null) { + throw new XMLStreamException("Event reader shouldn't be null"); + } + while (xMLEventReader.hasNext()) { add(xMLEventReader.nextEvent()); } } @@ -76,101 +81,127 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @param xMLEvent * @throws XMLStreamException */ - public void add(javax.xml.stream.events.XMLEvent xMLEvent) throws javax.xml.stream.XMLStreamException { + public void add(XMLEvent xMLEvent) throws XMLStreamException { int type = xMLEvent.getEventType(); - switch(type){ - case XMLEvent.DTD:{ - DTD dtd = (DTD)xMLEvent ; - if (DEBUG)System.out.println("Adding DTD = " + dtd.toString()); + switch (type) { + case XMLEvent.DTD: { + DTD dtd = (DTD) xMLEvent; + if (DEBUG) { + System.out.println("Adding DTD = " + dtd.toString()); + } fStreamWriter.writeDTD(dtd.getDocumentTypeDeclaration()); break; } - case XMLEvent.START_DOCUMENT :{ - StartDocument startDocument = (StartDocument)xMLEvent ; - if (DEBUG)System.out.println("Adding StartDocument = " + startDocument.toString()); + case XMLEvent.START_DOCUMENT: { + StartDocument startDocument = (StartDocument) xMLEvent; + if (DEBUG) { + System.out.println("Adding StartDocument = " + startDocument.toString()); + } try { - fStreamWriter.writeStartDocument(startDocument.getCharacterEncodingScheme(), startDocument.getVersion(), - startDocument.isStandalone(), startDocument.standaloneSet()); - }catch(XMLStreamException e) { + fStreamWriter.writeStartDocument(startDocument.getCharacterEncodingScheme(), + startDocument.getVersion(), + startDocument.isStandalone(), startDocument.standaloneSet()); + } catch (XMLStreamException e) { fStreamWriter.writeStartDocument(startDocument.getVersion()); } break; } - case XMLEvent.START_ELEMENT :{ - StartElement startElement = xMLEvent.asStartElement() ; - if (DEBUG)System.out.println("Adding startelement = " + startElement.toString()); + case XMLEvent.START_ELEMENT: { + StartElement startElement = xMLEvent.asStartElement(); + if (DEBUG) { + System.out.println("Adding startelement = " + startElement.toString()); + } QName qname = startElement.getName(); - fStreamWriter.writeStartElement(qname.getPrefix(), qname.getLocalPart(), qname.getNamespaceURI()); + fStreamWriter.writeStartElement(qname.getPrefix(), qname.getLocalPart(), + qname.getNamespaceURI()); - //getNamespaces() Returns an Iterator of namespaces declared on this element. This Iterator does not contain - //previously declared namespaces unless they appear on the current START_ELEMENT. Therefore - //this list may contain redeclared namespaces and duplicate namespace declarations. Use the - //getNamespaceContext() method to get the current context of namespace declarations. - - //so we should be using getNamespaces() to write namespace declarations for this START_ELEMENT - Iterator iterator = startElement.getNamespaces(); - while(iterator.hasNext()){ - Namespace namespace = (Namespace)iterator.next(); + /* + getNamespaces() Returns an Iterator of namespaces declared on this element. + This Iterator does not contain previously declared namespaces unless they + appear on the current START_ELEMENT. Therefore this list may contain redeclared + namespaces and duplicate namespace declarations. Use the getNamespaceContext() + method to get the current context of namespace declarations. We should be + using getNamespaces() to write namespace declarations for this START_ELEMENT + */ + Iterator iterator = startElement.getNamespaces(); + while (iterator.hasNext()) { + Namespace namespace = iterator.next(); fStreamWriter.writeNamespace(namespace.getPrefix(), namespace.getNamespaceURI()); } //REVISIT: What about writing attributes ? - Iterator attributes = startElement.getAttributes(); - while(attributes.hasNext()){ - Attribute attribute = (Attribute)attributes.next(); + Iterator attributes = startElement.getAttributes(); + while (attributes.hasNext()) { + Attribute attribute = attributes.next(); QName aqname = attribute.getName(); - fStreamWriter.writeAttribute(aqname.getPrefix(), aqname.getNamespaceURI(), aqname.getLocalPart(),attribute.getValue()); + fStreamWriter.writeAttribute(aqname.getPrefix(), aqname.getNamespaceURI(), + aqname.getLocalPart(), attribute.getValue()); } break; } - case XMLEvent.NAMESPACE:{ - Namespace namespace = (Namespace)xMLEvent; - if (DEBUG)System.out.println("Adding namespace = " + namespace.toString()); + case XMLEvent.NAMESPACE: { + Namespace namespace = (Namespace) xMLEvent; + if (DEBUG) { + System.out.println("Adding namespace = " + namespace.toString()); + } fStreamWriter.writeNamespace(namespace.getPrefix(), namespace.getNamespaceURI()); - break ; + break; } case XMLEvent.COMMENT: { - Comment comment = (Comment)xMLEvent ; - if (DEBUG)System.out.println("Adding comment = " + comment.toString()); + Comment comment = (Comment) xMLEvent; + if (DEBUG) { + System.out.println("Adding comment = " + comment.toString()); + } fStreamWriter.writeComment(comment.getText()); break; } - case XMLEvent.PROCESSING_INSTRUCTION:{ - ProcessingInstruction processingInstruction = (ProcessingInstruction)xMLEvent ; - if (DEBUG)System.out.println("Adding processing instruction = " + processingInstruction.toString()); - fStreamWriter.writeProcessingInstruction(processingInstruction.getTarget(), processingInstruction.getData()); + case XMLEvent.PROCESSING_INSTRUCTION: { + ProcessingInstruction processingInstruction = (ProcessingInstruction) xMLEvent; + if (DEBUG) { + System.out.println("Adding processing instruction = " + processingInstruction.toString()); + } + fStreamWriter.writeProcessingInstruction(processingInstruction.getTarget(), + processingInstruction.getData()); break; } - case XMLEvent.CHARACTERS:{ + case XMLEvent.CHARACTERS: { Characters characters = xMLEvent.asCharacters(); - if (DEBUG)System.out.println("Adding characters = " + characters.toString()); - //check if the CHARACTERS are CDATA - if(characters.isCData()){ - fStreamWriter.writeCData(characters.getData()); + if (DEBUG) { + System.out.println("Adding characters = " + characters.toString()); } - else{ + //check if the CHARACTERS are CDATA + if (characters.isCData()) { + fStreamWriter.writeCData(characters.getData()); + } else { fStreamWriter.writeCharacters(characters.getData()); } break; } - case XMLEvent.ENTITY_REFERENCE:{ - EntityReference entityReference = (EntityReference)xMLEvent ; - if (DEBUG)System.out.println("Adding Entity Reference = "+ entityReference.toString()); + case XMLEvent.ENTITY_REFERENCE: { + EntityReference entityReference = (EntityReference) xMLEvent; + if (DEBUG) { + System.out.println("Adding Entity Reference = " + entityReference.toString()); + } fStreamWriter.writeEntityRef(entityReference.getName()); break; } - case XMLEvent.ATTRIBUTE:{ - Attribute attribute = (Attribute)xMLEvent; - if (DEBUG)System.out.println("Adding Attribute = " + attribute.toString()); + case XMLEvent.ATTRIBUTE: { + Attribute attribute = (Attribute) xMLEvent; + if (DEBUG) { + System.out.println("Adding Attribute = " + attribute.toString()); + } QName qname = attribute.getName(); - fStreamWriter.writeAttribute(qname.getPrefix(), qname.getNamespaceURI(), qname.getLocalPart(),attribute.getValue()); + fStreamWriter.writeAttribute(qname.getPrefix(), qname.getNamespaceURI(), + qname.getLocalPart(), attribute.getValue()); break; } - case XMLEvent.CDATA:{ + case XMLEvent.CDATA: { //there is no separate CDATA datatype but CDATA event can be reported //by using vendor specific CDATA property. - Characters characters = (Characters)xMLEvent; - if (DEBUG)System.out.println("Adding characters = " + characters.toString()); - if(characters.isCData()){ + Characters characters = (Characters) xMLEvent; + if (DEBUG) { + System.out.println("Adding characters = " + characters.toString()); + } + if (characters.isCData()) { fStreamWriter.writeCData(characters.getData()); } break; @@ -179,15 +210,11 @@ public class XMLEventWriterImpl implements XMLEventWriter{ //case XMLEvent.NOTATION_DECLARATION:{ //} - case XMLEvent.END_ELEMENT:{ - //we dont need to typecast it.. just call writeEndElement() and fStreamWriter will take care of it. - //EndElement endElement = (EndElement)xMLEvent; + case XMLEvent.END_ELEMENT: { fStreamWriter.writeEndElement(); break; } - case XMLEvent.END_DOCUMENT:{ - //we dont need to typecast just call writeEndDocument() and fStreamWriter will take care rest. - //EndDocument endDocument = (EndDocument)xMLEvent; + case XMLEvent.END_DOCUMENT: { fStreamWriter.writeEndDocument(); break; } @@ -200,16 +227,16 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * * @throws XMLStreamException */ - public void close() throws javax.xml.stream.XMLStreamException { + public void close() throws XMLStreamException { fStreamWriter.close(); } /** * - * @throws XMLStreamException will inturn call flush on the stream to which data is being - * written. + * @throws XMLStreamException will inturn call flush on the stream to which + * data is being written. */ - public void flush() throws javax.xml.stream.XMLStreamException { + public void flush() throws XMLStreamException { fStreamWriter.flush(); } @@ -217,7 +244,7 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * * @return */ - public javax.xml.namespace.NamespaceContext getNamespaceContext() { + public NamespaceContext getNamespaceContext() { return fStreamWriter.getNamespaceContext(); } @@ -227,7 +254,7 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @throws XMLStreamException * @return prefix associated with the URI. */ - public String getPrefix(String namespaceURI) throws javax.xml.stream.XMLStreamException { + public String getPrefix(String namespaceURI) throws XMLStreamException { return fStreamWriter.getPrefix(namespaceURI); } @@ -236,7 +263,7 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @param uri Namespace URI * @throws XMLStreamException */ - public void setDefaultNamespace(String uri) throws javax.xml.stream.XMLStreamException { + public void setDefaultNamespace(String uri) throws XMLStreamException { fStreamWriter.setDefaultNamespace(uri); } @@ -245,7 +272,8 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @param namespaceContext Namespace Context * @throws XMLStreamException */ - public void setNamespaceContext(javax.xml.namespace.NamespaceContext namespaceContext) throws javax.xml.stream.XMLStreamException { + public void setNamespaceContext(NamespaceContext namespaceContext) + throws XMLStreamException { fStreamWriter.setNamespaceContext(namespaceContext); } @@ -255,7 +283,7 @@ public class XMLEventWriterImpl implements XMLEventWriter{ * @param uri Namespace URI * @throws XMLStreamException */ - public void setPrefix(String prefix, String uri) throws javax.xml.stream.XMLStreamException { + public void setPrefix(String prefix, String uri) throws XMLStreamException { fStreamWriter.setPrefix(prefix, uri); } diff --git a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java index b7a0652087a..3ec7f7c742a 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java +++ b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java @@ -35,7 +35,6 @@ import java.nio.charset.CharsetEncoder; import java.util.AbstractMap; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Random; import java.util.Vector; import java.util.Set; @@ -46,7 +45,6 @@ import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.stream.StreamResult; import com.sun.org.apache.xerces.internal.impl.Constants; @@ -71,7 +69,8 @@ import com.sun.xml.internal.stream.util.ReadOnlyIterator; * @author Santiago.Pericas-Geertsen@sun.com * @author Sunitha.Reddy@sun.com */ -public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamWriterBase { +public final class XMLStreamWriterImpl extends AbstractMap + implements XMLStreamWriterBase { public static final String START_COMMENT = ""; @@ -115,12 +114,12 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW /** * Collects attributes when the writer is in reparing mode. */ - private ArrayList fAttributeCache; + private ArrayList fAttributeCache; /** * Collects namespace declarations when the writer is in reparing mode. */ - private ArrayList fNamespaceDecls; + private ArrayList fNamespaceDecls; /** * Namespace context encapsulating user specified context @@ -153,7 +152,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW final private String DEFAULT_PREFIX = fSymbolTable.addSymbol(""); - private final ReadOnlyIterator fReadOnlyIterator = new ReadOnlyIterator(); + private final ReadOnlyIterator fReadOnlyIterator = new ReadOnlyIterator<>(); /** * In some cases, this charset encoder is used to determine if a char is @@ -168,7 +167,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * the same uri as the default namespace; It's added to avoid changing the * current impl. which has many redundant code for the repair mode */ - HashMap fAttrNamespace = null; + HashMap fAttrNamespace = null; /** * Creates a new instance of XMLStreamWriterImpl. Uses platform's default @@ -230,9 +229,9 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW */ private void init() { fReuse = false; - fNamespaceDecls = new ArrayList(); + fNamespaceDecls = new ArrayList<>(); fPrefixGen = new Random(); - fAttributeCache = new ArrayList(); + fAttributeCache = new ArrayList<>(); fInternalNamespaceContext = new NamespaceSupport(); fInternalNamespaceContext.reset(); fNamespaceContext = new NamespaceContextImpl(); @@ -240,9 +239,9 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW // Set internal state based on property values Boolean ob = (Boolean) fPropertyManager.getProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES); - fIsRepairingNamespace = ob.booleanValue(); + fIsRepairingNamespace = ob; ob = (Boolean) fPropertyManager.getProperty(Constants.ESCAPE_CHARACTERS); - setEscapeCharacters(ob.booleanValue()); + setEscapeCharacters(ob); } /** @@ -279,9 +278,9 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW if (resetProperties) { Boolean ob = (Boolean) fPropertyManager.getProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES); - fIsRepairingNamespace = ob.booleanValue(); + fIsRepairingNamespace = ob; ob = (Boolean) fPropertyManager.getProperty(Constants.ESCAPE_CHARACTERS); - setEscapeCharacters(ob.booleanValue()); + setEscapeCharacters(ob); } } @@ -369,6 +368,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW /** * Close this XMLStreamWriter by closing underlying writer. */ + @Override public void close() throws XMLStreamException { if (fWriter != null) { try { @@ -392,6 +392,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW /** * Flush this XMLStreamWriter by flushin underlying writer. */ + @Override public void flush() throws XMLStreamException { try { fWriter.flush(); @@ -405,6 +406,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * * @return NamespaceContext */ + @Override public NamespaceContext getNamespaceContext() { return fNamespaceContext; } @@ -416,6 +418,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param uri The namespace uri * @throws XMLStreamException if uri specified is "" or null */ + @Override public String getPrefix(String uri) throws XMLStreamException { return fNamespaceContext.getPrefix(uri); } @@ -427,6 +430,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @throws IllegalArgumentException if the specified property is not supported * @return value associated with the specified property. */ + @Override public Object getProperty(String str) throws IllegalArgumentException { if (str == null) { @@ -446,6 +450,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * * @param uri Namespace URI */ + @Override public void setDefaultNamespace(String uri) throws XMLStreamException { if (uri != null) { uri = fSymbolTable.addSymbol(uri); @@ -479,6 +484,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param namespaceContext the namespace context to use for this writer, may not be null * @throws XMLStreamException */ + @Override public void setNamespaceContext(NamespaceContext namespaceContext) throws XMLStreamException { fNamespaceContext.userContext = namespaceContext; @@ -493,6 +499,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param uri * @throws XMLStreamException */ + @Override public void setPrefix(String prefix, String uri) throws XMLStreamException { if (prefix == null) { @@ -525,6 +532,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW fInternalNamespaceContext.declarePrefix(prefix, uri); } + @Override public void writeAttribute(String localName, String value) throws XMLStreamException { try { @@ -554,6 +562,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException { try { @@ -590,7 +599,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW String value) throws IOException { fWriter.write(SPACE); - if ((prefix != null) && (prefix != XMLConstants.DEFAULT_NS_PREFIX)) { + if ((prefix != null) && (!prefix.equals(XMLConstants.DEFAULT_NS_PREFIX))) { fWriter.write(prefix); fWriter.write(":"); } @@ -603,6 +612,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW fWriter.write("\""); } + @Override public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException { try { @@ -629,7 +639,8 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } - if (!prefix.equals(XMLConstants.XML_NS_PREFIX) || !namespaceURI.equals(XMLConstants.XML_NS_URI)) { + if (!prefix.equals(XMLConstants.XML_NS_PREFIX) || + !namespaceURI.equals(XMLConstants.XML_NS_URI)) { prefix = fSymbolTable.addSymbol(prefix); namespaceURI = fSymbolTable.addSymbol(namespaceURI); @@ -663,6 +674,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeCData(String cdata) throws XMLStreamException { try { if (cdata == null) { @@ -681,6 +693,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeCharacters(String data) throws XMLStreamException { try { if (fStartTagOpened) { @@ -693,6 +706,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeCharacters(char[] data, int start, int len) throws XMLStreamException { try { @@ -706,6 +720,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeComment(String comment) throws XMLStreamException { try { if (fStartTagOpened) { @@ -724,6 +739,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeDTD(String dtd) throws XMLStreamException { try { if (fStartTagOpened) { @@ -750,11 +766,12 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @see * Namespaces in XML, 5.2 Namespace Defaulting */ + @Override public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException { // normalize namespaceURI - String namespaceURINormalized = null; + String namespaceURINormalized; if (namespaceURI == null) { namespaceURINormalized = ""; // XMLConstants.NULL_NS_URI } else { @@ -782,7 +799,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW String tmp = fInternalNamespaceContext.getURI(""); - if (tmp != null && tmp != namespaceURINormalized) { + if (tmp != null && !tmp.equals(namespaceURINormalized)) { throw new XMLStreamException( "xmlns has been already bound to " +tmp + ". Rebinding it to "+ namespaceURINormalized + @@ -798,6 +815,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeEmptyElement(String localName) throws XMLStreamException { try { if (fStartTagOpened) { @@ -816,6 +834,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException { if (namespaceURI == null) { @@ -828,6 +847,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW writeEmptyElement(prefix, localName, namespaceURI); } + @Override public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException { try { @@ -863,7 +883,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW return; } - if ((prefix != null) && (prefix != XMLConstants.DEFAULT_NS_PREFIX)) { + if ((prefix != null) && (!prefix.equals(XMLConstants.DEFAULT_NS_PREFIX))) { fWriter.write(prefix); fWriter.write(":"); } @@ -874,16 +894,15 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeEndDocument() throws XMLStreamException { try { if (fStartTagOpened) { closeStartTag(); } - ElementState elem = null; - while (!fElementStack.empty()) { - elem = (ElementState) fElementStack.pop(); + ElementState elem = fElementStack.pop(); fInternalNamespaceContext.popContext(); if (elem.isEmpty) { @@ -907,13 +926,14 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeEndElement() throws XMLStreamException { try { if (fStartTagOpened) { closeStartTag(); } - ElementState currentElement = (ElementState) fElementStack.pop(); + ElementState currentElement = fElementStack.pop(); if (currentElement == null) { throw new XMLStreamException("No element was found to write"); @@ -944,6 +964,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } + @Override public void writeEntityRef(String refName) throws XMLStreamException { try { if (fStartTagOpened) { @@ -973,11 +994,12 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @see * Namespaces in XML, 5.2 Namespace Defaulting */ + @Override public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException { // normalize namespaceURI - String namespaceURINormalized = null; + String namespaceURINormalized; if (namespaceURI == null) { namespaceURINormalized = ""; // XMLConstants.NULL_NS_URI } else { @@ -985,7 +1007,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } try { - QName qname = null; + QName qname; if (!fStartTagOpened) { throw new IllegalStateException( @@ -1013,7 +1035,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW if (fIsRepairingNamespace) { String tmpURI = fInternalNamespaceContext.getURI(prefix); - if ((tmpURI != null) && (tmpURI == namespaceURINormalized)) { + if ((tmpURI != null) && (tmpURI.equals(namespaceURINormalized))) { return; } @@ -1030,7 +1052,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW String tmp = fInternalNamespaceContext.getURI(prefix); - if (tmp != null && tmp != namespaceURINormalized) { + if (tmp != null && !tmp.equals(namespaceURINormalized)) { throw new XMLStreamException("prefix "+prefix+ " has been already bound to " +tmp + @@ -1051,7 +1073,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW throws IOException { fWriter.write(" xmlns"); - if ((prefix != null) && (prefix != XMLConstants.DEFAULT_NS_PREFIX)) { + if ((prefix != null) && (!prefix.equals(XMLConstants.DEFAULT_NS_PREFIX))) { fWriter.write(":"); fWriter.write(prefix); } @@ -1064,6 +1086,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW fWriter.write("\""); } + @Override public void writeProcessingInstruction(String target) throws XMLStreamException { try { @@ -1090,6 +1113,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param data * @throws XMLStreamException */ + @Override public void writeProcessingInstruction(String target, String data) throws XMLStreamException { try { @@ -1116,6 +1140,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * * @throws XMLStreamException in case of an IOException */ + @Override public void writeStartDocument() throws XMLStreamException { writeStartDocument(null, null, false, false); } @@ -1126,6 +1151,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param version the specified version * @throws XMLStreamException in case of an IOException */ + @Override public void writeStartDocument(String version) throws XMLStreamException { writeStartDocument(null, version, false, false); } @@ -1143,7 +1169,6 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW writeStartDocument(encoding, version, false, false); } - @Override public void writeStartDocument(String encoding, String version, boolean standalone, boolean standaloneSet) throws XMLStreamException { @@ -1212,9 +1237,9 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW if (streamEncoding != null && !streamEncoding.equalsIgnoreCase(encoding)) { // If the equality check failed, check for charset encoding aliases boolean foundAlias = false; - Set aliases = Charset.forName(encoding).aliases(); - for (Iterator it = aliases.iterator(); !foundAlias && it.hasNext(); ) { - if (streamEncoding.equalsIgnoreCase((String) it.next())) { + Set aliases = Charset.forName(encoding).aliases(); + for (Iterator it = aliases.iterator(); !foundAlias && it.hasNext(); ) { + if (streamEncoding.equalsIgnoreCase(it.next())) { foundAlias = true; } } @@ -1232,6 +1257,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param localName * @throws XMLStreamException */ + @Override public void writeStartElement(String localName) throws XMLStreamException { try { if (localName == null) { @@ -1261,6 +1287,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param localName * @throws XMLStreamException */ + @Override public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException { if (localName == null) { @@ -1292,6 +1319,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @param namespaceURI * @throws XMLStreamException */ + @Override public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException { try { @@ -1537,10 +1565,10 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW fWriter.write(currentElement.localpart); int len = fNamespaceDecls.size(); - QName qname = null; + QName qname; for (int i = 0; i < len; i++) { - qname = (QName) fNamespaceDecls.get(i); + qname = fNamespaceDecls.get(i); if (qname != null) { if (fInternalNamespaceContext.declarePrefix(qname.prefix, @@ -1552,16 +1580,16 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW fNamespaceDecls.clear(); - Attribute attr = null; + Attribute attr; for (int j = 0; j < fAttributeCache.size(); j++) { - attr = (Attribute) fAttributeCache.get(j); + attr = fAttributeCache.get(j); if ((attr.prefix != null) && (attr.uri != null)) { if (!attr.prefix.equals("") && !attr.uri.equals("") ) { String tmp = fInternalNamespaceContext.getPrefix(attr.uri); - if ((tmp == null) || (tmp != attr.prefix)) { + if ((tmp == null) || (!tmp.equals(attr.prefix))) { tmp = getAttrPrefix(attr.uri); if (tmp == null) { if (fInternalNamespaceContext.declarePrefix(attr.prefix, @@ -1611,29 +1639,29 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * @return */ private void correctPrefix(QName attr, int type) { - String tmpPrefix = null; + String tmpPrefix; String prefix; String uri; prefix = attr.prefix; uri = attr.uri; boolean isSpecialCaseURI = false; - if (prefix == null || prefix.equals("")) { + if (prefix == null || prefix.equals(XMLConstants.DEFAULT_NS_PREFIX)) { if (uri == null) { return; } - if (prefix == XMLConstants.DEFAULT_NS_PREFIX && uri == XMLConstants.DEFAULT_NS_PREFIX) + if (XMLConstants.DEFAULT_NS_PREFIX.equals(prefix) && uri.equals(XMLConstants.DEFAULT_NS_PREFIX)) return; uri = fSymbolTable.addSymbol(uri); - QName decl = null; + QName decl; for (int i = 0; i < fNamespaceDecls.size(); i++) { - decl = (QName) fNamespaceDecls.get(i); + decl = fNamespaceDecls.get(i); - if ((decl != null) && (decl.uri == attr.uri)) { + if ((decl != null) && (decl.uri.equals(attr.uri))) { attr.prefix = decl.prefix; return; @@ -1642,7 +1670,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW tmpPrefix = fNamespaceContext.getPrefix(uri); - if (tmpPrefix == XMLConstants.DEFAULT_NS_PREFIX) { + if (XMLConstants.DEFAULT_NS_PREFIX.equals(tmpPrefix)) { if (type == XMLStreamConstants.START_ELEMENT) { return; } @@ -1654,7 +1682,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } if (tmpPrefix == null) { - StringBuffer genPrefix = new StringBuffer("zdef"); + StringBuilder genPrefix = new StringBuilder("zdef"); for (int i = 0; i < 1; i++) { genPrefix.append(fPrefixGen.nextInt()); @@ -1687,13 +1715,13 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW */ private String getAttrPrefix(String uri) { if (fAttrNamespace != null) { - return (String)fAttrNamespace.get(uri); + return fAttrNamespace.get(uri); } return null; } private void addAttrNamespace(String prefix, String uri) { if (fAttrNamespace == null) { - fAttrNamespace = new HashMap(); + fAttrNamespace = new HashMap<>(); } fAttrNamespace.put(prefix, uri); } @@ -1704,7 +1732,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW private boolean isDefaultNamespace(String uri) { String defaultNamespace = fInternalNamespaceContext.getURI(DEFAULT_PREFIX); - if (uri == defaultNamespace) { + if (uri.equals(defaultNamespace)) { return true; } @@ -1732,13 +1760,13 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * Correct's namespaces as per requirements of isReparisingNamespace property. */ protected void repair() { - Attribute attr = null; - Attribute attr2 = null; + Attribute attr; + Attribute attr2; ElementState currentElement = fElementStack.peek(); removeDuplicateDecls(); for(int i=0 ; i< fAttributeCache.size();i++){ - attr = (Attribute)fAttributeCache.get(i); + attr = fAttributeCache.get(i); if((attr.prefix != null && !attr.prefix.equals("")) || (attr.uri != null && !attr.uri.equals(""))) { correctPrefix(currentElement,attr); } @@ -1754,9 +1782,9 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } for(int i=0 ; i< fAttributeCache.size();i++){ - attr = (Attribute)fAttributeCache.get(i); + attr = fAttributeCache.get(i); for(int j=i+1;j getPrefixes(String uri) { Vector prefixes = null; - Iterator itr = null; + Iterator itr = null; if (uri != null) { uri = fSymbolTable.addSymbol(uri); @@ -2140,12 +2167,12 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW if ((prefixes == null) && (itr != null)) { return itr; } else if ((prefixes != null) && (itr == null)) { - return new ReadOnlyIterator(prefixes.iterator()); + return new ReadOnlyIterator<>(prefixes.iterator()); } else if ((prefixes != null) && (itr != null)) { String ob = null; while (itr.hasNext()) { - ob = (String) itr.next(); + ob = itr.next(); if (ob != null) { ob = fSymbolTable.addSymbol(ob); @@ -2156,7 +2183,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW } } - return new ReadOnlyIterator(prefixes.iterator()); + return new ReadOnlyIterator<>(prefixes.iterator()); } return fReadOnlyIterator; @@ -2165,14 +2192,17 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW // -- Map Interface -------------------------------------------------- + @Override public int size() { return 1; } + @Override public boolean isEmpty() { return false; } + @Override public boolean containsKey(Object key) { return key.equals(OUTPUTSTREAM_PROPERTY); } @@ -2181,6 +2211,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * Returns the value associated to an implementation-specific * property. */ + @Override public Object get(Object key) { if (key.equals(OUTPUTSTREAM_PROPERTY)) { return fOutputStream; @@ -2188,7 +2219,8 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW return null; } - public java.util.Set entrySet() { + @Override + public Set> entrySet() { throw new UnsupportedOperationException(); } @@ -2198,6 +2230,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * AbstractMap would cause an unsupported exection to * be thrown. */ + @Override public String toString() { return getClass().getName() + "@" + Integer.toHexString(hashCode()); } @@ -2206,6 +2239,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * Overrides the method defined in AbstractMap * This is required by the toString() method */ + @Override public int hashCode() { return fElementStack.hashCode(); } @@ -2213,6 +2247,7 @@ public final class XMLStreamWriterImpl extends AbstractMap implements XMLStreamW * Overrides the method defined in AbstractMap * This is required to satisfy the contract for hashCode. */ + @Override public boolean equals(Object obj) { return (this == obj); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java index 72ee2e55c77..770284ac016 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** *

Implements pluggable Datatypes.

@@ -80,9 +81,9 @@ class FactoryFinder { } } - private static void dPrint(String msg) { + private static void dPrint(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -190,10 +191,9 @@ class FactoryFinder { throw new ClassCastException(className + " cannot be cast to " + type.getName()); } Object instance = providerClass.newInstance(); - if (debug) { // Extra check to avoid computing cl strings - dPrint("created new instance of " + providerClass + - " using ClassLoader: " + cl); - } + final ClassLoader clD = cl; + dPrint(()->"created new instance of " + providerClass + + " using ClassLoader: " + clD); return type.cast(instance); } catch (ClassNotFoundException x) { @@ -223,13 +223,13 @@ class FactoryFinder { throws DatatypeConfigurationException { final String factoryId = type.getName(); - dPrint("find factoryId =" + factoryId); + dPrint(()->"find factoryId =" + factoryId); // Use the system property first try { String systemProp = ss.getSystemProperty(factoryId); if (systemProp != null) { - dPrint("found system property, value=" + systemProp); + dPrint(()->"found system property, value=" + systemProp); return newInstance(type, systemProp, null, true); } } @@ -247,7 +247,7 @@ class FactoryFinder { File f = new File(configFile); firstTime = false; if (ss.doesFileExist(f)) { - dPrint("Read properties file "+f); + dPrint(()->"Read properties file "+f); cacheProps.load(ss.getFileInputStream(f)); } } @@ -256,7 +256,7 @@ class FactoryFinder { final String factoryClassName = cacheProps.getProperty(factoryId); if (factoryClassName != null) { - dPrint("found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); + dPrint(()->"found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); return newInstance(type, factoryClassName, null, true); } } @@ -274,7 +274,7 @@ class FactoryFinder { "Provider for " + factoryId + " cannot be found"); } - dPrint("loaded from fallback value: " + fallbackClassName); + dPrint(()->"loaded from fallback value: " + fallbackClassName); return newInstance(type, fallbackClassName, null, true); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java index e17b4dd147c..88a772d89f6 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** *

Implements pluggable Parsers.

@@ -80,9 +81,9 @@ class FactoryFinder { } } - private static void dPrint(String msg) { + private static void dPrint(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -190,10 +191,9 @@ class FactoryFinder { throw new ClassCastException(className + " cannot be cast to " + type.getName()); } Object instance = providerClass.newInstance(); - if (debug) { // Extra check to avoid computing cl strings - dPrint("created new instance of " + providerClass + - " using ClassLoader: " + cl); - } + final ClassLoader clD = cl; + dPrint(()->"created new instance of " + providerClass + + " using ClassLoader: " + clD); return type.cast(instance); } catch (ClassNotFoundException x) { @@ -222,13 +222,13 @@ class FactoryFinder { throws FactoryConfigurationError { final String factoryId = type.getName(); - dPrint("find factoryId =" + factoryId); + dPrint(()->"find factoryId =" + factoryId); // Use the system property first try { String systemProp = ss.getSystemProperty(factoryId); if (systemProp != null) { - dPrint("found system property, value=" + systemProp); + dPrint(()->"found system property, value=" + systemProp); return newInstance(type, systemProp, null, true); } } @@ -246,7 +246,7 @@ class FactoryFinder { File f = new File(configFile); firstTime = false; if (ss.doesFileExist(f)) { - dPrint("Read properties file "+f); + dPrint(()->"Read properties file "+f); cacheProps.load(ss.getFileInputStream(f)); } } @@ -255,7 +255,7 @@ class FactoryFinder { final String factoryClassName = cacheProps.getProperty(factoryId); if (factoryClassName != null) { - dPrint("found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); + dPrint(()->"found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); return newInstance(type, factoryClassName, null, true); } } @@ -273,7 +273,7 @@ class FactoryFinder { "Provider for " + factoryId + " cannot be found"); } - dPrint("loaded from fallback value: " + fallbackClassName); + dPrint(()->"loaded from fallback value: " + fallbackClassName); return newInstance(type, fallbackClassName, null, true); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java index 61feecbf5f7..4c9e5ff7857 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import javax.xml.stream.events.XMLEvent; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java index 6192f3d4aac..2351f59c406 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,9 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ package javax.xml.stream; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java index c9c4a08dc43..2496e208705 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** *

Implements pluggable streams.

@@ -81,9 +82,9 @@ class FactoryFinder { } } - private static void dPrint(String msg) { + private static void dPrint(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -191,10 +192,9 @@ class FactoryFinder { throw new ClassCastException(className + " cannot be cast to " + type.getName()); } Object instance = providerClass.newInstance(); - if (debug) { // Extra check to avoid computing cl strings - dPrint("created new instance of " + providerClass + - " using ClassLoader: " + cl); - } + final ClassLoader clD = cl; + dPrint(()->"created new instance of " + providerClass + + " using ClassLoader: " + clD); return type.cast(instance); } catch (ClassNotFoundException x) { @@ -249,7 +249,7 @@ class FactoryFinder { static T find(Class type, String factoryId, ClassLoader cl, String fallbackClassName) throws FactoryConfigurationError { - dPrint("find factoryId =" + factoryId); + dPrint(()->"find factoryId =" + factoryId); // Use the system property first try { @@ -261,7 +261,7 @@ class FactoryFinder { systemProp = System.getProperty(factoryId); } if (systemProp != null) { - dPrint("found system property, value=" + systemProp); + dPrint(()->"found system property, value=" + systemProp); return newInstance(type, systemProp, cl, true); } } @@ -279,19 +279,19 @@ class FactoryFinder { if (firstTime) { configFile = ss.getSystemProperty("java.home") + File.separator + "lib" + File.separator + "stax.properties"; - File f = new File(configFile); + final File fStax = new File(configFile); firstTime = false; - if (ss.doesFileExist(f)) { - dPrint("Read properties file "+f); - cacheProps.load(ss.getFileInputStream(f)); + if (ss.doesFileExist(fStax)) { + dPrint(()->"Read properties file "+fStax); + cacheProps.load(ss.getFileInputStream(fStax)); } else { configFile = ss.getSystemProperty("java.home") + File.separator + "conf" + File.separator + "jaxp.properties"; - f = new File(configFile); - if (ss.doesFileExist(f)) { - dPrint("Read properties file "+f); - cacheProps.load(ss.getFileInputStream(f)); + final File fJaxp = new File(configFile); + if (ss.doesFileExist(fJaxp)) { + dPrint(()->"Read properties file "+fJaxp); + cacheProps.load(ss.getFileInputStream(fJaxp)); } } } @@ -300,7 +300,8 @@ class FactoryFinder { final String factoryClassName = cacheProps.getProperty(factoryId); if (factoryClassName != null) { - dPrint("found in " + configFile + " value=" + factoryClassName); + final String foundIn = configFile; + dPrint(()->"found in " + foundIn + " value=" + factoryClassName); return newInstance(type, factoryClassName, cl, true); } } @@ -325,7 +326,7 @@ class FactoryFinder { "Provider for " + factoryId + " cannot be found", null); } - dPrint("loaded from fallback value: " + fallbackClassName); + dPrint(()->"loaded from fallback value: " + fallbackClassName); return newInstance(type, fallbackClassName, cl, true); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java index 74a25f37f24..f9fb34f1af0 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java index b4d81c3b87d..328c49c7a4d 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java @@ -39,53 +39,34 @@ class SecuritySupport { ClassLoader getContextClassLoader() throws SecurityException{ - return (ClassLoader) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - ClassLoader cl = null; - //try { - cl = Thread.currentThread().getContextClassLoader(); - //} catch (SecurityException ex) { } + return AccessController.doPrivileged((PrivilegedAction) () -> { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); - if (cl == null) - cl = ClassLoader.getSystemClassLoader(); + if (cl == null) + cl = ClassLoader.getSystemClassLoader(); - return cl; - } + return cl; }); } String getSystemProperty(final String propName) { - return (String) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return System.getProperty(propName); - } - }); + return AccessController.doPrivileged((PrivilegedAction) () -> + System.getProperty(propName)); } FileInputStream getFileInputStream(final File file) throws FileNotFoundException { try { - return (FileInputStream) - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws FileNotFoundException { - return new FileInputStream(file); - } - }); + return AccessController.doPrivileged((PrivilegedExceptionAction) () + -> new FileInputStream(file)); } catch (PrivilegedActionException e) { throw (FileNotFoundException)e.getException(); } } boolean doesFileExist(final File f) { - return ((Boolean) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return new Boolean(f.exists()); - } - })).booleanValue(); + return AccessController.doPrivileged((PrivilegedAction) () -> f.exists()); } } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java index d248d6dbb20..b2e967f1356 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java index 37e5f7a8772..9428a2ef0c4 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009, 2015, by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import com.sun.xml.internal.stream.events.XMLEventFactoryImpl; import java.util.Iterator; @@ -53,8 +50,7 @@ public abstract class XMLEventFactory { static final String JAXPFACTORYID = "javax.xml.stream.XMLEventFactory"; static final String DEFAULIMPL = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl"; - - /** + /** * Creates a new instance of the {@code XMLEventFactory} builtin * system-default implementation. * @@ -159,6 +155,7 @@ public abstract class XMLEventFactory { * #newFactory(java.lang.String, java.lang.ClassLoader)} * method defines no changes in behavior. */ + @Deprecated(since="7") public static XMLEventFactory newInstance(String factoryId, ClassLoader classLoader) throws FactoryConfigurationError { @@ -307,8 +304,8 @@ public abstract class XMLEventFactory { * @return an instance of the requested StartElement */ public abstract StartElement createStartElement(QName name, - Iterator attributes, - Iterator namespaces); + Iterator attributes, + Iterator namespaces); /** * Create a new StartElement. This defaults the NamespaceContext to @@ -341,8 +338,8 @@ public abstract class XMLEventFactory { public abstract StartElement createStartElement(String prefix, String namespaceUri, String localName, - Iterator attributes, - Iterator namespaces + Iterator attributes, + Iterator namespaces ); /** * Create a new StartElement. Namespaces can be added to this StartElement @@ -363,8 +360,8 @@ public abstract class XMLEventFactory { public abstract StartElement createStartElement(String prefix, String namespaceUri, String localName, - Iterator attributes, - Iterator namespaces, + Iterator attributes, + Iterator namespaces, NamespaceContext context ); @@ -376,7 +373,7 @@ public abstract class XMLEventFactory { * @return an instance of the requested EndElement */ public abstract EndElement createEndElement(QName name, - Iterator namespaces); + Iterator namespaces); /** * Create a new EndElement @@ -400,7 +397,7 @@ public abstract class XMLEventFactory { public abstract EndElement createEndElement(String prefix, String namespaceUri, String localName, - Iterator namespaces); + Iterator namespaces); /** * Create a Characters event, this method does not check if the content diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java index 30050ba2377..d20fe24bb87 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import javax.xml.stream.events.XMLEvent; @@ -44,7 +41,7 @@ import java.util.Iterator; * @see XMLEventWriter * @since 1.6 */ -public interface XMLEventReader extends Iterator { +public interface XMLEventReader extends Iterator { /** * Gets the next XMLEvent. The initial event is * {@link javax.xml.stream.events.StartDocument StartDocument}. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java index f389da613a1..e94feaec309 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import javax.xml.stream.events.*; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java index cb936ac6fde..717dee5a9a9 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009, 2013, by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import com.sun.xml.internal.stream.XMLInputFactoryImpl; @@ -225,6 +222,7 @@ public abstract class XMLInputFactory { * java.util.ServiceConfigurationError service configuration error} or if * the implementation is not available or cannot be instantiated. */ + @Deprecated(since="7") public static XMLInputFactory newFactory() throws FactoryConfigurationError { @@ -246,6 +244,7 @@ public abstract class XMLInputFactory { * #newFactory(java.lang.String, java.lang.ClassLoader)} method * defines no changes in behavior. */ + @Deprecated(since="7") public static XMLInputFactory newInstance(String factoryId, ClassLoader classLoader) throws FactoryConfigurationError { diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java index 939cb67f34a..50b6ba79c0a 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009, 2013, by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import com.sun.xml.internal.stream.XMLOutputFactoryImpl; @@ -121,7 +118,7 @@ public abstract class XMLOutputFactory { protected XMLOutputFactory(){} - /** + /** * Creates a new instance of the {@code XMLOutputFactory} builtin * system-default implementation. * @@ -225,6 +222,7 @@ public abstract class XMLOutputFactory { * Use the new method {@link #newFactory(java.lang.String, * java.lang.ClassLoader)} instead. */ + @Deprecated(since="7") public static XMLInputFactory newInstance(String factoryId, ClassLoader classLoader) throws FactoryConfigurationError { diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java index f78648e200d..6cf5cb9a292 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java index dbb177b0e5b..c43eb267cdc 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java index 6ceb1c61b85..ab50fd234d9 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 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 diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java index 48e510cf70c..4b3d6447d1e 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java index 102228bc716..23322b995db 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import javax.xml.namespace.NamespaceContext; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java index ca05fc083be..6fc1722c9a0 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream; import javax.xml.namespace.NamespaceContext; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java index 248d060525c..ffc53508693 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import javax.xml.namespace.QName; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java index 76dab7f93ab..ab59dcbcb81 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java index 8ed0929f5d2..1ebee8f49af 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java index 3b0bb9f0be2..e9d5ba4f9f5 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import java.util.List; @@ -39,36 +36,40 @@ import java.util.List; */ public interface DTD extends XMLEvent { - /** - * Returns the entire Document Type Declaration as a string, including - * the internal DTD subset. - * This may be null if there is not an internal subset. - * If it is not null it must return the entire - * Document Type Declaration which matches the doctypedecl - * production in the XML 1.0 specification - */ - String getDocumentTypeDeclaration(); + /** + * Returns the entire Document Type Declaration as a string, including the + * internal DTD subset. This may be null if there is not an internal subset. + * If it is not null it must return the entire Document Type Declaration + * which matches the doctypedecl production in the XML 1.0 specification + * + * @return the Document Type Declaration + */ + String getDocumentTypeDeclaration(); - /** - * Returns an implementation defined representation of the DTD. - * This method may return null if no representation is available. - */ - Object getProcessedDTD(); + /** + * Returns an implementation defined representation of the DTD. This method + * may return null if no representation is available. + * + * @return the representation of the DTD + */ + Object getProcessedDTD(); - /** - * Return a List containing the notations declared in the DTD. - * This list must contain NotationDeclaration events. - * @see NotationDeclaration - * @return an unordered list of NotationDeclaration events - */ - List getNotations(); + /** + * Return a List containing the notations declared in the DTD. This list + * must contain NotationDeclaration events. + * + * @see NotationDeclaration + * @return an unordered list of NotationDeclaration events + */ + List getNotations(); - /** - * Return a List containing the general entities, - * both external and internal, declared in the DTD. - * This list must contain EntityDeclaration events. - * @see EntityDeclaration - * @return an unordered list of EntityDeclaration events - */ - List getEntities(); + /** + * Return a List containing the general entities, both external and + * internal, declared in the DTD. This list must contain EntityDeclaration + * events. + * + * @see EntityDeclaration + * @return an unordered list of EntityDeclaration events + */ + List getEntities(); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java index 0e7ab312ac2..20e89cc40ce 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java index fd6d5f2b4f4..76575f96bef 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import java.util.Iterator; @@ -54,6 +51,6 @@ public interface EndElement extends XMLEvent { * @return an Iterator over Namespace interfaces, or an * empty iterator */ - public Iterator getNamespaces(); + public Iterator getNamespaces(); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java index 74610dac295..5edb683ad29 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** * An interface for handling Entity Declarations diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java index 8871460c24c..0087b0a0bbb 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** * An interface for handling Entity events. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java index df5e6bd9772..fac3a7eec8b 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import javax.xml.namespace.QName; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java index fc5f790f9d2..6d5ba68260c 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** * An interface for handling Notation Declarations diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java index 9ee77d8905e..4fb2df3ba30 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** * An interface that describes the data found in processing instructions diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java index d46c070cf93..6cd1fc4d3b2 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; /** * An interface for the start document event diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java index 9b286a6e4a0..4336c1bb9b8 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,16 +23,10 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import javax.xml.namespace.QName; import javax.xml.namespace.NamespaceContext; - -import java.util.Map; import java.util.Iterator; /** @@ -62,7 +57,7 @@ public interface StartElement extends XMLEvent { * @return a readonly Iterator over Attribute interfaces, or an * empty iterator */ - public Iterator getAttributes(); + public Iterator getAttributes(); /** * Returns an Iterator of namespaces declared on this element. @@ -87,7 +82,7 @@ public interface StartElement extends XMLEvent { * empty iterator * */ - public Iterator getNamespaces(); + public Iterator getNamespaces(); /** * Returns the attribute referred to by this name diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java index 338b5cbff72..43f8becb512 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.events; import java.io.Writer; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java index 9e2fbd39d20..b7600ac5f55 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,17 +23,10 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.util; -import javax.xml.namespace.QName; -import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; /** diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java index f04a9859fa2..f94d1db7546 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,13 +23,8 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.util; -import java.io.Reader; import javax.xml.namespace.QName; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java index 11e6e7c0427..dbcfea03193 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.util; import javax.xml.stream.events.XMLEvent; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java index 062f706ced6..b1ba16064e5 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java @@ -1,4 +1,5 @@ /* + * 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 @@ -22,10 +23,6 @@ * questions. */ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ - package javax.xml.stream.util; import javax.xml.stream.events.XMLEvent; diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java index 25772307027..99413a27816 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** *

Implements pluggable Datatypes.

@@ -83,9 +84,9 @@ class FactoryFinder { } } - private static void dPrint(String msg) { + private static void dPrint(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -177,10 +178,9 @@ class FactoryFinder { if (instance == null) { instance = providerClass.newInstance(); } - if (debug) { // Extra check to avoid computing cl strings - dPrint("created new instance of " + providerClass + - " using ClassLoader: " + cl); - } + final ClassLoader clD = cl; + dPrint(()->"created new instance of " + providerClass + + " using ClassLoader: " + clD); return type.cast(instance); } catch (ClassNotFoundException x) { @@ -255,12 +255,12 @@ class FactoryFinder { final String factoryId = type.getName(); - dPrint("find factoryId =" + factoryId); + dPrint(()->"find factoryId =" + factoryId); // Use the system property first try { String systemProp = ss.getSystemProperty(factoryId); if (systemProp != null) { - dPrint("found system property, value=" + systemProp); + dPrint(()->"found system property, value=" + systemProp); return newInstance(type, systemProp, null, true, true); } } @@ -278,7 +278,7 @@ class FactoryFinder { File f = new File(configFile); firstTime = false; if (ss.doesFileExist(f)) { - dPrint("Read properties file "+f); + dPrint(()->"Read properties file "+f); cacheProps.load(ss.getFileInputStream(f)); } } @@ -287,7 +287,7 @@ class FactoryFinder { final String factoryClassName = cacheProps.getProperty(factoryId); if (factoryClassName != null) { - dPrint("found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); + dPrint(()->"found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); return newInstance(type, factoryClassName, null, true, true); } } @@ -305,7 +305,7 @@ class FactoryFinder { "Provider for " + factoryId + " cannot be found"); } - dPrint("loaded from fallback value: " + fallbackClassName); + dPrint(()->"loaded from fallback value: " + fallbackClassName); return newInstance(type, fallbackClassName, null, true, true); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java index b0ae3a4cb40..812882923f4 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ import java.security.PrivilegedAction; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** * Implementation of {@link SchemaFactory#newInstance(String)}. @@ -72,11 +73,11 @@ class SchemaFactoryFinder { /** *

Conditional debug printing.

* - * @param msg to print + * @param msgGen Supplier function that returns debug message */ - private static void debugPrintln(String msg) { + private static void debugPrintln(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -106,7 +107,7 @@ class SchemaFactoryFinder { private void debugDisplayClassLoader() { try { if( classLoader == ss.getContextClassLoader() ) { - debugPrintln("using thread context class loader ("+classLoader+") for search"); + debugPrintln(()->"using thread context class loader ("+classLoader+") for search"); return; } } catch( Throwable unused ) { @@ -114,11 +115,11 @@ class SchemaFactoryFinder { } if( classLoader==ClassLoader.getSystemClassLoader() ) { - debugPrintln("using system class loader ("+classLoader+") for search"); + debugPrintln(()->"using system class loader ("+classLoader+") for search"); return; } - debugPrintln("using class loader ("+classLoader+") for search"); + debugPrintln(()->"using class loader ("+classLoader+") for search"); } /** @@ -142,9 +143,9 @@ class SchemaFactoryFinder { } SchemaFactory f = _newFactory(schemaLanguage); if (f != null) { - debugPrintln("factory '" + f.getClass().getName() + "' was found for " + schemaLanguage); + debugPrintln(()->"factory '" + f.getClass().getName() + "' was found for " + schemaLanguage); } else { - debugPrintln("unable to find a factory for " + schemaLanguage); + debugPrintln(()->"unable to find a factory for " + schemaLanguage); } return f; } @@ -163,17 +164,17 @@ class SchemaFactoryFinder { // system property look up try { - debugPrintln("Looking up system property '"+propertyName+"'" ); + debugPrintln(()->"Looking up system property '"+propertyName+"'" ); String r = ss.getSystemProperty(propertyName); if(r!=null) { - debugPrintln("The value is '"+r+"'"); + debugPrintln(()->"The value is '"+r+"'"); sf = createInstance(r, true); if(sf!=null) return sf; } else - debugPrintln("The property is undefined."); + debugPrintln(()->"The property is undefined."); } catch( Throwable t ) { if( debug ) { - debugPrintln("failed to look up system property '"+propertyName+"'" ); + debugPrintln(()->"failed to look up system property '"+propertyName+"'" ); t.printStackTrace(); } } @@ -191,14 +192,14 @@ class SchemaFactoryFinder { File f=new File( configFile ); firstTime = false; if(ss.doesFileExist(f)){ - debugPrintln("Read properties file " + f); + debugPrintln(()->"Read properties file " + f); cacheProps.load(ss.getFileInputStream(f)); } } } } final String factoryClassName = cacheProps.getProperty(propertyName); - debugPrintln("found " + factoryClassName + " in $java.home/conf/jaxp.properties"); + debugPrintln(()->"found " + factoryClassName + " in $java.home/conf/jaxp.properties"); if (factoryClassName != null) { sf = createInstance(factoryClassName, true); @@ -225,11 +226,11 @@ class SchemaFactoryFinder { // platform default if(schemaLanguage.equals("http://www.w3.org/2001/XMLSchema")) { - debugPrintln("attempting to use the platform default XML Schema validator"); + debugPrintln(()->"attempting to use the platform default XML Schema validator"); return createInstance("com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory", true); } - debugPrintln("all things were tried, but none was found. bailing out."); + debugPrintln(()->"all things were tried, but none was found. bailing out."); return null; } @@ -280,15 +281,15 @@ class SchemaFactoryFinder { SchemaFactory createInstance( String className, boolean useServicesMechanism ) { SchemaFactory schemaFactory = null; - debugPrintln("createInstance(" + className + ")"); + debugPrintln(()->"createInstance(" + className + ")"); // get Class from className Class clazz = createClass(className); if (clazz == null) { - debugPrintln("failed to getClass(" + className + ")"); + debugPrintln(()->"failed to getClass(" + className + ")"); return null; } - debugPrintln("loaded " + className + " from " + which(clazz)); + debugPrintln(()->"loaded " + className + " from " + which(clazz)); // instantiate Class as a SchemaFactory try { @@ -303,19 +304,19 @@ class SchemaFactoryFinder { schemaFactory = (SchemaFactory) clazz.newInstance(); } } catch (ClassCastException classCastException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { classCastException.printStackTrace(); } return null; } catch (IllegalAccessException illegalAccessException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { illegalAccessException.printStackTrace(); } return null; } catch (InstantiationException instantiationException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { instantiationException.printStackTrace(); } diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java index dc950cbc896..97c923e15d1 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ import java.security.PrivilegedAction; import java.util.Properties; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; +import java.util.function.Supplier; /** * Implementation of {@link XPathFactory#newInstance(String)}. @@ -69,11 +70,11 @@ class XPathFactoryFinder { /** *

Conditional debug printing.

* - * @param msg to print + * @param msgGen Supplier function that returns debug message */ - private static void debugPrintln(String msg) { + private static void debugPrintln(Supplier msgGen) { if (debug) { - System.err.println("JAXP: " + msg); + System.err.println("JAXP: " + msgGen.get()); } } @@ -102,7 +103,7 @@ class XPathFactoryFinder { private void debugDisplayClassLoader() { try { if( classLoader == ss.getContextClassLoader() ) { - debugPrintln("using thread context class loader ("+classLoader+") for search"); + debugPrintln(() -> "using thread context class loader ("+classLoader+") for search"); return; } } catch( Throwable unused ) { @@ -110,11 +111,11 @@ class XPathFactoryFinder { } if( classLoader==ClassLoader.getSystemClassLoader() ) { - debugPrintln("using system class loader ("+classLoader+") for search"); + debugPrintln(() -> "using system class loader ("+classLoader+") for search"); return; } - debugPrintln("using class loader ("+classLoader+") for search"); + debugPrintln(() -> "using class loader ("+classLoader+") for search"); } /** @@ -135,9 +136,9 @@ class XPathFactoryFinder { } XPathFactory f = _newFactory(uri); if (f != null) { - debugPrintln("factory '" + f.getClass().getName() + "' was found for " + uri); + debugPrintln(()->"factory '" + f.getClass().getName() + "' was found for " + uri); } else { - debugPrintln("unable to find a factory for " + uri); + debugPrintln(()->"unable to find a factory for " + uri); } return f; } @@ -156,19 +157,19 @@ class XPathFactoryFinder { // system property look up try { - debugPrintln("Looking up system property '"+propertyName+"'" ); + debugPrintln(()->"Looking up system property '"+propertyName+"'" ); String r = ss.getSystemProperty(propertyName); if(r!=null) { - debugPrintln("The value is '"+r+"'"); + debugPrintln(()->"The value is '"+r+"'"); xpathFactory = createInstance(r, true); if (xpathFactory != null) { return xpathFactory; } } else - debugPrintln("The property is undefined."); + debugPrintln(()->"The property is undefined."); } catch( Throwable t ) { if( debug ) { - debugPrintln("failed to look up system property '"+propertyName+"'" ); + debugPrintln(()->"failed to look up system property '"+propertyName+"'" ); t.printStackTrace(); } } @@ -185,14 +186,14 @@ class XPathFactoryFinder { File f=new File( configFile ); firstTime = false; if(ss.doesFileExist(f)){ - debugPrintln("Read properties file " + f); + debugPrintln(()->"Read properties file " + f); cacheProps.load(ss.getFileInputStream(f)); } } } } final String factoryClassName = cacheProps.getProperty(propertyName); - debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties"); + debugPrintln(()->"found " + factoryClassName + " in $java.home/jaxp.properties"); if (factoryClassName != null) { xpathFactory = createInstance(factoryClassName, true); @@ -220,11 +221,11 @@ class XPathFactoryFinder { // platform default if(uri.equals(XPathFactory.DEFAULT_OBJECT_MODEL_URI)) { - debugPrintln("attempting to use the platform default W3C DOM XPath lib"); + debugPrintln(()->"attempting to use the platform default W3C DOM XPath lib"); return createInstance("com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl", true); } - debugPrintln("all things were tried, but none was found. bailing out."); + debugPrintln(()->"all things were tried, but none was found. bailing out."); return null; } @@ -280,15 +281,15 @@ class XPathFactoryFinder { { XPathFactory xPathFactory = null; - debugPrintln("createInstance(" + className + ")"); + debugPrintln(()->"createInstance(" + className + ")"); // get Class from className Class clazz = createClass(className); if (clazz == null) { - debugPrintln("failed to getClass(" + className + ")"); + debugPrintln(()->"failed to getClass(" + className + ")"); return null; } - debugPrintln("loaded " + className + " from " + which(clazz)); + debugPrintln(()->"loaded " + className + " from " + which(clazz)); // instantiate Class as a XPathFactory try { @@ -299,19 +300,19 @@ class XPathFactoryFinder { xPathFactory = (XPathFactory) clazz.newInstance(); } } catch (ClassCastException classCastException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { classCastException.printStackTrace(); } return null; } catch (IllegalAccessException illegalAccessException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { illegalAccessException.printStackTrace(); } return null; } catch (InstantiationException instantiationException) { - debugPrintln("could not instantiate " + clazz.getName()); + debugPrintln(()->"could not instantiate " + clazz.getName()); if (debug) { instantiationException.printStackTrace(); } diff --git a/jaxp/src/java.xml/share/legal/bcel.md b/jaxp/src/java.xml/share/legal/bcel.md new file mode 100644 index 00000000000..3ac4532e1f6 --- /dev/null +++ b/jaxp/src/java.xml/share/legal/bcel.md @@ -0,0 +1,222 @@ +## Apache Byte Code Engineering Library v5.2 + +### Notice +
+
+    =========================================================================
+    ==  NOTICE file corresponding to the section 4 d of                    ==
+    ==  the Apache License, Version 2.0,                                   ==
+    ==  in this case for the Apache Jakarta-BCEL distribution.             ==
+    =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+
+ +### Apache 2.0 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.
+
+
diff --git a/jaxp/src/java.xml/share/legal/dom.md b/jaxp/src/java.xml/share/legal/dom.md new file mode 100644 index 00000000000..de63edd485c --- /dev/null +++ b/jaxp/src/java.xml/share/legal/dom.md @@ -0,0 +1,62 @@ +## DOM Level 3 core specification, v1.0 + +## W3C 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
+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
+site-policy@w3.org.
+
+
diff --git a/jaxp/src/java.xml/share/legal/jcup.md b/jaxp/src/java.xml/share/legal/jcup.md new file mode 100644 index 00000000000..acceffdf9c5 --- /dev/null +++ b/jaxp/src/java.xml/share/legal/jcup.md @@ -0,0 +1,24 @@ +## CUP Parser Generator for Java v 0.10k + +### CUP Parser Generator License +
+
+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
+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.
+
+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.
+
+
diff --git a/jaxp/src/java.xml/share/legal/xalan.md b/jaxp/src/java.xml/share/legal/xalan.md new file mode 100644 index 00000000000..5c1749b3721 --- /dev/null +++ b/jaxp/src/java.xml/share/legal/xalan.md @@ -0,0 +1,229 @@ +## Apache Xalan v2.7.1 + +### Notice +
+
+    ======================================================================================
+    ==  NOTICE file corresponding to the section 4d of the Apache License, Version 2.0, ==
+    ==  in this case for the Apache Xalan distribution.                                 ==
+    ======================================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software was originally based on the following:
+
+     - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
+     - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
+     - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
+     - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
+       Apache Software Foundation and was originally developed at Hewlett Packard Company.
+
+
+ +### Apache 2.0 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.
+
+
diff --git a/jaxp/src/java.xml/share/legal/xerces.md b/jaxp/src/java.xml/share/legal/xerces.md new file mode 100644 index 00000000000..438419b13c9 --- /dev/null +++ b/jaxp/src/java.xml/share/legal/xerces.md @@ -0,0 +1,226 @@ +## Apache Xerces v2.11.0 + +### Notice + + ========================================================================= + == NOTICE file corresponding to section 4(d) of the Apache License, == + == Version 2.0, in this case for the Apache Xerces Java distribution. == + ========================================================================= + + Apache Xerces Java + Copyright 1999-2010 The Apache Software Foundation + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + Portions of this software were originally based on the following: + - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. + - voluntary contributions made by Paul Eng on behalf of the + Apache Software Foundation that were originally developed at iClick, Inc., + software copyright (c) 1999. + +### Apache 2.0 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.
+
+
diff --git a/jaxp/src/java.xml/share/legal/xmlresolver.md b/jaxp/src/java.xml/share/legal/xmlresolver.md new file mode 100644 index 00000000000..cf18bb439b3 --- /dev/null +++ b/jaxp/src/java.xml/share/legal/xmlresolver.md @@ -0,0 +1,223 @@ +## Apache XML Resolver Library v1.2 + +### Notice +
+
+Apache XML Commons Resolver
+Copyright 2006 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation http://www.apache.org/
+
+Portions of this code are derived from classes placed in the
+public domain by Arbortext on 10 Apr 2000. See:
+http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
+
+
+ +### Apache 2.0 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.
+
+
diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf001GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf002GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf003GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf005GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf006GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out index 1fc9136a82b..4e646319c6e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/out/saxtf009GF.out @@ -1,17 +1,17 @@ - -Paris -Nice -Lyon - - -Roma -Milano -Firenze -Napoli - - -Madrid -Barcelona - + + Paris + Nice + Lyon + + + Roma + Milano + Firenze + Napoli + + + Madrid + Barcelona + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java index b605137f48f..8712697a298 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java @@ -25,14 +25,13 @@ package test.astro; import static java.lang.String.valueOf; import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static org.testng.Assert.assertEquals; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; import static test.astro.AstroConstants.ASTROCAT; import static test.astro.AstroConstants.GOLDEN_DIR; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.List; import javax.xml.transform.sax.TransformerHandler; @@ -77,10 +76,10 @@ public class AstroTest { @BeforeClass public void setup() throws Exception { data = new FiltersAndGolden[4]; - data[0] = new FiltersAndGolden(getGoldenFileContent(1), astro -> astro.getRAFilter(0.106, 0.108)); - data[1] = new FiltersAndGolden(getGoldenFileContent(2), astro -> astro.getStellarTypeFilter("K0IIIbCN-0.5")); - data[2] = new FiltersAndGolden(getGoldenFileContent(3), astro -> astro.getStellarTypeFilter("G"), astro -> astro.getDecFilter(-5.0, 60.0)); - data[3] = new FiltersAndGolden(getGoldenFileContent(4), astro -> astro.getRADECFilter(0.084, 0.096, -5.75, 14.0)); + data[0] = new FiltersAndGolden(getGoldenFileName(1), astro -> astro.getRAFilter(0.106, 0.108)); + data[1] = new FiltersAndGolden(getGoldenFileName(2), astro -> astro.getStellarTypeFilter("K0IIIbCN-0.5")); + data[2] = new FiltersAndGolden(getGoldenFileName(3), astro -> astro.getStellarTypeFilter("G"), astro -> astro.getDecFilter(-5.0, 60.0)); + data[3] = new FiltersAndGolden(getGoldenFileName(4), astro -> astro.getRADECFilter(0.084, 0.096, -5.75, 14.0)); } /* @@ -102,11 +101,11 @@ public class AstroTest { AstroProcessor astro = new AstroProcessor(fFactClass, ASTROCAT, isFactClass); for (int i = 0; i < data.length; i++) { - runProcess(astro, valueOf(i + 1), data[i].getGolden(), data[i].getFilters()); + runProcess(astro, valueOf(i + 1), data[i].getGoldenFileName(), data[i].getFilters()); } } - private void runProcess(AstroProcessor astro, String processNum, List goldenfileContent, FilterCreator... filterCreators) throws Exception { + private void runProcess(AstroProcessor astro, String processNum, String goldenFileName, FilterCreator... filterCreators) throws Exception { System.out.println("run process " + processNum); TransformerHandler[] filters = new TransformerHandler[filterCreators.length]; for (int i = 0; i < filterCreators.length; i++) @@ -115,11 +114,11 @@ public class AstroTest { String outputfile = Files.createTempFile(Paths.get(USER_DIR), "query" + processNum + ".out.", null).toString(); System.out.println("output file: " + outputfile); astro.process(outputfile, filters); - assertEquals(Files.readAllLines(Paths.get(outputfile)), goldenfileContent); + assertTrue(compareWithGold(goldenFileName, outputfile)); } - private List getGoldenFileContent(int num) throws IOException { - return Files.readAllLines(Paths.get(GOLDEN_DIR + "query" + num + ".out")); + private String getGoldenFileName(int num) { + return GOLDEN_DIR + "query" + num + ".out"; } @FunctionalInterface @@ -129,19 +128,19 @@ public class AstroTest { private static class FiltersAndGolden { private FilterCreator[] filters; - private List golden; + private String goldenFileName; - FiltersAndGolden(List golden, FilterCreator... filters) { + FiltersAndGolden(String goldenFileName, FilterCreator... filters) { this.filters = filters; - this.golden = golden; + this.goldenFileName = goldenFileName; } FilterCreator[] getFilters() { return filters; } - List getGolden() { - return golden; + String getGoldenFileName() { + return goldenFileName; } } } diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out index d5ccc94fa11..1c5fb9c4001 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query1.out @@ -1,15 +1,24 @@ -

Bright Star Catalog Extract

- -Star Id: 7
-Constellation: Cas
-Description: 10 Cas
-RA J2000: 00:06:26.5
-DEC J2000: 64:11:46
-Visual Magnitude: 5.59
-Spectral Type: B9III
-Galactic Longitude: 118.06
-Galactic Latitude: 1.75
-
- +

Bright Star Catalog Extract

+ + Star Id: 7 +
+ Constellation: Cas +
+ Description: 10 Cas +
+ RA J2000: 00:06:26.5 +
+ DEC J2000: 64:11:46 +
+ Visual Magnitude: 5.59 +
+ Spectral Type: B9III +
+ Galactic Longitude: 118.06 +
+ Galactic Latitude: 1.75 +
+
+ diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out index 22dc28c6581..907209680fc 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query2.out @@ -1,15 +1,24 @@ -

Bright Star Catalog Extract

- -Star Id: 3
-Constellation: Psc
-Description: 33 Psc
-RA J2000: 00:05:20.1
-DEC J2000: 05:42:27
-Visual Magnitude: 4.61
-Spectral Type: K0IIIbCN-0.5
-Galactic Longitude: 93.75
-Galactic Latitude: -65.93
-
- +

Bright Star Catalog Extract

+ + Star Id: 3 +
+ Constellation: Psc +
+ Description: 33 Psc +
+ RA J2000: 00:05:20.1 +
+ DEC J2000: 05:42:27 +
+ Visual Magnitude: 4.61 +
+ Spectral Type: K0IIIbCN-0.5 +
+ Galactic Longitude: 93.75 +
+ Galactic Latitude: -65.93 +
+
+ diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out index e3f7184369d..4e59b3a20e3 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query3.out @@ -1,39 +1,62 @@ -

Bright Star Catalog Extract

- -Star Id: 2
-Constellation: -
-Description: -
-RA J2000: 00:05:03.8
-DEC J2000: 00:30:11
-Visual Magnitude: 6.29
-Spectral Type: gG9
-Galactic Longitude: 98.33
-Galactic Latitude: -61.14
-
-Star Id: 4
-Constellation: Peg
-Description: 86 Peg
-RA J2000: 00:05:42.0
-DEC J2000: 13:23:46
-Visual Magnitude: 5.51
-Spectral Type: G5III
-Galactic Longitude: 106.19
-Galactic Latitude: -47.98
-
-Star Id: 5
-Constellation: -
-Description: -
-RA J2000: 00:06:16.0
-DEC J2000: 58:26:12
-Visual Magnitude: 5.96
-Spectral Type: G5V
-Galactic Longitude: 117.03
-Galactic Latitude: -03.92
-
- +

Bright Star Catalog Extract

+ + Star Id: 2 +
+ Constellation: +
+ Description: +
+ RA J2000: 00:05:03.8 +
+ DEC J2000: 00:30:11 +
+ Visual Magnitude: 6.29 +
+ Spectral Type: gG9 +
+ Galactic Longitude: 98.33 +
+ Galactic Latitude: -61.14 +
+
+ Star Id: 4 +
+ Constellation: Peg +
+ Description: 86 Peg +
+ RA J2000: 00:05:42.0 +
+ DEC J2000: 13:23:46 +
+ Visual Magnitude: 5.51 +
+ Spectral Type: G5III +
+ Galactic Longitude: 106.19 +
+ Galactic Latitude: -47.98 +
+
+ Star Id: 5 +
+ Constellation: +
+ Description: +
+ RA J2000: 00:06:16.0 +
+ DEC J2000: 58:26:12 +
+ Visual Magnitude: 5.96 +
+ Spectral Type: G5V +
+ Galactic Longitude: 117.03 +
+ Galactic Latitude: -03.92 +
+
+ diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out index 71b99603efd..0f23e984107 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/xmlfiles/gold/query4.out @@ -1,37 +1,62 @@ -

Bright Star Catalog Extract

- -Star Id: 2
-Constellation: -
-Description: -
-RA J2000: 00:05:03.8
-DEC J2000: 00:30:11
-Visual Magnitude: 6.29
-Spectral Type: gG9
-Galactic Longitude: 98.33
-Galactic Latitude: -61.14
-
-Star Id: 3
-Constellation: Psc
-Description: 33 Psc
-RA J2000: 00:05:20.1
-DEC J2000: 05:42:27
-Visual Magnitude: 4.61
-Spectral Type: K0IIIbCN-0.5
-Galactic Longitude: 93.75
-Galactic Latitude: -65.93
-
-Star Id: 4
-Constellation: Peg
-Description: 86 Peg
-RA J2000: 00:05:42.0
-DEC J2000: 13:23:46
-Visual Magnitude: 5.51
-Spectral Type: G5III
-Galactic Longitude: 106.19
-Galactic Latitude: -47.98
-
- +

Bright Star Catalog Extract

+ + Star Id: 2 +
+ Constellation: +
+ Description: +
+ RA J2000: 00:05:03.8 +
+ DEC J2000: 00:30:11 +
+ Visual Magnitude: 6.29 +
+ Spectral Type: gG9 +
+ Galactic Longitude: 98.33 +
+ Galactic Latitude: -61.14 +
+
+ Star Id: 3 +
+ Constellation: Psc +
+ Description: 33 Psc +
+ RA J2000: 00:05:20.1 +
+ DEC J2000: 05:42:27 +
+ Visual Magnitude: 4.61 +
+ Spectral Type: K0IIIbCN-0.5 +
+ Galactic Longitude: 93.75 +
+ Galactic Latitude: -65.93 +
+
+ Star Id: 4 +
+ Constellation: Peg +
+ Description: 86 Peg +
+ RA J2000: 00:05:42.0 +
+ DEC J2000: 13:23:46 +
+ Visual Magnitude: 5.51 +
+ Spectral Type: G5III +
+ Galactic Longitude: 106.19 +
+ Galactic Latitude: -47.98 +
+
+ diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java new file mode 100644 index 00000000000..be54c6c2e05 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java @@ -0,0 +1,366 @@ +/* + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package common.prettyprint; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.io.StringWriter; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.testng.Assert; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; +import org.w3c.dom.DOMConfiguration; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; +import org.w3c.dom.bootstrap.DOMImplementationRegistry; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSOutput; +import org.w3c.dom.ls.LSSerializer; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + + +/* + * @test + * @bug 6439439 8087303 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.prettyprint.PrettyPrintTest + * @run testng/othervm common.prettyprint.PrettyPrintTest + * @summary Test serializing xml and html with indentation. + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class PrettyPrintTest { + /* + * test CDATA, elements only, text and element, whitespace and element, + * xml:space property and nested xml:space property, mixed node types. + */ + @DataProvider(name = "xml-data") + public Object[][] xmlData() throws Exception { + return new Object[][] { + { read("xmltest1.xml"), read("xmltest1.out") }, + { read("xmltest2.xml"), read("xmltest2.out") }, + { read("xmltest3.xml"), read("xmltest3.out") }, + { read("xmltest4.xml"), read("xmltest4.out") }, + { read("xmltest5.xml"), read("xmltest5.out") }, + { read("xmltest6.xml"), read("xmltest6.out") }, + { read("xmltest7.xml"), read("xmltest7.out") }, + { read("xmltest8.xml"), read("xmltest8.out") } }; + } + + /* + * @bug 8087303 + * Test the whitespace text nodes are serialized with pretty-print by LSSerializer and transformer correctly + * + */ + @Test(dataProvider = "xml-data") + public void testXMLPrettyPrint(String source, String expected) throws Exception { + // test it's no change if no pretty-print + String result = serializerWrite(toXmlDocument(source), false); + assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result); + // test pretty-print + assertEquals(serializerWrite(toXmlDocument(source), true), expected); + // test it's no change if no pretty-print + result = transform(toXmlDocument(source), false); + assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result); + // test pretty-print + assertEquals(transform(toXmlDocument(source), true).replaceAll("\r\n", "\n"), expected); + } + + /* + * test pure text content, and sequent Text nodes. + */ + @DataProvider(name = "xml-node-data") + public Object[][] xmlNodeData() throws Exception { + return new Object[][] { + { newTextNode(read("nodetest1.txt")), read("nodetest1.out") }, + { createDocWithSequentTextNodes(), read("nodetest2.out") } }; + } + + /* + * @bug 8087303 + * Test the whitespace text nodes are serialized with pretty-print by LSSerializer and transformer correctly, + * doesn't compare with the source because the test data is Node object + * + */ + @Test(dataProvider = "xml-node-data") + public void testXMLNodePrettyPrint(Node xml, String expected) throws Exception { + assertEquals(serializerWrite(xml, true), expected); + assertEquals(transform(xml, true).replaceAll("\r\n", "\n"), expected); + } + + /* + * test block element, inline element, text, and mixed elements. + */ + @DataProvider(name = "html-data") + public Object[][] htmlData() throws Exception { + return new Object[][] { + { read("htmltest1.xml"), read("htmltest1.out") }, + { read("htmltest2.xml"), read("htmltest2.out") }, + { read("htmltest3.xml"), read("htmltest3.out") }, + { read("htmltest4.xml"), read("htmltest4.out") }, + { read("htmltest5.xml"), read("htmltest5.out") }, + { read("htmltest6.xml"), read("htmltest6.out") } }; + } + + /* + * @bug 8087303 + * Transform to HTML, test Pretty Print for HTML. + * + */ + @Test(dataProvider = "html-data") + public void testTransformToHTML(String source, String expected) throws Exception { + // test it's no change if no pretty-print + StringWriter writer = new StringWriter(); + getTransformer(true, false).transform(new StreamSource(new StringReader(source)), new StreamResult(writer)); + assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(writer.toString())), "The actual is: " + writer.toString()); + + // test pretty-print + writer = new StringWriter(); + getTransformer(true, true).transform(new StreamSource(new StringReader(source)), new StreamResult(writer)); + assertEquals(writer.toString().replaceAll("\r\n", "\n"), expected); + } + + @Test + public void testLSSerializerFormatPrettyPrint() { + + final String XML_DOCUMENT = "\n" + + "before child elementafter child element"; + /**JDK-8035467 + * no newline in default output + */ + final String XML_DOCUMENT_DEFAULT_PRINT = + "" + + "" + + "before child element" + + "" + + "after child element"; + + final String XML_DOCUMENT_PRETTY_PRINT = "\n" + + " before child element\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " after child element\n" + + "\n"; + + // it all begins with a Document + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder documentBuilder = null; + try { + documentBuilder = documentBuilderFactory.newDocumentBuilder(); + } catch (ParserConfigurationException parserConfigurationException) { + parserConfigurationException.printStackTrace(); + Assert.fail(parserConfigurationException.toString()); + } + Document document = null; + + StringReader stringReader = new StringReader(XML_DOCUMENT); + InputSource inputSource = new InputSource(stringReader); + try { + document = documentBuilder.parse(inputSource); + } catch (SAXException saxException) { + saxException.printStackTrace(); + Assert.fail(saxException.toString()); + } catch (IOException ioException) { + ioException.printStackTrace(); + Assert.fail(ioException.toString()); + } + + // query DOM Interfaces to get to a LSSerializer + DOMImplementation domImplementation = documentBuilder.getDOMImplementation(); + DOMImplementationLS domImplementationLS = (DOMImplementationLS) domImplementation; + LSSerializer lsSerializer = domImplementationLS.createLSSerializer(); + + System.out.println("Serializer is: " + lsSerializer.getClass().getName() + " " + lsSerializer); + + // get configuration + DOMConfiguration domConfiguration = lsSerializer.getDomConfig(); + + // query current configuration + Boolean defaultFormatPrettyPrint = (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT); + Boolean canSetFormatPrettyPrintFalse = (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE); + Boolean canSetFormatPrettyPrintTrue = (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE); + + System.out.println(DOM_FORMAT_PRETTY_PRINT + " default/can set false/can set true = " + defaultFormatPrettyPrint + "/" + + canSetFormatPrettyPrintFalse + "/" + canSetFormatPrettyPrintTrue); + + // test values + assertEquals(defaultFormatPrettyPrint, Boolean.FALSE, "Default value of " + DOM_FORMAT_PRETTY_PRINT + " should be " + Boolean.FALSE); + + assertEquals(canSetFormatPrettyPrintFalse, Boolean.TRUE, "Can set " + DOM_FORMAT_PRETTY_PRINT + " to " + Boolean.FALSE + " should be " + + Boolean.TRUE); + + assertEquals(canSetFormatPrettyPrintTrue, Boolean.TRUE, "Can set " + DOM_FORMAT_PRETTY_PRINT + " to " + Boolean.TRUE + " should be " + + Boolean.TRUE); + + // get default serialization + String prettyPrintDefault = lsSerializer.writeToString(document); + System.out.println("(default) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) + + ": \n\"" + prettyPrintDefault + "\""); + + assertEquals(prettyPrintDefault, XML_DOCUMENT_DEFAULT_PRINT, "Invalid serialization with default value, " + DOM_FORMAT_PRETTY_PRINT + "==" + + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); + + // configure LSSerializer to not format-pretty-print + domConfiguration.setParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE); + String prettyPrintFalse = lsSerializer.writeToString(document); + System.out.println("(FALSE) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) + + ": \n\"" + prettyPrintFalse + "\""); + + assertEquals(prettyPrintFalse, XML_DOCUMENT_DEFAULT_PRINT, "Invalid serialization with FALSE value, " + DOM_FORMAT_PRETTY_PRINT + "==" + + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); + + // configure LSSerializer to format-pretty-print + domConfiguration.setParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE); + String prettyPrintTrue = lsSerializer.writeToString(document); + System.out.println("(TRUE) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) + + ": \n\"" + prettyPrintTrue + "\""); + + assertEquals(prettyPrintTrue, XML_DOCUMENT_PRETTY_PRINT, "Invalid serialization with TRUE value, " + DOM_FORMAT_PRETTY_PRINT + "==" + + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); + } + + private String serializerWrite(Node xml, boolean pretty) throws Exception { + DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance(); + DOMImplementationLS domImplementation = (DOMImplementationLS) registry.getDOMImplementation("LS"); + StringWriter writer = new StringWriter(); + LSOutput formattedOutput = domImplementation.createLSOutput(); + formattedOutput.setCharacterStream(writer); + LSSerializer domSerializer = domImplementation.createLSSerializer(); + domSerializer.getDomConfig().setParameter(DOM_FORMAT_PRETTY_PRINT, pretty); + domSerializer.getDomConfig().setParameter("xml-declaration", false); + domSerializer.write(xml, formattedOutput); + return writer.toString(); + } + + private String transform(Node xml, boolean pretty) throws Exception { + Transformer transformer = getTransformer(false, pretty); + StringWriter writer = new StringWriter(); + transformer.transform(new DOMSource(xml), new StreamResult(writer)); + return writer.toString(); + } + + private Document toXmlDocument(String xmlString) throws Exception { + InputSource xmlInputSource = new InputSource(new StringReader(xmlString)); + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setValidating(true); + DocumentBuilder xmlDocumentBuilder = dbf.newDocumentBuilder(); + Document node = xmlDocumentBuilder.parse(xmlInputSource); + return node; + } + + private Text newTextNode(String text) throws Exception { + DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + return db.newDocument().createTextNode(text); + } + + private Document createDocWithSequentTextNodes() throws Exception { + DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + Document doc = db.newDocument(); + Node root = doc.createElement("root"); + doc.appendChild(root); + root.appendChild(doc.createTextNode(" ")); + root.appendChild(doc.createTextNode("t")); + root.appendChild(doc.createTextNode("\n")); + root.appendChild(doc.createTextNode("t")); + root.appendChild(doc.createTextNode(" ")); + Node child1 = doc.createElement("child1"); + root.appendChild(child1); + child1.appendChild(doc.createTextNode(" ")); + child1.appendChild(doc.createTextNode("\n")); + root.appendChild(doc.createTextNode("t")); + Node child2 = doc.createElement("child2"); + root.appendChild(child2); + child2.appendChild(doc.createTextNode(" ")); + root.appendChild(doc.createTextNode(" ")); + Node child3 = doc.createElement("child3"); + root.appendChild(child3); + child3.appendChild(doc.createTextNode(" ")); + root.appendChild(doc.createTextNode(" ")); + Node child4 = doc.createElement("child4"); + root.appendChild(child4); + child4.appendChild(doc.createTextNode(" ")); + + root.appendChild(doc.createTextNode(" ")); + Node child5 = doc.createElement("child5"); + root.appendChild(child5); + child5.appendChild(doc.createTextNode("t")); + + Node child51 = doc.createElement("child51"); + child5.appendChild(child51); + child51.appendChild(doc.createTextNode(" ")); + Node child511 = doc.createElement("child511"); + child51.appendChild(child511); + child511.appendChild(doc.createTextNode("t")); + child51.appendChild(doc.createTextNode(" ")); + child5.appendChild(doc.createTextNode("t")); + + root.appendChild(doc.createTextNode(" ")); + root.appendChild(doc.createComment(" test comment ")); + root.appendChild(doc.createTextNode(" \n")); + root.appendChild(doc.createComment(" ")); + root.appendChild(doc.createTextNode("\n")); + root.appendChild(doc.createProcessingInstruction("target1", "test")); + root.appendChild(doc.createTextNode(" ")); + root.appendChild(doc.createTextNode(" ")); + return doc; + } + + private Transformer getTransformer(boolean html, boolean pretty) throws Exception { + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); + transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); + if (html) + transformer.setOutputProperty(OutputKeys.METHOD, "html"); + transformer.setOutputProperty(OutputKeys.INDENT, pretty ? "yes" : "no"); + return transformer; + } + + + private String read(String filename) throws Exception { + try (InputStream in = PrettyPrintTest.class.getResourceAsStream(filename)) { + return new String(in.readAllBytes()); + } + } + + private static final String DOM_FORMAT_PRETTY_PRINT = "format-pretty-print"; +} diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out new file mode 100644 index 00000000000..d142675db93 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.out @@ -0,0 +1,6 @@ + + + Java Tutorials and Examples 1 + en-us + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml new file mode 100644 index 00000000000..50460626a7b --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml @@ -0,0 +1 @@ +Java Tutorials and Examples 1 en-us \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out new file mode 100644 index 00000000000..8c083a595b6 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.out @@ -0,0 +1,3 @@ + + JavaTM + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml new file mode 100644 index 00000000000..d1f16162395 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest2.xml @@ -0,0 +1 @@ +JavaTM \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out new file mode 100644 index 00000000000..e7f9eeaffd1 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.out @@ -0,0 +1,3 @@ +

+ this is a test page +

diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml new file mode 100644 index 00000000000..51f84ba13e2 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest3.xml @@ -0,0 +1 @@ +

this is a test page

\ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out new file mode 100644 index 00000000000..7eb8ff16547 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.out @@ -0,0 +1,10 @@ + + +

A heading

+

+ new paragraph +

an empty form
+ test +

+ + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml new file mode 100644 index 00000000000..eca3decf70f --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest4.xml @@ -0,0 +1 @@ +

A heading

new paragraph

an empty form
test

\ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out new file mode 100644 index 00000000000..ce2d1caad21 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.out @@ -0,0 +1,7 @@ + +

+ this is a mixed test click +

to the test

+ pagelink end +

+ diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml new file mode 100644 index 00000000000..cfcf67f500d --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest5.xml @@ -0,0 +1 @@ +

this is a mixed test click

to the test

pagelink end

\ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out new file mode 100644 index 00000000000..e8ab1a233b3 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.out @@ -0,0 +1,6 @@ +

+ text +
+ another +

+

diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml new file mode 100644 index 00000000000..b6820ae0a29 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest6.xml @@ -0,0 +1 @@ +

text another

\ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out new file mode 100644 index 00000000000..cd7d2cc3cea --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.out @@ -0,0 +1,4 @@ + abc def +line2 &a + test + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt new file mode 100644 index 00000000000..086050d67d4 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest1.txt @@ -0,0 +1,4 @@ + abc def +line2 &a + test + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out new file mode 100644 index 00000000000..a0d94368a3d --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out @@ -0,0 +1,19 @@ + + t +t + + t + + + + + t + + t + + t + + + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out new file mode 100644 index 00000000000..7d51a352ecb --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.out @@ -0,0 +1,3 @@ + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml new file mode 100644 index 00000000000..7a1317a3355 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest1.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out new file mode 100644 index 00000000000..ab37d7cffcc --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.out @@ -0,0 +1,5 @@ + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml new file mode 100644 index 00000000000..8340ae40cf6 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest2.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out new file mode 100644 index 00000000000..d37bef0bced --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.out @@ -0,0 +1,5 @@ + + + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml new file mode 100644 index 00000000000..99d7a639910 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest3.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out new file mode 100644 index 00000000000..fedb9565061 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.out @@ -0,0 +1,6 @@ + + + child1 + abc test + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml new file mode 100644 index 00000000000..b79c9b28a04 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest4.xml @@ -0,0 +1 @@ +child1 abc test \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.out new file mode 100644 index 00000000000..562ccc63399 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.out @@ -0,0 +1,10 @@ + + + Java Tutorials and Examples 1 + en-us + + + + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml new file mode 100644 index 00000000000..3ff19efd3aa --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.xml @@ -0,0 +1,3 @@ + Java Tutorials and Examples 1 en-us + + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out new file mode 100644 index 00000000000..266c378b4e3 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.out @@ -0,0 +1,3 @@ + + Java Tutorials and Examples 1 en-us + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml new file mode 100644 index 00000000000..21a41f1110e --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest6.xml @@ -0,0 +1 @@ + Java Tutorials and Examples 1 en-us \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.out new file mode 100644 index 00000000000..ba002da540e --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.out @@ -0,0 +1,10 @@ + + Java + 5 + + + + + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml new file mode 100644 index 00000000000..6e6b3de1e79 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.xml @@ -0,0 +1,2 @@ + Java 5 + \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out new file mode 100644 index 00000000000..621263fbe19 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out @@ -0,0 +1,25 @@ + + + t + + +t + + + + t + + + + + t + + + t + + + + t + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml new file mode 100644 index 00000000000..e9c1c477d3a --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml @@ -0,0 +1,15 @@ + + t +t + + t + + + t + + t + + t + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java index f1019369c4b..9068969b318 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java @@ -23,6 +23,8 @@ package dom.ls; +import static org.w3c.dom.ls.DOMImplementationLS.MODE_SYNCHRONOUS; + import java.io.IOException; import java.io.OutputStream; import java.io.StringReader; @@ -35,22 +37,22 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Listeners; import org.testng.annotations.Test; -import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMError; import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSException; +import org.w3c.dom.ls.LSInput; import org.w3c.dom.ls.LSOutput; +import org.w3c.dom.ls.LSParser; import org.w3c.dom.ls.LSSerializer; import org.xml.sax.InputSource; import org.xml.sax.SAXException; - /* * @test - * @bug 6439439 8080906 + * @bug 8080906 8114834 * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest * @run testng/othervm -DrunSecMngr=true dom.ls.LSSerializerTest * @run testng/othervm dom.ls.LSSerializerTest @@ -58,7 +60,6 @@ import org.xml.sax.SAXException; */ @Listeners({jaxp.library.BasePolicy.class}) public class LSSerializerTest { - private static final String DOM_FORMAT_PRETTY_PRINT = "format-pretty-print"; class DOMErrorHandlerImpl implements DOMErrorHandler { @@ -166,101 +167,6 @@ public class LSSerializerTest { Assert.assertTrue(eh.NoOutputSpecifiedErrorReceived, "'no-output-specified' error was expected"); } - @Test - public void testFormatPrettyPrint() { - - final String XML_DOCUMENT = "\n" + "" + "world" + "" - + ""; - /**JDK-8035467 - * no newline in default output - */ - final String XML_DOCUMENT_DEFAULT_PRINT = - "" - + "" - + "world" - + "" - + ""; - - final String XML_DOCUMENT_PRETTY_PRINT = "" + "" + "world" + "" + "\n" + " " - + "" + "\n" + " " + "" + "\n" + " " + "" + "\n" + "" + "\n"; - - // it all begins with a Document - DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder documentBuilder = null; - try { - documentBuilder = documentBuilderFactory.newDocumentBuilder(); - } catch (ParserConfigurationException parserConfigurationException) { - parserConfigurationException.printStackTrace(); - Assert.fail(parserConfigurationException.toString()); - } - Document document = null; - - StringReader stringReader = new StringReader(XML_DOCUMENT); - InputSource inputSource = new InputSource(stringReader); - try { - document = documentBuilder.parse(inputSource); - } catch (SAXException saxException) { - saxException.printStackTrace(); - Assert.fail(saxException.toString()); - } catch (IOException ioException) { - ioException.printStackTrace(); - Assert.fail(ioException.toString()); - } - - // query DOM Interfaces to get to a LSSerializer - DOMImplementation domImplementation = documentBuilder.getDOMImplementation(); - DOMImplementationLS domImplementationLS = (DOMImplementationLS) domImplementation; - LSSerializer lsSerializer = domImplementationLS.createLSSerializer(); - - System.out.println("Serializer is: " + lsSerializer.getClass().getName() + " " + lsSerializer); - - // get configuration - DOMConfiguration domConfiguration = lsSerializer.getDomConfig(); - - // query current configuration - Boolean defaultFormatPrettyPrint = (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT); - Boolean canSetFormatPrettyPrintFalse = (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE); - Boolean canSetFormatPrettyPrintTrue = (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE); - - System.out.println(DOM_FORMAT_PRETTY_PRINT + " default/can set false/can set true = " + defaultFormatPrettyPrint + "/" - + canSetFormatPrettyPrintFalse + "/" + canSetFormatPrettyPrintTrue); - - // test values - Assert.assertEquals(defaultFormatPrettyPrint, Boolean.FALSE, "Default value of " + DOM_FORMAT_PRETTY_PRINT + " should be " + Boolean.FALSE); - - Assert.assertEquals(canSetFormatPrettyPrintFalse, Boolean.TRUE, "Can set " + DOM_FORMAT_PRETTY_PRINT + " to " + Boolean.FALSE + " should be " - + Boolean.TRUE); - - Assert.assertEquals(canSetFormatPrettyPrintTrue, Boolean.TRUE, "Can set " + DOM_FORMAT_PRETTY_PRINT + " to " + Boolean.TRUE + " should be " - + Boolean.TRUE); - - // get default serialization - String prettyPrintDefault = lsSerializer.writeToString(document); - System.out.println("(default) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) - + ": \n\"" + prettyPrintDefault + "\""); - - Assert.assertEquals(XML_DOCUMENT_DEFAULT_PRINT, prettyPrintDefault, "Invalid serialization with default value, " + DOM_FORMAT_PRETTY_PRINT + "==" - + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); - - // configure LSSerializer to not format-pretty-print - domConfiguration.setParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE); - String prettyPrintFalse = lsSerializer.writeToString(document); - System.out.println("(FALSE) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) - + ": \n\"" + prettyPrintFalse + "\""); - - Assert.assertEquals(XML_DOCUMENT_DEFAULT_PRINT, prettyPrintFalse, "Invalid serialization with FALSE value, " + DOM_FORMAT_PRETTY_PRINT + "==" - + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); - - // configure LSSerializer to format-pretty-print - domConfiguration.setParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE); - String prettyPrintTrue = lsSerializer.writeToString(document); - System.out.println("(TRUE) " + DOM_FORMAT_PRETTY_PRINT + "==" + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT) - + ": \n\"" + prettyPrintTrue + "\""); - - Assert.assertEquals(XML_DOCUMENT_PRETTY_PRINT, prettyPrintTrue, "Invalid serialization with TRUE value, " + DOM_FORMAT_PRETTY_PRINT + "==" - + (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT)); - } - @Test public void testXML11() { @@ -318,4 +224,109 @@ public class LSSerializerTest { // output should == input Assert.assertEquals(XML11_DOCUMENT_OUTPUT, defaultSerialization, "Invalid serialization of XML 1.1 document: "); } + + /* + * @bug 8114834 test entity reference, nested entity reference when entities + * is true and false + */ + @Test + public void testEntityReference() throws Exception { + final String XML_DOCUMENT = "\n" + + "" + + " " + + " " + + "text\">" + + " " + + " " + + " ]>" + + " &name1;" + + "b &name2; &name1; b" + + " &name; " + + "&ele1;d" + + " &ele2;eee " + + "<att>" + + " &ele; g" + + "&ele2;" ; + + + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + + DOMImplementation domImplementation = documentBuilder.getDOMImplementation(); + DOMImplementationLS domImplementationLS = (DOMImplementationLS) domImplementation; + + LSParser domParser = domImplementationLS.createLSParser(MODE_SYNCHRONOUS, null); + domParser.getDomConfig().setParameter("entities", Boolean.TRUE); + + LSInput src = domImplementationLS.createLSInput(); + src.setStringData(XML_DOCUMENT); + Document document = domParser.parse(src); + + LSSerializer lsSerializer = domImplementationLS.createLSSerializer(); + + lsSerializer.getDomConfig().setParameter("format-pretty-print", true); + System.out.println("test with default entities is " + lsSerializer.getDomConfig().getParameter("entities")); + Assert.assertEquals(lsSerializer.writeToString(document), + "\n" + + "\n" + + "\n" + + "text'>\n" + + "\n" + + "\n" + + "]>\n" + + "\n" + + " &name1;Jo Smith\n" + + " b &name2;Jo Smith &name1;Jo Smith b\n" + + " &name;Jo Smith \n" + + " &ele1;d\n" + + " &ele2;eee \n" + + " <att>\n" + + " &ele; g\n" + + " &ele2;\n" + + "\n"); + + lsSerializer.getDomConfig().setParameter("entities", Boolean.FALSE); + System.out.println("test with entities is false"); + Assert.assertEquals(lsSerializer.writeToString(document), + "\n" + + "\n" + + "\n" + + "text'>\n" + + "\n" + + "\n" + + "]>\n" + + "\n" + + " &name;Jo Smith\n" + + " b &name;Jo Smith &name;Jo Smith b\n" + + " &name;Jo Smith \n" + + " \n" + + " \n" + + " text\n" + + " \n" + + " d\n" + + " \n" + + " \n" + + " \n" + + " text\n" + + " \n" + + " eee \n" + + " \n" + + " <att>\n" + + " \n" + + " \n" + + " text\n" + + " \n" + + " g\n" + + " \n" + + " \n" + + " \n" + + " text\n" + + " \n" + + " \n" + + "\n"); + + } } diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8169112.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8169112.xsl new file mode 100644 index 00000000000..e16639bae1f --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug8169112.xsl @@ -0,0 +1,8382 @@ + + + + + + + TRI Reporting Form + + + + + + + + + 2070-0093 + 2070-0093 + 2070-0093 + 2070-0093 + 2025-0009 + 2025-0009 + 2025-0009 + 2025-0009 + + + + + 2070-0143 + 2070-0143 + 2070-0143 + 2070-0143 + 2025-0010 + 2025-0010 + 2025-0009 + 2025-0009 + + + + + 2025-0007 + 2025-0007 + 2025-0007 + 2025-0009 + 2025-0009 + + + + + + 08/2005 + 08/2006 + 01/2008 + 08/2008 + 10/2009 + 10/2009 + 10/2011 + 10/2012 + + + + + 08/2005 + 11/2006 + 01/2008 + 03/2009 + 10/2009 + 03/2009 + 10/2011 + 10/2012 + + + + + + 01/31/2008 + 01/31/2008 + 01/31/2010 + 03/31/2011 + 07/31/2011 + 07/31/2011 + 10/31/2014 + 10/31/2014 + + + + + 01/31/2008 + 01/31/2008 + 03/31/2011 + 03/31/2011 + 07/31/2011 + 07/31/2011 + 10/31/2014 + 10/31/2014 + + + + + 07/31/2011 + 10/31/2014 + + + + + + false + true + + + + + + +

 

+ + + +
+
+ + + + + + + + + + + + + + + + +
+ + *** Do not send to EPA: This is the final copy of your form.*** +   +
+ + Form Status: + +   +
+ + Validation Status: + +   +
+ + + + + + + + + + + +
+ +

+ Form Approved OMB Number: + + +   +

+ + 		+
+
+ +

(IMPORTANT: Read instructions before completing form; type or use fill-and-print form)

+ + 		+ +

+ Approval Expires: + + +   +

+ + 		+

+ Page 1 of 5 +

+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+

EPA

+ 		+

FORM R

+
+

+ United States
Environmental Protection
Agency +

+ 		+

+ Section 313 of the Emergency Planning and Community Right-to-know Act of 1986, +
+ also known as Title III of the Superfund Amendments and Reauthorization Act. +

+
+ 		+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+ + + + + + + + + +
+

WHERE TO SEND COMPLETED FORMS:

+ 		+

+ 1. TRI Data Processing Center +
+ P.O. Box 10163 +
+ Fairfax, VA 22038 +
+

+ 		+

2. APPROPRIATE STATE OFFICE
(See instructions in Appendix F)

+
+ + + + + + +
+

This section only applies if you are revising or withdrawing a previously submitted form, otherwise leave blank:

+ 		+

+ Revision (Enter up to two code(s)) +
+
+ [ + + +   + ] [ + + +   + ] +

+ 		+

+ Withdrawal (Enter up to two code(s)) +
+
+ [ + + +   + ] [ + + +   + ] +

+
+
+

Important: See Instructions to determine when "Not Applicable (NA)" boxes should be checked.

+
+

Part I. FACILITY IDENTIFICATION INFORMATION

+
+

SECTION 1. REPORTING YEAR : + +

+
+

SECTION 2. TRADE SECRET INFORMATION

+
+
+
2.1 Are you claiming the toxic chemical identified on + page 2 trade secret?
+
+ [ + + + X + + + ] Yes (Answer question 2.2; attach substantiation forms) +
+
+ [ + + + X + + + ] NO (Do not answer 2.2; go to Section 3) +
+
+ 		+
+
2.2 Is this copy
+
+ [ + ] Sanitized [ + ] Unsanitized +
+
(Answer only if "Yes" in 2.1)
+
+ 		+
+
+

SECTION 3. CERTIFICATION (Important: Read and sign after completing all form sections.)

+
+

+ I hereby certify that I have reviewed the attached documents and that, to the best of my knowledge and belief, the submitted + information is true and complete and that the amounts and values in this report are accurate based on reasonable estimates using data + available to the preparers of this report. +

+ + + + + + + + + + + +
Name and official title of owner/operator or senior management official:Signature:Date Signed:
+

+     + +

+ 		+

+ Reference Copy: Copy of Record Resides in CDX +

+ 		+ + + + + +
+
+

SECTION 4. FACILITY IDENTIFICATION

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

4.1

+ 		  +

TRI Facility ID Number

+ 		+

+ + +   +

+
+

+ Facility or Establishment Name +
+ + + +

+ 		+

+ Facility or Establishment Name or Mailing Address(if different from street address) +
+ + + +

+
+

+ Facility or Establishment Name +

+

+ + +   +

+
+

+ Street +
+ + +   +

+ 		+

+ Mailing Address (if different from physical street address) +
+ + +   +

+
+

+ + + City/County/Tribe/State/ZIP Code +
+ + +   + / + + +   + / + + BIA Code: +   + / + + +   + / + + +   + + + + City/County/State/ZIP Code +
+ + +   + / + + +   + / + + +   + / + + +   + + + +

+ 		+

+ City/State/ZIP Code +
+ + +   + + +   + / + + +   + / + + +   +

+ 		+

+ Country (Non-US) +
+ + +   +

+
+
+ + + + + + + + + +
+

4.2

+ 		+

+ This report contains information for : +
+ ( + Important: + check a or b; check c or d if applicable) +

+ 		+

+ a. [ + + + X + + + ] An Entire facility +

+ 		+

+ b. [ + + + X + + + ] Part of a facility +

+ 		+

+ c. [ + + + X + + + ] A Federal facility +

+ 		+

+ d. [ + + + X + + + ] GOCO +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

4.3

+ 		+

Technical Contact name

+ 		+ + +   + +

+ Email Address +
+ + +   +

+ 		+

+ + + Telephone Number (include area code and ext.) + + + Telephone Number (include area code) + + +
+ + -- +   + + + + -   + +   + +

+
+

4.4

+ 		+

Public Contact name

+ 		+ + +   + +

+ Email Address +
+ + +   +

+ 		+

+ + + Telephone Number (include area code and ext.) + + + Telephone Number (include area code) + + +
+ + + -- + +   + + + + -   + +   + +

+
+

4.4

+ 		+

Public Contact name

+ 		+ + +   + +

+ + + Telephone Number (include area code and ext.) + + + Telephone Number (include area code) + + +
+ + + -- + +   + + + + -   + +   + +

+
+

4.5

+ 		+

SIC Code(s) (4 digits)

+ 		+

+ a. + + + + + + (Primary) +   + + + +

+ 		+

+ b. + + + + +   + + +

+ 		+

+ c. + + + + +   + + +

+ 		+

+ d. + + + + +   + + +

+ 		+

+ e. + + + + +   + + +

+ 		+

+ f. + + + + +   + + +

+
+

4.5

+ 		+

NAICS Code(s) (6 digits)

+ 		+

+ a. + + + + + + (Primary) +   + + + +

+ 		+

+ b. + + + + + + +   + + + + +   + + + + +

+ 		+

+ c. + + + + + + +   + + + + +

+ 		+

+ d. + + + + + + +   + + + + +

+ 		+

+ e. + + + + + + +   + + + + +

+ 		+

+ f. + + + + + + +   + + + + +

+
+ + + + + + + + + + + +
+

4.6

+ 		+

+ Dun and Bradstreet +
+ Number(s) (9 digits) +

+
+

+ a. + + +   +

+
+

+ b. + + +   +

+
+
+

SECTION 5. PARENT COMPANY INFORMATION

+
+

5.1

+ 		+

+ + + Name of Parent Company + + + Name of U.S. Parent Company (for TRI Reporting purposes) + + +

+ 		+ + + + +   +
+ 		+

+ No U.S. Parent Company (for TRI Reporting purposes) [ + + + X + + + ] +

+ 		+

+ NA [ + + + + X + + + ] +

+ 		+ + +   +
+
+

5.2

+ 		+

Parent Company's Dun & Bradstreet Number

+ 		+

+ NA [ + + + X + + + ] +

+ 		+ + + + +   + + +
+
+
+
+ + + + + +
+

+ + EPA Form 9350-1 (Rev. ) - Previous editions are obsolete. + +

+ 		+

Printed using TRI-MEweb

+
+ +

 

+ + + + + +
+

+ Page 2 of 5 +

+
+
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+

+ EPA FORM R +
+ PART II. CHEMICAL - SPECIFIC INFORMATION +

+ 		+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+
+ + + + + +
+

SECTION 1. TOXIC CHEMICAL IDENTITY

+ 		+

(Important: DO NOT complete this section if you are reporting a mixture component in Section 2 below.)

+
+
+

1.1

+ 		+ CAS Number (Important: Enter only one number exactly as it + appears on the Section 313 list. Enter category code if + reporting a chemical category.) +
+ + +   +
+

1.2

+ 		+ Toxic Chemical or Chemical Category Name (Important: Enter + only one name exactly as it appears on the Section 313 list.) +
+ + +   +
+

1.3

+ 		+ Generic Chemical Name (Important: Complete only if Part I, + Section 2.1 is checked "Yes". Generic Name must be + structurally descriptive). +
+ NA  +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

1.4

+ 		+

+ Distribution of Each Member of the Dioxin and + Dioxin-like Compounds Category. +
+ (If there are any numbers in boxes 1-17, then every + field must be filled in with either 0 or some number + between 0.01 and 100. Distribution should be reported + in percentages and the total should equal 100%. If you + do not have speciation data available, indicate NA.) +

+
+

+ NA [ + X + ] +

+

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

 +

NA [ ]

+ 		+

+ 1 +

+ + +   +

+ 		+

+ 2 +

+ + +   +

+ 		+

+ 3 +

+ + +   +

+ 		+

+ 4 +

+ + +   +

+ 		+

+ 5 +

+ + +   +

+ 		+

+ 6 +

+ + +   +

+ 		+

+ 7 +

+ + +   +

+ 		+

+ 8 +

+ + +   +

+ 		+

+ 9 +

+ + +   +

+ 		+

+ 10 +

+ + +   +

+ 		+

+ 11 +

+ + +   +

+ 		+

+ 12 +

+ + +   +

+ 		+

+ 13 +

+ + +   +

+ 		+

+ 14 +

+ + +   +

+ 		+

+ 15 +

+ + +   +

+ 		+

+ 16 +

+ + +   +

+ 		+

+ 17 +

+ + +   +

+
+
+ + + + +
+

SECTION 2. MIXTURE COMPONENT + IDENTITY (Important: DO NOT + complete this section if you + completed Section 1.)

+
+
+

2.1

+ 		+ Generic Chemical Name Provided by Supplier (Important: + Maximum of 70 characters, including numbers, spaces, and + punctuation.) +
+ + + +
+
+ + + + +
+ SECTION 3. ACTIVITIES AND USES OF THE TOXIC CHEMICAL AT THE FACILITY +
+ (Important: Check all that apply.) +
+
+ + + + + + + + + + + + + + + + + + +
3.1Manufacture the toxic chemical:3.2Process the toxic chemical:3.3Otherwise use the toxic chemical:
+ a. [ + + + + X + + + + ] Produce b. [ + + + + X + + + + ] Import +
+
+
If produce or import:
+
+ c. [ + + + + X + + + + ] For on-site use/processing +
+
+ d. [ + + + + X + + + + ] For sale/distribution +
+
+ e. [ + + + + X + + + + ] As a byproduct +
+
+ f. [ + + + + X + + + + ] As an impurity +
+
+ 		+
+
+ a. [ + + + + X + + + + ] As a reactant +
+
+ b. [ + + + + X + + + + ] As a formulation component +
+
+ c. [ + + + + X + + + + ] As an article component +
+
+ d. [ + + + + X + + + + ] Repackaging +
+
+ e. [ + + + + X + + + + ] As an impurity +
+
+ 		+
+
+ a. [ + + + + X + + + + ] As a chemical processing aid +
+
+ b. [ + + + + X + + + + ] As a manufacturing aid +
+
+ c. [ + + + + X + + + + ] Ancillary or other use +
+
+
+
+ + + + +
+

SECTION 4. MAXIMUM AMOUNT OF + THE TOXIC CHEMICAL ON-SITE AT + ANY TIME DURING THE CALENDAR + YEAR

+
+
+

4.1

+ 		+ [ + + + + +   + ] (Enter two-digit code from instruction package.) +
+ + + + +
+

SECTION 5.QUANTITY OF THE + TOXIC CHEMICAL ENTERING EACH + ENVIRONMENTAL MEDIUM ON-SITE

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ A. Total Release (pounds/year*) +
+ (Enter range code or estimate**) +

+ 		+

+ B. Basis of Estimate +
+ (Enter code) +

+ 		+

C. Percent from Stormwater

+
+

5.1

+ 		+

+ Fugitive or non-point +
+ air emissions +

+ 		+

+ NA [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+ 		 
+

5.2

+ 		+

+ Stack or point +
+ air emissions +

+ 		+

+ NA [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+ 		 
+

5.3

+ 		+

+ Discharges to receiving streams or +
+ water bodies (Enter one name per box) +

+ 		+ + +   + + +

+ NA [ + + + + + + X + + + + + + ] +

+ + + 		  
+

Stream or Water Body Name

+ 		+

Reach Code (optional)

+ 		+
+ 		+
+ 		+
+
+

5.3.1

+ 		+

+ NA  +
+

+
+

+ 5.3. +

+ 		+

+ + +   +
+

+ 		+

+ + +   +
+

+ 		+

+ + + + + + + + + +   +
+

+ 		+

+ + +   +
+

+ 		+

+ + + NA + % + +   +
+

+
+
+
+ + + + + + + + +
+

*For Dioxin and Dioxin-like Compounds, + report in grams/year

+
+

+ + EPA Form 9350-1 (Rev. ) - Previous editions are obsolete. + +

+ 		+

**Range Codes: A=1-10 pounds; B=11-499 + pounds; C=500-999 pounds.

+
+

 

+ + + + + +
+

+ Page 3 of 5 +

+
+
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + + + + + + + + + +
+ + + + + +
+

+ EPA FORM R +
+ PART II. CHEMICAL - SPECIFIC INFORMATION (CONTINUED) +

+ 		+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+
+ + + + +
+

+ SECTION 5. QUANTITY OF THE TOXIC CHEMICAL ENTERING + EACH ENVIRONMENTAL MEDIUM ON-SITE + (Continued) +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ NA +

+ 		+

A. Total Release + (pounds/year*) (Enter range + code** or estimate)

+ 		+

B. Basis of Estimate (Enter + code)

+
+

5.4-5.5

+ 		+

+ Disposal to land on-site +
+

+ 		 
+

5.4

+ 		+

+ UIC Injections Aggregate +

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.4.1

+ 		+

+ + + Class I Underground +
+ Injection wells + + + Underground Injection onsite +
+ to Class I wells + + +

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +

+
+ 		+

+ + + + + +   + + + +

+
+
+

5.4.2

+ 		+

+ + + Class II-V Underground +
+ Injection wells + + + Underground Injection onsite +
+ to Class II-V wells + + +

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5

+ 		+

+ Disposal to land on-site +
+

+ 		 
+

5.5.1

+ 		+

+ Total Landfill Releases +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.1.A

+ 		+

+ RCRA subtitle C landfills +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.1.B

+ 		+

+ Other landfills +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.2

+ 		+

+ Land treatment/application +
+ farming +

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.3

+ 		+

+ Surface impoundment +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.3A

+ 		+

+ RCRA Subtitle C +
+ surface impoundments +

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.3B

+ 		+

+ Other surface impoundments +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+

5.5.4

+ 		+

+ Other disposal +
+
+

+ 		+

+ [ + + + + + + X + + + + + + ] +

+ 		+

+ + + + + + + +
+ + + +
+ + +   + + + +
+

+ 		+

+ + + + + +   + + + +
+

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

SECTION 6. TRANSFER(S) OF THE + TOXIC CHEMICAL IN WASTES TO + OFF-SITE LOCATIONS

+ 		+

SECTION 6. TRANSFER(S) OF THE + TOXIC CHEMICAL IN WASTES TO + OFF-SITE LOCATIONS

+
+

6.1 DISCHARGES TO PUBLICLY + OWNED TREATMENT WORKS (POTWs)

+ 		+

+ NA [ + + X + + ] +

+
+

6.1 DISCHARGES TO PUBLICLY + OWNED TREATMENT WORKS (POTWs)

+ 		+

+ NA [ + + X + + ] +

+ 		+

+ NA [ + + X + + ] +

+
+

6.1 DISCHARGES TO PUBLICLY + OWNED TREATMENT WORKS (POTWs)

+
+

6.1.A Total Quantity + Transferred to POTWs and Basis + of Estimate

+
+

+ 6.1.A.1 Total Transfers (pounds/year*) +
+ (Enter range code** or estimate) +

+ 		+

+ 6.1.A.2 Basis of Estimate +
+ (Enter code) +

+
+

+ + + NA + + + + +
+ + + +
+ + + + + +
+

+ 		+

+ + + +
+

+
+

+
+ + + 6.1. + + + 6.1.B. + + +
+ POTW Name +
+

+ 		+

+ + +   +
+

+ 		+

+ + +   +
+

+
+

+
+ POTW Address +
+

+ 		+

+ + +   +
+

+ 		+

+ + +   +
+

+
+

+
+ City +
+

+ 		+

+ + +   +
+

+ 		+

+
+ State +
+

+ 		+

+ + + +
+

+ 		+

+
+ County +
+

+ 		+

+ + +   +
+

+ 		+

+
+ County +
+

+ 		+

+ + + +
+

+ 		+

+
+ State +
+

+ 		+

+ + +   +
+

+ 		+

+
+ ZIP +
+

+ 		+

+ + + +
+

+ 		+

+
+ Country +
+ (Non-US) +

+ 		+

+ + +   +
+

+
+

+ A. Quantity Transferred to this POTW +
+ (pounds/year*) (Enter range code**or estimate) +

+ 		+

+ A. Quantity Transferred to this POTW +
+ (pounds/year*) (Enter range code**or estimate) +

+ 		+

+ B. Basis of Estimate +
+ (Enter code) +

+ 		+

+ B. Basis of Estimate +
+ (Enter code) +

+
+

+ + + NA + + + + + + + +
+ + + + +   +
+

+ 		+

+ + + NA + + + + + + + +
+ + + + +   +
+

+ 		+

+ + +   +
+

+ 		+

+ + +   +
+

+
+
+
+ + + + + + + + +
+

*For Dioxin and Dioxin-like Compounds, report in grams/year

+
+

+ + EPA Form 9350-1 (Rev. ) - Previous editions are obsolete. + +

+ 		+

**Range Codes: A=1-10 pounds; B=11-499 pounds; C=500-999 pounds.

+
+

 

+ + + + + +
+

+ Page 4 of 5 +

+
+
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+

+ EPA FORM R +
+ PART II. CHEMICAL - SPECIFIC INFORMATION (CONTINUED) +

+ 		+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+
+ + + + + + + + + + + + +
+

SECTION 6.2 TRANSFERS TO OTHER OFF-SITE LOCATIONS

+ 		+

+ NA [ + + + + X + + + + ] +

+
+

SECTION 6.2 TRANSFERS TO OTHER OFF-SITE LOCATIONS

+
+
+ + + + + + + + + + + + + + + + + + + + +
+

+ 6.2. + Off-Site EPA Identification Number (RCRA ID + No.) +

+ 		+

+ 6.2. + Off-Site EPA Identification Number (RCRA ID No.) +

+ 		+

+ + +   +
+

+
+

Off-Site Location Name:

+ 		+

+ + +   +
+

+
+

Off-Site Address:

+ 		+

+ + +   +
+

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

City

+ 		+

+ + +   +
+

+ 		+

State

+ 		+

+ + + +
+

+ 		+

County

+ 		+

+ + + +
+

+ 		+

County

+ 		+

+ + + +
+

+ 		+

State

+ 		+

+ + +   +
+

+ 		+

ZIP

+ 		+

+ + +   +
+

+ 		+

+ Country +
+ (Non-US) +

+ 		+

+ + +   +
+

+
+

Is location under control + of reporting facility or + parent company?

+ 		+

+
+ [ + + + + + + X + + + + + ] Yes [ + + + + + + X + + + + + ] No +
+

+
+
+ + + + + + + + + + + + + +
+

+ A. Total Transfer (pounds/year*) +
+ (Enter range code** or estimate) +

+ 		+

+ B. Basis of Estimate +
+ (Enter code) +

+ 		+

+ C. Type of Waste Treatment/Disposal/ +
+ Recycling/Energy Recovery (Enter code) +

+
+

+ + . + + + + + + + + + +   +

+ 		+

+ + . + + +   +

+ 		+

+ + . + + +   +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

SECTION 7A. ONSITE WASTE TREATMENT METHODS AND EFFICIENCY

+
+

+ [ + + + X + + + + ] Not Applicable (NA) - Check here if no on-site waste + treatment is applied to any waste stream containing + the toxic chemical or chemical category. +

+
+

+ a. General +
+ Waste Stream +
+ (enter code) +

+ 		+

+ b. Waste Treatment Method(s) Sequence +
+ [enter 3-character code(s)] +

+ 		+

+ c. Influent Concentration +

+ 		+

+ d. % Waste Treatment +
+ Efficiency +

+ 		+

+ e. Based on +
+ Operating Data? +

+
+

+ + 7A. + + a + +
+

+ 		+

+ + 7A. + + b + +

+ 		+

+ + 7A. + + c + +
+

+ 		+

+ + 7A. + + d + +
+

+ 		+

+ + 7A. + + e + +
+

+
+

+ + +   +

+ 		+

+ + + : + + + +   + +

+ 		+ + +   + + + +   + + + + + X + + + +   +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

SECTION 7A. ONSITE WASTE TREATMENT METHODS AND EFFICIENCY

+
+

+ [ + + + X + + + + ] Not Applicable (NA) - Check here if no on-site waste + treatment is applied to any waste stream containing + the toxic chemical or chemical category. +

+
+

+ a. General +
+ Waste Stream +
+ (enter code) +

+ 		+

+ b. Waste Treatment Method(s) Sequence +
+ [enter 3-character code(s)] +

+ 		+

+ d. Waste Treatment +
+ Efficiency +
+ Estimate +

+
+

+ + 7A. + + a + +
+

+ 		+

+ + 7A. + + b + +

+ 		+

+ + 7A. + + d + +
+

+
+

+ + +   +

+ 		+

+ + + : + + + +   + +

+ 		+ + +   +
+ + +
+
+ + + + + + + + +
+

*For Dioxin and Dioxin-like Compounds, + report in grams/year

+
+

+ + EPA Form 9350-1 (Rev. ) - Previous editions are obsolete. + +

+ 		+

**Range Codes: A=1-10 pounds; B=11-499 + pounds; C=500-999 pounds.

+
+

 

+ + + + + +
+

+ Page 5 of 5 +

+
+
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + + + + + + + + + +
+ + + + + +
+

+ EPA FORM R +
+ PART II. CHEMICAL - SPECIFIC INFORMATION (CONTINUED) +

+ 		+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+
+ + + + + + + + + + + + + +
SECTION 7B. ON-SITE ENERGY RECOVERY PROCESSES
+ [ + + + + X + + + + ] NA - Check here if no on-site + energy recovery is applied to any waste +
+ stream containing the toxic chemical or chemical + category. +
+

+ Energy Recovery Methods [Enter 3-character code(s)] +
+
+

+
+ + + + + + + . + + +   +     + + + + +   +
+
+ + + + + + + + + + + + + +
+ SECTION 7C. ON-SITE RECYCLING PROCESSES +
+ [ + + + + X + + + + ] NA - Check here if no on-site + recycling is applied to any waste +
+ stream containing the toxic chemical or chemical + category. +
+

+ Recycling Methods [Enter 3-character code(s)] +
+
+

+
+ + + + + + + . + + +   +     + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

SECTION 8. SOURCE REDUCTION AND WASTE MANAGEMENT

+
+

+ Column A +
+ Prior Year +
+ (pounds/year*) +

+ 		+

+ Column B +
+ Current Reporting Year +
+ (pounds/year*) +

+ 		+

+ Column C +
+ Following Year +
+ (pounds/year*) +

+ 		+

+ Column D +
+ Second Following Year +
+ (pounds/year*) +

+
+

8.1

+ 		+

+ Quantity Released +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.1

+ 		+

 

+ 		+

8.1 - 8.7 Production-Related Waste Managed

+ 		+

+
+

+ 		+

+
+

+ 		+

+
+

+ 		+

+
+

+
+

8.1a

+ 		+

+ Total on-site disposal to Class I +
+ Underground Injection Wells, RCRA +
+ Subtitle C landfills, and other landfills +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.1b

+ 		+

+ Total other on-site disposal or other +
+ releases +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.1c

+ 		+

+ Total off-site disposal to Class I +
+ Underground Injection Wells, RCRA +
+ Subtitle C landfills, and other landfills +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.1d

+ 		+

+ Total other off-site disposal or other +
+ releases +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.2

+ 		+

+ Quantity used for energy recovery +
+ on-site +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.3

+ 		+

+ Quantity used for energy recovery +
+ off-site +

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.4

+ 		+

+ Quantity recycled on-site +
+
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.5

+ 		+

+ Quantity recycled off-site +
+
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.6

+ 		+

+ Quantity treated on-site +
+
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.7

+ 		+

+ Quantity treated off-site +
+
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+ 		+

+ + + + + + + NA  + + + + +   + + + + + + +
+

+
+

8.8

+ 		+

+ + + Quantity released to the environment as a result of + remedial actions, +
+ catastrophic events, or one-time events not associated + with production processes (pounds/year) + + + Non-production-related waste managed** + + +

+ 		+ + + NA + + + + +   +
+
+

8.9

+ 		+

+ + [X] + [ ] + + Production ratio or + + [X] + [ ] + + Activity ratio (select one and enter value to right) +

+ 		+

Production ratio or activity index

+ 		+ + + NA + + + + +   +
+
+

8.10

+ 		+

+ Did your facility engage in any source reduction activities for this chemical during the reporting +year? If not, enter "NA" in Section 8.10.1 and answer Section 8.11. +

+ 		+

+ Did your facility engage in any newly implemented source reduction activities for this + chemical during the reporting year? +
+ If so, complete the following section; if not, check NA. +

+ 		+ NA [ + + + X + +   + + ] + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Source Reduction Activities +
+ (Enter code(s)) +

+ 		+

Methods to Identify Activity + (Enter code(s))

+ 		+

Estimated annual + reduction + (Enter code(s)) + (optional)

+
+

8.10.1

+ 		+

+ NA +
+

+ 		+

+
+
+

+ 		+

+
+
+

+ 		+

+
+
+

+
+

+ 8.10. +

+ 		+

+ + +   +
+

+ 		+

+ + +   +
+
+

+ 		+

+ + +   +
+
+

+ 		+

+ + +   +
+
+

+ 		+

+ + +   +
+
+

+
+

8.11

+ 		+ +

If you wish to submit + additional optional + information on source + reduction, recycling, or + pollution control activities, + check "Yes."

+ 		+

+ Yes [ + + + + X + + + ] + +

+
+
+
+ + + + + +
+

+ + EPA Form 9350-1 (Rev. ) - Previous editions are obsolete. + +

+ 		+

+ *For Dioxin and Dioxin-like Compounds, report in grams/year
+ + ** Includes quantities released to the environment or transferred off-site as a result of remedial actions, catastrophic events, or other one-time events not associated with production processes + +

+
+

 

+ + + + +
+ + + + +
+ + + + +
+ TRI Facility ID Number +
+ + +   +
+ Toxic Chemical, Category, or Generic Name +
+ + + + + + + + + +   +
+
+
+ + + + + + + +
+

+ Additional optional information on source reduction, + recycling, or pollution control activities. +

+
+ + +   + +
+
+ + + + + + + + + + + + + + + + + + +
+

+ Section 8.11: If you wish to submit additional optional information on source reduction, recycling, or pollution control activities, provide it here. +

+
+

+ Topic +

+ 		+

+ Comment +

+
+

+ +

+ 		+

+ +

+
+
+ + + + + + + + + + + + + + + + + + +
+

+ Section 9.1: If you wish to submit any miscellaneous, additional, or optional information regarding your Form R submission, provide it here. +

+
+

+ Topic +

+ 		+

+ Comment +

+
+

+ +

+ 		+

+ +

+
+ + + + + + + + + +
+

+ Miscellaneous, additional, or optional information regarding the Form R submission +

+
+ + +   +
+ + + +

+ + + + + + 0 + + + + + + + + + + + + + + + + + + + + + +
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + +
+ + Form Approved OMB Number: 
+ Approval Expires:   + + 		+

Page 2 of 4

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
EPA FORM R Schedule 1

TRI Facility ID Number:

+

United States
Environmental Protection
Agency

+ 		+

PART II. CHEMICAL-SPECIFIC INFORMATION (continued)

+
+
+

Section 5. Quantity Of Dioxin And Dioxin-Like Compounds Entering Each Environmental Medium On-site (continued)

+
  +

5.4   Underground Injection

+ 		+

5.5   Disposal to Land On-site

+
5.4.1NA + + X +   + 5.4.2NA + + X +   + 5.5.1ANA + + X +   + 5.5.1BNA + + X +   + 5.5.2NA + + X +   + 5.5.3ANA + + X +   + 5.5.3BNA + + X +   + 5.5.4NA + + X +   +
+ + + Underground Injection on-site to Class I Wells + + + Class I Underground Injection Wells + + + + + + Underground Injection on-site to Class II-V Wells + + + Class II-V Underground Injection Wells + + + + + RCRA Subtitle C landfills + + Other landfills + + Land treatment/application farming + + RCRA Subtitle C surface impoundment + + Other surface impoundment + + Other disposal +
+
+ + + + + + +
+

+ EPA Form 9350-3 +

+ 		+

Printed using TRI-MEweb

+
+
+ + + + +
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + +
+ + Form Approved OMB Number: 
+ Approval Expires:   + + 		+

Page 3 of 4

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + + + + + + +
+ + + + + + + + + + + +
+

EPA

+ 		+

FORM R Schedule 1

+ 		+

TRI Facility ID Number:

+
+

United States
Environmental Protection
Agency

+ 		+

PART II. CHEMICAL-SPECIFIC INFORMATION (continued)

+ 		+

+ + +   +

+
+
+

SECTION 6. TRANSFERS OF DIOXIN AND DIOXIN-LIKE COMPOUNDS IN WASTES TO OFF-SITE LOCATIONS

+
+

6.1 DISCHARGES TO PUBLICLY-OWNED TREATMENT WORKS (POTWs)

+ 		+

6.1 DISCHARGES TO PUBLICLY-OWNED TREATMENT WORKS (POTWs)

+ 		+

+ NA [ + + X + + ] +

+
6.1.A.3 Mass (grams) of each compound in the category (1-17) + +
1 2 3 4 5 6 7 8 9 
10 11 12 13 14 15 16 17  
6.1. + C. Mass (grams) of each compound in the category (1-17) +
+ . + 1 2 3 4 5 6 7 8 
9 10 11 12 13 14 15 16 17 
+

6.2 TRANSFERS TO OTHER OFF-SITE LOCATIONS

+ 		+

6.2 TRANSFERS TO OTHER OFF-SITE LOCATIONS

+ 		+

+ NA [ + + + + X + + + + ] +

+
+

+ + + 6.2. + + + 6.2. + + +

+ 		+

D. Mass (grams) of each compound in the category (1-17)

+
+ +   +
+
+ + + + + + +
+

+ EPA Form 9350-3 +

+ 		+

Printed using TRI-MEweb

+
+
+ + + +
+ + + + *** Do not send to EPA: This is the final copy of your form.*** +   + + + + + + + +
+ + Form Approved OMB Number: 
+ Approval Expires:   + + 		+

Page 4 of 4

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+

EPA

+ 		+

FORM R Schedule 1

+ 		+

TRI Facility ID Number:

+
+

United States
Environmental Protection
Agency

+ 		+

PART II. CHEMICAL-SPECIFIC INFORMATION (continued)

+ 		+

+ + +   +

+
+
+

SECTION 8. SOURCE REDUCTION AND WASTE MANAGEMENT FOR DIOXIN AND DIOXIN-LIKE COMPOUNDS (current year only)

+
  +

8.1a

+ 		+

8.1b

+ 		+

8.1c

+ 		+

8.1d

+ 		+

8.2

+ 		+

8.3

+ 		+

8.4

+ 		+

8.5

+ 		+

8.6

+ 		+

8.7

+ 		+

8.8

+
+

Total on-site disposal to Class 1 Underground Injection Wells, RCRA Subtitle C landfills, and other landfills

+ 		+

Total other on-site disposal or other releases

+ 		+

Total off-site disposal to Class 1 Underground Injection Wells, RCRA Subtitle C landfills, and other landfills

+ 		+

Total other off-site disposal or other releases

+ 		+

Quantity used for energy recovery on-site

+ 		+

Quantity used for energy recovery off-site

+ 		+

Quantity recycled on-site

+ 		+

Quantity recycled off-site

+ 		+

Quantity treated on-site

+ 		+

Quantity treated off-site

+ 		+

Quantity released to the environment as a result of remedial actions, catastrophic events, or one-time events not associated with production processes

+
+
+ + + + + + +
+

+ EPA Form 9350-3 +

+ 		+

Printed using TRI-MEweb

+
+
+ + + + + + + + +

 

+ + + + + + + + + + + + + + + + + +
+ + *** File Copy Only: Do Not Submit Paper Form to EPA *** +   +
+ + Form Status: + +   +
+ + Validation Status: + +   +
+ + + + + + + + + + +
+ +

+ Form Approved OMB Number: + + +   +

+ + 		+
+
+

+ + (IMPORTANT: Read instructions before completing form; type or use fill-and-print form) + +

+ 		+ +

+ Approval Expires: + + +   +

+ + 		+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+

+ + United States +
+ Environmental Protection Agency +   +

+ 		+

+ + TOXICS CHEMICAL RELEASE INVENTORY +
+ FORM A +   +

+
+ 		+ TRI Facility ID Number +
+ +   +
+ + + + + + + + + +
+

WHERE TO SEND COMPLETED FORMS:

+ 		+

+ 1. TRI Data Processing Center +
+ P.O. Box 10163 +
+ Fairfax, VA 22038 +
+ + *** File Copy Only: Do Not Submit Paper Form to EPA *** +   +

+ 		+

+ 2. APPROPRIATE STATE OFFICE +
+ (See instructions in Appendix F) +

+
+ + + + + + +
+

This section only applies if you are revising or withdrawing a previously submitted form, otherwise leave blank:

+ 		+

+ Revision (Enter up to two code(s)) +
+
+ [ + + +   + ] [ + + +   + ] +

+ 		+

+ Withdrawal (Enter up to two code(s)) +
+
+ [ + + +   + ] [ + + +   + ] +

+
+
+

Important: See Instructions to determine when "Not Applicable (NA)" boxes should be checked.

+
+

Part I. FACILITY IDENTIFICATION INFORMATION

+
+ SECTION 1. REPORTING YEAR : + +
+
+

SECTION 2. TRADE SECRET INFORMATION

+
+
+
+ 2.1 Are you claiming the toxic chemical identified on page 2 trade secret? +
+
+ [ + + + X + + + ] Yes (Answer question 2.2; attach substantiation forms) +
+
+ [ + + + X + + + ] NO (Do not answer 2.2; go to Section 3) +
+
+ 		+
+
+ 2.2 Is this copy +
+
+

[ ] Sanitized [ ] Unsanitized

+
+
+

(Answer only if "Yes" in 2.1)

+
+
+ 		+
+
+

SECTION 3. CERTIFICATION (Important: Read and sign after completing all form sections.)

+
+

+ + + Pursuant to 40 CFR 372.27(a)(1), "I hereby certify that to the best of my knowledge and belief for the + toxic chemical(s) listed in this statement, for this reporting year, the annual reportable amount for each + chemical, as defined in 40 CFR 372.27(a)(1), did not exceed 5,000 pounds, which included no more than 2,000 + pounds of total disposal or other releases to the environment, and that the chemical was manufactured, + or processed, or otherwise used in an amount not exceeding 1 million pounds during this reporting + year;" and/or Pursuant to 40 CFR 372.27(a)(2), "I hereby certify that to the best of my knowledge and + belief for the toxic chemical(s) of special concern listed in this statement, there were zero disposals or + other releases to the environment (including disposals or other releases that resulted from catastrophic + events) for this reporting year, the "Annual Reportable Amount of a Chemical of Special Concern" + for each such chemical, as defined in 40 CFR 372.27(a)(2), did not exceed 500 pounds for this + reporting year, and that the chemical was manufactured, or processed, or otherwise used in an + amount not exceeding 1 million pounds during this reporting year." + + + Pursuant to 40 CFR 372.27(a)(1), "I hereby certify that to the best of my knowledge and belief for the + toxic chemical(s) listed in this statement, for this reporting year, the annual reportable amount for each + chemical, as defined in 40 CFR 372.27(a)(1), did not exceed 5,000 pounds, which included no more than 2,000 + pounds of total disposal or other releases to the environment, and that the chemical was manufactured, + or processed, or otherwise used in an amount not exceeding 1 million pounds during this reporting + year;" and/or Pursuant to 40 CFR 372.27(a)(2), "I hereby certify that to the best of my knowledge and + belief for the toxic chemical(s) of special concern listed in this statement, there were zero disposals or + other releases to the environment (including disposals or other releases that resulted from catastrophic + events) for this reporting year, the "Annual Reportable Amount of a Chemical of Special Concern" + for each such chemical, as defined in 40 CFR 372.27(a)(2), did not exceed 500 pounds for this + reporting year, and that the chemical was manufactured, or processed, or otherwise used in an + amount not exceeding 1 million pounds during this reporting year." + + + I hereby certify that to the best of my knowledge and belief, for each toxic chemical listed in the statement, + the annual reportable amount as defined in 40 CFR 372.27 (a), did not exceed 500 pounds for this reporting year + and the chemical was manufactured, processed, or otherwise used in an amount not exceeding 1 million pounds during + this reporting year. + + +

+ + + + + + + + + + + +
+

Name and official title of owner/operator or senior management official:

+ 		+

Signature:

+ 		+

Date Signed:

+
+

+     + +

+ 		+

+ Reference Copy: Copy of Record Resides in CDX +

+ 		+ + + + + +
+
+

SECTION 4. FACILITY IDENTIFICATION

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
4.1 TRI Facility ID Number +

+ + +   +

+
+

+ Facility or Establishment Name +
+ + + +

+ 		+

+ Facility or Establishment Name or Mailing Address(if different from street address) +
+ + + +

+
+

+ Facility or Establishment Name +

+

+ + +   +

+
+

+ Street +

+

+ + +   +

+ 		+

+ Mailing Address (if different from physical street address) +

+

+ + +   +

+
+

+ + + City/County/Tribe/State/ZIP Code +
+ + +   + / + + +   + / + + BIA Code: +   + / + + +   + / + + +   + + + + City/County/State/ZIP Code +
+ + +   + / + + +   + / + + +   + / + + +   + + +

+ 		+

+ City/State/ZIP Code +
+ + +   + / + + +   + / + + +   +

+ 		+

+ Country (Non-US) +
+ + +   + / + + +   +

+
+

4.2

+ 		+

+ This report contains information for : ( + Important: + check c or d if applicable) +

+ 		+ c. [ + + + X + + + ] A Federal facility + + d. [ + + + X + + + ] GOCO +
+

4.3

+ 		+

Technical Contact name

+ 		+ + +   + +

+ Email Address +
+ + +   +

+ 		+

+ + + Telephone Number (include area code and ext.) + + + Telephone Number (include area code) + + +
+ + -- +   + + + + -   + +   + +

+
+

4.4

+ 		+

Public Contact name

+ 		+ + +   + +

+ Email Address +
+ + +   +

+ 		+

+ + + Telephone Number (include area code and ext.) + + + Telephone Number (include area code) + + +
+ + + -- + +   + + + + -   + +   + + +

+
+

4.4

+ 		+

Intentionally left blank

+
+

4.5

+ 		+

SIC Code(s) (4 digits)

+ 		+

+ a. + + + + + + (Primary) +   + + + +

+ 		+

+ b. + + + + +   + + +

+ 		+

+ c. + + + + +   + + +

+ 		+

+ d. + + + + +   + + +

+ 		+

+ e. + + + + +   + + +

+ 		+

+ f. + + + + +   + + +

+
+

4.5

+ 		+

NAICS Code(s) (6 digits)

+ 		+

+ a. + + + + + + (Primary) +   + + + +

+ 		+

+ b. + + + + +   + + +

+ 		+

+ c. + + + + +   + + +

+ 		+

+ d. + + + + +   + + +

+ 		+

+ e. + + + + +   + + +

+ 		+

+ f. + + + + +   + + +

+
+ + + + + + + + + + + +
+

4.7

+ 		+

+ Dun and Bradstreet +
+ Number(s) (9 digits) +

+
+

+ a. + + +   +

+
+

+ b. + + +   +

+
+
+

SECTION 5. PARENT COMPANY INFORMATION

+
+

5.1

+ 		+

+ + + Name of Parent Company + + + Name of U.S. Parent Company (for TRI Reporting purposes) + + +

+ 		+ + + + +   +
+ 		+

+ No U.S. Parent Company (for TRI Reporting purposes) [ + + + X + + + ] +

+ 		+

+ NA [ + + + + X + + + ] +

+ 		+ + +   +
+
+

5.2

+ 		+

Parent Company's Dun & Bradstreet Number

+ 		+

+ NA [ + + + X + + + ] +

+ 		+ + + + +   + + +
+
+
+
+ + + + + +
+

+ + EPA Form 9350-2 (Rev. ) - Previous editions are obsolete. + +

+ 		+

Printed using TRI-MEweb

+
+ + + + + +

 

+ + + + + +
+

+ + + + 4 + + + IMPORTANT: Read instructions before completing form; type or use fill-and-print form + +

+ 		+ +
+ + + + + + +
+ + + + +
+ EPA FORM A +
+ PART II. CHEMICAL IDENTIFICATION +
+

+ + + Do not use this form for reporting PBT chemicals including Dioxin and Dioxin-like Compounds* + + + Do not use this form for reporting Dioxin and Dioxin-like Compounds* + +

+
+ 		TRI Facility ID Number +
+ + +   +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+

SECTION 1. TOXIC CHEMICAL IDENTITY

+ 		+

Report of

+
+
+

1.1

+ 		+ CAS Number (Important: Enter only one number as it appears on the + Section 313 list. Enter category code if reporting a chemical + category.) +
+ + +   +
+

1.2

+ 		+ Toxic Chemical or Chemical Category Name (Important: Enter only one + name exactly as it appears on the Section 313 list.) +
+ + +   +
+

1.3

+ 		+ Generic Chemical Name (Important: Complete only if Part I, Section + 2.1 is checked "Yes". Generic Name must be structurally descriptive). +
+ NA +
+ + + + +
+

+ SECTION 2. MIXTURE COMPONENT IDENTITY (Important: DO NOT complete this section if you completed Section 1.) +

+
+
+

2.1

+ 		+ Generic Chemical Name Provided by Supplier (Important: Maximum of 70 + characters, including numbers, spaces, and punctuation.) +
+ + + +
+
+
+ + + + + + + + + + + +
+

+ + + *See the TRI Reporting Forms and Instructions Manual for the list of PBT + Chemicals(including Dioxin and Dioxin-like Compounds) + + *See the TRI Reporting Forms and Instructions + Manual for the TRI-listed Dioxin and Dioxin-like + Compounds + +

+
+

+ + EPA Form 9350-2 (Rev. ) - Previous editions are obsolete. + +

+ 		+

 

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + Form Approved OMB Number: 
+ Approval Expires:   + + 		+

Page 1 of 4

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
EPA FORM R Schedule 1

TRI Facility ID Number:

United States
Environmental Protection
Agency

PART II. CHEMICAL-SPECIFIC INFORMATION (continued)

+
+

Section 5. Quantity Of Dioxin And Dioxin-Like Compounds Entering Each Environmental Medium On-site

+
 5.1NA + + X +   + 5.2NA + + X +   + + 5.3   Discharges to receiving streams or water + bodies       + + +   + + + NA    + [  + + + + + X + + + + +  ] + + +
+

Fugitive or non-point air emissions

+ 		+

Stack or point air emissions

+ 		+

5.3.  + +

+ 		+

5.3.  + +

+ 		+

5.3.  + +

+
+

+ If additional pages of Section 6.1 or 6.2 are attached, indicate the total number of pages in this box   + + +   +   +   +
+ and indicate the Section 6.1 or 6.2 page number in this box   + + +   +   +    + (Example: 1,2,3, etc.) +

+
+
+ + + + + + +
+

+ EPA Form 9350-3 +

+ 		+

Printed using TRI-MEweb

+
+
+ + + + + 1 + + + + + + + + + + + +

D. Mass
(grams)
of
each
compound
in
the
category
(1-17)

+ + + + + + + +
+ + +
+ + +
+ + +
+ + +
+ + + + + + + + + + + + 1 + + + + + + + + + + + + + + + C. Mass
(grams)
of
each
compound
in
the
category
(1-17) + + + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + + + + + + + + + 1 + + + 6.2_ + . Mass (grams) of each compound in the Category (1-17) + + + 1 + 2 + 3 + 4 + + + + 1 + + + + . + + 1  + 2  + 3  + 4  + 5  + 6  + 7  + 8  + + + 9  + 10  + 11  + 12  + 13  + 14  + 15  + 16  + 17  + + + + + + + . + + 1 +   + + 2 +   + + 3 +   + + 4 +   + + 5 +   + + 6 +   + + 7 +   + + 8 +   + + + + 9 +   + + 10 +   + + 11 +   + + 12 +   + + 13 +   + + 14 +   + + 15 +   + + 16 +   + + 17 +   + + + + + 1 + + + + + + + F. Mass
(grams)
of
each
compound
in
the
category
(1-17) + + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + + + + + + + + + + 0 + 0 + 0 + + + + + + + + + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java index c479ab117ba..1ae853d81e0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java @@ -29,6 +29,7 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.io.StringReader; @@ -73,7 +74,7 @@ import com.sun.org.apache.xml.internal.serialize.XMLSerializer; * @run testng/othervm -DrunSecMngr=true transform.TransformerTest * @run testng/othervm transform.TransformerTest * @summary Transformer Tests - * @bug 6272879 6305029 6505031 8150704 8162598 8169772 + * @bug 6272879 6305029 6505031 8150704 8162598 8169112 8169772 */ @Listeners({jaxp.library.FilePolicy.class}) public class TransformerTest { @@ -436,6 +437,27 @@ public class TransformerTest { Assert.assertNull(document.getElementsByTagName("test6").item(0).getNamespaceURI(), "unexpected namespace for test6"); } + /** + * @bug 8169112 + * @summary Test compilation of large xsl file with outlining. + * + * This test merely compiles a large xsl file and tests if its bytecode + * passes verification by invoking the transform() method for + * dummy content. The test succeeds if no Exception is thrown + */ + @Test + public final void testBug8169112() throws FileNotFoundException, + TransformerException + { + TransformerFactory tf = TransformerFactory.newInstance(); + String xslFile = getClass().getResource("Bug8169112.xsl").toString(); + Transformer t = tf.newTransformer(new StreamSource(xslFile)); + String xmlIn = ""; + ByteArrayInputStream bis = new ByteArrayInputStream(xmlIn.getBytes()); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + t.transform(new StreamSource(bis), new StreamResult(bos)); + } + /** * @bug 8169772 * @summary Test transformation of DOM with null valued text node diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 005ff37c46c..83940464072 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -394,3 +394,4 @@ b2c18f755228d1d19a86cd7d5fa1abb6b1495dfb jdk-9+141 1461e3e07876ea61bd0a07355a43912c9b04022a jdk-9+146 be37411855de5b76035bef6f1b0d90d8607f2205 jdk-9+147 c8c9c334743caf8155c9809b6b4ac315d3a66476 jdk-9+148 +72554d319b474b3636c7d02fe3c110254d111b1a jdk-9+149 diff --git a/jaxws/THIRD_PARTY_README b/jaxws/THIRD_PARTY_README deleted file mode 100644 index a93b35b994c..00000000000 --- a/jaxws/THIRD_PARTY_README +++ /dev/null @@ -1,3605 +0,0 @@ -DO NOT TRANSLATE OR LOCALIZE. ------------------------------ - -%% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and -OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2000-2011 France Télécom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to BSDiff v4.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright 2003-2005 Colin Percival -All rights reserved - -Redistribution and use in source and binary forms, with or without -modification, are permitted providing 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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CodeViewer 1.0, which may be -included with JDK 8. - ---- begin of LICENSE --- - -Copyright 1999 by CoolServlets.com. - -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. 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. - -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. - -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." - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Cryptix AES 3.2.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CUP Parser Generator for -Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Document Object Model (DOM) Level 2 -& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 -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 -site-policy@w3.org. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Dynalink v0.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2009-2013, Attila Szegedi - -All rights reserved.Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met:* 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 Attila -Szegedi nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Elliptic Curve Cryptography, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - -You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 8 and OpenJDK 8 source distributions, and as object code in -the JRE 8 & JDK 8 runtimes. - -In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do -NOT apply to the Elliptic Curve Cryptography library; it is licensed under the -following license, separately from Oracle's JDK & JRE. If you do not wish to -install the Elliptic Curve Cryptography library, 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. - - - Copyright (C) - - 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. - - , 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 ECMAScript Language -Specification ECMA-262 Edition 5.1 which may be included with -JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright notice -Copyright © 2011 Ecma International -Ecma International -Rue du Rhone 114 -CH-1204 Geneva -Tel: +41 22 849 6000 -Fax: +41 22 849 6001 -Web: http://www.ecma-international.org - -This document and possible translations of it may be copied and furnished to -others, and derivative works that comment on or otherwise explain it or assist -in its implementation may be prepared, copied, published, and distributed, in -whole or in part, without restriction of any kind, provided that the above -copyright notice and this section are included on all such copies and derivative -works. However, this document itself may not be modified in any way, including -by removing the copyright notice or references to Ecma International, except as -needed for the purpose of developing any document or deliverable produced by -Ecma International (in which case the rules applied to copyrights must be -followed) or as required to translate it into languages other than English. The -limited permissions granted above are perpetual and will not be revoked by Ecma -International or its successors or assigns. This document and the information -contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL -DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY -WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP -RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE." Software License - -All Software contained in this document ("Software)" is protected by copyright -and is being made available under the "BSD License", included below. This -Software may be subject to third party rights (rights from parties other than -Ecma International), including patent rights, and no licenses under such third -party rights are granted under this license even if the third party concerned is -a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS -AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR -INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO -IMPLEMENT ECMA INTERNATIONAL STANDARDS*. 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 authors nor Ecma International may be used to endorse -or promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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 Dynalink library which is included -with the Nashorn technology. - ---- begin of LICENSE --- -Copyright (c) 2009-2013, Attila Szegedi - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -* 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 the copyright holder nor the names of - 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 COPYRIGHT HOLDER -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 Joni library which is included -with the Nashorn technology. - ---- begin of 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: - -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 FontConfig 2.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on -Linux and Solaris. - ---- begin of LICENSE --- - -Copyright © 2001,2003 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IAIK PKCS#11 Wrapper, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -IAIK PKCS#11 Wrapper 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: - -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 IAIK of Graz University of - Technology." - - Alternately, this acknowledgment may appear in the software itself, if and - wherever such third-party acknowledgments normally appear. - -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. - -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 1995-2010 International Business Machines Corporation and others - -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, 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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IJG JPEG 6b, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -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. - -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". - -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. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to Joni v1.1.9, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of 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: - -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 JOpt-Simple v3.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - 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. - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Kronos OpenGL headers, which may be -included with JDK 8 and OpenJDK 8 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.5.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 following -this sentence. - -This code is released under the libpng license. - -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 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 - - Cosmin Truta - -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. - -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: - - 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: - - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner - -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: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -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 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. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -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, 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: - - 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 a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -July 7, 2011 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to libungif 4.1.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 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 Little CMS 2.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Little CMS -Copyright (c) 1998-2010 Marti Maria Saguer - -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 --- - -------------------------------------------------------------------------------- - -%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the -U.S. and other countries. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mesa 3D Graphics Library v4.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. - ---- begin of LICENSE --- - - 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mozilla Network Security -Services (NSS), which is supplied with the JDK test suite in the OpenJDK -source code repository. It is licensed under Mozilla Public License (MPL), -version 2.0. - -The NSS libraries are supplied in executable form, built from unmodified -NSS source code labeled with the "NSS_3.13.1_RTM" release tag. - -The NSS source code is available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/src - -The NSS libraries are available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/lib - ---- begin of LICENSE --- - -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - 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. License Grants and Conditions --------------------------------- - -2.1. Grants - -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 such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -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 Software 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 placed in a text file included with all distributions of the Covered -Software under this License. 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. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software 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 Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any 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 Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, 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. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the 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. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. - ---- begin of LICENSE --- - -Copyright (c) 1999-2004 David Corcoran -Copyright (c) 1999-2004 Ludovic Rousseau -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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran - 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. - -Changes to this license can be made only by the copyright author with -explicit written consent. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PorterStemmer v4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -See: http://tartarus.org/~martin/PorterStemmer - -The software is completely free for any purpose, unless notes at the head of -the program text indicates otherwise (which is rare). In any case, the notes -about licensing are never more restrictive than the BSD License. - -In every case where the software is not written by me (Martin Porter), this -licensing arrangement has been endorsed by the contributor, and it is -therefore unnecessary to ask the contributor again to confirm it. - -I have not asked any contributors (or their employers, if they have them) for -proofs that they have the right to distribute their software in this way. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Relax NG Object/Parser v.20050510, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) Kohsuke Kawaguchi - -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 RelaxNGCC v1.12, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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: - -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 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. - -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. - -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. - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SAX 2.0.1, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- 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. - - 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. - - David Megginson, sax@megginson.com - 1998-05-11 - - SAX 2.0 - - 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@megginson.com - 2000-05-05 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SoftFloat version 2b, which may be -included with JRE 8, JDK 8, and OpenJDK 8 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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Sparkle 1.5, -which may be included with JRE 8 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -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 --- - -------------------------------------------------------------------------------- - -%% Portions licensed from Taligent, Inc. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Thai Dictionary, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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.2.0 & CLDR 21.0.1 -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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-2013 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-2012 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 may be included -with JRE 8 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 - - -PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN -TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION. - - -ABSTRACT -======== - - UPX and UCL are copyrighted software distributed under the terms - of the GNU General Public License (hereinafter the "GPL"). - - 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. - - As a special exception we grant the free usage of UPX for all - executables, including commercial programs. - See below for details and restrictions. - - -COPYRIGHT -========= - - 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@jk.uni-linz.ac.at ml1050@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 may be included with JRE 8, JDK 8, and OpenJDK 8 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 may be -included with JRE 8, JDK 8, and OpenJDK 8 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. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following -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: - -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) 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 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. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2. The Open Group - -Copyright 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. - -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. 3.2. -Berkeley-based copyrights: - -o -3.2.1. General - -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 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 - -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 - -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@urwpp.de or design@bigelowandholmes.com - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to zlib v1.2.5, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - version 1.2.5, 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@gzip.org madler@alumni.caltech.edu - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: - - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 - Apache Xerces Java 2.10.0 - Apache XML Resolver 1.1 - Dynalink 0.5 - - ---- 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 --- - -------------------------------------------------------------------------------- - diff --git a/jaxws/src/jdk.xml.bind/share/legal/relaxngdatatype.md b/jaxws/src/jdk.xml.bind/share/legal/relaxngdatatype.md new file mode 100644 index 00000000000..54343b7483d --- /dev/null +++ b/jaxws/src/jdk.xml.bind/share/legal/relaxngdatatype.md @@ -0,0 +1,37 @@ +## RelaxNG Datatype + +### RelaxNG Datatype License +
+
+Copyright (c) 2001, Thai Open Source Software Center Ltd, Sun Microsystems.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    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 names of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 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.
+
+
diff --git a/jaxws/src/jdk.xml.bind/share/legal/rngom.md b/jaxws/src/jdk.xml.bind/share/legal/rngom.md new file mode 100644 index 00000000000..c71f8c31a48 --- /dev/null +++ b/jaxws/src/jdk.xml.bind/share/legal/rngom.md @@ -0,0 +1,25 @@ +## RelaxNG Object Model/Parser v20061207 + +### RelaxNG Object Model/Parser License +
+
+Copyright (c) 2004-2012 RELAXNG
+
+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.
+
+
diff --git a/jaxws/src/jdk.xml.bind/share/legal/xmlresolver.md b/jaxws/src/jdk.xml.bind/share/legal/xmlresolver.md new file mode 100644 index 00000000000..cf18bb439b3 --- /dev/null +++ b/jaxws/src/jdk.xml.bind/share/legal/xmlresolver.md @@ -0,0 +1,223 @@ +## Apache XML Resolver Library v1.2 + +### Notice +
+
+Apache XML Commons Resolver
+Copyright 2006 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation http://www.apache.org/
+
+Portions of this code are derived from classes placed in the
+public domain by Arbortext on 10 Apr 2000. See:
+http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
+
+
+ +### Apache 2.0 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.
+
+
diff --git a/jdk/.hgtags b/jdk/.hgtags index 8aee88cad73..a491956afa3 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -391,3 +391,4 @@ efa71dc820eb8bd5a6c9f2f66f39c383ac3ee99d jdk-9+144 6e4ff59afb5d0adf21a72c4ff534326594a99e5d jdk-9+146 c41140100bf1e5c10c7b8f3bde91c16eff7485f5 jdk-9+147 9098b2b9d997d65af0026fc2f39cf75234e26bc5 jdk-9+148 +5a846396a24c7aff01d6a8feaa7afc0a6369f04d jdk-9+149 diff --git a/jdk/THIRD_PARTY_README b/jdk/THIRD_PARTY_README deleted file mode 100644 index 767609febcb..00000000000 --- a/jdk/THIRD_PARTY_README +++ /dev/null @@ -1,3605 +0,0 @@ -DO NOT TRANSLATE OR LOCALIZE. ------------------------------ - -%% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and -OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2000-2011 France Télécom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to BSDiff v4.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright 2003-2005 Colin Percival -All rights reserved - -Redistribution and use in source and binary forms, with or without -modification, are permitted providing 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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CodeViewer 1.0, which may be -included with JDK 8. - ---- begin of LICENSE --- - -Copyright 1999 by CoolServlets.com. - -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. 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. - -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. - -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." - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Cryptix AES 3.2.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CUP Parser Generator for -Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Document Object Model (DOM) Level 2 -& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 -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 -site-policy@w3.org. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Dynalink v0.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2009-2013, Attila Szegedi - -All rights reserved.Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met:* 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 Attila -Szegedi nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Elliptic Curve Cryptography, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - -You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 8 and OpenJDK 8 source distributions, and as object code in -the JRE 8 & JDK 8 runtimes. - -In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do -NOT apply to the Elliptic Curve Cryptography library; it is licensed under the -following license, separately from Oracle's JDK & JRE. If you do not wish to -install the Elliptic Curve Cryptography library, 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. - - - Copyright (C) - - 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. - - , 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 ECMAScript Language -Specification ECMA-262 Edition 5.1 which may be included with -JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright notice -Copyright © 2011 Ecma International -Ecma International -Rue du Rhone 114 -CH-1204 Geneva -Tel: +41 22 849 6000 -Fax: +41 22 849 6001 -Web: http://www.ecma-international.org - -This document and possible translations of it may be copied and furnished to -others, and derivative works that comment on or otherwise explain it or assist -in its implementation may be prepared, copied, published, and distributed, in -whole or in part, without restriction of any kind, provided that the above -copyright notice and this section are included on all such copies and derivative -works. However, this document itself may not be modified in any way, including -by removing the copyright notice or references to Ecma International, except as -needed for the purpose of developing any document or deliverable produced by -Ecma International (in which case the rules applied to copyrights must be -followed) or as required to translate it into languages other than English. The -limited permissions granted above are perpetual and will not be revoked by Ecma -International or its successors or assigns. This document and the information -contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL -DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY -WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP -RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE." Software License - -All Software contained in this document ("Software)" is protected by copyright -and is being made available under the "BSD License", included below. This -Software may be subject to third party rights (rights from parties other than -Ecma International), including patent rights, and no licenses under such third -party rights are granted under this license even if the third party concerned is -a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS -AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR -INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO -IMPLEMENT ECMA INTERNATIONAL STANDARDS*. 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 authors nor Ecma International may be used to endorse -or promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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 Dynalink library which is included -with the Nashorn technology. - ---- begin of LICENSE --- -Copyright (c) 2009-2013, Attila Szegedi - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -* 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 the copyright holder nor the names of - 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 COPYRIGHT HOLDER -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 Joni library which is included -with the Nashorn technology. - ---- begin of 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: - -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 FontConfig 2.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on -Linux and Solaris. - ---- begin of LICENSE --- - -Copyright © 2001,2003 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IAIK PKCS#11 Wrapper, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -IAIK PKCS#11 Wrapper 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: - -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 IAIK of Graz University of - Technology." - - Alternately, this acknowledgment may appear in the software itself, if and - wherever such third-party acknowledgments normally appear. - -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. - -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 1995-2010 International Business Machines Corporation and others - -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, 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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IJG JPEG 6b, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -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. - -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". - -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. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to Joni v1.1.9, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of 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: - -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 JOpt-Simple v3.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - 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. - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Kronos OpenGL headers, which may be -included with JDK 8 and OpenJDK 8 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.5.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 following -this sentence. - -This code is released under the libpng license. - -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 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 - - Cosmin Truta - -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. - -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: - - 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: - - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner - -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: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -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 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. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -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, 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: - - 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 a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -July 7, 2011 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to libungif 4.1.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 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 Little CMS 2.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Little CMS -Copyright (c) 1998-2010 Marti Maria Saguer - -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 --- - -------------------------------------------------------------------------------- - -%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the -U.S. and other countries. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mesa 3D Graphics Library v4.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. - ---- begin of LICENSE --- - - 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mozilla Network Security -Services (NSS), which is supplied with the JDK test suite in the OpenJDK -source code repository. It is licensed under Mozilla Public License (MPL), -version 2.0. - -The NSS libraries are supplied in executable form, built from unmodified -NSS source code labeled with the "NSS_3_16_RTM" HG tag. - -The NSS source code is available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/src - -The NSS libraries are available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/lib - ---- begin of LICENSE --- - -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - 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. License Grants and Conditions --------------------------------- - -2.1. Grants - -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 such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -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 Software 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 placed in a text file included with all distributions of the Covered -Software under this License. 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. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software 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 Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any 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 Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, 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. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the 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. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. - ---- begin of LICENSE --- - -Copyright (c) 1999-2004 David Corcoran -Copyright (c) 1999-2004 Ludovic Rousseau -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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran - 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. - -Changes to this license can be made only by the copyright author with -explicit written consent. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PorterStemmer v4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -See: http://tartarus.org/~martin/PorterStemmer - -The software is completely free for any purpose, unless notes at the head of -the program text indicates otherwise (which is rare). In any case, the notes -about licensing are never more restrictive than the BSD License. - -In every case where the software is not written by me (Martin Porter), this -licensing arrangement has been endorsed by the contributor, and it is -therefore unnecessary to ask the contributor again to confirm it. - -I have not asked any contributors (or their employers, if they have them) for -proofs that they have the right to distribute their software in this way. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Relax NG Object/Parser v.20050510, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) Kohsuke Kawaguchi - -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 RelaxNGCC v1.12, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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: - -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 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. - -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. - -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. - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SAX 2.0.1, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- 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. - - 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. - - David Megginson, sax@megginson.com - 1998-05-11 - - SAX 2.0 - - 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@megginson.com - 2000-05-05 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SoftFloat version 2b, which may be -included with JRE 8, JDK 8, and OpenJDK 8 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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Sparkle 1.5, -which may be included with JRE 8 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -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 --- - -------------------------------------------------------------------------------- - -%% Portions licensed from Taligent, Inc. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Thai Dictionary, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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.2.0 & CLDR 21.0.1 -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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-2013 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-2012 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 may be included -with JRE 8 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 - - -PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN -TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION. - - -ABSTRACT -======== - - UPX and UCL are copyrighted software distributed under the terms - of the GNU General Public License (hereinafter the "GPL"). - - 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. - - As a special exception we grant the free usage of UPX for all - executables, including commercial programs. - See below for details and restrictions. - - -COPYRIGHT -========= - - 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@jk.uni-linz.ac.at ml1050@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 may be included with JRE 8, JDK 8, and OpenJDK 8 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 may be -included with JRE 8, JDK 8, and OpenJDK 8 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. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following -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: - -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) 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 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. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2. The Open Group - -Copyright 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. - -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. 3.2. -Berkeley-based copyrights: - -o -3.2.1. General - -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 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 - -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 - -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@urwpp.de or design@bigelowandholmes.com - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to zlib v1.2.5, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - version 1.2.5, 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@gzip.org madler@alumni.caltech.edu - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: - - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 - Apache Xerces Java 2.10.0 - Apache XML Resolver 1.1 - Dynalink 0.5 - - ---- 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 --- - -------------------------------------------------------------------------------- - diff --git a/jdk/make/copy/Copy-java.base.gmk b/jdk/make/copy/Copy-java.base.gmk index c9964cc1730..2f26a834718 100644 --- a/jdk/make/copy/Copy-java.base.gmk +++ b/jdk/make/copy/Copy-java.base.gmk @@ -100,8 +100,7 @@ else # Allow override by ALT_JVMCFG_SRC if it exists JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC)) endif -JVMCFG_DIR := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR) -JVMCFG := $(JVMCFG_DIR)/jvm.cfg +JVMCFG := $(LIB_DST_DIR)/jvm.cfg # To do: should this also support -zeroshark? @@ -233,3 +232,17 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) endif ################################################################################ + +# JDK license and assembly exception files to be packaged in JMOD + +JDK_LICENSE ?= $(JDK_TOPDIR)/LICENSE +JDK_NOTICE ?= $(JDK_TOPDIR)/ASSEMBLY_EXCEPTION + +$(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \ + FILES := $(JDK_LICENSE) $(JDK_NOTICE), \ + DEST := $(LEGAL_DST_DIR), \ + FLATTEN := true, \ +)) + +TARGETS += $(COPY_JDK_NOTICES) + diff --git a/jdk/make/copy/Copy-java.desktop.gmk b/jdk/make/copy/Copy-java.desktop.gmk index 51db98a356a..49d6b86aeb2 100644 --- a/jdk/make/copy/Copy-java.desktop.gmk +++ b/jdk/make/copy/Copy-java.desktop.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) ifeq ($(OPENJDK_TARGET_OS), windows) FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype) else - FREETYPE_TARGET_LIB := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 + FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype).6 endif # We can't use $(install-file) in this rule because it preserves symbolic links and diff --git a/jdk/make/copy/Copy-jdk.crypto.pkcs11.gmk b/jdk/make/copy/Copy-jdk.crypto.token.gmk similarity index 95% rename from jdk/make/copy/Copy-jdk.crypto.pkcs11.gmk rename to jdk/make/copy/Copy-jdk.crypto.token.gmk index b9771dee017..d35f655818e 100644 --- a/jdk/make/copy/Copy-jdk.crypto.pkcs11.gmk +++ b/jdk/make/copy/Copy-jdk.crypto.token.gmk @@ -30,7 +30,7 @@ include CopyCommon.gmk ifeq ($(OPENJDK_TARGET_OS), solaris) SUNPKCS11_CFG_SRC := \ - $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/solaris/conf/security/sunpkcs11-solaris.cfg + $(JDK_TOPDIR)/src/jdk.crypto.token/solaris/conf/security/sunpkcs11-solaris.cfg SUNPKCS11_CFG_DST := $(CONF_DST_DIR)/security/sunpkcs11-solaris.cfg $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC) diff --git a/jdk/make/copy/CopyCommon.gmk b/jdk/make/copy/CopyCommon.gmk index cb87c80294f..c82edd29d4e 100644 --- a/jdk/make/copy/CopyCommon.gmk +++ b/jdk/make/copy/CopyCommon.gmk @@ -26,6 +26,7 @@ INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE) LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE) CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE) +LEGAL_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE) INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS) diff --git a/jdk/make/launcher/Launcher-java.base.gmk b/jdk/make/launcher/Launcher-java.base.gmk index 4d4b981c097..f70d90029a6 100644 --- a/jdk/make/launcher/Launcher-java.base.gmk +++ b/jdk/make/launcher/Launcher-java.base.gmk @@ -74,7 +74,7 @@ $(eval $(call SetupBuildLauncher, keytool, \ BUILD_JEXEC := BUILD_JEXEC_SRC := BUILD_JEXEC_INC := -BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base # # UNHANDLED: @@ -138,7 +138,7 @@ endif BUILD_JSPAWNHELPER := BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava -BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o BUILD_JSPAWNHELPER_LDFLAGS := diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh b/jdk/make/launcher/Launcher-jdk.aot.gmk similarity index 58% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh rename to jdk/make/launcher/Launcher-jdk.aot.gmk index 538142606a0..a827a66bc35 100644 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh +++ b/jdk/make/launcher/Launcher-jdk.aot.gmk @@ -1,25 +1,37 @@ -# -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). -# +# # You should have received a copy of the GNU General Public License version # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# +# # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. # -${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=${TESTSRC} -cp ${TESTCLASSES} UserDefaultControlTest +include LauncherCommon.gmk +$(eval $(call SetupBuildLauncher, jaotc, \ + MAIN_CLASS := jdk.tools.jaotc.Main, \ + JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \ + -XX:+UseAOT \ + -Djvmci.UseProfilingInformation=false \ + -Dgraal.UseExceptionProbability=false \ + -Djvmci.Compiler=graal \ + --add-modules ALL-DEFAULT \ + , \ +)) diff --git a/jdk/make/launcher/Launcher-jdk.jshell.gmk b/jdk/make/launcher/Launcher-jdk.jshell.gmk index e80876f645c..349eb88e9eb 100644 --- a/jdk/make/launcher/Launcher-jdk.jshell.gmk +++ b/jdk/make/launcher/Launcher-jdk.jshell.gmk @@ -26,6 +26,6 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, jshell, \ - MAIN_CLASS := jdk.internal.jshell.tool.JShellTool, \ + MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \ )) diff --git a/jdk/make/launcher/Launcher-jdk.pack200.gmk b/jdk/make/launcher/Launcher-jdk.pack.gmk similarity index 93% rename from jdk/make/launcher/Launcher-jdk.pack200.gmk rename to jdk/make/launcher/Launcher-jdk.pack.gmk index 32b29b0c598..2ee08c767bf 100644 --- a/jdk/make/launcher/Launcher-jdk.pack200.gmk +++ b/jdk/make/launcher/Launcher-jdk.pack.gmk @@ -34,9 +34,9 @@ $(eval $(call SetupBuildLauncher, pack200, \ # The order of the object files on the link command line affects the size of the resulting # binary (at least on linux) which causes the size to differ between old and new build. -UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ - $(JDK_TOPDIR)/src/jdk.pack200/share/native/unpack200 -UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ +UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \ + $(JDK_TOPDIR)/src/jdk.pack/share/native/unpack200 +UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava @@ -97,7 +97,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ -D "JDK_FNAME=unpack200.exe" \ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ - MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest, \ + MANIFEST := $(JDK_TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \ MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ )) diff --git a/jdk/make/launcher/LauncherCommon.gmk b/jdk/make/launcher/LauncherCommon.gmk index 1bef88f8a42..a4178039d6e 100644 --- a/jdk/make/launcher/LauncherCommon.gmk +++ b/jdk/make/launcher/LauncherCommon.gmk @@ -32,13 +32,13 @@ else ifeq ($(OPENJDK_TARGET_OS), windows) DISABLE_MAPFILES := true endif - ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) + ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib/jli) # Applications expect to be able to link against libjawt without invoking # System.loadLibrary("jawt") first. This was the behaviour described in the # devloper documentation of JAWT and what worked with OpenJDK6. ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) - ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)) + ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib) endif endif @@ -190,9 +190,9 @@ define SetupBuildLauncherBody $$(ORIGIN_ARG) \ $$($1_LDFLAGS), \ LDFLAGS_linux := \ - -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ - -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ MAPFILE := $$($1_MAPFILE), \ LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ LIBS_unix := $$($1_LIBS_unix), \ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 09423e4d770..670434669af 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -418,6 +418,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ DISABLED_WARNINGS_clang := tautological-compare, \ DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ + DISABLED_WARNINGS_microsoft := 4819, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -681,7 +682,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ DISABLED_WARNINGS_CXX_solstudio := \ truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ hidevf w_novirtualdescr arrowrtn2, \ - DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334, \ + DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819, \ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk index 27dad3553ee..6fba2fa6ab3 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -340,9 +340,6 @@ endif LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS)) -# Append defines depending on target platform -LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) - ifneq ($(USE_EXTERNAL_LIBZ), true) LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) LIBJLI_EXTRA_FILES += \ diff --git a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk b/jdk/make/lib/Lib-jdk.crypto.token.gmk similarity index 90% rename from jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk rename to jdk/make/lib/Lib-jdk.crypto.token.gmk index 82618b11fb5..9e015be9f89 100644 --- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.token.gmk @@ -27,8 +27,8 @@ include LibCommon.gmk ################################################################################ -LIBJ2PKCS11_SRC := $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 \ - $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11 +LIBJ2PKCS11_SRC := $(JDK_TOPDIR)/src/jdk.crypto.token/share/native/libj2pkcs11 \ + $(JDK_TOPDIR)/src/jdk.crypto.token/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11 $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ LIBRARY := j2pkcs11, \ @@ -37,7 +37,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ - -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.pkcs11, \ + -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.token, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/Lib-jdk.pack200.gmk b/jdk/make/lib/Lib-jdk.pack.gmk similarity index 92% rename from jdk/make/lib/Lib-jdk.pack200.gmk rename to jdk/make/lib/Lib-jdk.pack.gmk index 7f942fcfb41..cc482c9ecd4 100644 --- a/jdk/make/lib/Lib-jdk.pack200.gmk +++ b/jdk/make/lib/Lib-jdk.pack.gmk @@ -30,14 +30,14 @@ include LibCommon.gmk $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ LIBRARY := unpack, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/libunpack \ - $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack, \ + SRC := $(JDK_TOPDIR)/src/jdk.pack/share/native/libunpack \ + $(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack, \ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ OPTIMIZATION := LOW, \ CFLAGS := $(CXXFLAGS_JDKLIB) \ -DNO_ZLIB -DUNPACK_JNI -DFULL \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ - -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ + -I$(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \ $(LIBJAVA_HEADER_FLAGS), \ CFLAGS_release := -DPRODUCT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index 5d7cc4a655f..c08bc2c12f0 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -114,6 +114,7 @@ SUNWprivate_1.1 { Java_java_io_UnixFileSystem_getBooleanAttributes0; Java_java_io_UnixFileSystem_getLastModifiedTime; Java_java_io_UnixFileSystem_getLength; + Java_java_io_UnixFileSystem_getNameMax0; Java_java_io_UnixFileSystem_getSpace; Java_java_io_UnixFileSystem_initIDs; Java_java_io_UnixFileSystem_list; @@ -150,7 +151,6 @@ SUNWprivate_1.1 { Java_java_lang_StrictMath_atan; Java_java_lang_StrictMath_atan2; Java_java_lang_StrictMath_cos; - Java_java_lang_StrictMath_exp; Java_java_lang_StrictMath_log; Java_java_lang_StrictMath_log10; Java_java_lang_StrictMath_sin; diff --git a/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java b/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java index bf0f03be6b3..99f6d0f8bd7 100644 --- a/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java +++ b/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java @@ -26,6 +26,7 @@ package build.tools.jigsaw; import java.io.IOException; +import java.io.OutputStream; import java.io.PrintStream; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; @@ -35,14 +36,17 @@ import java.lang.module.ResolvedModule; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.function.Function; -import java.util.stream.Collectors; + +import static java.util.stream.Collectors.*; import static java.lang.module.ModuleDescriptor.Requires.Modifier.TRANSITIVE; /** @@ -67,42 +71,25 @@ public class GenGraphs { .map(ModuleReference::descriptor) .filter(m -> (m.name().startsWith("java.") && !m.name().equals("java.smartcardio"))) - .collect(Collectors.toSet())); + .collect(toSet())); Set jdkModules = new TreeSet<>(finder.findAll().stream() .map(ModuleReference::descriptor) .filter(m -> !javaSEModules.contains(m)) - .collect(Collectors.toSet())); + .collect(toSet())); - GenGraphs genGraphs = new GenGraphs(javaSEModules, jdkModules); + GenGraphs genGraphs = new GenGraphs(dir, javaSEModules, jdkModules); Set mods = new HashSet<>(); for (ModuleReference mref: finder.findAll()) { - ModuleDescriptor descriptor = mref.descriptor(); - String name = descriptor.name(); - mods.add(name); - Configuration cf = Configuration.empty() - .resolveRequires(finder, - ModuleFinder.of(), - Set.of(name)); - genGraphs.genDotFile(dir, name, cf); + mods.add(mref.descriptor().name()); + genGraphs.genDotFile(mref); } - Configuration cf = Configuration.empty() - .resolveRequires(finder, - ModuleFinder.of(), - mods); - genGraphs.genDotFile(dir, "jdk", cf); + // all modules + genGraphs.genDotFile("jdk", mods); } - private final Set javaGroup; - private final Set jdkGroup; - - GenGraphs(Set javaGroup, Set jdkGroup) { - this.javaGroup = Collections.unmodifiableSet(javaGroup); - this.jdkGroup = Collections.unmodifiableSet(jdkGroup); - } - private static final String ORANGE = "#e76f00"; private static final String BLUE = "#437291"; private static final String GRAY = "#dddddd"; @@ -112,6 +99,7 @@ public class GenGraphs { private static final String REQUIRES_BASE = "color=\"" + GRAY + "\""; private static final Map weights = new HashMap<>(); + private static final List> ranks = new ArrayList<>(); private static void weight(String s, String t, int w) { weights.put(s + ":" + t, w); @@ -128,23 +116,84 @@ public class GenGraphs { static { int h = 1000; - weight("java.se", "java.compact3", h * 10); - weight("jdk.compact3", "java.compact3", h * 10); - weight("java.compact3", "java.compact2", h * 10); - weight("java.compact2", "java.compact1", h * 10); - weight("java.compact1", "java.logging", h * 10); - weight("java.logging", "java.base", h * 10); + weight("java.se", "java.sql.rowset", h * 10); + weight("java.sql.rowset", "java.sql", h * 10); + weight("java.sql", "java.xml", h * 10); + weight("java.xml", "java.base", h * 10); + + ranks.add(Set.of("java.logging", "java.scripting", "java.xml")); + ranks.add(Set.of("java.sql")); + ranks.add(Set.of("java.compiler", "java.instrument")); + ranks.add(Set.of("java.desktop", "java.management")); + ranks.add(Set.of("java.corba", "java.xml.ws")); + ranks.add(Set.of("java.xml.bind", "java.annotations.common")); + } - private void genDotFile(Path dir, String name, Configuration cf) throws IOException { - try (PrintStream out - = new PrintStream(Files.newOutputStream(dir.resolve(name + ".dot")))) { + private final Path dir; + private final Set javaGroup; + private final Set jdkGroup; - Map nameToModule = cf.modules().stream() - .map(ResolvedModule::reference) - .map(ModuleReference::descriptor) - .collect(Collectors.toMap(ModuleDescriptor::name, Function.identity())); + GenGraphs(Path dir, Set javaGroup, Set jdkGroup) { + this.dir = dir; + this.javaGroup = Collections.unmodifiableSet(javaGroup); + this.jdkGroup = Collections.unmodifiableSet(jdkGroup); + } + /** + * Generates a dot file for the given module reference as the root. + */ + void genDotFile(ModuleReference mref) throws IOException { + String name = mref.descriptor().name(); + genDotFile(name, Set.of(name)); + } + + /** + * Generates a dot file for the given set of root modules. + */ + void genDotFile(String name, Set roots) throws IOException { + Configuration cf = + Configuration.empty().resolveRequires(ModuleFinder.ofSystem(), + ModuleFinder.of(), + roots); + + Set mds = cf.modules().stream() + .map(ResolvedModule::reference) + .map(ModuleReference::descriptor) + .collect(toSet()); + + // generate a dot file for the resolved graph + try (OutputStream os = Files.newOutputStream(dir.resolve(name + ".dot")); + PrintStream out = new PrintStream(os)) { + printGraph(out, name, gengraph(cf), + mds.stream() + .collect(toMap(ModuleDescriptor::name, Function.identity())) + ); + } + + if (name.equals("java.se") || name.equals("java.se.ee")) { + // generate a dot file for Java SE module graph + try (OutputStream os = Files.newOutputStream(dir.resolve(name + "-spec.dot")); + PrintStream out = new PrintStream(os)) { + // transitive reduction on the graph of `requires transitive` edges + // filter out jdk.* modules which are implementation dependences + Graph graph = requiresTransitiveGraph(cf, true); + printGraph(out, name, graph, + mds.stream() + .filter(md -> !md.name().startsWith("jdk.") && + graph.nodes().contains(md.name())) + .collect(toMap(ModuleDescriptor::name, Function.identity())) + ); + } + } + } + + private void printGraph(PrintStream out, + String name, + Graph graph, + Map nameToModule) + throws IOException + { Set descriptors = new TreeSet<>(nameToModule.values()); out.format("digraph \"%s\" {%n", name); @@ -162,33 +211,45 @@ public class GenGraphs { .forEach(mn -> out.format(" \"%s\" [fontcolor=\"%s\", group=%s];%n", mn, ORANGE, "java")); out.format("}%n"); + + // same ranks + ranks.stream() + .map(group -> descriptors.stream() + .map(ModuleDescriptor::name) + .filter(group::contains) + .map(mn -> "\"" + mn + "\"") + .collect(joining(","))) + .filter(group -> group.length() > 0) + .forEach(group -> out.format("{rank=same %s}%n", group)); + descriptors.stream() .filter(jdkGroup::contains) .map(ModuleDescriptor::name) .forEach(mn -> out.format(" \"%s\" [fontcolor=\"%s\", group=%s];%n", mn, BLUE, "jdk")); - // transitive reduction - Graph graph = gengraph(cf); - descriptors.forEach(md -> { - String mn = md.name(); - Set requiresTransitive = md.requires().stream() - .filter(d -> d.modifiers().contains(TRANSITIVE)) - .map(d -> d.name()) - .collect(Collectors.toSet()); + descriptors.stream() + .forEach(md -> { + String mn = md.name(); + Set requiresTransitive = md.requires().stream() + .filter(d -> d.modifiers().contains(TRANSITIVE)) + .map(d -> d.name()) + .collect(toSet()); - graph.adjacentNodes(mn).forEach(dn -> { - String attr = dn.equals("java.base") ? REQUIRES_BASE - : (requiresTransitive.contains(dn) ? REEXPORTS : REQUIRES); - int w = weightOf(mn, dn); - if (w > 1) - attr += "weight=" + w; - out.format(" \"%s\" -> \"%s\" [%s];%n", mn, dn, attr); + graph.adjacentNodes(mn) + .stream() + .filter(nameToModule::containsKey) + .forEach(dn -> { + String attr = dn.equals("java.base") ? REQUIRES_BASE + : (requiresTransitive.contains(dn) ? REEXPORTS : REQUIRES); + int w = weightOf(mn, dn); + if (w > 1) + attr += "weight=" + w; + out.format(" \"%s\" -> \"%s\" [%s];%n", mn, dn, attr); + }); }); - }); out.println("}"); - } } /** @@ -208,7 +269,7 @@ public class GenGraphs { .map(ResolvedModule::name) .forEach(target -> builder.addEdge(mn, target)); } - Graph rpg = requiresTransitiveGraph(cf); + Graph rpg = requiresTransitiveGraph(cf, false); return builder.build().reduce(rpg); } @@ -216,13 +277,14 @@ public class GenGraphs { * Returns a Graph containing only requires transitive edges * with transitive reduction. */ - private Graph requiresTransitiveGraph(Configuration cf) { + private Graph requiresTransitiveGraph(Configuration cf, boolean includeBase) { Graph.Builder builder = new Graph.Builder<>(); for (ResolvedModule resolvedModule : cf.modules()) { ModuleDescriptor descriptor = resolvedModule.reference().descriptor(); String mn = descriptor.name(); descriptor.requires().stream() - .filter(d -> d.modifiers().contains(TRANSITIVE)) + .filter(d -> d.modifiers().contains(TRANSITIVE) + || (includeBase && d.name().equals("java.base"))) .map(d -> d.name()) .forEach(d -> builder.addEdge(mn, d)); } diff --git a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c index c6c36594a9d..f21201ced6a 100644 --- a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c +++ b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c @@ -171,8 +171,6 @@ struct NSAppArgs { * Main */ -#define GetArch() GetArchPath(CURRENT_DATA_MODEL) - /* Store the name of the executable once computed */ static char *execname = NULL; @@ -184,16 +182,6 @@ GetExecName() { return execname; } -const char * -GetArchPath(int nbits) -{ - switch(nbits) { - default: - return LIBARCHNAME; - } -} - - /* * Exports the JNI interface from libjli * @@ -211,7 +199,7 @@ static InvocationFunctions *GetExportedJNIFunctions() { if (sExportedJNIFunctions != NULL) return sExportedJNIFunctions; char jrePath[PATH_MAX]; - jboolean gotJREPath = GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE); + jboolean gotJREPath = GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE); if (!gotJREPath) { JLI_ReportErrorMessage("Failed to GetJREPath()"); return NULL; @@ -229,7 +217,7 @@ static InvocationFunctions *GetExportedJNIFunctions() { } char jvmPath[PATH_MAX]; - jboolean gotJVMPath = GetJVMPath(jrePath, preferredJVM, jvmPath, sizeof(jvmPath), GetArch(), CURRENT_DATA_MODEL); + jboolean gotJVMPath = GetJVMPath(jrePath, preferredJVM, jvmPath, sizeof(jvmPath), CURRENT_DATA_MODEL); if (!gotJVMPath) { JLI_ReportErrorMessage("Failed to GetJVMPath()"); return NULL; @@ -390,7 +378,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, /* Check data model flags, and exec process, if needed */ { - char *arch = (char *)GetArch(); /* like sparc or sparcv9 */ char * jvmtype = NULL; int argc = *pargc; char **argv = *pargv; @@ -462,7 +449,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, jvmpath does not exist */ if (wanted == running) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, arch, JNI_FALSE) ) { + if (!GetJREPath(jrepath, so_jrepath, JNI_FALSE) ) { JLI_ReportErrorMessage(JRE_ERROR1); exit(2); } @@ -481,7 +468,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(4); } - if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, wanted)) { + if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, wanted)) { JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath); exit(4); } @@ -502,7 +489,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, #if defined(DUAL_MODE) if (running != wanted) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, GetArchPath(wanted), JNI_TRUE)) { + if (!GetJREPath(jrepath, so_jrepath, JNI_TRUE)) { /* give up and let other code report error message */ JLI_ReportErrorMessage(JRE_ERROR2, wanted); exit(1); @@ -526,7 +513,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, } /* exec child can do error checking on the existence of the path */ - jvmpathExists = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, GetArchPath(wanted), wanted); + jvmpathExists = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, wanted); } #else /* ! DUAL_MODE */ JLI_ReportErrorMessage(JRE_ERROR2, wanted); @@ -579,7 +566,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, */ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, int bitsWanted) + char *jvmpath, jint jvmpathsize, int bitsWanted) { struct stat s; @@ -613,7 +600,7 @@ GetJVMPath(const char *jrepath, const char *jvmtype, * Find path to JRE based on .exe's location or registry settings. */ static jboolean -GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) +GetJREPath(char *path, jint pathsize, jboolean speculative) { char libjava[MAXPATHLEN]; @@ -841,7 +828,7 @@ static void* hSplashLib = NULL; void* SplashProcAddress(const char* name) { if (!hSplashLib) { char jrePath[PATH_MAX]; - if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) { + if (!GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE)) { JLI_ReportErrorMessage(JRE_ERROR1); return NULL; } diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java index f903754fb48..4e93d6fe03a 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java @@ -142,6 +142,9 @@ class CipherBlockChaining extends FeedbackCipher { */ int encrypt(byte[] plain, int plainOffset, int plainLen, byte[] cipher, int cipherOffset) { + if (plainLen <= 0) { + return plainLen; + } cryptBlockSizeCheck(plainLen); cryptNullAndBoundsCheck(plain, plainOffset, plainLen); cryptNullAndBoundsCheck(cipher, cipherOffset, plainLen); @@ -190,6 +193,9 @@ class CipherBlockChaining extends FeedbackCipher { */ int decrypt(byte[] cipher, int cipherOffset, int cipherLen, byte[] plain, int plainOffset) { + if (cipherLen <= 0) { + return cipherLen; + } cryptBlockSizeCheck(cipherLen); cryptNullAndBoundsCheck(cipher, cipherOffset, cipherLen); cryptNullAndBoundsCheck(plain, plainOffset, cipherLen); @@ -220,10 +226,6 @@ class CipherBlockChaining extends FeedbackCipher { } private static void cryptNullAndBoundsCheck(byte[] array, int offset, int len) { - if (len <= 0) { - return; // not an error because cryptImpl/decryptImpl won't execute if len <= 0 - } - Objects.requireNonNull(array); if (offset < 0 || offset >= array.length) { diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java index da6c10a7956..a1c33ae1593 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java @@ -172,10 +172,12 @@ final class CounterMode extends FeedbackCipher { * are encrypted on demand. */ private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) { - - Objects.checkFromIndexSize(inOff, len, in.length); - Objects.checkFromIndexSize(outOff, len, out.length); - return implCrypt(in, inOff, len, out, outOff); + if (len == 0) { + return 0; + } + Objects.checkFromIndexSize(inOff, len, in.length); + Objects.checkFromIndexSize(outOff, len, out.length); + return implCrypt(in, inOff, len, out, outOff); } // Implementation of crpyt() method. Possibly replaced with a compiler intrinsic. diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java index 203fde39335..fa36c3feda4 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java @@ -317,7 +317,7 @@ public class PackerImpl extends TLGlobals implements Pack200.Packer { this(null, je); } boolean isClassFile() { - if (!name.endsWith(".class")) { + if (!name.endsWith(".class") || name.endsWith("module-info.class")) { return false; } for (String prefix = name;;) { diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties index 14bc2ad8831..c31b1a03a50 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties @@ -14,15 +14,6 @@ pack.code.attribute.CharacterRangeTable = NH[PHPOHIIH] pack.class.attribute.SourceID = RUH pack.class.attribute.CompilationID = RUH -# Module attributes, supported by the tool and not JSR-200 -pack.class.attribute.Module = RUHFHNH[RUHFH]NH[RUHFHNH[RUH]]NH[RUHFHNH[RUH]]NH[RCH]NH[RCHNH[RCH]] -pack.class.attribute.ModulePackages = NH[RUH] -pack.class.attribute.ModuleVersion = RUH -pack.class.attribute.ModuleMainClass = RCH -pack.class.attribute.ModuleTarget = RUHRUHRUH -pack.class.attribute.ModuleHashes = RUHNH[RUHNH[B]] - - # Note: Zero-length ("marker") attributes do not need to be specified here. # They are automatically defined to have an empty layout. #pack.class.attribute.Deprecated = diff --git a/jdk/src/java.base/share/classes/java/io/File.java b/jdk/src/java.base/share/classes/java/io/File.java index 0e966659ee0..1598694ef2f 100644 --- a/jdk/src/java.base/share/classes/java/io/File.java +++ b/jdk/src/java.base/share/classes/java/io/File.java @@ -1903,20 +1903,72 @@ public class File // file name generation private static final SecureRandom random = new SecureRandom(); + private static int shortenSubName(int subNameLength, int excess, + int nameMin) { + int newLength = Math.max(nameMin, subNameLength - excess); + if (newLength < subNameLength) { + return newLength; + } + return subNameLength; + } static File generateFile(String prefix, String suffix, File dir) throws IOException { long n = random.nextLong(); + String nus = Long.toUnsignedString(n); // Use only the file name from the supplied prefix prefix = (new File(prefix)).getName(); - String name = prefix + Long.toUnsignedString(n) + suffix; + + int prefixLength = prefix.length(); + int nusLength = nus.length(); + int suffixLength = suffix.length();; + + String name; + int nameMax = fs.getNameMax(dir.getPath()); + int excess = prefixLength + nusLength + suffixLength - nameMax; + if (excess <= 0) { + name = prefix + nus + suffix; + } else { + // Name exceeds the maximum path component length: shorten it + + // Attempt to shorten the prefix length to no less then 3 + prefixLength = shortenSubName(prefixLength, excess, 3); + excess = prefixLength + nusLength + suffixLength - nameMax; + + if (excess > 0) { + // Attempt to shorten the suffix length to no less than + // 0 or 4 depending on whether it begins with a dot ('.') + suffixLength = shortenSubName(suffixLength, excess, + suffix.indexOf(".") == 0 ? 4 : 0); + suffixLength = shortenSubName(suffixLength, excess, 3); + excess = prefixLength + nusLength + suffixLength - nameMax; + } + + if (excess > 0 && excess <= nusLength - 5) { + // Attempt to shorten the random character string length + // to no less than 5 + nusLength = shortenSubName(nusLength, excess, 5); + } + + StringBuilder sb = + new StringBuilder(prefixLength + nusLength + suffixLength); + sb.append(prefixLength < prefix.length() ? + prefix.substring(0, prefixLength) : prefix); + sb.append(nusLength < nus.length() ? + nus.substring(0, nusLength) : nus); + sb.append(suffixLength < suffix.length() ? + suffix.substring(0, suffixLength) : suffix); + name = sb.toString(); + } + File f = new File(dir, name); if (!name.equals(f.getName()) || f.isInvalid()) { if (System.getSecurityManager() != null) throw new IOException("Unable to create temporary file"); else - throw new IOException("Unable to create temporary file, " + f); + throw new IOException("Unable to create temporary file, " + + name); } return f; } diff --git a/jdk/src/java.base/share/classes/java/io/FilePermission.java b/jdk/src/java.base/share/classes/java/io/FilePermission.java index c3d51135905..5bd29603edb 100644 --- a/jdk/src/java.base/share/classes/java/io/FilePermission.java +++ b/jdk/src/java.base/share/classes/java/io/FilePermission.java @@ -206,12 +206,6 @@ public final class FilePermission extends Permission implements Serializable { DefaultFileSystemProvider.create() .getFileSystem(URI.create("file:///")); - /** - * Creates FilePermission objects with special internals. - * See {@link FilePermCompat#newPermPlusAltPath(Permission)} and - * {@link FilePermCompat#newPermUsingAltPath(Permission)}. - */ - private static final Path here = builtInFS.getPath( GetPropertyAction.privilegedGetProperty("user.dir")); @@ -261,9 +255,14 @@ public final class FilePermission extends Permission implements Serializable { static { SharedSecrets.setJavaIOFilePermissionAccess( + /** + * Creates FilePermission objects with special internals. + * See {@link FilePermCompat#newPermPlusAltPath(Permission)} and + * {@link FilePermCompat#newPermUsingAltPath(Permission)}. + */ new JavaIOFilePermissionAccess() { public FilePermission newPermPlusAltPath(FilePermission input) { - if (input.npath2 == null && !input.allFiles) { + if (!input.invalid && input.npath2 == null && !input.allFiles) { Path npath2 = altPath(input.npath); if (npath2 != null) { // Please note the name of the new permission is @@ -281,7 +280,7 @@ public final class FilePermission extends Permission implements Serializable { return input; } public FilePermission newPermUsingAltPath(FilePermission input) { - if (!input.allFiles) { + if (!input.invalid && !input.allFiles) { Path npath2 = altPath(input.npath); if (npath2 != null) { // New name, see above. @@ -340,6 +339,16 @@ public final class FilePermission extends Permission implements Serializable { // Windows. Some JDK codes generate such illegal names. npath = builtInFS.getPath(new File(name).getPath()) .normalize(); + // lastName should always be non-null now + Path lastName = npath.getFileName(); + if (lastName != null && lastName.toString().equals("-")) { + directory = true; + recursive = !rememberStar; + npath = npath.getParent(); + } + if (npath == null) { + npath = builtInFS.getPath(""); + } invalid = false; } catch (InvalidPathException ipe) { // Still invalid. For compatibility reason, accept it @@ -348,16 +357,6 @@ public final class FilePermission extends Permission implements Serializable { invalid = true; } - // lastName should always be non-null now - Path lastName = npath.getFileName(); - if (lastName != null && lastName.toString().equals("-")) { - directory = true; - recursive = !rememberStar; - npath = npath.getParent(); - } - if (npath == null) { - npath = builtInFS.getPath(""); - } } else { if ((cpath = getName()) == null) throw new NullPointerException("name can't be null"); @@ -452,6 +451,8 @@ public final class FilePermission extends Permission implements Serializable { * is converted to a {@link java.nio.file.Path} object named {@code npath} * after {@link Path#normalize() normalization}. No canonicalization is * performed which means the underlying file system is not accessed. + * If an {@link InvalidPathException} is thrown during the conversion, + * this {@code FilePermission} will be labeled as invalid. *

* In either case, the "*" or "-" character at the end of a wildcard * {@code path} is removed before canonicalization or normalization. @@ -532,7 +533,12 @@ public final class FilePermission extends Permission implements Serializable { * {@code simple_npath.relativize(wildcard_npath)} is exactly "..", * a simple {@code npath} is recursively inside a wildcard {@code npath} * if and only if {@code simple_npath.relativize(wildcard_npath)} - * is a series of one or more "..". + * is a series of one or more "..". An invalid {@code FilePermission} does + * not imply any object except for itself. An invalid {@code FilePermission} + * is not implied by any object except for itself or a {@code FilePermission} + * on {@literal "<>"} whose actions is a superset of this + * invalid {@code FilePermission}. Even if two {@code FilePermission} + * are created with the same invalid path, one does not imply the other. * * @param p the permission to check against. * @@ -566,12 +572,12 @@ public final class FilePermission extends Permission implements Serializable { if (this == that) { return true; } - if (this.invalid || that.invalid) { - return false; - } if (allFiles) { return true; } + if (this.invalid || that.invalid) { + return false; + } if (that.allFiles) { return false; } @@ -699,6 +705,10 @@ public final class FilePermission extends Permission implements Serializable { * (if {@code jdk.io.permissionsUseCanonicalPath} is {@code true}) or * {@code npath} (if {@code jdk.io.permissionsUseCanonicalPath} * is {@code false}) are equal. Or they are both {@literal "<>"}. + *

+ * When {@code jdk.io.permissionsUseCanonicalPath} is {@code false}, an + * invalid {@code FilePermission} does not equal to any object except + * for itself, even if they are created using the same invalid path. * * @param obj the object we are testing for equality with this object. * @return true if obj is a FilePermission, and has the same diff --git a/jdk/src/java.base/share/classes/java/io/FileSystem.java b/jdk/src/java.base/share/classes/java/io/FileSystem.java index a7528a9b5ca..dab7fa8bc22 100644 --- a/jdk/src/java.base/share/classes/java/io/FileSystem.java +++ b/jdk/src/java.base/share/classes/java/io/FileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -212,6 +212,13 @@ abstract class FileSystem { /* -- Basic infrastructure -- */ + /** + * Retrieve the maximum length of a component of a file path. + * + * @return The maximum length of a file path component. + */ + public abstract int getNameMax(String path); + /** * Compare two abstract pathnames lexicographically. */ diff --git a/jdk/src/java.base/share/classes/java/lang/FdLibm.java b/jdk/src/java.base/share/classes/java/lang/FdLibm.java index dfecf79bb18..e1d3085ba70 100644 --- a/jdk/src/java.base/share/classes/java/lang/FdLibm.java +++ b/jdk/src/java.base/share/classes/java/lang/FdLibm.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -79,7 +79,8 @@ class FdLibm { */ private static double __LO(double x, int low) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L)|low ); + return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L) | + (low & 0x0000_0000_FFFF_FFFFL)); } /** @@ -96,7 +97,8 @@ class FdLibm { */ private static double __HI(double x, int high) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL)|( ((long)high)) << 32 ); + return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL) | + ( ((long)high)) << 32 ); } /** @@ -580,4 +582,152 @@ class FdLibm { return s * z; } } + + /** + * Returns the exponential of x. + * + * Method + * 1. Argument reduction: + * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. + * Given x, find r and integer k such that + * + * x = k*ln2 + r, |r| <= 0.5*ln2. + * + * Here r will be represented as r = hi-lo for better + * accuracy. + * + * 2. Approximation of exp(r) by a special rational function on + * the interval [0,0.34658]: + * Write + * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... + * We use a special Reme algorithm on [0,0.34658] to generate + * a polynomial of degree 5 to approximate R. The maximum error + * of this polynomial approximation is bounded by 2**-59. In + * other words, + * R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5 + * (where z=r*r, and the values of P1 to P5 are listed below) + * and + * | 5 | -59 + * | 2.0+P1*z+...+P5*z - R(z) | <= 2 + * | | + * The computation of exp(r) thus becomes + * 2*r + * exp(r) = 1 + ------- + * R - r + * r*R1(r) + * = 1 + r + ----------- (for better accuracy) + * 2 - R1(r) + * where + * 2 4 10 + * R1(r) = r - (P1*r + P2*r + ... + P5*r ). + * + * 3. Scale back to obtain exp(x): + * From step 1, we have + * exp(x) = 2^k * exp(r) + * + * Special cases: + * exp(INF) is INF, exp(NaN) is NaN; + * exp(-INF) is 0, and + * for finite argument, only exp(0)=1 is exact. + * + * Accuracy: + * according to an error analysis, the error is always less than + * 1 ulp (unit in the last place). + * + * Misc. info. + * For IEEE double + * if x > 7.09782712893383973096e+02 then exp(x) overflow + * if x < -7.45133219101941108420e+02 then exp(x) underflow + * + * Constants: + * The hexadecimal values are the intended ones for the following + * constants. The decimal values may be used, provided that the + * compiler will convert from decimal to binary accurately enough + * to produce the hexadecimal values shown. + */ + static class Exp { + private static final double one = 1.0; + private static final double[] half = {0.5, -0.5,}; + private static final double huge = 1.0e+300; + private static final double twom1000= 0x1.0p-1000; // 9.33263618503218878990e-302 = 2^-1000 + private static final double o_threshold= 0x1.62e42fefa39efp9; // 7.09782712893383973096e+02 + private static final double u_threshold= -0x1.74910d52d3051p9; // -7.45133219101941108420e+02; + private static final double[] ln2HI ={ 0x1.62e42feep-1, // 6.93147180369123816490e-01 + -0x1.62e42feep-1}; // -6.93147180369123816490e-01 + private static final double[] ln2LO ={ 0x1.a39ef35793c76p-33, // 1.90821492927058770002e-10 + -0x1.a39ef35793c76p-33}; // -1.90821492927058770002e-10 + private static final double invln2 = 0x1.71547652b82fep0; // 1.44269504088896338700e+00 + + private static final double P1 = 0x1.555555555553ep-3; // 1.66666666666666019037e-01 + private static final double P2 = -0x1.6c16c16bebd93p-9; // -2.77777777770155933842e-03 + private static final double P3 = 0x1.1566aaf25de2cp-14; // 6.61375632143793436117e-05 + private static final double P4 = -0x1.bbd41c5d26bf1p-20; // -1.65339022054652515390e-06 + private static final double P5 = 0x1.6376972bea4d0p-25; // 4.13813679705723846039e-08 + + // should be able to forgo strictfp due to controlled over/underflow + public static strictfp double compute(double x) { + double y; + double hi = 0.0; + double lo = 0.0; + double c; + double t; + int k = 0; + int xsb; + /*unsigned*/ int hx; + + hx = __HI(x); /* high word of x */ + xsb = (hx >> 31) & 1; /* sign bit of x */ + hx &= 0x7fffffff; /* high word of |x| */ + + /* filter out non-finite argument */ + if (hx >= 0x40862E42) { /* if |x| >= 709.78... */ + if (hx >= 0x7ff00000) { + if (((hx & 0xfffff) | __LO(x)) != 0) + return x + x; /* NaN */ + else + return (xsb == 0) ? x : 0.0; /* exp(+-inf) = {inf, 0} */ + } + if (x > o_threshold) + return huge * huge; /* overflow */ + if (x < u_threshold) // unsigned compare needed here? + return twom1000 * twom1000; /* underflow */ + } + + /* argument reduction */ + if (hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ + if(hx < 0x3FF0A2B2) { /* and |x| < 1.5 ln2 */ + hi = x - ln2HI[xsb]; + lo=ln2LO[xsb]; + k = 1 - xsb - xsb; + } else { + k = (int)(invln2 * x + half[xsb]); + t = k; + hi = x - t*ln2HI[0]; /* t*ln2HI is exact here */ + lo = t*ln2LO[0]; + } + x = hi - lo; + } else if (hx < 0x3e300000) { /* when |x|<2**-28 */ + if (huge + x > one) + return one + x; /* trigger inexact */ + } else { + k = 0; + } + + /* x is now in primary range */ + t = x * x; + c = x - t*(P1 + t*(P2 + t*(P3 + t*(P4 + t*P5)))); + if (k == 0) + return one - ((x*c)/(c - 2.0) - x); + else + y = one - ((lo - (x*c)/(2.0 - c)) - hi); + + if(k >= -1021) { + y = __HI(y, __HI(y) + (k << 20)); /* add k to y's exponent */ + return y; + } else { + y = __HI(y, __HI(y) + ((k + 1000) << 20)); /* add k to y's exponent */ + return y * twom1000; + } + } + } } diff --git a/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java b/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java index 04ba817a553..d95ea5ef826 100644 --- a/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java +++ b/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java @@ -26,11 +26,13 @@ package java.lang; import jdk.internal.loader.BuiltinClassLoader; -import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.VM; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; import java.lang.module.ModuleDescriptor.Version; +import java.lang.module.ModuleReference; +import java.lang.module.ResolvedModule; import java.lang.reflect.Layer; import java.lang.reflect.Module; import java.util.HashSet; @@ -51,12 +53,13 @@ import java.util.Set; * @author Josh Bloch */ public final class StackTraceElement implements java.io.Serializable { - // This field is set to the compacted String representation used - // by StackTraceElement::toString and stored in serial form. + + // For Throwables and StackWalker, the VM initially sets this field to a + // reference to the declaring Class. The Class reference is used to + // construct the 'format' bitmap, and then is cleared. // - // This field is of Object type. VM initially sets this field to - // the Class object of the declaring class to build the compacted string. - private Object classOrLoaderModuleClassName; + // For STEs constructed using the public constructors, this field is not used. + private transient Class declaringClassObject; // Normally initialized by VM private String classLoaderName; @@ -66,6 +69,7 @@ public final class StackTraceElement implements java.io.Serializable { private String methodName; private String fileName; private int lineNumber; + private byte format = 0; // Default to show all /** * Creates a stack trace element representing the specified execution @@ -256,9 +260,10 @@ public final class StackTraceElement implements java.io.Serializable { } /** - * Returns a string representation of this stack trace element. The - * format of this string depends on the implementation, but the following - * examples may be regarded as typical: + * Returns a string representation of this stack trace element. + * + * @apiNote The format of this string depends on the implementation, but the + * following examples may be regarded as typical: *

    *
  • * "{@code com.foo.loader/foo@9.0/com.foo.Main.run(Main.java:101)}" @@ -309,7 +314,7 @@ public final class StackTraceElement implements java.io.Serializable { * then the second element is omitted as shown in * "{@code com.foo.loader//com.foo.bar.App.run(App.java:12)}". * - * If the class loader is a + *

    If the class loader is a * built-in class loader or is not named then the first element * and its following {@code "/"} are omitted as shown in * "{@code acme@2.1/org.acme.Lib.test(Lib.java:80)}". @@ -317,25 +322,30 @@ public final class StackTraceElement implements java.io.Serializable { * the second element and its following {@code "/"} are also omitted * as shown in "{@code MyClass.mash(MyClass.java:9)}". * + *

    The {@code toString} method may return two different values on two + * {@code StackTraceElement} instances that are + * {@linkplain #equals(Object) equal}, for example one created via the + * constructor, and one obtained from {@link java.lang.Throwable} or + * {@link java.lang.StackWalker.StackFrame}, where an implementation may + * choose to omit some element in the returned string. + * * @see Throwable#printStackTrace() */ public String toString() { - String s = buildLoaderModuleClassName(); - if (s == null) { - // all elements will be included - s = ""; - if (classLoaderName != null && !classLoaderName.isEmpty()) { - s += classLoaderName + "/"; - } - if (moduleName != null && !moduleName.isEmpty()) { - s += moduleName; - - if (moduleVersion != null && !moduleVersion.isEmpty()) { - s += "@" + moduleVersion; - } - } - s = s.isEmpty() ? declaringClass : s + "/" + declaringClass; + String s = ""; + if (!dropClassLoaderName() && classLoaderName != null && + !classLoaderName.isEmpty()) { + s += classLoaderName + "/"; } + if (moduleName != null && !moduleName.isEmpty()) { + s += moduleName; + + if (!dropModuleVersion() && moduleVersion != null && + !moduleVersion.isEmpty()) { + s += "@" + moduleVersion; + } + } + s = s.isEmpty() ? declaringClass : s + "/" + declaringClass; return s + "." + methodName + "(" + (isNativeMethod() ? "Native Method)" : @@ -397,67 +407,53 @@ public final class StackTraceElement implements java.io.Serializable { /** - * Build the compacted String representation to be returned by - * toString method from the declaring Class object. + * Called from of() methods to set the 'format' bitmap using the Class + * reference stored in declaringClassObject, and then clear the reference. + * + *

    + * If the module is a non-upgradeable JDK module, then set + * JDK_NON_UPGRADEABLE_MODULE to omit its version string. + *

    + * If the loader is one of the built-in loaders (`boot`, `platform`, or `app`) + * then set BUILTIN_CLASS_LOADER to omit the first element (`/`). */ - synchronized String buildLoaderModuleClassName() { - if (classOrLoaderModuleClassName == null) - return null; + private synchronized void computeFormat() { + try { + Class cls = (Class) declaringClassObject; + ClassLoader loader = cls.getClassLoader0(); + Module m = cls.getModule(); + byte bits = 0; - if (classOrLoaderModuleClassName instanceof Class) { - Class cls = (Class)classOrLoaderModuleClassName; - classOrLoaderModuleClassName = toLoaderModuleClassName(cls); + // First element - class loader name + // Call package-private ClassLoader::name method + + if (loader instanceof BuiltinClassLoader) { + bits |= BUILTIN_CLASS_LOADER; + } + + // Second element - module name and version + + // Omit if is a JDK non-upgradeable module (recorded in the hashes + // in java.base) + if (isHashedInJavaBase(m)) { + bits |= JDK_NON_UPGRADEABLE_MODULE; + } + format = bits; + } finally { + // Class reference no longer needed, clear it + declaringClassObject = null; } - return (String)classOrLoaderModuleClassName; } - /** - * Returns // string - * representation of the given class. - *

    - * If the module is a non-upgradeable JDK module then omit - * its version string. - *

    - * If the loader has no name, or if the loader is one of the built-in - * loaders (`boot`, `platform`, or `app`) then drop the first element - * (`/`). - *

    - * If the first element has been dropped and the module is unnamed - * then drop the second element (`/`). - *

    - * If the first element is not dropped and the module is unnamed - * then drop ``. - */ - private static String toLoaderModuleClassName(Class cls) { - ClassLoader loader = cls.getClassLoader0(); - Module m = cls.getModule(); + private static final byte BUILTIN_CLASS_LOADER = 0x1; + private static final byte JDK_NON_UPGRADEABLE_MODULE = 0x2; - // First element - class loader name - // Call package-private ClassLoader::name method - String s = ""; - if (loader != null && loader.name() != null && - !(loader instanceof BuiltinClassLoader)) { - s = loader.name() + "/"; - } + private boolean dropClassLoaderName() { + return (format & BUILTIN_CLASS_LOADER) == BUILTIN_CLASS_LOADER; + } - // Second element - module name and version - if (m != null && m.isNamed()) { - s += m.getName(); - // Include version if it is a user module or upgradeable module - // - // If it is JDK non-upgradeable module which is recorded - // in the hashes in java.base, omit the version. - if (!isHashedInJavaBase(m)) { - Optional ov = m.getDescriptor().version(); - if (ov.isPresent()) { - String version = "@" + ov.get().toString(); - s += version; - } - } - } - - // fully-qualified class name - return s.isEmpty() ? cls.getName() : s + "/" + cls.getName(); + private boolean dropModuleVersion() { + return (format & JDK_NON_UPGRADEABLE_MODULE) == JDK_NON_UPGRADEABLE_MODULE; } /** @@ -484,13 +480,16 @@ public final class StackTraceElement implements java.io.Serializable { static Set HASHED_MODULES = hashedModules(); static Set hashedModules() { - Module javaBase = Layer.boot().findModule("java.base").get(); - Optional ohashes = - SharedSecrets.getJavaLangModuleAccess() - .hashes(javaBase.getDescriptor()); - if (ohashes.isPresent()) { - Set names = new HashSet<>(ohashes.get().names()); + Optional resolvedModule = Layer.boot() + .configuration() + .findModule("java.base"); + assert resolvedModule.isPresent(); + ModuleReference mref = resolvedModule.get().reference(); + assert mref instanceof ModuleReferenceImpl; + ModuleHashes hashes = ((ModuleReferenceImpl)mref).recordedHashes(); + if (hashes != null) { + Set names = new HashSet<>(hashes.names()); names.add("java.base"); return names; } @@ -519,7 +518,7 @@ public final class StackTraceElement implements java.io.Serializable { // ensure the proper StackTraceElement initialization for (StackTraceElement ste : stackTrace) { - ste.buildLoaderModuleClassName(); + ste.computeFormat(); } return stackTrace; } @@ -531,7 +530,7 @@ public final class StackTraceElement implements java.io.Serializable { StackTraceElement ste = new StackTraceElement(); initStackTraceElement(ste, sfi); - ste.buildLoaderModuleClassName(); + ste.computeFormat(); return ste; } diff --git a/jdk/src/java.base/share/classes/java/lang/StrictMath.java b/jdk/src/java.base/share/classes/java/lang/StrictMath.java index 1491a8478bc..63d895fa13c 100644 --- a/jdk/src/java.base/share/classes/java/lang/StrictMath.java +++ b/jdk/src/java.base/share/classes/java/lang/StrictMath.java @@ -227,7 +227,9 @@ public final class StrictMath { * @return the value e{@code a}, * where e is the base of the natural logarithms. */ - public static native double exp(double a); + public static double exp(double a) { + return FdLibm.Exp.compute(a); + } /** * Returns the natural logarithm (base e) of a {@code double} diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 0c9da2c9e80..d195d3d3db8 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -172,6 +172,7 @@ public class MethodHandles { * @throws IllegalAccessException if the access check specified above fails * @throws SecurityException if denied by the security manager * @since 9 + * @see Lookup#dropLookupMode */ public static Lookup privateLookupIn(Class targetClass, Lookup lookup) throws IllegalAccessException { SecurityManager sm = System.getSecurityManager(); @@ -691,10 +692,15 @@ public class MethodHandles { * A lookup object on a new lookup class * {@linkplain java.lang.invoke.MethodHandles.Lookup#in created from a previous lookup object} * may have some mode bits set to zero. + * Mode bits can also be + * {@linkplain java.lang.invoke.MethodHandles.Lookup#dropLookupMode directly cleared}. + * Once cleared, mode bits cannot be restored from the downgraded lookup object. * The purpose of this is to restrict access via the new lookup object, * so that it can access only names which can be reached by the original * lookup object, and also by the new lookup class. * @return the lookup modes, which limit the kinds of access performed by this lookup object + * @see #in + * @see #dropLookupMode */ public int lookupModes() { return allowedModes & ALL_MODES; @@ -748,7 +754,8 @@ public class MethodHandles { * which may change due to this operation. * * @param requestedLookupClass the desired lookup class for the new lookup object - * @return a lookup object which reports the desired lookup class + * @return a lookup object which reports the desired lookup class, or the same object + * if there is no change * @throws NullPointerException if the argument is null */ public Lookup in(Class requestedLookupClass) { @@ -788,6 +795,40 @@ public class MethodHandles { return new Lookup(requestedLookupClass, newModes); } + + /** + * Creates a lookup on the same lookup class which this lookup object + * finds members, but with a lookup mode that has lost the given lookup mode. + * The lookup mode to drop is one of {@link #PUBLIC PUBLIC}, {@link #MODULE + * MODULE}, {@link #PACKAGE PACKAGE}, {@link #PROTECTED PROTECTED} or {@link #PRIVATE PRIVATE}. + * {@link #PROTECTED PROTECTED} is always dropped and so the resulting lookup + * mode will never have this access capability. When dropping {@code PACKAGE} + * then the resulting lookup will not have {@code PACKAGE} or {@code PRIVATE} + * access. When dropping {@code MODULE} then the resulting lookup will not + * have {@code MODULE}, {@code PACKAGE}, or {@code PRIVATE} access. If {@code + * PUBLIC} is dropped then the resulting lookup has no access. + * @param modeToDrop the lookup mode to drop + * @return a lookup object which lacks the indicated mode, or the same object if there is no change + * @throws IllegalArgumentException if {@code modeToDrop} is not one of {@code PUBLIC}, + * {@code MODULE}, {@code PACKAGE}, {@code PROTECTED} or {@code PRIVATE} + * @since 9 + * @see MethodHandles#privateLookupIn + */ + public Lookup dropLookupMode(int modeToDrop) { + int oldModes = lookupModes(); + int newModes = oldModes & ~(modeToDrop | PROTECTED); + switch (modeToDrop) { + case PUBLIC: newModes &= ~(ALL_MODES); break; + case MODULE: newModes &= ~(PACKAGE | PRIVATE); break; + case PACKAGE: newModes &= ~(PRIVATE); break; + case PROTECTED: + case PRIVATE: break; + default: throw new IllegalArgumentException(modeToDrop + " is not a valid mode to drop"); + } + if (newModes == oldModes) return this; // return self if no change + return new Lookup(lookupClass(), newModes); + } + // Make sure outer class is initialized first. static { IMPL_NAMES.getClass(); } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java index b527ffaeafb..b10d986ade9 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.io.IOException; import java.io.PrintStream; import java.io.UncheckedIOException; -import java.net.URI; import java.nio.ByteBuffer; import java.nio.file.Path; import java.util.ArrayList; @@ -38,7 +37,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -52,7 +50,7 @@ import static jdk.internal.module.Checks.*; import static java.util.Objects.*; import jdk.internal.module.Checks; -import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; /** @@ -123,8 +121,9 @@ public class ModuleDescriptor private final Set mods; private final String name; + private final Version compiledVersion; - private Requires(Set ms, String mn) { + private Requires(Set ms, String mn, Version v) { if (ms.isEmpty()) { ms = Collections.emptySet(); } else { @@ -132,11 +131,13 @@ public class ModuleDescriptor } this.mods = ms; this.name = mn; + this.compiledVersion = v; } - private Requires(Set ms, String mn, boolean unused) { + private Requires(Set ms, String mn, Version v, boolean unused) { this.mods = ms; this.name = mn; + this.compiledVersion = v; } /** @@ -157,13 +158,27 @@ public class ModuleDescriptor return name; } + /** + * Returns the version of the module if recorded at compile-time. + * + * @return The version of the module if recorded at compile-time + */ + public Optional compiledVersion() { + return Optional.ofNullable(compiledVersion); + } + /** * Compares this module dependence to another. * *

    Two {@code Requires} objects are compared by comparing their * module name lexicographically. Where the module names are equal then * the sets of modifiers are compared based on a value computed from the - * ordinal of each modifier.

    + * ordinal of each modifier. Where the module names are equal and the + * set of modifiers are equal then the version of the modules recorded + * at compile-time are compared. When comparing the versions recorded + * at compile-time then a dependence that has a recorded version is + * considered to succeed a dependence that does not have a recorded + * version.

    * * @return A negative integer, zero, or a positive integer if this module * dependence is less than, equal to, or greater than the given @@ -174,8 +189,24 @@ public class ModuleDescriptor int c = this.name().compareTo(that.name()); if (c != 0) return c; - // same name, compare by modifiers - return Long.compare(this.modsValue(), that.modsValue()); + + // modifiers + c = Long.compare(this.modsValue(), that.modsValue()); + if (c != 0) + return c; + + // compiledVersion + if (this.compiledVersion != null) { + if (that.compiledVersion != null) + c = this.compiledVersion.compareTo(that.compiledVersion); + else + c = 1; + } else { + if (that.compiledVersion != null) + c = -1; + } + + return c; } /** @@ -195,7 +226,9 @@ public class ModuleDescriptor * *

    If the given object is not a {@code Requires} then this method * returns {@code false}. Two module dependence objects are equal if - * the module names are equal and set of modifiers are equal.

    + * the module names are equal, set of modifiers are equal, and the + * compiled version of both modules is equal or not recorded for + * both modules.

    * *

    This method satisfies the general contract of the {@link * java.lang.Object#equals(Object) Object.equals} method.

    @@ -211,21 +244,25 @@ public class ModuleDescriptor if (!(ob instanceof Requires)) return false; Requires that = (Requires)ob; - return (name.equals(that.name) && mods.equals(that.mods)); + return name.equals(that.name) && mods.equals(that.mods) + && Objects.equals(compiledVersion, that.compiledVersion); } /** * Computes a hash code for this module dependence. * - *

    The hash code is based upon the module name and modifiers. It - * satisfies the general contract of the {@link Object#hashCode - * Object.hashCode} method.

    + *

    The hash code is based upon the module name, modifiers, and the + * module version if recorded at compile time. It satisfies the general + * contract of the {@link Object#hashCode Object.hashCode} method.

    * * @return The hash-code value for this module dependence */ @Override public int hashCode() { - return name.hashCode() * 43 + mods.hashCode(); + int hash = name.hashCode() * 43 + mods.hashCode(); + if (compiledVersion != null) + hash = hash * 43 + compiledVersion.hashCode(); + return hash; } /** @@ -235,7 +272,13 @@ public class ModuleDescriptor */ @Override public String toString() { - return ModuleDescriptor.toString(mods, name); + String what; + if (compiledVersion != null) { + what = name() + " (@" + compiledVersion + ")"; + } else { + what = name(); + } + return ModuleDescriptor.toString(mods, what); } } @@ -967,9 +1010,8 @@ public class ModuleDescriptor } - - // From module declarations private final String name; + private final Version version; private final boolean open; // Indicates if synthesised for a JAR file found on the module path @@ -984,17 +1026,16 @@ public class ModuleDescriptor private final Set uses; private final Set provides; - // "Extended" information, added post-compilation by tools - private final Version version; + // Added post-compilation by tools + private final Set packages; private final String mainClass; private final String osName; private final String osArch; private final String osVersion; - private final Set packages; - private final ModuleHashes hashes; private ModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -1003,16 +1044,14 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, - String osVersion, - Set packages, - ModuleHashes hashes) + String osVersion) { - this.name = name; + this.version = version; this.open = open; this.automatic = automatic; this.synthetic = synthetic; @@ -1020,18 +1059,16 @@ public class ModuleDescriptor assert (requires.stream().map(Requires::name).distinct().count() == requires.size()); this.requires = emptyOrUnmodifiableSet(requires); - this.exports = emptyOrUnmodifiableSet(exports); this.opens = emptyOrUnmodifiableSet(opens); this.uses = emptyOrUnmodifiableSet(uses); this.provides = emptyOrUnmodifiableSet(provides); - this.version = version; + + this.packages = emptyOrUnmodifiableSet(packages); this.mainClass = mainClass; this.osName = osName; this.osArch = osArch; this.osVersion = osVersion; - this.hashes = hashes; - this.packages = emptyOrUnmodifiableSet(packages); } /** @@ -1039,6 +1076,7 @@ public class ModuleDescriptor */ ModuleDescriptor(ModuleDescriptor md, Set pkgs) { this.name = md.name; + this.version = md.version; this.open = md.open; this.automatic = md.automatic; this.synthetic = md.synthetic; @@ -1049,16 +1087,14 @@ public class ModuleDescriptor this.uses = md.uses; this.provides = md.provides; - this.version = md.version; + Set packages = new HashSet<>(md.packages); + packages.addAll(pkgs); + this.packages = emptyOrUnmodifiableSet(packages); + this.mainClass = md.mainClass; this.osName = md.osName; this.osArch = md.osArch; this.osVersion = md.osVersion; - this.hashes = null; // need to ignore - - Set packages = new HashSet<>(md.packages); - packages.addAll(pkgs); - this.packages = emptyOrUnmodifiableSet(packages); } /** @@ -1066,6 +1102,7 @@ public class ModuleDescriptor * The arguments are pre-validated and sets are unmodifiable sets. */ ModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -1074,16 +1111,15 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode, boolean unused) { this.name = name; + this.version = version; this.open = open; this.automatic = automatic; this.synthetic = synthetic; @@ -1093,12 +1129,10 @@ public class ModuleDescriptor this.uses = uses; this.provides = provides; this.packages = packages; - this.version = version; this.mainClass = mainClass; this.osName = osName; this.osArch = osArch; this.osVersion = osVersion; - this.hashes = hashes; this.hash = hashCode; } @@ -1284,13 +1318,6 @@ public class ModuleDescriptor return packages; } - /** - * Returns the object with the hashes of other modules - */ - Optional hashes() { - return Optional.ofNullable(hashes); - } - /** * A builder used for building {@link ModuleDescriptor} objects. @@ -1317,15 +1344,13 @@ public class ModuleDescriptor public static final class Builder { final String name; final boolean strict; // true if module names are checked - boolean open; + final boolean open; + final boolean synthetic; boolean automatic; - boolean synthetic; final Map requires = new HashMap<>(); - final Map exports = new HashMap<>(); final Map opens = new HashMap<>(); final Set concealedPackages = new HashSet<>(); - final Set uses = new HashSet<>(); final Map provides = new HashMap<>(); Version version; @@ -1333,7 +1358,6 @@ public class ModuleDescriptor String osArch; String osVersion; String mainClass; - ModuleHashes hashes; /** * Initializes a new builder with the given module name. @@ -1341,14 +1365,11 @@ public class ModuleDescriptor * @param strict * Indicates whether module names are checked or not */ - Builder(String name, boolean strict) { - this.strict = strict; + Builder(String name, boolean strict, boolean open, boolean synthetic) { this.name = (strict) ? requireModuleName(name) : name; - } - - /* package */ Builder open(boolean open) { + this.strict = strict; this.open = open; - return this; + this.synthetic = synthetic; } /* package */ Builder automatic(boolean automatic) { @@ -1356,10 +1377,20 @@ public class ModuleDescriptor return this; } - /* package */ boolean isOpen() { return open; } + /** + * Returns the set of packages that are exported (unconditionally or + * unconditionally). + */ + /* package */ Set exportedPackages() { + return exports.keySet(); + } - /* package */ boolean isAutomatic() { - return automatic; + /** + * Returns the set of packages that are opened (unconditionally or + * unconditionally). + */ + /* package */Set openPackages() { + return opens.keySet(); } /** @@ -1387,6 +1418,36 @@ public class ModuleDescriptor return this; } + /** + * Adds a dependence on a module with the given (and possibly empty) + * set of modifiers. The dependence includes the version of the + * module that that was recorded at compile-time. + * + * @param ms + * The set of modifiers + * @param mn + * The module name + * @param compiledVersion + * The version of the module recorded at compile-time + * + * @return This builder + * + * @throws IllegalArgumentException + * If the module name is {@code null}, is not a legal Java + * identifier, or is equal to the module name that this builder + * was initialized to build + * @throws IllegalStateException + * If the dependence on the module has already been declared + */ + public Builder requires(Set ms, + String mn, + Version compiledVersion) { + Objects.requireNonNull(compiledVersion); + if (strict) + mn = requireModuleName(mn); + return requires(new Requires(ms, mn, compiledVersion)); + } + /** * Adds a dependence on a module with the given (and possibly empty) * set of modifiers. @@ -1408,7 +1469,7 @@ public class ModuleDescriptor public Builder requires(Set ms, String mn) { if (strict) mn = requireModuleName(mn); - return requires(new Requires(ms, mn)); + return requires(new Requires(ms, mn, null)); } /** @@ -1705,17 +1766,6 @@ public class ModuleDescriptor return opens(Collections.emptySet(), pn); } - - // Used by ModuleInfo, after a packageFinder is invoked - /* package */ Set exportedAndOpenPackages() { - if (opens.isEmpty()) - return exports.keySet(); - Set result = new HashSet<>(); - result.addAll(exports.keySet()); - result.addAll(opens.keySet()); - return result; - } - /** * Adds a service dependence. * @@ -1789,7 +1839,6 @@ public class ModuleDescriptor if (providerNames.isEmpty()) throw new IllegalArgumentException("Empty providers set"); providerNames.forEach(Checks::requireServiceProviderName); - provides.put(service, p); return this; } @@ -1914,7 +1963,7 @@ public class ModuleDescriptor * If {@code mainClass} is null or is not a legal Java identifier */ public Builder mainClass(String mc) { - mainClass = requireJavaIdentifier("main class name", mc); + mainClass = requireBinaryName("main class name", mc); return this; } @@ -1972,16 +2021,6 @@ public class ModuleDescriptor return this; } - /* package */ Builder hashes(ModuleHashes hashes) { - this.hashes = hashes; - return this; - } - - /* package */ Builder synthetic(boolean v) { - this.synthetic = v; - return this; - } - /** * Builds and returns a {@code ModuleDescriptor} from its components. * @@ -1990,7 +2029,9 @@ public class ModuleDescriptor public ModuleDescriptor build() { Set requires = new HashSet<>(this.requires.values()); - Set packages = new HashSet<>(exportedAndOpenPackages()); + Set packages = new HashSet<>(); + packages.addAll(exports.keySet()); + packages.addAll(opens.keySet()); packages.addAll(concealedPackages); Set exports = new HashSet<>(this.exports.values()); @@ -1999,6 +2040,7 @@ public class ModuleDescriptor Set provides = new HashSet<>(this.provides.values()); return new ModuleDescriptor(name, + version, open, automatic, synthetic, @@ -2007,13 +2049,11 @@ public class ModuleDescriptor opens, uses, provides, - version, + packages, mainClass, osName, osArch, - osVersion, - packages, - hashes); + osVersion); } } @@ -2088,8 +2128,7 @@ public class ModuleDescriptor && Objects.equals(osName, that.osName) && Objects.equals(osArch, that.osArch) && Objects.equals(osVersion, that.osVersion) - && Objects.equals(packages, that.packages) - && Objects.equals(hashes, that.hashes)); + && Objects.equals(packages, that.packages)); } private transient int hash; // cached hash code @@ -2122,7 +2161,6 @@ public class ModuleDescriptor hc = hc * 43 + Objects.hashCode(osArch); hc = hc * 43 + Objects.hashCode(osVersion); hc = hc * 43 + Objects.hashCode(packages); - hc = hc * 43 + Objects.hashCode(hashes); if (hc == 0) hc = -1; hash = hc; @@ -2145,7 +2183,7 @@ public class ModuleDescriptor if (!requires.isEmpty()) sb.append(", ").append(requires); if (!uses.isEmpty()) - sb.append(", ").append(uses); + sb.append(", uses: ").append(uses); if (!exports.isEmpty()) sb.append(", exports: ").append(exports); if (!opens.isEmpty()) @@ -2171,7 +2209,7 @@ public class ModuleDescriptor * identifier */ public static Builder module(String name) { - return new Builder(name, true); + return new Builder(name, true, false, false); } /** @@ -2199,7 +2237,7 @@ public class ModuleDescriptor * identifier */ public static Builder openModule(String name) { - return new Builder(name, true).open(true); + return new Builder(name, true, true, false); } /** @@ -2221,7 +2259,7 @@ public class ModuleDescriptor * @see ModuleFinder#of(Path[]) */ public static Builder automaticModule(String name) { - return new Builder(name, true).automatic(true); + return new Builder(name, true, false, false).automatic(true); } @@ -2263,7 +2301,7 @@ public class ModuleDescriptor Supplier> packageFinder) throws IOException { - return ModuleInfo.read(in, requireNonNull(packageFinder)); + return ModuleInfo.read(in, requireNonNull(packageFinder)).descriptor(); } /** @@ -2281,7 +2319,7 @@ public class ModuleDescriptor * If an I/O error occurs reading from the input stream */ public static ModuleDescriptor read(InputStream in) throws IOException { - return ModuleInfo.read(in, null); + return ModuleInfo.read(in, null).descriptor(); } /** @@ -2320,7 +2358,7 @@ public class ModuleDescriptor public static ModuleDescriptor read(ByteBuffer bb, Supplier> packageFinder) { - return ModuleInfo.read(bb, requireNonNull(packageFinder)); + return ModuleInfo.read(bb, requireNonNull(packageFinder)).descriptor(); } /** @@ -2336,7 +2374,7 @@ public class ModuleDescriptor * If an invalid module descriptor is detected */ public static ModuleDescriptor read(ByteBuffer bb) { - return ModuleInfo.read(bb, null); + return ModuleInfo.read(bb, null).descriptor(); } private static Map emptyOrUnmodifiableMap(Map map) { @@ -2377,18 +2415,26 @@ public class ModuleDescriptor jdk.internal.misc.SharedSecrets .setJavaLangModuleAccess(new jdk.internal.misc.JavaLangModuleAccess() { @Override - public Builder newModuleBuilder(String mn, boolean strict) { - return new Builder(mn, strict); + public Builder newModuleBuilder(String mn, + boolean strict, + boolean open, + boolean synthetic) { + return new Builder(mn, strict, open, synthetic); } @Override - public Builder newOpenModuleBuilder(String mn, boolean strict) { - return new Builder(mn, strict).open(true); + public Set exportedPackages(ModuleDescriptor.Builder builder) { + return builder.exportedPackages(); } @Override - public Requires newRequires(Set ms, String mn) { - return new Requires(ms, mn, true); + public Set openPackages(ModuleDescriptor.Builder builder) { + return builder.openPackages(); + } + + @Override + public Requires newRequires(Set ms, String mn, Version v) { + return new Requires(ms, mn, v, true); } @Override @@ -2433,6 +2479,7 @@ public class ModuleDescriptor @Override public ModuleDescriptor newModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -2441,15 +2488,14 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode) { return new ModuleDescriptor(name, + version, open, automatic, synthetic, @@ -2458,22 +2504,15 @@ public class ModuleDescriptor opens, uses, provides, - version, + packages, mainClass, osName, osArch, osVersion, - packages, - hashes, hashCode, false); } - @Override - public Optional hashes(ModuleDescriptor descriptor) { - return descriptor.hashes(); - } - @Override public Configuration resolveRequiresAndUses(ModuleFinder finder, Collection roots, @@ -2482,20 +2521,6 @@ public class ModuleDescriptor { return Configuration.resolveRequiresAndUses(finder, roots, check, traceOutput); } - - @Override - public ModuleReference newPatchedModule(ModuleDescriptor descriptor, - URI location, - Supplier s) { - return new ModuleReference(descriptor, location, s, true, null); - } - - @Override - public ModuleFinder newModulePath(Runtime.Version version, - boolean isLinkPhase, - Path... entries) { - return new ModulePath(version, isLinkPhase, entries); - } }); } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java index 4b98bf48416..5d01f698806 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import jdk.internal.module.ModulePath; +import jdk.internal.module.SystemModuleFinder; import sun.security.action.GetPropertyAction; /** @@ -137,7 +139,7 @@ public interface ModuleFinder { /** * Returns a module finder that locates the system modules. The - * system modules are typically linked into the Java run-time image. + * system modules are the modules in the Java run-time image. * The module finder will always find {@code java.base}. * *

    If there is a security manager set then its {@link @@ -166,7 +168,7 @@ public interface ModuleFinder { Path modules = Paths.get(home, "lib", "modules"); if (Files.isRegularFile(modules)) { - return new SystemModuleFinder(); + return SystemModuleFinder.getInstance(); } else { Path mlib = Paths.get(home, "modules"); if (Files.isDirectory(mlib)) { diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java index cbf84cf938d..09a5acec219 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java @@ -26,96 +26,42 @@ package java.lang.module; import java.io.IOException; -import java.io.UncheckedIOException; import java.net.URI; import java.util.Objects; import java.util.Optional; -import java.util.function.Supplier; - -import jdk.internal.module.ModuleHashes.HashSupplier; /** * A reference to a module's content. * - *

    A module reference contains the module's descriptor and its location, if - * known. It also has the ability to create a {@link ModuleReader} in order to - * access the module's content, which may be inside the Java run-time system - * itself or in an artifact such as a modular JAR file. + *

    A module reference is a concrete implementation of this class that + * implements the abstract methods defined by this class. It contains the + * module's descriptor and its location, if known. It also has the ability to + * create a {@link ModuleReader} in order to access the module's content, which + * may be inside the Java run-time system itself or in an artifact such as a + * modular JAR file. * * @see ModuleFinder * @see ModuleReader * @since 9 */ -public final class ModuleReference { +public abstract class ModuleReference { private final ModuleDescriptor descriptor; private final URI location; - private final Supplier readerSupplier; - - // true if this is a reference to a patched module - private boolean patched; - - // the function that computes the hash of this module reference - private final HashSupplier hasher; - - // cached hash to avoid needing to compute it many times - private byte[] cachedHash; - /** * Constructs a new instance of this class. - */ - ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier, - boolean patched, - HashSupplier hasher) - - { - this.descriptor = Objects.requireNonNull(descriptor); - this.location = location; - this.readerSupplier = Objects.requireNonNull(readerSupplier); - this.patched = patched; - this.hasher = hasher; - } - - /** - * Constructs a new instance of this class. - */ - ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier, - HashSupplier hasher) - - { - this(descriptor, location, readerSupplier, false, hasher); - } - - - /** - * Constructs a new instance of this class. - * - *

    The {@code readSupplier} parameter is the supplier of the {@link - * ModuleReader} that may be used to read the module content. Its {@link - * Supplier#get() get()} method throws {@link UncheckedIOException} if an - * I/O error occurs opening the module content. The {@code get()} method - * throws {@link SecurityException} if opening the module is denied by the - * security manager. * * @param descriptor * The module descriptor * @param location * The module location or {@code null} if not known - * @param readerSupplier - * The {@code Supplier} of the {@code ModuleReader} */ - public ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier) - { - this(descriptor, location, readerSupplier, false, null); + protected ModuleReference(ModuleDescriptor descriptor, URI location) { + this.descriptor = Objects.requireNonNull(descriptor); + this.location = location; } /** @@ -123,11 +69,10 @@ public final class ModuleReference { * * @return The module descriptor */ - public ModuleDescriptor descriptor() { + public final ModuleDescriptor descriptor() { return descriptor; } - /** * Returns the location of this module's content, if known. * @@ -139,18 +84,13 @@ public final class ModuleReference { * * @return The location or an empty {@code Optional} if not known */ - public Optional location() { + public final Optional location() { return Optional.ofNullable(location); } - /** * Opens the module content for reading. * - *

    This method opens the module content by invoking the {@link - * Supplier#get() get()} method of the {@code readSupplier} specified at - * construction time.

    - * * @return A {@code ModuleReader} to read the module * * @throws IOException @@ -158,113 +98,5 @@ public final class ModuleReference { * @throws SecurityException * If denied by the security manager */ - public ModuleReader open() throws IOException { - try { - return readerSupplier.get(); - } catch (UncheckedIOException e) { - throw e.getCause(); - } - - } - - - /** - * Returns {@code true} if this module has been patched via --patch-module. - */ - boolean isPatched() { - return patched; - } - - /** - * Returns the hash supplier for this module. - */ - HashSupplier hasher() { - return hasher; - } - - /** - * Computes the hash of this module. Returns {@code null} if the hash - * cannot be computed. - * - * @throws java.io.UncheckedIOException if an I/O error occurs - */ - byte[] computeHash(String algorithm) { - byte[] result = cachedHash; - if (result != null) - return result; - if (hasher == null) - return null; - cachedHash = result = hasher.generate(algorithm); - return result; - } - - /** - * Computes a hash code for this module reference. - * - *

    The hash code is based upon the components of the reference, and - * satisfies the general contract of the {@link Object#hashCode - * Object.hashCode} method.

    - * - * @return The hash-code value for this module reference - */ - @Override - public int hashCode() { - int hc = hash; - if (hc == 0) { - hc = descriptor.hashCode(); - hc = 43 * hc + readerSupplier.hashCode(); - hc = 43 * hc + Objects.hashCode(location); - hc = 43 * hc + Objects.hashCode(hasher); - hc = 43 * hc + Boolean.hashCode(patched); - if (hc == 0) - hc = -1; - hash = hc; - } - return hc; - } - - private int hash; - - /** - * Tests this module reference for equality with the given object. - * - *

    If the given object is not a {@code ModuleReference} then this - * method returns {@code false}. Two module references are equal if their - * module descriptors are equal, their locations are equal or both unknown, - * and were created with equal supplier objects to access the module - * content.

    - * - *

    This method satisfies the general contract of the {@link - * java.lang.Object#equals(Object) Object.equals} method.

    - * - * @param ob - * the object to which this object is to be compared - * - * @return {@code true} if, and only if, the given object is a module - * reference that is equal to this module reference - */ - @Override - public boolean equals(Object ob) { - if (!(ob instanceof ModuleReference)) - return false; - ModuleReference that = (ModuleReference)ob; - - return Objects.equals(this.descriptor, that.descriptor) - && Objects.equals(this.location, that.location) - && Objects.equals(this.readerSupplier, that.readerSupplier) - && Objects.equals(this.hasher, that.hasher) - && this.patched == that.patched; - } - - /** - * Returns a string describing this module reference. - * - * @return A string describing this module reference - */ - @Override - public String toString() { - return ("[module " + descriptor().name() - + ", location=" + location + "]"); - } - + public abstract ModuleReader open() throws IOException; } diff --git a/jdk/src/java.base/share/classes/java/lang/module/Resolver.java b/jdk/src/java.base/share/classes/java/lang/module/Resolver.java index 5f716b131b7..d2aafdc5d87 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/Resolver.java +++ b/jdk/src/java.base/share/classes/java/lang/module/Resolver.java @@ -46,6 +46,7 @@ import java.util.StringJoiner; import java.util.stream.Collectors; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; /** * The resolver used by {@link Configuration#resolveRequires} and @@ -438,24 +439,32 @@ final class Resolver { */ private void checkHashes() { for (ModuleReference mref : nameToReference.values()) { - ModuleDescriptor descriptor = mref.descriptor(); - // get map of module hashes - Optional ohashes = descriptor.hashes(); - if (!ohashes.isPresent()) + // get the recorded hashes, if any + if (!(mref instanceof ModuleReferenceImpl)) + continue; + ModuleHashes hashes = ((ModuleReferenceImpl)mref).recordedHashes(); + if (hashes == null) continue; - ModuleHashes hashes = ohashes.get(); + ModuleDescriptor descriptor = mref.descriptor(); String algorithm = hashes.algorithm(); for (String dn : hashes.names()) { - ModuleReference other = nameToReference.get(dn); - if (other == null) { + ModuleReference mref2 = nameToReference.get(dn); + if (mref2 == null) { ResolvedModule resolvedModule = findInParent(dn); if (resolvedModule != null) - other = resolvedModule.reference(); + mref2 = resolvedModule.reference(); + } + if (mref2 == null) + continue; + + if (!(mref2 instanceof ModuleReferenceImpl)) { + fail("Unable to compute the hash of module %s", dn); } // skip checking the hash if the module has been patched + ModuleReferenceImpl other = (ModuleReferenceImpl)mref2; if (other != null && !other.isPatched()) { byte[] recordedHash = hashes.hashFor(dn); byte[] actualHash = other.computeHash(algorithm); diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java index a046a748f7c..f585b476504 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java @@ -28,9 +28,11 @@ package java.lang.reflect; import java.lang.annotation.Annotation; import java.security.AccessController; +import jdk.internal.misc.VM; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; import jdk.internal.reflect.ReflectionFactory; +import sun.security.action.GetPropertyAction; /** * The AccessibleObject class is the base class for Field, Method and @@ -172,8 +174,10 @@ public class AccessibleObject implements AnnotatedElement { // package is open to caller String pn = packageName(declaringClass); - if (declaringModule.isOpen(pn, callerModule)) + if (declaringModule.isOpen(pn, callerModule)) { + printStackTraceIfOpenedReflectively(declaringModule, pn, callerModule); return; + } // package is exported to caller and class/member is public boolean isExported = declaringModule.isExported(pn, callerModule); @@ -185,8 +189,10 @@ public class AccessibleObject implements AnnotatedElement { modifiers = ((Field) this).getModifiers(); } boolean isMemberPublic = Modifier.isPublic(modifiers); - if (isExported && isClassPublic && isMemberPublic) + if (isExported && isClassPublic && isMemberPublic) { + printStackTraceIfExportedReflectively(declaringModule, pn, callerModule); return; + } // not accessible String msg = "Unable to make "; @@ -198,7 +204,44 @@ public class AccessibleObject implements AnnotatedElement { else msg += "opens"; msg += " " + pn + "\" to " + callerModule; - Reflection.throwInaccessibleObjectException(msg); + InaccessibleObjectException e = new InaccessibleObjectException(msg); + if (Reflection.printStackTraceWhenAccessFails()) { + e.printStackTrace(System.err); + } + throw e; + } + + private void printStackTraceIfOpenedReflectively(Module module, + String pn, + Module other) { + printStackTraceIfExposedReflectively(module, pn, other, true); + } + + private void printStackTraceIfExportedReflectively(Module module, + String pn, + Module other) { + printStackTraceIfExposedReflectively(module, pn, other, false); + } + + private void printStackTraceIfExposedReflectively(Module module, + String pn, + Module other, + boolean open) + { + if (Reflection.printStackTraceWhenAccessSucceeds() + && !module.isStaticallyExportedOrOpen(pn, other, open)) + { + String msg = other + " allowed to invoke setAccessible on "; + if (this instanceof Field) + msg += "field "; + msg += this; + new Exception(msg) { + private static final long serialVersionUID = 42L; + public String toString() { + return "WARNING: " + getMessage(); + } + }.printStackTrace(System.err); + } } /** diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java index 7466c57ae22..4b4588c3c01 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java @@ -245,7 +245,6 @@ public final class Layer { * @see Module#addOpens */ public Controller addOpens(Module source, String pn, Module target) { - Objects.requireNonNull(source); Objects.requireNonNull(source); Objects.requireNonNull(target); ensureInLayer(source); @@ -541,7 +540,7 @@ public final class Layer { * {@link ClassLoader#registerAsParallelCapable parallel-capable} so as to * avoid deadlocks during class loading. In addition, the entity creating * a new layer with this method should arrange that the class loaders are - * ready to load from these module before there are any attempts to load + * ready to load from these modules before there are any attempts to load * classes or resources. * *

    Creating a {@code Layer} can fail for the following reasons:

    @@ -603,12 +602,8 @@ public final class Layer { checkGetClassLoaderPermission(); - // For now, no two modules in the boot Layer may contain the same - // package so we use a simple check for the boot Layer to keep - // the overhead at startup to a minimum - if (boot() == null) { - checkBootModulesForDuplicatePkgs(cf); - } else { + // The boot layer is checked during module system initialization + if (boot() != null) { checkForDuplicatePkgs(cf, clf); } @@ -657,27 +652,6 @@ public final class Layer { sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION); } - /** - * Checks a configuration for the boot Layer to ensure that no two modules - * have the same package. - * - * @throws LayerInstantiationException - */ - private static void checkBootModulesForDuplicatePkgs(Configuration cf) { - Map packageToModule = new HashMap<>(); - for (ResolvedModule resolvedModule : cf.modules()) { - ModuleDescriptor descriptor = resolvedModule.reference().descriptor(); - String name = descriptor.name(); - for (String p : descriptor.packages()) { - String other = packageToModule.putIfAbsent(p, name); - if (other != null) { - throw fail("Package " + p + " in both module " - + name + " and module " + other); - } - } - } - } - /** * Checks a configuration and the module-to-loader mapping to ensure that * no two modules mapped to the same class loader have the same package. diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Module.java b/jdk/src/java.base/share/classes/java/lang/reflect/Module.java index 29f21cc0108..a71b4b320ab 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Module.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Module.java @@ -559,7 +559,7 @@ public final class Module implements AnnotatedElement { * Returns {@code true} if this module exports or opens a package to * the given module via its module declaration. */ - private boolean isStaticallyExportedOrOpen(String pn, Module other, boolean open) { + boolean isStaticallyExportedOrOpen(String pn, Module other, boolean open) { // package is open to everyone or Map> openPackages = this.openPackages; if (openPackages != null) { @@ -643,6 +643,12 @@ public final class Module implements AnnotatedElement { * open) to the given module. It also has no effect if * invoked on an {@link ModuleDescriptor#isOpen open} module.

    * + * @apiNote As specified in section 5.4.3 of the The Java™ + * Virtual Machine Specification , if an attempt to resolve a + * symbolic reference fails because of a linkage error, then subsequent + * attempts to resolve the reference always fail with the same error that + * was thrown as a result of the initial resolution attempt. + * * @param pn * The package name * @param other @@ -656,6 +662,7 @@ public final class Module implements AnnotatedElement { * @throws IllegalStateException * If this is a named module and the caller is not this module * + * @jvms 5.4.3 Resolution * @see #isExported(String,Module) */ @CallerSensitive @@ -676,8 +683,8 @@ public final class Module implements AnnotatedElement { } /** - * If the caller's module is this module then update this module to - * open the given package to the given module. + * If this module has opened a package to at least the caller + * module then update this module to open the package to the given module. * Opening a package with this method allows all types in the package, * and all their members, not just public types and their public members, * to be reflected on by the given module when using APIs that support @@ -699,7 +706,8 @@ public final class Module implements AnnotatedElement { * If {@code pn} is {@code null}, or this is a named module and the * package {@code pn} is not a package in this module * @throws IllegalStateException - * If this is a named module and the caller is not this module + * If this is a named module and this module has not opened the + * package to at least the caller * * @see #isOpen(String,Module) * @see AccessibleObject#setAccessible(boolean) @@ -713,9 +721,8 @@ public final class Module implements AnnotatedElement { if (isNamed() && !descriptor.isOpen()) { Module caller = Reflection.getCallerClass().getModule(); - if (caller != this) { - throw new IllegalStateException(caller + " != " + this); - } + if (caller != this && !isOpen(pn, caller)) + throw new IllegalStateException(pn + " is not open to " + caller); implAddExportsOrOpens(pn, other, /*open*/true, /*syncVM*/true); } @@ -1568,6 +1575,10 @@ public final class Module implements AnnotatedElement { public Stream layers(ClassLoader loader) { return Layer.layers(loader); } + @Override + public boolean isStaticallyExported(Module module, String pn, Module other) { + return module.isStaticallyExportedOrOpen(pn, other, false); + } }); } } diff --git a/jdk/src/java.base/share/classes/java/security/KeyStore.java b/jdk/src/java.base/share/classes/java/security/KeyStore.java index 811422f73e5..f963cae1390 100644 --- a/jdk/src/java.base/share/classes/java/security/KeyStore.java +++ b/jdk/src/java.base/share/classes/java/security/KeyStore.java @@ -824,10 +824,14 @@ public class KeyStore { if (!skipDebug && pdebug != null) { pdebug.println("KeyStore." + type.toUpperCase() + " type from: " + - this.provider.getName()); + getProviderName()); } } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Returns a keystore object of the specified type. * diff --git a/jdk/src/java.base/share/classes/java/security/MessageDigest.java b/jdk/src/java.base/share/classes/java/security/MessageDigest.java index dac789f1ab1..692dce5a10f 100644 --- a/jdk/src/java.base/share/classes/java/security/MessageDigest.java +++ b/jdk/src/java.base/share/classes/java/security/MessageDigest.java @@ -430,13 +430,17 @@ public abstract class MessageDigest extends MessageDigestSpi { return digest(); } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Returns a string representation of this message digest object. */ public String toString() { ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream p = new PrintStream(baos); - p.print(algorithm+" Message Digest from "+provider.getName()+", "); + p.print(algorithm+" Message Digest from "+getProviderName()+", "); switch (state) { case INITIAL: p.print(""); diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandom.java b/jdk/src/java.base/share/classes/java/security/SecureRandom.java index 12b60f688e0..ac4ee6e7c7a 100644 --- a/jdk/src/java.base/share/classes/java/security/SecureRandom.java +++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java @@ -310,10 +310,14 @@ public class SecureRandom extends java.util.Random { if (!skipDebug && pdebug != null) { pdebug.println("SecureRandom." + algorithm + - " algorithm from: " + this.provider.getName()); + " algorithm from: " + getProviderName()); } } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Returns a {@code SecureRandom} object that implements the specified * Random Number Generator (RNG) algorithm. diff --git a/jdk/src/java.base/share/classes/java/security/Signature.java b/jdk/src/java.base/share/classes/java/security/Signature.java index df326f4a280..df5350e99f1 100644 --- a/jdk/src/java.base/share/classes/java/security/Signature.java +++ b/jdk/src/java.base/share/classes/java/security/Signature.java @@ -452,6 +452,10 @@ public abstract class Signature extends SignatureSpi { return this.provider; } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + void chooseFirstProvider() { // empty, overridden in Delegate } @@ -473,7 +477,7 @@ public abstract class Signature extends SignatureSpi { if (!skipDebug && pdebug != null) { pdebug.println("Signature." + algorithm + - " verification algorithm from: " + this.provider.getName()); + " verification algorithm from: " + getProviderName()); } } @@ -522,7 +526,7 @@ public abstract class Signature extends SignatureSpi { if (!skipDebug && pdebug != null) { pdebug.println("Signature." + algorithm + - " verification algorithm from: " + this.provider.getName()); + " verification algorithm from: " + getProviderName()); } } @@ -543,7 +547,7 @@ public abstract class Signature extends SignatureSpi { if (!skipDebug && pdebug != null) { pdebug.println("Signature." + algorithm + - " signing algorithm from: " + this.provider.getName()); + " signing algorithm from: " + getProviderName()); } } @@ -566,7 +570,7 @@ public abstract class Signature extends SignatureSpi { if (!skipDebug && pdebug != null) { pdebug.println("Signature." + algorithm + - " signing algorithm from: " + this.provider.getName()); + " signing algorithm from: " + getProviderName()); } } diff --git a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java index f289fdb1a93..7ae62944025 100644 --- a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java +++ b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -73,11 +73,13 @@ import java.io.ObjectStreamException; import java.io.Serializable; import java.time.DateTimeException; import java.time.LocalDate; +import java.time.format.TextStyle; import java.time.temporal.ChronoField; import java.time.temporal.TemporalField; import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; import java.util.Arrays; +import java.util.Locale; import java.util.Objects; import sun.util.calendar.CalendarDate; @@ -125,8 +127,8 @@ public final class JapaneseEra */ public static final JapaneseEra HEISEI = new JapaneseEra(2, LocalDate.of(1989, 1, 8)); - // the number of defined JapaneseEra constants. - // There could be an extra era defined in its configuration. + // The number of predefined JapaneseEra constants. + // There may be a supplemental era defined by the property. private static final int N_ERA_CONSTANTS = HEISEI.getValue() + ERA_OFFSET; /** @@ -237,6 +239,32 @@ public final class JapaneseEra return Arrays.copyOf(KNOWN_ERAS, KNOWN_ERAS.length); } + /** + * Gets the textual representation of this era. + *

    + * This returns the textual name used to identify the era, + * suitable for presentation to the user. + * The parameters control the style of the returned text and the locale. + *

    + * If no textual mapping is found then the {@link #getValue() numeric value} + * is returned. + * + * @param style the style of the text required, not null + * @param locale the locale to use, not null + * @return the text value of the era, not null + * @since 9 + */ + @Override + public String getDisplayName(TextStyle style, Locale locale) { + // If this JapaneseEra is a supplemental one, obtain the name from + // the era definition. + if (getValue() > N_ERA_CONSTANTS - ERA_OFFSET) { + Objects.requireNonNull(locale, "locale"); + return style.asNormal() == TextStyle.NARROW ? getAbbreviation() : getName(); + } + return Era.super.getDisplayName(style, locale); + } + //----------------------------------------------------------------------- /** * Obtains an instance of {@code JapaneseEra} from a date. @@ -338,11 +366,7 @@ public final class JapaneseEra //----------------------------------------------------------------------- String getAbbreviation() { - int index = ordinal(getValue()); - if (index == 0) { - return ""; - } - return ERA_CONFIG[index].getAbbreviation(); + return ERA_CONFIG[ordinal(getValue())].getAbbreviation(); } String getName() { diff --git a/jdk/src/java.base/share/classes/java/util/ResourceBundle.java b/jdk/src/java.base/share/classes/java/util/ResourceBundle.java index 7f8559daa38..78e86e5f2f4 100644 --- a/jdk/src/java.base/share/classes/java/util/ResourceBundle.java +++ b/jdk/src/java.base/share/classes/java/util/ResourceBundle.java @@ -60,7 +60,6 @@ import java.security.PrivilegedExceptionAction; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.jar.JarEntry; -import java.util.spi.ResourceBundleControlProvider; import java.util.spi.ResourceBundleProvider; import jdk.internal.loader.BootLoader; @@ -232,8 +231,6 @@ import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION; *

  • {@code ResourceBundle.Control} is not supported in named modules. * If the {@code getBundle} method with a {@code ResourceBundle.Control} is called * in a named module, the method will throw an {@code UnsupportedOperationException}. - * Any service providers of {@link ResourceBundleControlProvider} are ignored in - * named modules. *
    • *
* @@ -264,17 +261,6 @@ import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION; * {@link #getBundle(String, Locale, ClassLoader, Control) getBundle} * factory method for details. * - *

For the {@code getBundle} factory - * methods that take no {@link Control} instance, their default behavior of resource bundle loading - * can be modified with installed {@link - * ResourceBundleControlProvider} implementations. Any installed providers are - * detected at the {@code ResourceBundle} class loading time. If any of the - * providers provides a {@link Control} for the given base name, that {@link - * Control} will be used instead of the default {@link Control}. If there is - * more than one service provider installed for supporting the same base name, - * the first one returned from {@link ServiceLoader} will be used. - * *

Cache Management

* * Resource bundle instances created by the getBundle factory @@ -469,21 +455,6 @@ public abstract class ResourceBundle { */ private volatile Set keySet; - private static final List providers; - - static { - List list = null; - ServiceLoader serviceLoaders - = ServiceLoader.loadInstalled(ResourceBundleControlProvider.class); - for (ResourceBundleControlProvider provider : serviceLoaders) { - if (list == null) { - list = new ArrayList<>(); - } - list.add(provider); - } - providers = list; - } - /** * Sole constructor. (For invocation by subclass constructors, typically * implicit.) @@ -948,7 +919,7 @@ public abstract class ResourceBundle { { Class caller = Reflection.getCallerClass(); return getBundleImpl(baseName, Locale.getDefault(), - caller, getDefaultControl(caller, baseName)); + caller, Control.INSTANCE); } /** @@ -1022,7 +993,7 @@ public abstract class ResourceBundle { { Class caller = Reflection.getCallerClass(); return getBundleImpl(baseName, locale, - caller, getDefaultControl(caller, baseName)); + caller, Control.INSTANCE); } /** @@ -1163,10 +1134,7 @@ public abstract class ResourceBundle { * *

This method behaves the same as calling * {@link #getBundle(String, Locale, ClassLoader, Control)} passing a - * default instance of {@link Control} unless another {@link Control} is - * provided with the {@link ResourceBundleControlProvider} SPI. Refer to the - * description of modifying the default - * behavior. + * default instance of {@link Control}. * *

The following describes the default * behavior. @@ -1364,7 +1332,7 @@ public abstract class ResourceBundle { throw new NullPointerException(); } Class caller = Reflection.getCallerClass(); - return getBundleImpl(baseName, locale, caller, loader, getDefaultControl(caller, baseName)); + return getBundleImpl(baseName, locale, caller, loader, Control.INSTANCE); } /** @@ -1589,18 +1557,6 @@ public abstract class ResourceBundle { return getBundleImpl(baseName, targetLocale, caller, loader, control); } - private static Control getDefaultControl(Class caller, String baseName) { - if (providers != null && !caller.getModule().isNamed()) { - for (ResourceBundleControlProvider provider : providers) { - Control control = provider.getControl(baseName); - if (control != null) { - return control; - } - } - } - return Control.INSTANCE; - } - private static void checkNamedModule(Class caller) { if (caller.getModule().isNamed()) { throw new UnsupportedOperationException( @@ -2573,8 +2529,7 @@ public abstract class ResourceBundle { * @apiNote {@code ResourceBundle.Control} is not supported * in named modules. If the {@code ResourceBundle.getBundle} method with * a {@code ResourceBundle.Control} is called in a named module, the method - * will throw an {@link UnsupportedOperationException}. Any service providers - * of {@link ResourceBundleControlProvider} are ignored in named modules. + * will throw an {@link UnsupportedOperationException}. * * @since 1.6 * @see java.util.spi.ResourceBundleProvider diff --git a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java b/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java index 3005df43167..8d383f8078c 100644 --- a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java +++ b/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleControlProvider.java @@ -35,21 +35,19 @@ import java.util.ResourceBundle; * no {@link java.util.ResourceBundle.Control} instance can be modified with {@code * ResourceBundleControlProvider} implementations. * - *

Provider implementations must be packaged using the Java Extension - * Mechanism as installed extensions. Refer to {@link java.util.ServiceLoader} - * for the extension packaging. Any installed {@code - * ResourceBundleControlProvider} implementations are loaded using {@link - * java.util.ServiceLoader} at the {@code ResourceBundle} class loading time. - * - *

All {@code ResourceBundleControlProvider}s are ignored in named modules. - * * @author Masayoshi Okutsu * @since 1.8 * @see ResourceBundle#getBundle(String, java.util.Locale, ClassLoader, ResourceBundle.Control) * ResourceBundle.getBundle * @see java.util.ServiceLoader#loadInstalled(Class) + * @deprecated There is no longer any mechanism to install a custom + * {@code ResourceBundleControlProvider} implementation defined + * by the platform class loader or its ancestor. The recommended + * way to use a custom {@code Control} implementation to load resource bundle + * is to use {@link java.util.ResourceBundle#getBundle(String, Control)} + * or other factory methods that take custom {@link java.util.ResourceBundle.Control}. */ +@Deprecated(since="9", forRemoval=true) public interface ResourceBundleControlProvider { /** * Returns a {@code ResourceBundle.Control} instance that is used diff --git a/jdk/src/java.base/share/classes/java/util/stream/Collectors.java b/jdk/src/java.base/share/classes/java/util/stream/Collectors.java index 8a53a27589e..17c743a9064 100644 --- a/jdk/src/java.base/share/classes/java/util/stream/Collectors.java +++ b/jdk/src/java.base/share/classes/java/util/stream/Collectors.java @@ -1268,10 +1268,16 @@ public final class Collectors { * to a {@code Predicate}, and organizes them into a * {@code Map>}. * + * The returned {@code Map} always contains mappings for both + * {@code false} and {@code true} keys. * There are no guarantees on the type, mutability, * serializability, or thread-safety of the {@code Map} or {@code List} * returned. * + * @apiNote + * If a partition has no elements, its value in the result Map will be + * an empty List. + * * @param the type of the input elements * @param predicate a predicate used for classifying input elements * @return a {@code Collector} implementing the partitioning operation @@ -1290,9 +1296,17 @@ public final class Collectors { * {@code Map} whose values are the result of the downstream * reduction. * - *

There are no guarantees on the type, mutability, + *

+ * The returned {@code Map} always contains mappings for both + * {@code false} and {@code true} keys. + * There are no guarantees on the type, mutability, * serializability, or thread-safety of the {@code Map} returned. * + * @apiNote + * If a partition has no elements, its value in the result Map will be + * obtained by calling the downstream collector's supplier function and then + * applying the finisher function. + * * @param the type of the input elements * @param the intermediate accumulation type of the downstream collector * @param the result type of the downstream reduction diff --git a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java index 4c3ba78f676..48ca2b01994 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java +++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java @@ -611,6 +611,10 @@ public class Cipher { return getInstance(transformation, p); } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Returns a {@code Cipher} object that implements the specified * transformation. @@ -1278,7 +1282,7 @@ public class Cipher { if (!skipDebug && pdebug != null) { pdebug.println("Cipher." + transformation + " " + getOpmodeString(opmode) + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -1421,7 +1425,7 @@ public class Cipher { if (!skipDebug && pdebug != null) { pdebug.println("Cipher." + transformation + " " + getOpmodeString(opmode) + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -1564,7 +1568,7 @@ public class Cipher { if (!skipDebug && pdebug != null) { pdebug.println("Cipher." + transformation + " " + getOpmodeString(opmode) + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -1754,7 +1758,7 @@ public class Cipher { if (!skipDebug && pdebug != null) { pdebug.println("Cipher." + transformation + " " + getOpmodeString(opmode) + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java index be333ff1eb7..47449b3338c 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java +++ b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java @@ -484,7 +484,7 @@ public class KeyAgreement { if (!skipDebug && pdebug != null) { pdebug.println("KeyAgreement." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -517,6 +517,10 @@ public class KeyAgreement { init(key, params, JceSecurity.RANDOM); } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Initializes this key agreement with the given key, set of * algorithm parameters, and source of randomness. @@ -545,7 +549,7 @@ public class KeyAgreement { if (!skipDebug && pdebug != null) { pdebug.println("KeyAgreement." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java index a5277d8bb6f..4cb8b79be23 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java +++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java @@ -154,7 +154,7 @@ public class KeyGenerator { if (!skipDebug && pdebug != null) { pdebug.println("KeyGenerator." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -172,10 +172,14 @@ public class KeyGenerator { if (!skipDebug && pdebug != null) { pdebug.println("KeyGenerator." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Returns the algorithm name of this {@code KeyGenerator} object. * diff --git a/jdk/src/java.base/share/classes/javax/crypto/Mac.java b/jdk/src/java.base/share/classes/javax/crypto/Mac.java index 97cd19a197a..5a1d12de4c6 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/Mac.java +++ b/jdk/src/java.base/share/classes/javax/crypto/Mac.java @@ -415,6 +415,10 @@ public class Mac implements Cloneable { return spi.engineGetMacLength(); } + private String getProviderName() { + return (provider == null) ? "(no provider)" : provider.getName(); + } + /** * Initializes this {@code Mac} object with the given key. * @@ -437,7 +441,7 @@ public class Mac implements Cloneable { if (!skipDebug && pdebug != null) { pdebug.println("Mac." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } @@ -464,7 +468,7 @@ public class Mac implements Cloneable { if (!skipDebug && pdebug != null) { pdebug.println("Mac." + algorithm + " algorithm from: " + - this.provider.getName()); + getProviderName()); } } diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java index 300265cbcd4..2c724f73a67 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java @@ -27,6 +27,8 @@ package javax.net.ssl; import java.nio.ByteBuffer; import java.nio.ReadOnlyBufferException; +import java.util.List; +import java.util.function.BiFunction; /** @@ -1332,4 +1334,89 @@ public abstract class SSLEngine { public String getHandshakeApplicationProtocol() { throw new UnsupportedOperationException(); } + + /** + * Registers a callback function that selects an application protocol + * value for a SSL/TLS/DTLS handshake. + * The function overrides any values set using + * {@link SSLParameters#setApplicationProtocols + * SSLParameters.setApplicationProtocols} and it supports the following + * type parameters: + *

+ *
+ *
{@code SSLEngine} + *
The function's first argument allows the current {@code SSLEngine} + * to be inspected, including the handshake session and configuration + * settings. + *
{@code List} + *
The function's second argument lists the application protocol names + * advertised by the TLS peer. + *
{@code String} + *
The function's result is an application protocol name, or null to + * indicate that none of the advertised names are acceptable. + * If the return value is null (no value chosen) or is a value that + * was not advertised by the peer, the underlying protocol will + * determine what action to take. (For example, ALPN will send a + * "no_application_protocol" alert and terminate the connection.) + *
+ *
+ * + * For example, the following call registers a callback function that + * examines the TLS handshake parameters and selects an application protocol + * name: + * 
{@code
+     *     serverEngine.setHandshakeApplicationProtocolSelector(
+     *         (serverEngine, clientProtocols) -> {
+     *             SSLSession session = serverEngine.getHandshakeSession();
+     *             return chooseApplicationProtocol(
+     *                 serverEngine,
+     *                 clientProtocols,
+     *                 session.getProtocol(),
+     *                 session.getCipherSuite());
+     *         });
+     * }
+ * + * @apiNote + * This method should be called by TLS server applications before the TLS + * handshake begins. Also, this {@code SSLEngine} should be configured with + * parameters that are compatible with the application protocol selected by + * the callback function. For example, enabling a poor choice of cipher + * suites could result in no suitable application protocol. + * See {@link SSLParameters}. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @param selector the callback function, or null to disable the callback + * functionality. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + throw new UnsupportedOperationException(); + } + + /** + * Retrieves the callback function that selects an application protocol + * value during a SSL/TLS/DTLS handshake. + * See {@link #setHandshakeApplicationProtocolSelector + * setHandshakeApplicationProtocolSelector} + * for the function's type parameters. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @return the callback function, or null if none has been set. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public BiFunction, String> + getHandshakeApplicationProtocolSelector() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java index daaefe08ec7..ebbc9d9eb8d 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java @@ -28,6 +28,8 @@ package javax.net.ssl; import java.io.IOException; import java.net.*; +import java.util.List; +import java.util.function.BiFunction; /** * This class extends Sockets and provides secure @@ -742,4 +744,89 @@ public abstract class SSLSocket extends Socket public String getHandshakeApplicationProtocol() { throw new UnsupportedOperationException(); } + + + /** + * Registers a callback function that selects an application protocol + * value for a SSL/TLS/DTLS handshake. + * The function overrides any values set using + * {@link SSLParameters#setApplicationProtocols + * SSLParameters.setApplicationProtocols} and it supports the following + * type parameters: + *
+ *
+ *
{@code SSLSocket} + *
The function's first argument allows the current {@code SSLSocket} + * to be inspected, including the handshake session and configuration + * settings. + *
{@code List} + *
The function's second argument lists the application protocol names + * advertised by the TLS peer. + *
{@code String} + *
The function's result is an application protocol name, or null to + * indicate that none of the advertised names are acceptable. + * If the return value is null (no value chosen) or is a value that + * was not advertised by the peer, the underlying protocol will + * determine what action to take. (For example, ALPN will send a + * "no_application_protocol" alert and terminate the connection.) + *
+ *
+ * + * For example, the following call registers a callback function that + * examines the TLS handshake parameters and selects an application protocol + * name: + * 
{@code
+     *     serverSocket.setHandshakeApplicationProtocolSelector(
+     *         (serverSocket, clientProtocols) -> {
+     *             SSLSession session = serverSocket.getHandshakeSession();
+     *             return chooseApplicationProtocol(
+     *                 serverSocket,
+     *                 clientProtocols,
+     *                 session.getProtocol(),
+     *                 session.getCipherSuite());
+     *         });
+     * }
+ * + * @apiNote + * This method should be called by TLS server applications before the TLS + * handshake begins. Also, this {@code SSLSocket} should be configured with + * parameters that are compatible with the application protocol selected by + * the callback function. For example, enabling a poor choice of cipher + * suites could result in no suitable application protocol. + * See {@link SSLParameters}. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @param selector the callback function, or null to de-register. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + throw new UnsupportedOperationException(); + } + + /** + * Retrieves the callback function that selects an application protocol + * value during a SSL/TLS/DTLS handshake. + * See {@link #setHandshakeApplicationProtocolSelector + * setHandshakeApplicationProtocolSelector} + * for the function's type parameters. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @return the callback function, or null if none has been set. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public BiFunction, String> + getHandshakeApplicationProtocolSelector() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java index d979f984da3..1284a3f129f 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java @@ -64,8 +64,10 @@ public class StringSharingDecompressor implements ResourceDecompressor { private static final int CONSTANT_MethodHandle = 15; private static final int CONSTANT_MethodType = 16; private static final int CONSTANT_InvokeDynamic = 18; + private static final int CONSTANT_Module = 19; + private static final int CONSTANT_Package = 20; - private static final int[] SIZES = new int[20]; + private static final int[] SIZES = new int[21]; static { @@ -83,6 +85,8 @@ public class StringSharingDecompressor implements ResourceDecompressor { SIZES[CONSTANT_MethodHandle] = 3; SIZES[CONSTANT_MethodType] = 2; SIZES[CONSTANT_InvokeDynamic] = 4; + SIZES[CONSTANT_Module] = 2; + SIZES[CONSTANT_Package] = 2; } public static int[] getSizes() { diff --git a/jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java b/jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java index 01cece15ca7..34e99dfdd9b 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jmod/JmodFile.java @@ -31,7 +31,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Iterator; +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -70,12 +73,13 @@ public class JmodFile implements AutoCloseable { * JMOD sections */ public static enum Section { - NATIVE_LIBS("native"), - NATIVE_CMDS("bin"), CLASSES("classes"), CONFIG("conf"), HEADER_FILES("include"), - MAN_PAGES("man"); + LEGAL_NOTICES("legal"), + MAN_PAGES("man"), + NATIVE_LIBS("native"), + NATIVE_CMDS("bin"); private final String jmodDir; private Section(String jmodDir) { @@ -87,7 +91,6 @@ public class JmodFile implements AutoCloseable { * this section */ public String jmodDir() { return jmodDir; } - } /** @@ -109,7 +112,7 @@ public class JmodFile implements AutoCloseable { } this.zipEntry = e; - this.section = section(name); + this.section = section(name.substring(0, i)); this.name = name.substring(i+1); } @@ -143,26 +146,21 @@ public class JmodFile implements AutoCloseable { return section.jmodDir() + "/" + name; } + /* + * A map from the jmodDir name to Section + */ + static final Map NAME_TO_SECTION = + Arrays.stream(Section.values()) + .collect(Collectors.toMap(Section::jmodDir, Function.identity())); + static Section section(String name) { - int i = name.indexOf('/'); - String s = name.substring(0, i); - switch (s) { - case "native": - return Section.NATIVE_LIBS; - case "bin": - return Section.NATIVE_CMDS; - case "classes": - return Section.CLASSES; - case "conf": - return Section.CONFIG; - case "include": - return Section.HEADER_FILES; - case "man": - return Section.MAN_PAGES; - default: - throw new IllegalArgumentException("invalid section: " + s); + if (!NAME_TO_SECTION.containsKey(name)) { + throw new IllegalArgumentException("invalid section: " + name); + } + return NAME_TO_SECTION.get(name); } + } private final Path file; diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java index d0b1c19232f..eed7a2d2aff 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java @@ -38,10 +38,8 @@ import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.net.URI; import java.nio.file.Path; -import java.util.Map; import java.util.Collection; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -59,21 +57,28 @@ public interface JavaLangModuleAccess { * @param strict * Indicates whether module names are checked or not */ - ModuleDescriptor.Builder newModuleBuilder(String mn, boolean strict); + ModuleDescriptor.Builder newModuleBuilder(String mn, + boolean strict, + boolean open, + boolean synthetic); /** - * Creates a builder for building an open module with the given module name. - * - * @param strict - * Indicates whether module names are checked or not + * Returns the set of packages that are exported (unconditionally or + * unconditionally). */ - ModuleDescriptor.Builder newOpenModuleBuilder(String mn, boolean strict); + Set exportedPackages(ModuleDescriptor.Builder builder); + + /** + * Returns the set of packages that are opened (unconditionally or + * unconditionally). + */ + Set openPackages(ModuleDescriptor.Builder builder); /** * Returns a {@code ModuleDescriptor.Requires} of the given modifiers * and module name. */ - Requires newRequires(Set ms, String mn); + Requires newRequires(Set ms, String mn, Version v); /** * Returns an unqualified {@code ModuleDescriptor.Exports} @@ -122,6 +127,7 @@ public interface JavaLangModuleAccess { * Returns a new {@code ModuleDescriptor} instance. */ ModuleDescriptor newModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -130,20 +136,13 @@ public interface JavaLangModuleAccess { Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode); - /** - * Returns the object with the hashes of other modules - */ - Optional hashes(ModuleDescriptor descriptor); - /** * Resolves a collection of root modules, with service binding * and the empty configuration as the parent. The post resolution @@ -154,18 +153,4 @@ public interface JavaLangModuleAccess { boolean check, PrintStream traceOutput); - /** - * Creates a ModuleReference to a "patched" module. - */ - ModuleReference newPatchedModule(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier); - - /** - * Creates a ModuleFinder for a module path. - */ - ModuleFinder newModulePath(Runtime.Version version, - boolean isLinkPhase, - Path... entries); - } diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java index 55772793111..7bf6a1f3977 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java @@ -123,4 +123,12 @@ public interface JavaLangReflectModuleAccess { * given class loader. */ Stream layers(ClassLoader loader); + + /** + * Tests if a module exports a package at least {@code other} via its + * module declaration. + * + * @apiNote This is a temporary method for debugging features. + */ + boolean isStaticallyExported(Module module, String pn, Module other); } \ No newline at end of file diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java b/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java index 961dd08f28e..2ef9c11d248 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java @@ -30,11 +30,8 @@ import java.lang.module.ModuleDescriptor.Opens; import java.lang.module.ModuleDescriptor.Provides; import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Version; -import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import jdk.internal.misc.JavaLangModuleAccess; @@ -52,7 +49,7 @@ import jdk.internal.misc.SharedSecrets; * SystemModules should contain modules for the boot layer. */ final class Builder { - private static final JavaLangModuleAccess jlma = + private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); // Static cache of the most recently seen Version to cheaply deduplicate @@ -60,13 +57,36 @@ final class Builder { static Version cachedVersion; /** - * Returns a {@link Requires} for a dependence on a module - * with the given (and possibly empty) set of modifiers. + * Returns a {@link Requires} for a dependence on a module with the given + * (and possibly empty) set of modifiers, and optionally the version + * recorded at compile time. + */ + public static Requires newRequires(Set mods, + String mn, + String compiledVersion) + { + Version version = null; + if (compiledVersion != null) { + // use the cached version if the same version string + Version ver = cachedVersion; + if (ver != null && compiledVersion.equals(ver.toString())) { + version = ver; + } else { + version = Version.parse(compiledVersion); + } + } + return JLMA.newRequires(mods, mn, version); + } + + /** + * Returns a {@link Requires} for a dependence on a module with the given + * (and possibly empty) set of modifiers, and optionally the version + * recorded at compile time. */ public static Requires newRequires(Set mods, String mn) { - return jlma.newRequires(mods, mn); + return newRequires(mods, mn, null); } /** @@ -77,7 +97,7 @@ final class Builder { public static Exports newExports(Set ms, String pn, Set targets) { - return jlma.newExports(ms, pn, targets); + return JLMA.newExports(ms, pn, targets); } /** @@ -85,7 +105,7 @@ final class Builder { * modifiers. */ public static Opens newOpens(Set ms, String pn) { - return jlma.newOpens(ms, pn); + return JLMA.newOpens(ms, pn); } /** @@ -96,7 +116,7 @@ final class Builder { public static Opens newOpens(Set ms, String pn, Set targets) { - return jlma.newOpens(ms, pn, targets); + return JLMA.newOpens(ms, pn, targets); } /** @@ -104,7 +124,7 @@ final class Builder { * of modifiers. */ public static Exports newExports(Set ms, String pn) { - return jlma.newExports(ms, pn); + return JLMA.newExports(ms, pn); } /** @@ -112,7 +132,7 @@ final class Builder { * implementation classes. */ public static Provides newProvides(String st, List pcs) { - return jlma.newProvides(st, pcs); + return JLMA.newProvides(st, pcs); } final String name; @@ -130,8 +150,6 @@ final class Builder { String osName; String osArch; String osVersion; - String algorithm; - Map hashes; Builder(String name) { this.name = name; @@ -274,35 +292,14 @@ final class Builder { return this; } - /** - * Sets the algorithm of the module hashes - */ - public Builder algorithm(String algorithm) { - this.algorithm = algorithm; - return this; - } - - /** - * Sets the module hash for the given module name - */ - public Builder moduleHash(String mn, byte[] hash) { - if (hashes == null) - hashes = new HashMap<>(); - - hashes.put(mn, hash); - return this; - } - /** * Builds a {@code ModuleDescriptor} from the components. */ public ModuleDescriptor build(int hashCode) { assert name != null; - ModuleHashes moduleHashes = - hashes != null ? new ModuleHashes(algorithm, hashes) : null; - - return jlma.newModuleDescriptor(name, + return JLMA.newModuleDescriptor(name, + version, open, automatic, synthetic, @@ -311,13 +308,11 @@ final class Builder { opens, uses, provides, - version, + packages, mainClass, osName, osArch, osVersion, - packages, - moduleHashes, hashCode); } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java b/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java index 9f02048b5c8..2fdeaab6211 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java @@ -25,79 +25,200 @@ package jdk.internal.module; +/** + * Utility class for checking module name and binary names. + */ + public final class Checks { private Checks() { } - private static void fail(String what, String id, int i) { - throw new IllegalArgumentException(id - + ": Invalid " + what + ": " - + " Illegal character" - + " at index " + i); + /** + * Checks a name to ensure that it's a legal module name. + * + * @throws IllegalArgumentException if name is null or not a legal + * module name + */ + public static String requireModuleName(String name) { + if (name == null) + throw new IllegalArgumentException("Null module name"); + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) { + String id = name.substring(off, next); + throw new IllegalArgumentException(name + ": Invalid module name" + + ": '" + id + "' is not a Java identifier"); + } + off = next+1; + } + int last = isJavaIdentifier(name, off, name.length() - off); + if (last == -1) { + String id = name.substring(off); + throw new IllegalArgumentException(name + ": Invalid module name" + + ": '" + id + "' is not a Java identifier"); + } + //if (!Character.isJavaIdentifierStart(last)) + // throw new IllegalArgumentException(name + ": Module name ends in digit"); + return name; } /** - * Returns {@code true} if the given identifier is a legal Java identifier. + * Returns {@code true} if the given name is a legal module name. */ - public static boolean isJavaIdentifier(String id) { - int n = id.length(); - if (n == 0) - return false; - if (!Character.isJavaIdentifierStart(id.codePointAt(0))) - return false; - int cp = id.codePointAt(0); - int i = Character.charCount(cp); - for (; i < n; i += Character.charCount(cp)) { - cp = id.codePointAt(i); - if (!Character.isJavaIdentifierPart(cp) && id.charAt(i) != '.') + public static boolean isModuleName(String name) { + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) return false; + off = next+1; } - if (cp == '.') + int last = isJavaIdentifier(name, off, name.length() - off); + if (last == -1) return false; - + //if (!Character.isJavaIdentifierStart(last)) + // return false; return true; } /** - * Checks if a given identifier is a legal Java identifier. + * Checks a name to ensure that it's a legal package name. + * + * @throws IllegalArgumentException if name is null or not a legal + * package name */ - public static String requireJavaIdentifier(String what, String id) { - if (id == null) - throw new IllegalArgumentException("Null " + what); - int n = id.length(); - if (n == 0) - throw new IllegalArgumentException("Empty " + what); - if (!Character.isJavaIdentifierStart(id.codePointAt(0))) - fail(what, id, 0); - int cp = id.codePointAt(0); - int i = Character.charCount(cp); - int last = 0; - for (; i < n; i += Character.charCount(cp)) { - cp = id.codePointAt(i); - if (!Character.isJavaIdentifierPart(cp) && id.charAt(i) != '.') - fail(what, id, i); - last = i; + public static String requirePackageName(String name) { + return requireBinaryName("package name", name); + } + + /** + * Checks a name to ensure that it's a legal type name. + * + * @throws IllegalArgumentException if name is null or not a legal + * type name + */ + public static String requireServiceTypeName(String name) { + return requireBinaryName("service type name", name); + } + + /** + * Checks a name to ensure that it's a legal type name. + * + * @throws IllegalArgumentException if name is null or not a legal + * type name + */ + public static String requireServiceProviderName(String name) { + return requireBinaryName("service provider name", name); + } + + /** + * Returns {@code true} if the given name is a legal binary name. + */ + public static boolean isJavaIdentifier(String name) { + return isBinaryName(name); + } + + /** + * Returns {@code true} if the given name is a legal binary name. + */ + public static boolean isBinaryName(String name) { + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) + return false; + off = next+1; } - if (cp == '.') - fail(what, id, last); - - return id; + int count = name.length() - off; + return (isJavaIdentifier(name, off, count) != -1); } - public static String requireModuleName(String id) { - return requireJavaIdentifier("module name", id); + /** + * Checks if the given name is a legal binary name. + * + * @throws IllegalArgumentException if name is null or not a legal + * binary name + */ + public static String requireBinaryName(String what, String name) { + if (name == null) + throw new IllegalArgumentException("Null " + what); + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) { + String id = name.substring(off, next); + throw new IllegalArgumentException(name + ": Invalid " + what + + ": '" + id + "' is not a Java identifier"); + } + off = next + 1; + } + if (isJavaIdentifier(name, off, name.length() - off) == -1) { + String id = name.substring(off, name.length()); + throw new IllegalArgumentException(name + ": Invalid " + what + + ": '" + id + "' is not a Java identifier"); + } + return name; } - public static String requirePackageName(String id) { - return requireJavaIdentifier("package name", id); + /** + * Returns {@code true} if the last character of the given name is legal + * as the last character of a module name. + * + * @throws IllegalArgumentException if name is empty + */ + public static boolean hasLegalModuleNameLastCharacter(String name) { + if (name.isEmpty()) + throw new IllegalArgumentException("name is empty"); + int len = name.length(); + if (isASCIIString(name)) { + char c = name.charAt(len-1); + return Character.isJavaIdentifierStart(c); + } else { + int i = 0; + int cp = -1; + while (i < len) { + cp = name.codePointAt(i); + i += Character.charCount(cp); + } + return Character.isJavaIdentifierStart(cp); + } } - public static String requireServiceTypeName(String id) { - return requireJavaIdentifier("service type name", id); + /** + * Returns true if the given string only contains ASCII characters. + */ + private static boolean isASCIIString(String s) { + int i = 0; + while (i < s.length()) { + int c = s.charAt(i); + if (c > 0x7F) + return false; + i++; + } + return true; } - public static String requireServiceProviderName(String id) { - return requireJavaIdentifier("service provider name", id); - } + /** + * Checks if a char sequence is a legal Java identifier, returning the code + * point of the last character if legal or {@code -1} if not legal. + */ + private static int isJavaIdentifier(CharSequence cs, int offset, int count) { + if (count == 0) + return -1; + int first = Character.codePointAt(cs, offset); + if (!Character.isJavaIdentifierStart(first)) + return -1; + int cp = first; + int i = Character.charCount(first); + while (i < count) { + cp = Character.codePointAt(cs, offset+i); + if (!Character.isJavaIdentifierPart(cp)) + return -1; + i += Character.charCount(cp); + } + + return cp; + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java b/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java index 908b137eb5a..69c7ee670dd 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java @@ -68,12 +68,18 @@ public final class ClassFileAttributes { = SharedSecrets.getJavaLangModuleAccess(); private ModuleDescriptor descriptor; + private Version replacementVersion; public ModuleAttribute(ModuleDescriptor descriptor) { super(MODULE); this.descriptor = descriptor; } + public ModuleAttribute(Version v) { + super(MODULE); + this.replacementVersion = v; + } + public ModuleAttribute() { super(MODULE); } @@ -86,46 +92,70 @@ public final class ClassFileAttributes { int codeOff, Label[] labels) { - ModuleAttribute attr = new ModuleAttribute(); - - // module_name - String mn = cr.readUTF8(off, buf).replace('/', '.'); + // module_name (CONSTANT_Module_info) + String mn = cr.readModule(off, buf); off += 2; // module_flags int module_flags = cr.readUnsignedShort(off); boolean open = ((module_flags & ACC_OPEN) != 0); + boolean synthetic = ((module_flags & ACC_SYNTHETIC) != 0); off += 2; - ModuleDescriptor.Builder builder; - if (open) { - builder = JLMA.newOpenModuleBuilder(mn, false); - } else { - builder = JLMA.newModuleBuilder(mn, false); + ModuleDescriptor.Builder builder = JLMA.newModuleBuilder(mn, + false, + open, + synthetic); + + // module_version + String module_version = cr.readUTF8(off, buf); + off += 2; + if (replacementVersion != null) { + builder.version(replacementVersion); + } else if (module_version != null) { + builder.version(module_version); } // requires_count and requires[requires_count] int requires_count = cr.readUnsignedShort(off); off += 2; for (int i=0; i mods; - if (flags == 0) { + if (requires_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_TRANSITIVE) != 0) + if ((requires_flags & ACC_TRANSITIVE) != 0) mods.add(Requires.Modifier.TRANSITIVE); - if ((flags & ACC_STATIC_PHASE) != 0) + if ((requires_flags & ACC_STATIC_PHASE) != 0) mods.add(Requires.Modifier.STATIC); - if ((flags & ACC_SYNTHETIC) != 0) + if ((requires_flags & ACC_SYNTHETIC) != 0) mods.add(Requires.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((requires_flags & ACC_MANDATED) != 0) mods.add(Requires.Modifier.MANDATED); } - builder.requires(mods, dn); - off += 4; + + + // requires_version + Version compiledVersion = null; + String requires_version = cr.readUTF8(off, buf); + off += 2; + if (requires_version != null) { + compiledVersion = Version.parse(requires_version); + } + + if (compiledVersion == null) { + builder.requires(mods, dn); + } else { + builder.requires(mods, dn, compiledVersion); + } } // exports_count and exports[exports_count] @@ -133,19 +163,20 @@ public final class ClassFileAttributes { off += 2; if (exports_count > 0) { for (int i=0; i mods; - if (flags == 0) { + if (exports_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((exports_flags & ACC_SYNTHETIC) != 0) mods.add(Exports.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((exports_flags & ACC_MANDATED) != 0) mods.add(Exports.Modifier.MANDATED); } @@ -154,7 +185,7 @@ public final class ClassFileAttributes { if (exports_to_count > 0) { Set targets = new HashSet<>(); for (int j=0; j 0) { for (int i=0; i mods; - if (flags == 0) { + if (opens_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((opens_flags & ACC_SYNTHETIC) != 0) mods.add(Opens.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((opens_flags & ACC_MANDATED) != 0) mods.add(Opens.Modifier.MANDATED); } @@ -191,7 +223,7 @@ public final class ClassFileAttributes { if (opens_to_count > 0) { Set targets = new HashSet<>(); for (int j=0; j ts = e.targets(); attr.putShort(ts.size()); - ts.forEach(t -> attr.putShort(cw.newUTF8(t.replace('.', '/')))); + ts.forEach(target -> attr.putShort(cw.newModule(target))); } else { attr.putShort(0); } } - // opens_counts and opens[opens_counts] attr.putShort(descriptor.opens().size()); for (Opens obj : descriptor.opens()) { String pkg = obj.source().replace('.', '/'); - attr.putShort(cw.newUTF8(pkg)); + attr.putShort(cw.newPackage(pkg)); - int flags = 0; + int opens_flags = 0; if (obj.modifiers().contains(Opens.Modifier.SYNTHETIC)) - flags |= ACC_SYNTHETIC; + opens_flags |= ACC_SYNTHETIC; if (obj.modifiers().contains(Opens.Modifier.MANDATED)) - flags |= ACC_MANDATED; - attr.putShort(flags); + opens_flags |= ACC_MANDATED; + attr.putShort(opens_flags); if (obj.isQualified()) { Set ts = obj.targets(); attr.putShort(ts.size()); - ts.forEach(t -> attr.putShort(cw.newUTF8(t.replace('.', '/')))); + ts.forEach(target -> attr.putShort(cw.newModule(target))); } else { attr.putShort(0); } @@ -369,7 +417,7 @@ public final class ClassFileAttributes { * * // the number of entries in the packages table * u2 packages_count; - * { // index to CONSTANT_CONSTANT_utf8_info structure with the package name + * { // index to CONSTANT_Package_info structure with the package name * u2 package_index * } packages[package_count]; * @@ -402,7 +450,7 @@ public final class ClassFileAttributes { // packages Set packages = new HashSet<>(); for (int i=0; i p.replace('.', '/')) - .forEach(p -> attr.putShort(cw.newUTF8(p))); + .forEach(p -> attr.putShort(cw.newPackage(p))); return attr; } } - /** - * ModuleVersion attribute. - * - * 
 {@code
-     *
-     * ModuleVersion_attribute {
-     *   // index to CONSTANT_utf8_info structure in constant pool representing
-     *   // the string "ModuleVersion"
-     *   u2 attribute_name_index;
-     *   u4 attribute_length;
-     *
-     *   // index to CONSTANT_CONSTANT_utf8_info structure with the version
-     *   u2 version_index;
-     * }
-     *
-     * }
- */ - public static class ModuleVersionAttribute extends Attribute { - private final Version version; - - public ModuleVersionAttribute(Version version) { - super(MODULE_VERSION); - this.version = version; - } - - public ModuleVersionAttribute() { - this(null); - } - - @Override - protected Attribute read(ClassReader cr, - int off, - int len, - char[] buf, - int codeOff, - Label[] labels) - { - String value = cr.readUTF8(off, buf); - return new ModuleVersionAttribute(Version.parse(value)); - } - - @Override - protected ByteVector write(ClassWriter cw, - byte[] code, - int len, - int maxStack, - int maxLocals) - { - ByteVector attr = new ByteVector(); - int index = cw.newUTF8(version.toString()); - attr.putShort(index); - return attr; - } - } - /** * ModuleMainClass attribute. * @@ -526,7 +519,7 @@ public final class ClassFileAttributes { int codeOff, Label[] labels) { - String value = cr.readClass(off, buf); + String value = cr.readClass(off, buf).replace('/', '.'); return new ModuleMainClassAttribute(value); } @@ -538,7 +531,7 @@ public final class ClassFileAttributes { int maxLocals) { ByteVector attr = new ByteVector(); - int index = cw.newClass(mainClass); + int index = cw.newClass(mainClass.replace('.', '/')); attr.putShort(index); return attr; } @@ -555,11 +548,11 @@ public final class ClassFileAttributes { * u2 attribute_name_index; * u4 attribute_length; * - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS name + * // index to CONSTANT_utf8_info structure with the OS name * u2 os_name_index; - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS arch + * // index to CONSTANT_utf8_info structure with the OS arch * u2 os_arch_index - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS version + * // index to CONSTANT_utf8_info structure with the OS version * u2 os_version_index; * } * @@ -656,7 +649,7 @@ public final class ClassFileAttributes { * * // the number of entries in the hashes table * u2 hashes_count; - * { u2 module_name_index + * { u2 module_name_index (index to CONSTANT_Module_info structure) * u2 hash_length; * u1 hash[hash_length]; * } hashes[hashes_count]; @@ -691,7 +684,7 @@ public final class ClassFileAttributes { Map map = new HashMap<>(); for (int i=0; i !ModuleResolution.doNotResolveByDefault(mref)) .map(ModuleReference::descriptor) .map(ModuleDescriptor::name) .filter(mn -> f.find(mn).isPresent()) // observable @@ -277,6 +283,8 @@ public final class ModuleBootstrap { // time to create configuration PerfCounters.resolveTime.addElapsedTimeFrom(t3); + // check module names and incubating status + checkModuleNamesAndStatus(cf); // mapping of modules to class loaders Function clf = ModuleLoaderMap.mappingFunction(cf); @@ -298,8 +306,32 @@ public final class ModuleBootstrap { fail(name + ": cannot be loaded from application module path"); } } + + // check if module specified in --patch-module is present + for (String mn: patcher.patchedModules()) { + if (!cf.findModule(mn).isPresent()) { + warnUnknownModule(PATCH_MODULE, mn); + } + } } + // if needed check that there are no split packages in the set of + // resolved modules for the boot layer + if (SystemModules.hasSplitPackages() || needPostResolutionChecks) { + Map packageToModule = new HashMap<>(); + for (ResolvedModule resolvedModule : cf.modules()) { + ModuleDescriptor descriptor = + resolvedModule.reference().descriptor(); + String name = descriptor.name(); + for (String p : descriptor.packages()) { + String other = packageToModule.putIfAbsent(p, name); + if (other != null) { + fail("Package " + p + " in both module " + + name + " and module " + other); + } + } + } + } long t4 = System.nanoTime(); @@ -456,7 +488,7 @@ public final class ModuleBootstrap { String mn = e.getKey(); Optional om = bootLayer.findModule(mn); if (!om.isPresent()) { - warn("Unknown module: " + mn); + warnUnknownModule(ADD_READS, mn); continue; } Module m = om.get(); @@ -470,7 +502,7 @@ public final class ModuleBootstrap { if (om.isPresent()) { Modules.addReads(m, om.get()); } else { - warn("Unknown module: " + name); + warnUnknownModule(ADD_READS, name); } } } @@ -502,24 +534,25 @@ public final class ModuleBootstrap { Map> map, boolean opens) { + String option = opens ? ADD_OPENS : ADD_EXPORTS; for (Map.Entry> e : map.entrySet()) { // the key is $MODULE/$PACKAGE String key = e.getKey(); String[] s = key.split("/"); if (s.length != 2) - fail("Unable to parse: " + key); + fail(unableToParse(option, "/", key)); String mn = s[0]; String pn = s[1]; if (mn.isEmpty() || pn.isEmpty()) - fail("Module and package name must be specified:" + key); + fail(unableToParse(option, "/", key)); // The exporting module is in the boot layer Module m; Optional om = bootLayer.findModule(mn); if (!om.isPresent()) { - warn("Unknown module: " + mn); + warnUnknownModule(option, mn); continue; } @@ -541,7 +574,7 @@ public final class ModuleBootstrap { if (om.isPresent()) { other = om.get(); } else { - warn("Unknown module: " + name); + warnUnknownModule(option, name); continue; } } @@ -585,24 +618,30 @@ public final class ModuleBootstrap { int pos = value.indexOf('='); if (pos == -1) - fail("Unable to parse: " + value); + fail(unableToParse(option(prefix), "=", value)); if (pos == 0) - fail("Missing module name in: " + value); + fail(unableToParse(option(prefix), "=", value)); // key is or / String key = value.substring(0, pos); String rhs = value.substring(pos+1); if (rhs.isEmpty()) - fail("Unable to parse: " + value); + fail(unableToParse(option(prefix), "=", value)); // value is (,)* or ()* if (!allowDuplicates && map.containsKey(key)) - fail(key + " specified more than once"); + fail(key + " specified more than once in " + option(prefix)); List values = map.computeIfAbsent(key, k -> new ArrayList<>()); + int ntargets = 0; for (String s : rhs.split(regex)) { - if (s.length() > 0) values.add(s); + if (s.length() > 0) { + values.add(s); + ntargets++; + } } + if (ntargets == 0) + fail("Target must be specified: " + option(prefix) + " " + value); index++; value = getAndRemoveProperty(prefix + index); @@ -626,6 +665,33 @@ public final class ModuleBootstrap { return (String)System.getProperties().remove(key); } + /** + * Checks the names and resolution bit of each module in the configuration, + * emitting warnings if needed. + */ + private static void checkModuleNamesAndStatus(Configuration cf) { + String incubating = null; + for (ResolvedModule rm : cf.modules()) { + ModuleReference mref = rm.reference(); + String mn = mref.descriptor().name(); + + // emit warning if module name ends with a non-Java letter + if (!Checks.hasLegalModuleNameLastCharacter(mn)) + warn("Module name \"" + mn + "\" may soon be illegal"); + + // emit warning if the WARN_INCUBATING module resolution bit set + if (ModuleResolution.hasIncubatingWarning(mref)) { + if (incubating == null) { + incubating = mn; + } else { + incubating += ", " + mn; + } + } + } + if (incubating != null) + warn("Using incubator modules: " + incubating); + } + /** * Throws a RuntimeException with the given message */ @@ -637,6 +703,42 @@ public final class ModuleBootstrap { System.err.println("WARNING: " + m); } + static void warnUnknownModule(String option, String mn) { + warn("Unknown module: " + mn + " specified in " + option); + } + + static String unableToParse(String option, String text, String value) { + return "Unable to parse " + option + " " + text + ": " + value; + } + + private static final String ADD_MODULES = "--add-modules"; + private static final String ADD_EXPORTS = "--add-exports"; + private static final String ADD_OPENS = "--add-opens"; + private static final String ADD_READS = "--add-reads"; + private static final String PATCH_MODULE = "--patch-module"; + + + /* + * Returns the command-line option name corresponds to the specified + * system property prefix. + */ + static String option(String prefix) { + switch (prefix) { + case "jdk.module.addexports.": + return ADD_EXPORTS; + case "jdk.module.addopens.": + return ADD_OPENS; + case "jdk.module.addreads.": + return ADD_READS; + case "jdk.module.patch.": + return PATCH_MODULE; + case "jdk.module.addmods.": + return ADD_MODULES; + default: + throw new IllegalArgumentException(prefix); + } + } + static class PerfCounters { static PerfCounter systemModulesTime diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java index 107305e0c79..f4e5fcb9fe1 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java @@ -35,6 +35,7 @@ import java.security.NoSuchAlgorithmException; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -50,7 +51,6 @@ public final class ModuleHashes { byte[] generate(String algorithm); } - private final String algorithm; private final Map nameToHash; @@ -142,4 +142,37 @@ public final class ModuleHashes { } return new ModuleHashes(algorithm, nameToHash); } + + /** + * This is used by jdk.internal.module.SystemModules class + * generated at link time. + */ + public static class Builder { + final String algorithm; + final Map nameToHash; + + Builder(String algorithm, int initialCapacity) { + this.nameToHash = new HashMap<>(initialCapacity); + this.algorithm = Objects.requireNonNull(algorithm); + } + + /** + * Sets the module hash for the given module name + */ + public Builder hashForModule(String mn, byte[] hash) { + nameToHash.put(mn, hash); + return this; + } + + /** + * Builds a {@code ModuleHashes}. + */ + public ModuleHashes build() { + if (!nameToHash.isEmpty()) { + return new ModuleHashes(algorithm, nameToHash); + } else { + return null; + } + } + } } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java similarity index 69% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java index b1c82819aa9..3aac651577c 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java @@ -23,7 +23,7 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.DataInput; import java.io.DataInputStream; @@ -31,10 +31,13 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Builder; import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Exports; import java.lang.module.ModuleDescriptor.Opens; +import java.lang.module.ModuleDescriptor.Version; import java.nio.ByteBuffer; import java.nio.BufferUnderflowException; import java.util.ArrayList; @@ -46,7 +49,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import jdk.internal.module.ModuleHashes; +import jdk.internal.misc.JavaLangModuleAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModuleResolution; import static jdk.internal.module.ClassFileConstants.*; @@ -58,7 +63,10 @@ import static jdk.internal.module.ClassFileConstants.*; * and fine control over the throwing of InvalidModuleDescriptorException. */ -final class ModuleInfo { +public final class ModuleInfo { + + private static final JavaLangModuleAccess JLMA + = SharedSecrets.getJavaLangModuleAccess(); // supplies the set of packages when ModulePackages attribute not present private final Supplier> packageFinder; @@ -75,14 +83,42 @@ final class ModuleInfo { this(pf, true); } + /** + * A holder class for the ModuleDescriptor that is created by reading the + * Module and other standard class file attributes. It also holds the objects + * that represent the non-standard class file attributes that are read from + * the class file. + */ + public static final class Attributes { + private final ModuleDescriptor descriptor; + private final ModuleHashes recordedHashes; + private final ModuleResolution moduleResolution; + Attributes(ModuleDescriptor descriptor, + ModuleHashes recordedHashes, + ModuleResolution moduleResolution) { + this.descriptor = descriptor; + this.recordedHashes = recordedHashes; + this.moduleResolution = moduleResolution; + } + public ModuleDescriptor descriptor() { + return descriptor; + } + public ModuleHashes recordedHashes() { + return recordedHashes; + } + public ModuleResolution moduleResolution() { + return moduleResolution; + } + } + + /** * Reads a {@code module-info.class} from the given input stream. * * @throws InvalidModuleDescriptorException * @throws IOException */ - public static ModuleDescriptor read(InputStream in, - Supplier> pf) + public static Attributes read(InputStream in, Supplier> pf) throws IOException { try { @@ -100,9 +136,7 @@ final class ModuleInfo { * @throws InvalidModuleDescriptorException * @throws UncheckedIOException */ - public static ModuleDescriptor read(ByteBuffer bb, - Supplier> pf) - { + public static Attributes read(ByteBuffer bb, Supplier> pf) { try { return new ModuleInfo(pf).doRead(new DataInputWrapper(bb)); } catch (IllegalArgumentException | IllegalStateException e) { @@ -121,9 +155,7 @@ final class ModuleInfo { * @throws InvalidModuleDescriptorException * @throws UncheckedIOException */ - static ModuleDescriptor readIgnoringHashes(ByteBuffer bb, - Supplier> pf) - { + public static Attributes readIgnoringHashes(ByteBuffer bb, Supplier> pf) { try { return new ModuleInfo(pf, false).doRead(new DataInputWrapper(bb)); } catch (IllegalArgumentException | IllegalStateException e) { @@ -144,7 +176,7 @@ final class ModuleInfo { * because an identifier is not a legal Java identifier, duplicate * exports, and many other reasons */ - private ModuleDescriptor doRead(DataInput in) throws IOException { + private Attributes doRead(DataInput in) throws IOException { int magic = in.readInt(); if (magic != 0xCAFEBABE) @@ -163,8 +195,9 @@ final class ModuleInfo { throw invalidModuleDescriptor("access_flags should be ACC_MODULE"); int this_class = in.readUnsignedShort(); - if (this_class != 0) - throw invalidModuleDescriptor("this_class must be 0"); + String mn = cpool.getClassName(this_class); + if (!"module-info".equals(mn)) + throw invalidModuleDescriptor("this_class should be module-info"); int super_class = in.readUnsignedShort(); if (super_class > 0) @@ -189,10 +222,10 @@ final class ModuleInfo { Builder builder = null; Set packages = null; - String version = null; String mainClass = null; String[] osValues = null; ModuleHashes hashes = null; + ModuleResolution moduleResolution = null; for (int i = 0; i < attributes_count ; i++) { int name_index = in.readUnsignedShort(); @@ -215,10 +248,6 @@ final class ModuleInfo { packages = readModulePackagesAttribute(in, cpool); break; - case MODULE_VERSION : - version = readModuleVersionAttribute(in, cpool); - break; - case MODULE_MAIN_CLASS : mainClass = readModuleMainClassAttribute(in, cpool); break; @@ -235,6 +264,10 @@ final class ModuleInfo { } break; + case MODULE_RESOLUTION : + moduleResolution = readModuleResolution(in, cpool); + break; + default: if (isAttributeDisallowed(attribute_name)) { throw invalidModuleDescriptor(attribute_name @@ -263,23 +296,33 @@ final class ModuleInfo { usedPackageFinder = true; } if (packages != null) { - for (String pn : builder.exportedAndOpenPackages()) { - if (!packages.contains(pn)) { - String tail; - if (usedPackageFinder) { - tail = " not found by package finder"; - } else { - tail = " missing from ModulePackages attribute"; + Set exportedPackages = JLMA.exportedPackages(builder); + Set openPackages = JLMA.openPackages(builder); + if (packages.containsAll(exportedPackages) + && packages.containsAll(openPackages)) { + packages.removeAll(exportedPackages); + packages.removeAll(openPackages); + } else { + // the set of packages is not complete + Set exportedAndOpenPackages = new HashSet<>(); + exportedAndOpenPackages.addAll(exportedPackages); + exportedAndOpenPackages.addAll(openPackages); + for (String pn : exportedAndOpenPackages) { + if (!packages.contains(pn)) { + String tail; + if (usedPackageFinder) { + tail = " not found by package finder"; + } else { + tail = " missing from ModulePackages attribute"; + } + throw invalidModuleDescriptor("Package " + pn + tail); } - throw invalidModuleDescriptor("Package " + pn + tail); } - packages.remove(pn); + assert false; // should not get here } builder.contains(packages); } - if (version != null) - builder.version(version); if (mainClass != null) builder.mainClass(mainClass); if (osValues != null) { @@ -287,10 +330,9 @@ final class ModuleInfo { if (osValues[1] != null) builder.osArch(osValues[1]); if (osValues[2] != null) builder.osVersion(osValues[2]); } - if (hashes != null) - builder.hashes(hashes); - return builder.build(); + ModuleDescriptor descriptor = builder.build(); + return new Attributes(descriptor, hashes, moduleResolution); } /** @@ -302,38 +344,55 @@ final class ModuleInfo { { // module_name int module_name_index = in.readUnsignedShort(); - String mn = cpool.getUtf8AsBinaryName(module_name_index); - - Builder builder = new ModuleDescriptor.Builder(mn, /*strict*/ false); + String mn = cpool.getModuleName(module_name_index); int module_flags = in.readUnsignedShort(); boolean open = ((module_flags & ACC_OPEN) != 0); - if (open) - builder.open(true); - if ((module_flags & ACC_SYNTHETIC) != 0) - builder.synthetic(true); + boolean synthetic = ((module_flags & ACC_SYNTHETIC) != 0); + + Builder builder = JLMA.newModuleBuilder(mn, false, open, synthetic); + + int module_version_index = in.readUnsignedShort(); + if (module_version_index != 0) { + String vs = cpool.getUtf8(module_version_index); + builder.version(vs); + } int requires_count = in.readUnsignedShort(); boolean requiresJavaBase = false; for (int i=0; i mods; - if (flags == 0) { + if (requires_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_TRANSITIVE) != 0) + if ((requires_flags & ACC_TRANSITIVE) != 0) mods.add(Requires.Modifier.TRANSITIVE); - if ((flags & ACC_STATIC_PHASE) != 0) + if ((requires_flags & ACC_STATIC_PHASE) != 0) mods.add(Requires.Modifier.STATIC); - if ((flags & ACC_SYNTHETIC) != 0) + if ((requires_flags & ACC_SYNTHETIC) != 0) mods.add(Requires.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((requires_flags & ACC_MANDATED) != 0) mods.add(Requires.Modifier.MANDATED); } - builder.requires(mods, dn); + + int requires_version_index = in.readUnsignedShort(); + Version compiledVersion = null; + if (requires_version_index != 0) { + String vs = cpool.getUtf8(requires_version_index); + compiledVersion = Version.parse(vs); + } + + if (compiledVersion == null) { + builder.requires(mods, dn); + } else { + builder.requires(mods, dn, compiledVersion); + } + if (dn.equals("java.base")) requiresJavaBase = true; } @@ -350,18 +409,18 @@ final class ModuleInfo { int exports_count = in.readUnsignedShort(); if (exports_count > 0) { for (int i=0; i mods; - int flags = in.readUnsignedShort(); - if (flags == 0) { + int exports_flags = in.readUnsignedShort(); + if (exports_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((exports_flags & ACC_SYNTHETIC) != 0) mods.add(Exports.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((exports_flags & ACC_MANDATED) != 0) mods.add(Exports.Modifier.MANDATED); } @@ -370,7 +429,7 @@ final class ModuleInfo { Set targets = new HashSet<>(exports_to_count); for (int j=0; j mods; - int flags = in.readUnsignedShort(); - if (flags == 0) { + int opens_flags = in.readUnsignedShort(); + if (opens_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((opens_flags & ACC_SYNTHETIC) != 0) mods.add(Opens.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((opens_flags & ACC_MANDATED) != 0) mods.add(Opens.Modifier.MANDATED); } @@ -406,7 +465,7 @@ final class ModuleInfo { Set targets = new HashSet<>(open_to_count); for (int j=0; j 0) { for (int i=0; i 0) { for (int i=0; i providers = new ArrayList<>(with_count); for (int j=0; j packages = new HashSet<>(package_count); for (int i=0; i map = new HashMap<>(hash_count); for (int i=0; i binary name } - String getClassNameAsBinaryName(int index) { - String value = getClassName(index); + String getPackageName(int index) { + checkIndex(index); + Entry e = pool[index]; + if (e.tag != CONSTANT_Package) { + throw invalidModuleDescriptor("CONSTANT_Package expected at entry: " + + index); + } + String value = getUtf8(((IndexEntry) e).index); + checkUnqualifiedName("CONSTANT_Package", index, value); return value.replace('/', '.'); // internal form -> binary name } + String getModuleName(int index) { + checkIndex(index); + Entry e = pool[index]; + if (e.tag != CONSTANT_Module) { + throw invalidModuleDescriptor("CONSTANT_Module expected at entry: " + + index); + } + String value = getUtf8(((IndexEntry) e).index); + return decodeModuleName(index, value); + } + String getUtf8(int index) { checkIndex(index); Entry e = pool[index]; @@ -733,15 +835,103 @@ final class ModuleInfo { return (String) (((ValueEntry) e).value); } - String getUtf8AsBinaryName(int index) { - String value = getUtf8(index); - return value.replace('/', '.'); // internal -> binary name - } - void checkIndex(int index) { if (index < 1 || index >= pool.length) throw invalidModuleDescriptor("Index into constant pool out of range"); } + + void checkUnqualifiedName(String what, int index, String value) { + int len = value.length(); + if (len == 0) { + throw invalidModuleDescriptor(what + " at entry " + index + + " has zero length"); + } + for (int i=0; i= len) { + throw invalidModuleDescriptor("CONSTANT_Module at entry " + + index + " has illegal " + + "escape sequence"); + } + int next = value.codePointAt(j); + if (next != '\\' && next != ':' && next != '@') { + throw invalidModuleDescriptor("CONSTANT_Module at entry " + + index + " has illegal " + + "escape sequence"); + } + sb.appendCodePoint(next); + i += Character.charCount(next); + } else { + sb.appendCodePoint(cp); + } + + i += Character.charCount(cp); + } + return sb.toString(); + } } /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java index 07bb40205cf..952a328b71b 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java @@ -70,6 +70,9 @@ public final class ModuleInfoExtender { // the hashes for the Hashes attribute private ModuleHashes hashes; + // the value of the ModuleResolution attribute + private ModuleResolution moduleResolution; + private ModuleInfoExtender(InputStream in) { this.in = in; } @@ -120,6 +123,14 @@ public final class ModuleInfoExtender { return this; } + /** + * Sets the value for the ModuleResolution attribute. + */ + public ModuleInfoExtender moduleResolution(ModuleResolution mres) { + this.moduleResolution = mres; + return this; + } + /** * A ClassVisitor that supports adding class file attributes. If an * attribute already exists then the first occurence of the attribute @@ -183,21 +194,20 @@ public final class ModuleInfoExtender { if (packages != null) cv.addAttribute(new ModulePackagesAttribute(packages)); - if (version != null) - cv.addAttribute(new ModuleVersionAttribute(version)); if (mainClass != null) cv.addAttribute(new ModuleMainClassAttribute(mainClass)); if (osName != null || osArch != null || osVersion != null) cv.addAttribute(new ModuleTargetAttribute(osName, osArch, osVersion)); if (hashes != null) cv.addAttribute(new ModuleHashesAttribute(hashes)); + if (moduleResolution != null) + cv.addAttribute(new ModuleResolutionAttribute(moduleResolution.value())); List attrs = new ArrayList<>(); // prototypes of attributes that should be parsed - attrs.add(new ModuleAttribute()); + attrs.add(new ModuleAttribute(version)); attrs.add(new ModulePackagesAttribute()); - attrs.add(new ModuleVersionAttribute()); attrs.add(new ModuleMainClassAttribute()); attrs.add(new ModuleTargetAttribute()); attrs.add(new ModuleHashesAttribute()); diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java index 5e4efff1486..5a17442106c 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java @@ -49,13 +49,12 @@ public final class ModuleInfoWriter { * returning it in a byte array. */ private static byte[] toModuleInfo(ModuleDescriptor md) { - ClassWriter cw = new ClassWriter(0); - cw.visit(Opcodes.V1_9, ACC_MODULE, null, null, null, null); + cw.visit(Opcodes.V1_9, ACC_MODULE, "module-info", null, null, null); cw.visitAttribute(new ModuleAttribute(md)); - // for tests: write the Packages attribute when there are packages that - // aren't exported or open + // for tests: write the ModulePackages attribute when there are packages + // that aren't exported or open Stream exported = md.exports().stream() .map(ModuleDescriptor.Exports::source); Stream open = md.opens().stream() @@ -64,10 +63,10 @@ public final class ModuleInfoWriter { if (md.packages().size() > exportedOrOpen) cw.visitAttribute(new ModulePackagesAttribute(md.packages())); - md.version().ifPresent(v -> cw.visitAttribute(new ModuleVersionAttribute(v))); + // write ModuleMainClass if the module has a main class md.mainClass().ifPresent(mc -> cw.visitAttribute(new ModuleMainClassAttribute(mc))); - // write the TargetPlatform attribute if have any of OS name/arch/version + // write ModuleTarget attribute if have any of OS name/arch/version String osName = md.osName().orElse(null); String osArch = md.osArch().orElse(null); String osVersion = md.osVersion().orElse(null); @@ -76,7 +75,6 @@ public final class ModuleInfoWriter { } cw.visitEnd(); - return cw.toByteArray(); } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java index 97966bd0012..5bd7ef5ed04 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java @@ -149,9 +149,22 @@ public final class ModulePatcher { // return a module reference to the patched module URI location = mref.location().orElse(null); - return JLMA.newPatchedModule(descriptor, - location, - () -> new PatchedModuleReader(paths, mref)); + + ModuleHashes recordedHashes = null; + ModuleResolution mres = null; + if (mref instanceof ModuleReferenceImpl) { + ModuleReferenceImpl impl = (ModuleReferenceImpl)mref; + recordedHashes = impl.recordedHashes(); + mres = impl.moduleResolution(); + } + + return new ModuleReferenceImpl(descriptor, + location, + () -> new PatchedModuleReader(paths, mref), + this, + recordedHashes, + null, + mres); } @@ -162,6 +175,12 @@ public final class ModulePatcher { return map.isEmpty(); } + /* + * Returns the names of the patched modules. + */ + Set patchedModules() { + return map.keySet(); + } /** * A ModuleReader that reads resources from a patched module. diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java similarity index 95% rename from jdk/src/java.base/share/classes/java/lang/module/ModulePath.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java index 15df0307180..fb7871d3c31 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java @@ -23,7 +23,7 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -32,7 +32,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.UncheckedIOException; +import java.lang.module.FindException; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Requires; +import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReference; import java.net.URI; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -59,7 +64,6 @@ import java.util.zip.ZipFile; import jdk.internal.jmod.JmodFile; import jdk.internal.jmod.JmodFile.Section; -import jdk.internal.module.Checks; import jdk.internal.perf.PerfCounter; import jdk.internal.util.jar.VersionedStream; @@ -74,7 +78,7 @@ import jdk.internal.util.jar.VersionedStream; * modules in JMOD files. */ -class ModulePath implements ModuleFinder { +public class ModulePath implements ModuleFinder { private static final String MODULE_INFO = "module-info.class"; // the version to use for multi-release modular JARs @@ -90,7 +94,7 @@ class ModulePath implements ModuleFinder { // map of module name to module reference map for modules already located private final Map cachedModules = new HashMap<>(); - ModulePath(Runtime.Version version, boolean isLinkPhase, Path... entries) { + public ModulePath(Runtime.Version version, boolean isLinkPhase, Path... entries) { this.releaseVersion = version; this.isLinkPhase = isLinkPhase; this.entries = entries.clone(); @@ -99,7 +103,7 @@ class ModulePath implements ModuleFinder { } } - ModulePath(Path... entries) { + public ModulePath(Path... entries) { this(JarFile.runtimeVersion(), false, entries); } @@ -343,11 +347,11 @@ class ModulePath implements ModuleFinder { */ private ModuleReference readJMod(Path file) throws IOException { try (JmodFile jf = new JmodFile(file)) { - ModuleDescriptor md; + ModuleInfo.Attributes attrs; try (InputStream in = jf.getInputStream(Section.CLASSES, MODULE_INFO)) { - md = ModuleDescriptor.read(in, () -> jmodPackages(jf)); + attrs = ModuleInfo.read(in, () -> jmodPackages(jf)); } - return ModuleReferences.newJModModule(md, file); + return ModuleReferences.newJModModule(attrs, file); } } @@ -557,13 +561,14 @@ class ModulePath implements ModuleFinder { ZipFile.OPEN_READ, releaseVersion)) { - ModuleDescriptor md; + ModuleInfo.Attributes attrs; JarEntry entry = jf.getJarEntry(MODULE_INFO); if (entry == null) { // no module-info.class so treat it as automatic module try { - md = deriveModuleDescriptor(jf); + ModuleDescriptor md = deriveModuleDescriptor(jf); + attrs = new ModuleInfo.Attributes(md, null, null); } catch (IllegalArgumentException iae) { throw new FindException( "Unable to derive module descriptor for: " @@ -571,11 +576,11 @@ class ModulePath implements ModuleFinder { } } else { - md = ModuleDescriptor.read(jf.getInputStream(entry), - () -> jarPackages(jf)); + attrs = ModuleInfo.read(jf.getInputStream(entry), + () -> jarPackages(jf)); } - return ModuleReferences.newJarModule(md, file); + return ModuleReferences.newJarModule(attrs, file); } } @@ -604,15 +609,15 @@ class ModulePath implements ModuleFinder { */ private ModuleReference readExplodedModule(Path dir) throws IOException { Path mi = dir.resolve(MODULE_INFO); - ModuleDescriptor md; + ModuleInfo.Attributes attrs; try (InputStream in = Files.newInputStream(mi)) { - md = ModuleDescriptor.read(new BufferedInputStream(in), - () -> explodedPackages(dir)); + attrs = ModuleInfo.read(new BufferedInputStream(in), + () -> explodedPackages(dir)); } catch (NoSuchFileException e) { // for now return null; } - return ModuleReferences.newExplodedModule(md, dir); + return ModuleReferences.newExplodedModule(attrs, dir); } /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java new file mode 100644 index 00000000000..2ab42bdb4a2 --- /dev/null +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal.module; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; +import java.net.URI; +import java.util.Objects; +import java.util.function.Supplier; + +/** + * A ModuleReference implementation that supports referencing a module that + * is patched and/or can be tied to other modules by means of hashes. + */ + +public class ModuleReferenceImpl extends ModuleReference { + + private final Supplier readerSupplier; + + // non-null if the module is patched + private final ModulePatcher patcher; + + // the hashes of other modules recorded in this module + private final ModuleHashes recordedHashes; + + // the function that computes the hash of this module + private final ModuleHashes.HashSupplier hasher; + + // ModuleResolution flags + private final ModuleResolution moduleResolution; + + // cached hash of this module to avoid needing to compute it many times + private byte[] cachedHash; + + /** + * Constructs a new instance of this class. + */ + ModuleReferenceImpl(ModuleDescriptor descriptor, + URI location, + Supplier readerSupplier, + ModulePatcher patcher, + ModuleHashes recordedHashes, + ModuleHashes.HashSupplier hasher, + ModuleResolution moduleResolution) + { + super(descriptor, Objects.requireNonNull(location)); + this.readerSupplier = readerSupplier; + this.patcher = patcher; + this.recordedHashes = recordedHashes; + this.hasher = hasher; + this.moduleResolution = moduleResolution; + } + + @Override + public ModuleReader open() throws IOException { + try { + return readerSupplier.get(); + } catch (UncheckedIOException e) { + throw e.getCause(); + } + } + + /** + * Returns {@code true} if this module has been patched via --patch-module. + */ + public boolean isPatched() { + return (patcher != null); + } + + /** + * Returns the hashes recorded in this module or {@code null} if there + * are no hashes recorded. + */ + public ModuleHashes recordedHashes() { + return recordedHashes; + } + + /** + * Returns the supplier that computes the hash of this module. + */ + ModuleHashes.HashSupplier hasher() { + return hasher; + } + + /** + * Returns the ModuleResolution flags. + */ + public ModuleResolution moduleResolution() { + return moduleResolution; + } + + /** + * Computes the hash of this module. Returns {@code null} if the hash + * cannot be computed. + * + * @throws java.io.UncheckedIOException if an I/O error occurs + */ + public byte[] computeHash(String algorithm) { + byte[] result = cachedHash; + if (result != null) + return result; + if (hasher == null) + return null; + cachedHash = result = hasher.generate(algorithm); + return result; + } + + @Override + public int hashCode() { + int hc = hash; + if (hc == 0) { + hc = descriptor().hashCode(); + hc = 43 * hc + Objects.hashCode(location()); + hc = 43 * hc + Objects.hashCode(patcher); + if (hc == 0) + hc = -1; + hash = hc; + } + return hc; + } + + private int hash; + + @Override + public boolean equals(Object ob) { + if (!(ob instanceof ModuleReferenceImpl)) + return false; + ModuleReferenceImpl that = (ModuleReferenceImpl)ob; + + // assume module content, recorded hashes, etc. are the same + // when the modules have equal module descriptors, are at the + // same location, and are patched by the same patcher. + return Objects.equals(this.descriptor(), that.descriptor()) + && Objects.equals(this.location(), that.location()) + && Objects.equals(this.patcher, that.patcher); + } + + @Override + public String toString() { + return super.toString(); + } + +} diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java similarity index 92% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java index e53ba0441d3..a2aff8f76be 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java @@ -23,13 +23,15 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.File; import java.io.IOError; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; import java.net.URI; import java.nio.ByteBuffer; import java.nio.file.Files; @@ -51,10 +53,7 @@ import java.util.zip.ZipFile; import jdk.internal.jmod.JmodFile; import jdk.internal.misc.JavaLangAccess; import jdk.internal.misc.SharedSecrets; -import jdk.internal.module.ModuleBootstrap; -import jdk.internal.module.ModuleHashes; import jdk.internal.module.ModuleHashes.HashSupplier; -import jdk.internal.module.ModulePatcher; import jdk.internal.util.jar.VersionedStream; import sun.net.www.ParseUtil; @@ -75,12 +74,18 @@ class ModuleReferences { * Creates a ModuleReference to a module or to patched module when * creating modules for the boot Layer and --patch-module is specified. */ - private static ModuleReference newModule(ModuleDescriptor md, + private static ModuleReference newModule(ModuleInfo.Attributes attrs, URI uri, Supplier supplier, HashSupplier hasher) { - ModuleReference mref = new ModuleReference(md, uri, supplier, hasher); + ModuleReference mref = new ModuleReferenceImpl(attrs.descriptor(), + uri, + supplier, + null, + attrs.recordedHashes(), + hasher, + attrs.moduleResolution()); if (JLA.getBootLayer() == null) mref = ModuleBootstrap.patcher().patchIfNeeded(mref); @@ -90,29 +95,29 @@ class ModuleReferences { /** * Creates a ModuleReference to a module packaged as a modular JAR. */ - static ModuleReference newJarModule(ModuleDescriptor md, Path file) { + static ModuleReference newJarModule(ModuleInfo.Attributes attrs, Path file) { URI uri = file.toUri(); Supplier supplier = () -> new JarModuleReader(file, uri); HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a); - return newModule(md, uri, supplier, hasher); + return newModule(attrs, uri, supplier, hasher); } /** * Creates a ModuleReference to a module packaged as a JMOD. */ - static ModuleReference newJModModule(ModuleDescriptor md, Path file) { + static ModuleReference newJModModule(ModuleInfo.Attributes attrs, Path file) { URI uri = file.toUri(); Supplier supplier = () -> new JModModuleReader(file, uri); HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a); - return newModule(md, file.toUri(), supplier, hasher); + return newModule(attrs, uri, supplier, hasher); } /** * Creates a ModuleReference to an exploded module. */ - static ModuleReference newExplodedModule(ModuleDescriptor md, Path dir) { + static ModuleReference newExplodedModule(ModuleInfo.Attributes attrs, Path dir) { Supplier supplier = () -> new ExplodedModuleReader(dir); - return newModule(md, dir.toUri(), supplier, null); + return newModule(attrs, dir.toUri(), supplier, null); } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java new file mode 100644 index 00000000000..76c42368c63 --- /dev/null +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal.module; + +import java.lang.module.ModuleReference; +import static jdk.internal.module.ClassFileConstants.*; + +/** + * Represents the Module Resolution flags. + */ +public final class ModuleResolution { + + final int value; + + ModuleResolution(int value) { + this.value = value; + } + + public static ModuleResolution empty() { + return new ModuleResolution(0); + } + + public boolean doNotResolveByDefault() { + return (value & DO_NOT_RESOLVE_BY_DEFAULT) != 0; + } + + public boolean hasDeprecatedWarning() { + return (value & WARN_DEPRECATED) != 0; + } + + public boolean hasDeprecatedForRemovalWarning() { + return (value & WARN_DEPRECATED_FOR_REMOVAL) != 0; + } + + public boolean hasIncubatingWarning() { + return (value & WARN_INCUBATING) != 0; + } + + public ModuleResolution withDoNotResolveByDefault() { + return new ModuleResolution(value | DO_NOT_RESOLVE_BY_DEFAULT); + } + + public ModuleResolution withDeprecated() { + if ((value & (WARN_DEPRECATED_FOR_REMOVAL | WARN_INCUBATING)) != 0) + throw new InternalError("cannot add deprecated to " + value); + return new ModuleResolution(value | WARN_DEPRECATED); + } + + public ModuleResolution withDeprecatedForRemoval() { + if ((value & (WARN_DEPRECATED | WARN_INCUBATING)) != 0) + throw new InternalError("cannot add deprecated for removal to " + value); + return new ModuleResolution(value | WARN_DEPRECATED_FOR_REMOVAL); + } + public ModuleResolution withIncubating() { + if ((value & (WARN_DEPRECATED | WARN_DEPRECATED_FOR_REMOVAL)) != 0) + throw new InternalError("cannot add incubating to " + value); + return new ModuleResolution(value | WARN_INCUBATING); + } + + public int value() { + return value; + } + + public static boolean doNotResolveByDefault(ModuleReference mref) { + // get the DO_NOT_RESOLVE_BY_DEFAULT flag, if any + if (!(mref instanceof ModuleReferenceImpl)) + return false; + + ModuleResolution mres = ((ModuleReferenceImpl)mref).moduleResolution(); + if (mres != null) + return mres.doNotResolveByDefault(); + + return false; + } + + public static boolean hasIncubatingWarning(ModuleReference mref) { + if (!(mref instanceof ModuleReferenceImpl)) + return false; + + ModuleResolution mres = ((ModuleReferenceImpl)mref).moduleResolution(); + if (mres != null) + return mres.hasIncubatingWarning(); + + return false; + } + + @Override + public String toString() { + return super.toString() + "[value=" + value + "]"; + } +} diff --git a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java similarity index 77% rename from jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java rename to jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java index 6de8ce824cf..5ec0a62ca69 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java @@ -23,12 +23,16 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; import java.net.URI; import java.net.URLConnection; import java.nio.ByteBuffer; @@ -36,7 +40,6 @@ import java.util.ArrayDeque; import java.util.Collections; import java.util.Deque; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -54,11 +57,7 @@ import jdk.internal.jimage.ImageReader; import jdk.internal.jimage.ImageReaderFactory; import jdk.internal.misc.JavaNetUriAccess; import jdk.internal.misc.SharedSecrets; -import jdk.internal.module.ModuleBootstrap; -import jdk.internal.module.ModuleHashes; import jdk.internal.module.ModuleHashes.HashSupplier; -import jdk.internal.module.SystemModules; -import jdk.internal.module.ModulePatcher; import jdk.internal.perf.PerfCounter; /** @@ -69,7 +68,7 @@ import jdk.internal.perf.PerfCounter; * Packages attribute. */ -class SystemModuleFinder implements ModuleFinder { +public class SystemModuleFinder implements ModuleFinder { private static final JavaNetUriAccess JNUA = SharedSecrets.getJavaNetUriAccess(); @@ -84,11 +83,12 @@ class SystemModuleFinder implements ModuleFinder { // ImageReader used to access all modules in the image private static final ImageReader imageReader; - // the set of modules in the run-time image - private static final Set modules; + // singleton finder to find modules in the run-time images + private static final SystemModuleFinder INSTANCE; - // maps module name to module reference - private static final Map nameToModule; + public static SystemModuleFinder getInstance() { + return INSTANCE; + } /** * For now, the module references are created eagerly on the assumption @@ -98,72 +98,11 @@ class SystemModuleFinder implements ModuleFinder { long t0 = System.nanoTime(); imageReader = ImageReaderFactory.getImageReader(); - String[] names = moduleNames(); - ModuleDescriptor[] descriptors = descriptors(names); - - int n = names.length; - moduleCount.add(n); - - ModuleReference[] mods = new ModuleReference[n]; - - @SuppressWarnings(value = {"rawtypes", "unchecked"}) - Entry[] map - = (Entry[])new Entry[n]; - - for (int i = 0; i < n; i++) { - ModuleDescriptor md = descriptors[i]; - - // create the ModuleReference - ModuleReference mref = toModuleReference(md, hashSupplier(i, names[i])); - - mods[i] = mref; - map[i] = Map.entry(names[i], mref); - - // counters - packageCount.add(md.packages().size()); - exportsCount.add(md.exports().size()); - } - - modules = Set.of(mods); - nameToModule = Map.ofEntries(map); + INSTANCE = new SystemModuleFinder(); initTime.addElapsedTimeFrom(t0); } - /* - * Returns an array of ModuleDescriptor of the given module names. - * - * This obtains ModuleDescriptors from SystemModules class that is generated - * from the jlink system-modules plugin. ModuleDescriptors have already - * been validated at link time. - * - * If java.base is patched, or fastpath is disabled for troubleshooting - * purpose, it will fall back to find system modules via jrt file system. - */ - private static ModuleDescriptor[] descriptors(String[] names) { - // fastpath is enabled by default. - // It can be disabled for troubleshooting purpose. - boolean disabled = - System.getProperty("jdk.system.module.finder.disabledFastPath") != null; - - // fast loading of ModuleDescriptor of system modules - if (isFastPathSupported() && !disabled) - return SystemModules.modules(); - - // if fast loading of ModuleDescriptors is disabled - // fallback to read module-info.class - ModuleDescriptor[] descriptors = new ModuleDescriptor[names.length]; - for (int i = 0; i < names.length; i++) { - String mn = names[i]; - ImageLocation loc = imageReader.findLocation(mn, "module-info.class"); - descriptors[i] = ModuleDescriptor.read(imageReader.getResourceBuffer(loc)); - - // add the recorded hashes of tied modules - Hashes.add(descriptors[i]); - } - return descriptors; - } - private static boolean isFastPathSupported() { return SystemModules.MODULE_NAMES.length > 0; } @@ -178,69 +117,95 @@ class SystemModuleFinder implements ModuleFinder { return imageReader.getModuleNames(); } - private static ModuleReference toModuleReference(ModuleDescriptor md, - HashSupplier hash) - { - String mn = md.name(); - URI uri = JNUA.create("jrt", "/".concat(mn)); + // the set of modules in the run-time image + private final Set modules; - Supplier readerSupplier = new Supplier<>() { - @Override - public ModuleReader get() { - return new ImageModuleReader(mn, uri); - } - }; + // maps module name to module reference + private final Map nameToModule; - ModuleReference mref = - new ModuleReference(md, uri, readerSupplier, hash); + // module name to hashes + private final Map hashes; - // may need a reference to a patched module if --patch-module specified - mref = ModuleBootstrap.patcher().patchIfNeeded(mref); + private SystemModuleFinder() { + String[] names = moduleNames(); + int n = names.length; + moduleCount.add(n); - return mref; - } + // fastpath is enabled by default. + // It can be disabled for troubleshooting purpose. + boolean disabled = + System.getProperty("jdk.system.module.finder.disabledFastPath") != null; - private static HashSupplier hashSupplier(int index, String name) { - if (isFastPathSupported()) { - return new HashSupplier() { - @Override - public byte[] generate(String algorithm) { - return SystemModules.MODULES_TO_HASH[index]; - } - }; + ModuleDescriptor[] descriptors; + ModuleHashes[] recordedHashes; + ModuleResolution[] moduleResolutions; + + // fast loading of ModuleDescriptor of system modules + if (isFastPathSupported() && !disabled) { + descriptors = SystemModules.descriptors(); + recordedHashes = SystemModules.hashes(); + moduleResolutions = SystemModules.moduleResolutions(); } else { - return Hashes.hashFor(name); - } - } - - /* - * This helper class is only used when SystemModules is patched. - * It will get the recorded hashes from module-info.class. - */ - private static class Hashes { - static Map hashes = new HashMap<>(); - - static void add(ModuleDescriptor descriptor) { - Optional ohashes = descriptor.hashes(); - if (ohashes.isPresent()) { - hashes.putAll(ohashes.get().hashes()); + // if fast loading of ModuleDescriptors is disabled + // fallback to read module-info.class + descriptors = new ModuleDescriptor[n]; + recordedHashes = new ModuleHashes[n]; + moduleResolutions = new ModuleResolution[n]; + for (int i = 0; i < names.length; i++) { + String mn = names[i]; + ImageLocation loc = imageReader.findLocation(mn, "module-info.class"); + ModuleInfo.Attributes attrs = + ModuleInfo.read(imageReader.getResourceBuffer(loc), null); + descriptors[i] = attrs.descriptor(); + recordedHashes[i] = attrs.recordedHashes(); + moduleResolutions[i] = attrs.moduleResolution(); } } - static HashSupplier hashFor(String name) { - if (!hashes.containsKey(name)) - return null; - - return new HashSupplier() { - @Override - public byte[] generate(String algorithm) { - return hashes.get(name); + Map hashes = null; + boolean secondSeen = false; + // record the hashes to build HashSupplier + for (ModuleHashes mh : recordedHashes) { + if (mh != null) { + // if only one module contain ModuleHashes, use it + if (hashes == null) { + hashes = mh.hashes(); + } else { + if (!secondSeen) { + hashes = new HashMap<>(hashes); + secondSeen = true; + } + hashes.putAll(mh.hashes()); } - }; + } } - } + this.hashes = (hashes == null) ? Map.of() : hashes; - SystemModuleFinder() { } + ModuleReference[] mods = new ModuleReference[n]; + + @SuppressWarnings(value = {"rawtypes", "unchecked"}) + Entry[] map + = (Entry[])new Entry[n]; + + for (int i = 0; i < n; i++) { + ModuleDescriptor md = descriptors[i]; + + // create the ModuleReference + ModuleReference mref = toModuleReference(md, + recordedHashes[i], + hashSupplier(names[i]), + moduleResolutions[i]); + mods[i] = mref; + map[i] = Map.entry(names[i], mref); + + // counters + packageCount.add(md.packages().size()); + exportsCount.add(md.exports().size()); + } + + modules = Set.of(mods); + nameToModule = Map.ofEntries(map); + } @Override public Optional find(String name) { @@ -253,6 +218,41 @@ class SystemModuleFinder implements ModuleFinder { return modules; } + private ModuleReference toModuleReference(ModuleDescriptor md, + ModuleHashes recordedHashes, + HashSupplier hasher, + ModuleResolution mres) { + String mn = md.name(); + URI uri = JNUA.create("jrt", "/".concat(mn)); + + Supplier readerSupplier = new Supplier<>() { + @Override + public ModuleReader get() { + return new ImageModuleReader(mn, uri); + } + }; + + ModuleReference mref = + new ModuleReferenceImpl(md, uri, readerSupplier, null, + recordedHashes, hasher, mres); + + // may need a reference to a patched module if --patch-module specified + mref = ModuleBootstrap.patcher().patchIfNeeded(mref); + + return mref; + } + + private HashSupplier hashSupplier(String name) { + if (!hashes.containsKey(name)) + return null; + + return new HashSupplier() { + @Override + public byte[] generate(String algorithm) { + return hashes.get(name); + } + }; + } /** * A ModuleReader for reading resources from a module linked into the diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java index 299c6220450..596bb697238 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java @@ -29,14 +29,14 @@ import java.lang.module.ModuleDescriptor; /* * SystemModules class will be generated at link time to create - * ModuleDescriptor for the installed modules directly to improve + * ModuleDescriptor for the system modules directly to improve * the module descriptor reconstitution time. * * This will skip parsing of module-info.class file and validating * names such as module name, package name, service and provider type names. * It also avoids taking a defensive copy of any collection. * - * @see jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin + * @see jdk.tools.jlink.internal.plugins.SystemModulesPlugin */ public final class SystemModules { /** @@ -48,11 +48,6 @@ public final class SystemModules { */ public static final String[] MODULE_NAMES = new String[0]; - /** - * Hash of system modules. - */ - public static byte[][] MODULES_TO_HASH = new byte[0][]; - /** * Number of packages in the boot layer from the installed modules. * @@ -61,13 +56,37 @@ public final class SystemModules { */ public static int PACKAGES_IN_BOOT_LAYER = 1024; + /** + * @return {@code false} if there are no split packages in the run-time + * image, {@code true} if there are or if it's not been checked. + */ + public static boolean hasSplitPackages() { + return true; + } + /** * Returns a non-empty array of ModuleDescriptors in the run-time image. * * When running an exploded image it returns an empty array. */ - public static ModuleDescriptor[] modules() { - throw new InternalError("should not reach here"); + public static ModuleDescriptor[] descriptors() { + throw new InternalError("expected to be overridden at link time"); } + /** + * Returns a non-empty array of ModuleHashes recorded in each module + * in the run-time image. + * + * When running an exploded image it returns an empty array. + */ + public static ModuleHashes[] hashes() { + throw new InternalError("expected to be overridden at link time"); + } + + /** + * Returns a non-empty array of ModuleResolutions in the run-time image. + */ + public static ModuleResolution[] moduleResolutions() { + throw new InternalError("expected to be overridden at link time"); + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java index 90593f58fc3..4d91a001690 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java @@ -2490,6 +2490,40 @@ public class ClassReader { return readUTF8(items[readUnsignedShort(index)], buf); } + /** + * Reads a CONSTANT_Module_info item in {@code b}. This method is intended + * for {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of a module constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified module item. + */ + public String readModule(int index, char[] buf) { + return readUTF8(items[readUnsignedShort(index)], buf); + } + + /** + * Reads a CONSTANT_Pakcage_info item in {@code b}. This method is + * intended for {@link Attribute} sub slasses, and is normally not needed + * by class generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of a package constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified package item. + */ + public String readPackage(int index, char[] buf) { + return readUTF8(items[readUnsignedShort(index)], buf); + } + /** * Reads a numeric or string constant pool item in {@link #b b}. This * method is intended for {@link Attribute} sub classes, and is normally not @@ -2516,6 +2550,8 @@ public class ClassReader { case ClassWriter.DOUBLE: return Double.longBitsToDouble(readLong(index)); case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: return Type.getObjectType(readUTF8(index, buf)); case ClassWriter.STR: return readUTF8(index, buf); diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java index a577f933270..bd0978c0c09 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java @@ -271,6 +271,16 @@ public class ClassWriter extends ClassVisitor { */ static final int INDY = 18; + /** + * The type of CONSTANT_Module constant pool items. + */ + static final int MODULE = 19; + + /** + * The type of CONSTANT_Package constant pool items. + */ + static final int PACKAGE = 20; + /** * The base value for all CONSTANT_MethodHandle constant pool items. * Internally, ASM store the 9 variations of CONSTANT_MethodHandle into 9 @@ -1160,6 +1170,50 @@ public class ClassWriter extends ClassVisitor { return newClassItem(value).index; } + /** + * Adds a module name to the constant pool. + * + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the module name + * @return the index of a new or already existing module reference item. + */ + public int newModule(String value) { + key2.set(MODULE, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(MODULE, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result.index; + } + + /** + * Adds a package name to the constant pool. + * + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the internal name of the package. + * @return the index of a new or already existing package reference item. + */ + public int newPackage(String value) { + key2.set(PACKAGE, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(PACKAGE, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result.index; + } + /** * Adds a method type reference to the constant pool of the class being * build. Does nothing if the constant pool already contains a similar item. diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java index 25ed37718dd..b0b80907d9d 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java @@ -239,6 +239,8 @@ final class Item { this.strVal3 = strVal3; switch (type) { case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: this.intVal = 0; // intVal of a class must be zero, see visitInnerClass case ClassWriter.UTF8: case ClassWriter.STR: @@ -311,6 +313,8 @@ final class Item { case ClassWriter.UTF8: case ClassWriter.STR: case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: case ClassWriter.MTYPE: case ClassWriter.TYPE_NORMAL: return i.strVal1.equals(strVal1); diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java b/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java index 84c0f618a91..5522c0c1ff0 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java +++ b/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java @@ -58,7 +58,6 @@ import java.security.PrivilegedAction; public class Cleaner extends PhantomReference - implements Runnable { // Dummy reference queue, needed because the PhantomReference constructor @@ -153,12 +152,4 @@ public class Cleaner }}); } } - - @Override public void run() { - SecurityManager security = System.getSecurityManager(); - if (security != null) - security.checkPackageAccess("jdk.internal.ref"); - this.clean(); - } - } diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java index 0c4cb744578..9a410049188 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java +++ b/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.VM; import sun.security.action.GetPropertyAction; @@ -218,8 +219,16 @@ public class Reflection { if (c.isPrimitive()) return true; - // check that memberModule exports the package to currentModule - return memberModule.isExported(c.getPackageName(), currentModule); + String pkg = c.getPackageName(); + boolean allowed = memberModule.isExported(pkg, currentModule); + if (allowed && memberModule.isNamed() && printStackTraceWhenAccessSucceeds()) { + if (!SharedSecrets.getJavaLangReflectModuleAccess() + .isStaticallyExported(memberModule, pkg, currentModule)) { + String msg = currentModule + " allowed access to member of " + memberClass; + new Exception(msg).printStackTrace(System.err); + } + } + return allowed; } /** @@ -348,25 +357,43 @@ public class Reflection { } - // true to print a stack trace when IAE is thrown + // true to print a stack trace when access fails private static volatile boolean printStackWhenAccessFails; - // true if printStackWhenAccessFails has been initialized - private static volatile boolean printStackWhenAccessFailsSet; + // true to print a stack trace when access succeeds + private static volatile boolean printStackWhenAccessSucceeds; - private static void printStackTraceIfNeeded(Throwable e) { - if (!printStackWhenAccessFailsSet && VM.initLevel() >= 1) { + // true if printStack* values are initialized + private static volatile boolean printStackPropertiesSet; + + private static void ensurePrintStackPropertiesSet() { + if (!printStackPropertiesSet && VM.initLevel() >= 1) { String s = GetPropertyAction.privilegedGetProperty( "sun.reflect.debugModuleAccessChecks"); - printStackWhenAccessFails = - (s != null && !s.equalsIgnoreCase("false")); - printStackWhenAccessFailsSet = true; - } - if (printStackWhenAccessFails) { - e.printStackTrace(); + if (s != null) { + printStackWhenAccessFails = !s.equalsIgnoreCase("false"); + printStackWhenAccessSucceeds = s.equalsIgnoreCase("access"); + } + printStackPropertiesSet = true; } } + public static void enableStackTraces() { + printStackWhenAccessFails = true; + printStackWhenAccessSucceeds = true; + printStackPropertiesSet = true; + } + + public static boolean printStackTraceWhenAccessFails() { + ensurePrintStackPropertiesSet(); + return printStackWhenAccessFails; + } + + public static boolean printStackTraceWhenAccessSucceeds() { + ensurePrintStackPropertiesSet(); + return printStackWhenAccessSucceeds; + } + /** * Throws IllegalAccessException with the an exception message based on * the access that is denied. @@ -416,17 +443,10 @@ public class Reflection { throws IllegalAccessException { IllegalAccessException e = new IllegalAccessException(msg); - printStackTraceIfNeeded(e); + ensurePrintStackPropertiesSet(); + if (printStackWhenAccessFails) { + e.printStackTrace(System.err); + } throw e; } - - /** - * Throws InaccessibleObjectException with the given exception message. - */ - public static void throwInaccessibleObjectException(String msg) { - InaccessibleObjectException e = new InaccessibleObjectException(msg); - printStackTraceIfNeeded(e); - throw e; - } - } diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java index 2d38377f62f..0c455f827a7 100644 --- a/jdk/src/java.base/share/classes/module-info.java +++ b/jdk/src/java.base/share/classes/module-info.java @@ -180,7 +180,8 @@ module java.base { java.management, jdk.jvmstat; exports jdk.internal.ref to - java.desktop; + java.desktop, + jdk.unsupported; exports jdk.internal.reflect to java.corba, java.logging, @@ -218,8 +219,9 @@ module java.base { java.security.jgss; exports sun.nio.ch to java.management, - jdk.crypto.pkcs11, - jdk.sctp; + jdk.crypto.token, + jdk.sctp, + jdk.unsupported; exports sun.nio.cs to java.desktop, jdk.charsets; @@ -242,14 +244,14 @@ module java.base { java.desktop, java.security.jgss; exports sun.security.internal.interfaces to - jdk.crypto.pkcs11; + jdk.crypto.token; exports sun.security.internal.spec to - jdk.crypto.pkcs11; + jdk.crypto.token; exports sun.security.jca to java.smartcardio, java.xml.crypto, jdk.crypto.ec, - jdk.crypto.pkcs11, + jdk.crypto.token, jdk.naming.dns; exports sun.security.pkcs to jdk.crypto.ec, @@ -257,13 +259,13 @@ module java.base { exports sun.security.provider to java.rmi, java.security.jgss, - jdk.crypto.pkcs11, + jdk.crypto.token, jdk.policytool, jdk.security.auth; exports sun.security.provider.certpath to java.naming; exports sun.security.rsa to - jdk.crypto.pkcs11; + jdk.crypto.token; exports sun.security.ssl to java.security.jgss; exports sun.security.timestamp to @@ -278,14 +280,14 @@ module java.base { java.security.sasl, java.smartcardio, jdk.crypto.ec, - jdk.crypto.pkcs11, + jdk.crypto.token, jdk.jartool, jdk.policytool, jdk.security.auth, jdk.security.jgss; exports sun.security.x509 to jdk.crypto.ec, - jdk.crypto.pkcs11, + jdk.crypto.token, jdk.jartool, jdk.security.auth; exports sun.text.resources to diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java index 856efe16f41..7993b9d284d 100644 --- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java +++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java @@ -48,7 +48,9 @@ public abstract class Negotiator { Class clazz; Constructor c; try { - clazz = Class.forName("sun.net.www.protocol.http.spnego.NegotiatorImpl", true, null); + clazz = Class.forName("sun.net.www.protocol.http.spnego.NegotiatorImpl", + true, + ClassLoader.getPlatformClassLoader()); c = clazz.getConstructor(HttpCallerInfo.class); } catch (ClassNotFoundException cnfe) { finest(cnfe); diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java index b5d93a8f677..f1dadedaf53 100644 --- a/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java +++ b/jdk/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java @@ -157,6 +157,9 @@ class ISO_8859_1 // Method possible replaced with a compiler intrinsic. private static int encodeISOArray(char[] sa, int sp, byte[] da, int dp, int len) { + if (len <= 0) { + return 0; + } encodeISOArrayCheck(sa, sp, da, dp, len); return implEncodeISOArray(sa, sp, da, dp, len); } @@ -177,10 +180,6 @@ class ISO_8859_1 private static void encodeISOArrayCheck(char[] sa, int sp, byte[] da, int dp, int len) { - if (len <= 0) { - return; // not an error because encodeISOArrayImpl won't execute if len <= 0 - } - Objects.requireNonNull(sa); Objects.requireNonNull(da); diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java index 2e309dc8bb5..f830bc70ce1 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java @@ -36,6 +36,7 @@ import java.security.AlgorithmConstraints; import java.security.AccessControlContext; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; +import java.util.function.BiFunction; import javax.crypto.*; import javax.crypto.spec.*; @@ -122,6 +123,14 @@ abstract class Handshaker { // Negotiated ALPN value String applicationProtocol = null; + // Application protocol callback function (for SSLEngine) + BiFunction,String> + appProtocolSelectorSSLEngine = null; + + // Application protocol callback function (for SSLSocket) + BiFunction,String> + appProtocolSelectorSSLSocket = null; + // The maximum expected network packet size for SSL/TLS/DTLS records. int maximumPacketSize = 0; @@ -500,6 +509,22 @@ abstract class Handshaker { return applicationProtocol; } + /** + * Sets the Application Protocol selector function for SSLEngine. + */ + void setApplicationProtocolSelectorSSLEngine( + BiFunction,String> selector) { + this.appProtocolSelectorSSLEngine = selector; + } + + /** + * Sets the Application Protocol selector function for SSLSocket. + */ + void setApplicationProtocolSelectorSSLSocket( + BiFunction,String> selector) { + this.appProtocolSelectorSSLSocket = selector; + } + /** * Sets the cipher suites preference. */ diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java index 6aaaf893d80..188ba825758 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java @@ -27,8 +27,9 @@ package sun.security.ssl; import java.io.*; import java.nio.*; -import java.util.*; import java.security.*; +import java.util.*; +import java.util.function.BiFunction; import javax.crypto.BadPaddingException; @@ -206,6 +207,10 @@ public final class SSLEngineImpl extends SSLEngine { // The value under negotiation will be obtained from handshaker. String applicationProtocol = null; + // Callback function that selects the application protocol value during + // the SSL/TLS handshake. + BiFunction, String> applicationProtocolSelector; + // Have we been told whether we're client or server? private boolean serverModeSet = false; private boolean roleIsServer; @@ -442,6 +447,8 @@ public final class SSLEngineImpl extends SSLEngine { handshaker.setEnabledCipherSuites(enabledCipherSuites); handshaker.setEnableSessionCreation(enableSessionCreation); handshaker.setApplicationProtocols(applicationProtocols); + handshaker.setApplicationProtocolSelectorSSLEngine( + applicationProtocolSelector); outputRecord.initHandshaker(); } @@ -2237,7 +2244,7 @@ public final class SSLEngineImpl extends SSLEngine { } applicationProtocols = params.getApplicationProtocols(); - if ((handshaker != null) && !handshaker.started()) { + if ((handshaker != null) && !handshaker.activated()) { handshaker.setIdentificationProtocol(identificationProtocol); handshaker.setAlgorithmConstraints(algorithmConstraints); handshaker.setMaximumPacketSize(maximumPacketSize); @@ -2264,6 +2271,21 @@ public final class SSLEngineImpl extends SSLEngine { return null; } + @Override + public synchronized void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + applicationProtocolSelector = selector; + if ((handshaker != null) && !handshaker.activated()) { + handshaker.setApplicationProtocolSelectorSSLEngine(selector); + } + } + + @Override + public synchronized BiFunction, String> + getHandshakeApplicationProtocolSelector() { + return this.applicationProtocolSelector; + } + /** * Returns a printable representation of this end of the connection. */ diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java index 880c98a80a4..be69a7697e4 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java @@ -37,6 +37,7 @@ import java.security.AlgorithmConstraints; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.BiFunction; import javax.crypto.BadPaddingException; import javax.net.ssl.*; @@ -223,6 +224,10 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { // The value under negotiation will be obtained from handshaker. String applicationProtocol = null; + // Callback function that selects the application protocol value during + // the SSL/TLS handshake. + BiFunction, String> applicationProtocolSelector; + /* * READ ME * READ ME * READ ME * READ ME * READ ME * READ ME * * IMPORTANT STUFF TO UNDERSTANDING THE SYNCHRONIZATION ISSUES. @@ -1370,6 +1375,8 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { handshaker.setEnabledCipherSuites(enabledCipherSuites); handshaker.setEnableSessionCreation(enableSessionCreation); handshaker.setApplicationProtocols(applicationProtocols); + handshaker.setApplicationProtocolSelectorSSLSocket( + applicationProtocolSelector); } /** @@ -2151,7 +2158,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { Utilities.addToSNIServerNameList(serverNames, host); if (!roleIsServer && - (handshaker != null) && !handshaker.started()) { + (handshaker != null) && !handshaker.activated()) { handshaker.setSNIServerNames(serverNames); } } @@ -2179,7 +2186,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { this.serverNames = Utilities.addToSNIServerNameList(this.serverNames, this.host); - if (!roleIsServer && (handshaker != null) && !handshaker.started()) { + if (!roleIsServer && (handshaker != null) && !handshaker.activated()) { handshaker.setSNIServerNames(serverNames); } } @@ -2631,7 +2638,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { applicationProtocols = params.getApplicationProtocols(); - if ((handshaker != null) && !handshaker.started()) { + if ((handshaker != null) && !handshaker.activated()) { handshaker.setIdentificationProtocol(identificationProtocol); handshaker.setAlgorithmConstraints(algorithmConstraints); handshaker.setMaximumPacketSize(maximumPacketSize); @@ -2658,6 +2665,21 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { return null; } + @Override + public synchronized void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + applicationProtocolSelector = selector; + if ((handshaker != null) && !handshaker.activated()) { + handshaker.setApplicationProtocolSelectorSSLSocket(selector); + } + } + + @Override + public synchronized BiFunction, String> + getHandshakeApplicationProtocolSelector() { + return this.applicationProtocolSelector; + } + // // We allocate a separate thread to deliver handshake completion // events. This ensures that the notifications don't block the diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java index 17777825f3f..4ad18b163e5 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java @@ -34,6 +34,7 @@ import java.security.cert.*; import java.security.interfaces.*; import java.security.spec.ECParameterSpec; import java.math.BigInteger; +import java.util.function.BiFunction; import javax.crypto.SecretKey; import javax.net.ssl.*; @@ -532,31 +533,39 @@ final class ServerHandshaker extends Handshaker { ALPNExtension clientHelloALPN = (ALPNExtension) mesg.extensions.get(ExtensionType.EXT_ALPN); - if ((clientHelloALPN != null) && (localApl.length > 0)) { + // Use the application protocol callback when provided. + // Otherwise use the local list of application protocols. + boolean hasAPCallback = + ((engine != null && appProtocolSelectorSSLEngine != null) || + (conn != null && appProtocolSelectorSSLSocket != null)); - // Intersect the requested and the locally supported, - // and save for later. - String negotiatedValue = null; - List protocols = clientHelloALPN.getPeerAPs(); + if (!hasAPCallback) { + if ((clientHelloALPN != null) && (localApl.length > 0)) { - // Use server preference order - for (String ap : localApl) { - if (protocols.contains(ap)) { - negotiatedValue = ap; - break; + // Intersect the requested and the locally supported, + // and save for later. + String negotiatedValue = null; + List protocols = clientHelloALPN.getPeerAPs(); + + // Use server preference order + for (String ap : localApl) { + if (protocols.contains(ap)) { + negotiatedValue = ap; + break; + } } - } - if (negotiatedValue == null) { - fatalSE(Alerts.alert_no_application_protocol, - new SSLHandshakeException( - "No matching ALPN values")); - } - applicationProtocol = negotiatedValue; + if (negotiatedValue == null) { + fatalSE(Alerts.alert_no_application_protocol, + new SSLHandshakeException( + "No matching ALPN values")); + } + applicationProtocol = negotiatedValue; - } else { - applicationProtocol = ""; - } + } else { + applicationProtocol = ""; + } + } // Otherwise, applicationProtocol will be set by the callback. session = null; // forget about the current session // @@ -892,8 +901,36 @@ final class ServerHandshaker extends Handshaker { } // Prepare the ALPN response - if (applicationProtocol != null && !applicationProtocol.isEmpty()) { - m1.extensions.add(new ALPNExtension(applicationProtocol)); + if (clientHelloALPN != null) { + List peerAPs = clientHelloALPN.getPeerAPs(); + + // check for a callback function + if (hasAPCallback) { + if (conn != null) { + applicationProtocol = + appProtocolSelectorSSLSocket.apply(conn, peerAPs); + } else { + applicationProtocol = + appProtocolSelectorSSLEngine.apply(engine, peerAPs); + } + } + + // check for no-match and that the selected name was also proposed + // by the TLS peer + if (applicationProtocol == null || + (!applicationProtocol.isEmpty() && + !peerAPs.contains(applicationProtocol))) { + + fatalSE(Alerts.alert_no_application_protocol, + new SSLHandshakeException( + "No matching ALPN values")); + + } else if (!applicationProtocol.isEmpty()) { + m1.extensions.add(new ALPNExtension(applicationProtocol)); + } + } else { + // Nothing was negotiated, returned at end of the handshake + applicationProtocol = ""; } if (debug != null && Debug.isOn("handshake")) { diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java b/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java index 3ff90bf483a..a7754e67301 100644 --- a/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java +++ b/jdk/src/java.base/share/classes/sun/security/x509/AlgorithmId.java @@ -1024,7 +1024,7 @@ public class AlgorithmId implements Serializable, DerEncoder { } } - // Values from SP800-57 part 1 rev 3 tables 2 and three + // Values from SP800-57 part 1 rev 4 tables 2 and 3 private static String ecStrength (int bitLength) { if (bitLength >= 512) { // 256 bits of strength return "SHA512"; @@ -1035,7 +1035,7 @@ public class AlgorithmId implements Serializable, DerEncoder { } } - // same values for RSA and DSA + // Same values for RSA and DSA private static String ifcFfcStrength (int bitLength) { if (bitLength > 7680) { // 256 bits return "SHA512"; diff --git a/jdk/src/java.base/share/legal/aes.md b/jdk/src/java.base/share/legal/aes.md new file mode 100644 index 00000000000..6d0ee2e2bb4 --- /dev/null +++ b/jdk/src/java.base/share/legal/aes.md @@ -0,0 +1,36 @@ +## Cryptix AES v3.2.0 + +### Cryptix General License +
+
+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.
+
+
diff --git a/jdk/src/java.base/share/legal/asm.md b/jdk/src/java.base/share/legal/asm.md new file mode 100644 index 00000000000..584b205821d --- /dev/null +++ b/jdk/src/java.base/share/legal/asm.md @@ -0,0 +1,36 @@ +## ASM Bytecode Manipulation Framework v5.1 + +### ASM License +
+
+Copyright (c) 2000-2011 France Télécom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
diff --git a/jdk/src/java.base/share/legal/cldr.md b/jdk/src/java.base/share/legal/cldr.md new file mode 100644 index 00000000000..21e6d4caae6 --- /dev/null +++ b/jdk/src/java.base/share/legal/cldr.md @@ -0,0 +1,42 @@ +## Unicode Common Local Data Repository (CLDR) v29 + +### CLDR License +
+
+Copyright © 1991-2016 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) this copyright and permission notice appear with all copies
+of the Data Files or Software,
+(b) this copyright and 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.
+
+
diff --git a/jdk/src/java.base/share/legal/icu.md b/jdk/src/java.base/share/legal/icu.md new file mode 100644 index 00000000000..4b24757908c --- /dev/null +++ b/jdk/src/java.base/share/legal/icu.md @@ -0,0 +1,63 @@ +## International Components for Unicode (ICU4J) v56.1 + +### ICU4J License +
+
+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/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+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/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+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-2016 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 either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+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.
+
+
diff --git a/jdk/src/java.base/share/legal/zlib.md b/jdk/src/java.base/share/legal/zlib.md new file mode 100644 index 00000000000..bbf40f9814b --- /dev/null +++ b/jdk/src/java.base/share/legal/zlib.md @@ -0,0 +1,27 @@ +## zlib v1.2.8 + +### zlib License +
+
+Copyright (C) 1995-2013 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@gzip.org          madler@alumni.caltech.edu
+
+
diff --git a/jdk/src/java.base/share/lib/security/default.policy b/jdk/src/java.base/share/lib/security/default.policy index 9014111ce09..0c1798fbe9b 100644 --- a/jdk/src/java.base/share/lib/security/default.policy +++ b/jdk/src/java.base/share/lib/security/default.policy @@ -125,7 +125,7 @@ grant codeBase "jrt:/jdk.crypto.ec" { permission java.security.SecurityPermission "removeProviderProperty.SunEC"; }; -grant codeBase "jrt:/jdk.crypto.pkcs11" { +grant codeBase "jrt:/jdk.crypto.token" { permission java.lang.RuntimePermission "accessClassInPackage.sun.security.*"; permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; diff --git a/jdk/src/java.base/share/native/libjava/StrictMath.c b/jdk/src/java.base/share/native/libjava/StrictMath.c index 6c5ba3151c4..32d42217c5e 100644 --- a/jdk/src/java.base/share/native/libjava/StrictMath.c +++ b/jdk/src/java.base/share/native/libjava/StrictMath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,12 +64,6 @@ Java_java_lang_StrictMath_atan(JNIEnv *env, jclass unused, jdouble d) return (jdouble) jatan((double)d); } -JNIEXPORT jdouble JNICALL -Java_java_lang_StrictMath_exp(JNIEnv *env, jclass unused, jdouble d) -{ - return (jdouble) jexp((double)d); -} - JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_log(JNIEnv *env, jclass unused, jdouble d) { diff --git a/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp b/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp index 72de36db0ef..e2dbb79ce6f 100644 --- a/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp +++ b/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp @@ -181,7 +181,7 @@ void ImageDecompressor::decompress_resource(u1* compressed, u1* uncompressed, } } while (has_header); memcpy(uncompressed, decompressed_resource, (size_t) uncompressed_size); - delete decompressed_resource; + delete[] decompressed_resource; } // Zip decompressor diff --git a/jdk/src/java.base/share/native/libjli/java.c b/jdk/src/java.base/share/native/libjli/java.c index d3f05a60d4b..645d7321093 100644 --- a/jdk/src/java.base/share/native/libjli/java.c +++ b/jdk/src/java.base/share/native/libjli/java.c @@ -573,6 +573,17 @@ IsModuleOption(const char* name) { JLI_StrCmp(name, "--patch-module") == 0; } +static jboolean +IsLongFormModuleOption(const char* name) { + return JLI_StrCCmp(name, "--module-path=") == 0 || + JLI_StrCCmp(name, "--upgrade-module-path=") == 0 || + JLI_StrCCmp(name, "--add-modules=") == 0 || + JLI_StrCCmp(name, "--limit-modules=") == 0 || + JLI_StrCCmp(name, "--add-exports=") == 0 || + JLI_StrCCmp(name, "--add-reads=") == 0 || + JLI_StrCCmp(name, "--patch-module=") == 0; +} + /* * Test if the given name has a white space option. */ @@ -1236,7 +1247,7 @@ ParseArguments(int *pargc, char ***pargv, char *option = NULL; char *value = NULL; int kind = GetOpt(&argc, &argv, &option, &value); - jboolean has_arg = value != NULL; + jboolean has_arg = value != NULL && JLI_StrLen(value) > 0; /* * Option to set main entry point @@ -1285,19 +1296,13 @@ ParseArguments(int *pargc, char ***pargv, /* * Error missing argument */ - } else if (!has_arg && IsWhiteSpaceOption(arg)) { - if (JLI_StrCmp(arg, "--module-path") == 0 || - JLI_StrCmp(arg, "-p") == 0 || - JLI_StrCmp(arg, "--upgrade-module-path") == 0) { - REPORT_ERROR (has_arg, ARG_ERROR4, arg); - } else if (JLI_StrCmp(arg, "--add-modules") == 0 || - JLI_StrCmp(arg, "--limit-modules") == 0 || - JLI_StrCmp(arg, "--add-exports") == 0 || - JLI_StrCmp(arg, "--add-opens") == 0 || - JLI_StrCmp(arg, "--add-reads") == 0 || - JLI_StrCmp(arg, "--patch-module") == 0) { - REPORT_ERROR (has_arg, ARG_ERROR6, arg); - } + } else if (!has_arg && (JLI_StrCmp(arg, "--module-path") == 0 || + JLI_StrCmp(arg, "-p") == 0 || + JLI_StrCmp(arg, "--upgrade-module-path") == 0)) { + REPORT_ERROR (has_arg, ARG_ERROR4, arg); + + } else if (!has_arg && (IsModuleOption(arg) || IsLongFormModuleOption(arg))) { + REPORT_ERROR (has_arg, ARG_ERROR6, arg); /* * The following cases will cause the argument parsing to stop */ diff --git a/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java b/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java index 20370e13d4b..1fc1ce89c2a 100644 --- a/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java +++ b/jdk/src/java.base/unix/classes/java/io/UnixFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -299,6 +299,16 @@ class UnixFileSystem extends FileSystem { /* -- Basic infrastructure -- */ + private native long getNameMax0(String path); + + public int getNameMax(String path) { + long nameMax = getNameMax0(path); + if (nameMax > Integer.MAX_VALUE) { + nameMax = Integer.MAX_VALUE; + } + return (int)nameMax; + } + public int compare(File f1, File f2) { return f1.getPath().compareTo(f2.getPath()); } diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java index f26b0108fed..78d9f7fc061 100644 --- a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java +++ b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -109,13 +109,9 @@ final class ProcessImpl extends Process { private String helperPath(String javahome, String osArch) { switch (this) { case SOLARIS: - if (osArch.equals("x86")) { osArch = "i386"; } - else if (osArch.equals("x86_64")) { osArch = "amd64"; } // fall through... case LINUX: case AIX: - return javahome + "/lib/" + osArch + "/jspawnhelper"; - case BSD: return javahome + "/lib/jspawnhelper"; diff --git a/jdk/src/java.base/unix/classes/module-info.java.extra b/jdk/src/java.base/unix/classes/module-info.java.extra new file mode 100644 index 00000000000..43f85b0309a --- /dev/null +++ b/jdk/src/java.base/unix/classes/module-info.java.extra @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc +exports jdk.internal.misc to jdk.vm.compiler; +opens jdk.internal.misc to jdk.vm.compiler; + +// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics +opens com.sun.crypto.provider to jdk.vm.compiler; + +exports jdk.internal.module to jdk.vm.compiler; + +// AOT uses jdk.internal.misc.Unsafe +exports jdk.internal.misc to jdk.aot; diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/Makefile b/jdk/src/java.base/unix/conf/arm/jvm.cfg similarity index 55% rename from jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/Makefile rename to jdk/src/java.base/unix/conf/arm/jvm.cfg index 54ebbd50c3a..58efe004dd5 100644 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/Makefile +++ b/jdk/src/java.base/unix/conf/arm/jvm.cfg @@ -1,5 +1,4 @@ -# -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,42 +21,16 @@ # or visit www.oracle.com if you need additional information or have any # questions. # - +# +# List of JVMs that can be used as an option to java, javac, etc. +# Order is important -- first in this list is the default JVM. +# NOTE that this both this file and its format are UNSUPPORTED and +# WILL GO AWAY in a future release. # -# Makefile for building a ResourceBundleControlProvider jar file for testing. +# You may also select a JVM in an arbitrary location with the +# "-XXaltjvm=" option, but that too is unsupported +# and may not be available in a future release. # -# Usage: make JDK_HOME=... all install -# - -DESTDIR = .. -TMPDIR = tmp -SERVICESDIR = $(TMPDIR)/META-INF/services -TARGETJAR = rbcontrolprovider.jar -BINDIR = $(JDK_HOME)/bin - - -all: $(TARGETJAR) - -install: all - cp $(TARGETJAR) $(DESTDIR) - -SERVICES = java.util.spi.ResourceBundleControlProvider - -FILES_JAVA = UserControlProvider.java \ - UserXMLControl.java - -RESOURCE_FILES = XmlRB.xml \ - XmlRB_ja.xml - -$(TARGETJAR): $(SERVICES) $(FILES_JAVA) $(RESOURCE_FILES) - rm -rf $(TMPDIR) $@ - mkdir -p $(SERVICESDIR) - $(BINDIR)/javac -d $(TMPDIR) $(FILES_JAVA) - cp $(SERVICES) $(SERVICESDIR) - cp $(RESOURCE_FILES) $(TMPDIR)/com/foo - $(BINDIR)/jar cvf $@ -C $(TMPDIR) . - -clean: - rm -rf $(TMPDIR) $(TARGETJAR) - -.PHONY: all install clean +-server KNOWN +-client KNOWN +-minimal KNOWN diff --git a/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c b/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c index cd166933363..d204c1b3c78 100644 --- a/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c +++ b/jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,7 @@ * questions. */ +#include #include #include #include @@ -38,6 +39,10 @@ #include #include +#if defined(__solaris__) && !defined(NAME_MAX) +#define NAME_MAX MAXNAMLEN +#endif + #include "jni.h" #include "jni_util.h" #include "jlong.h" @@ -487,3 +492,14 @@ Java_java_io_UnixFileSystem_getSpace(JNIEnv *env, jobject this, } END_PLATFORM_STRING(env, path); return rv; } + +JNIEXPORT jlong JNICALL +Java_java_io_UnixFileSystem_getNameMax0(JNIEnv *env, jobject this, + jstring pathname) +{ + jlong length = -1; + WITH_PLATFORM_STRING(env, pathname, path) { + length = (jlong)pathconf(path, _PC_NAME_MAX); + } END_PLATFORM_STRING(env, path); + return length != -1 ? length : (jlong)NAME_MAX; +} diff --git a/jdk/src/java.base/unix/native/libjli/java_md.h b/jdk/src/java.base/unix/native/libjli/java_md.h index 8e95aced972..f0eaa302bd3 100644 --- a/jdk/src/java.base/unix/native/libjli/java_md.h +++ b/jdk/src/java.base/unix/native/libjli/java_md.h @@ -54,10 +54,8 @@ char *FindExecName(char *program); const char *SetExecname(char **argv); const char *GetExecName(); static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, - int bitsWanted); -static jboolean GetJREPath(char *path, jint pathsize, const char * arch, - jboolean speculative); + char *jvmpath, jint jvmpathsize, int bitsWanted); +static jboolean GetJREPath(char *path, jint pathsize, jboolean speculative); #if defined(_AIX) #include "java_md_aix.h" diff --git a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c index b9091aaead3..cb9afc09822 100644 --- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c +++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c @@ -52,9 +52,6 @@ #endif #ifdef __solaris__ -# ifndef LIBARCHNAME -# error "The macro LIBARCHNAME was not defined on the compile line" -# endif # include # include # include @@ -188,12 +185,13 @@ JvmExists(const char *path) { return JNI_FALSE; } /* - * contains a lib/$LIBARCHNAME/{server,client}/libjvm.so ? + * contains a lib/{server,client}/libjvm.so ? */ static jboolean ContainsLibJVM(const char *env) { - char clientPattern[PATH_MAX + 1]; - char serverPattern[PATH_MAX + 1]; + /* the usual suspects */ + char clientPattern[] = "lib/client"; + char serverPattern[] = "lib/server"; char *envpath; char *path; jboolean clientPatternFound; @@ -204,10 +202,6 @@ ContainsLibJVM(const char *env) { return JNI_FALSE; } - /* the usual suspects */ - JLI_Snprintf(clientPattern, PATH_MAX, "lib/%s/client", LIBARCHNAME); - JLI_Snprintf(serverPattern, PATH_MAX, "lib/%s/server", LIBARCHNAME); - /* to optimize for time, test if any of our usual suspects are present. */ clientPatternFound = JLI_StrStr(env, clientPattern) != NULL; serverPatternFound = JLI_StrStr(env, serverPattern) != NULL; @@ -322,7 +316,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, /* Check data model flags, and exec process, if needed */ { - char *arch = LIBARCHNAME; /* like sparc or sparcv9 */ char * jvmtype = NULL; int argc = *pargc; char **argv = *pargv; @@ -408,12 +401,12 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, jvmpath does not exist */ if (wanted == running) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, arch, JNI_FALSE) ) { + if (!GetJREPath(jrepath, so_jrepath, JNI_FALSE) ) { JLI_ReportErrorMessage(JRE_ERROR1); exit(2); } - JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg", - jrepath, FILESEP, FILESEP, arch, FILESEP); + JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%sjvm.cfg", + jrepath, FILESEP, FILESEP, FILESEP); /* Find the specified JVM type */ if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) { JLI_ReportErrorMessage(CFG_ERROR7); @@ -427,7 +420,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(4); } - if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0 )) { + if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, 0 )) { JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath); exit(4); } @@ -444,21 +437,21 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, return; } #else - JLI_MemFree(newargv); - return; + JLI_MemFree(newargv); + return; #endif /* SETENV_REQUIRED */ - } else { /* do the same speculatively or exit */ + } else { /* do the same speculatively or exit */ JLI_ReportErrorMessage(JRE_ERROR2, wanted); exit(1); - } + } #ifdef SETENV_REQUIRED if (mustsetenv) { /* * We will set the LD_LIBRARY_PATH as follows: * * o $JVMPATH (directory portion only) - * o $JRE/lib/$LIBARCHNAME - * o $JRE/../lib/$LIBARCHNAME + * o $JRE/lib + * o $JRE/../lib * * followed by the user's previous effective LD_LIBRARY_PATH, if * any. @@ -515,43 +508,44 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, #endif /* __solaris__ */ /* runpath contains current effective LD_LIBRARY_PATH setting */ - - jvmpath = JLI_StringDup(jvmpath); - new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) + - 2 * JLI_StrLen(jrepath) + 2 * JLI_StrLen(arch) + + { /* New scope to declare local variable */ + char *new_jvmpath = JLI_StringDup(jvmpath); + new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) + + 2 * JLI_StrLen(jrepath) + #ifdef AIX - /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */ - JLI_StrLen(jrepath) + JLI_StrLen(arch) + JLI_StrLen("/lib//jli:") + + /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */ + JLI_StrLen(jrepath) + JLI_StrLen("/lib//jli:") + #endif - JLI_StrLen(jvmpath) + 52; - new_runpath = JLI_MemAlloc(new_runpath_size); - newpath = new_runpath + JLI_StrLen(LD_LIBRARY_PATH "="); + JLI_StrLen(new_jvmpath) + 52; + new_runpath = JLI_MemAlloc(new_runpath_size); + newpath = new_runpath + JLI_StrLen(LD_LIBRARY_PATH "="); - /* - * Create desired LD_LIBRARY_PATH value for target data model. - */ - { + /* + * Create desired LD_LIBRARY_PATH value for target data model. + */ + { /* remove the name of the .so from the JVM path */ - lastslash = JLI_StrRChr(jvmpath, '/'); + lastslash = JLI_StrRChr(new_jvmpath, '/'); if (lastslash) *lastslash = '\0'; sprintf(new_runpath, LD_LIBRARY_PATH "=" "%s:" - "%s/lib/%s:" + "%s/lib:" #ifdef AIX - "%s/lib/%s/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */ + "%s/lib/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */ #endif - "%s/../lib/%s", - jvmpath, - jrepath, arch, + "%s/../lib", + new_jvmpath, + jrepath, #ifdef AIX - jrepath, arch, + jrepath, #endif - jrepath, arch + jrepath ); + JLI_MemFree(new_jvmpath); /* * Check to make sure that the prefix of the current path is the @@ -571,6 +565,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, JLI_MemFree(new_runpath); return; } + } } /* @@ -638,14 +633,14 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, */ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, int bitsWanted) + char *jvmpath, jint jvmpathsize, int bitsWanted) { struct stat s; if (JLI_StrChr(jvmtype, '/')) { JLI_Snprintf(jvmpath, jvmpathsize, "%s/" JVM_DLL, jvmtype); } else { - JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/%s/%s/" JVM_DLL, jrepath, arch, jvmtype); + JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/%s/" JVM_DLL, jrepath, jvmtype); } JLI_TraceLauncher("Does `%s' exist ... ", jvmpath); @@ -663,14 +658,14 @@ GetJVMPath(const char *jrepath, const char *jvmtype, * Find path to JRE based on .exe's location or registry settings. */ static jboolean -GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) +GetJREPath(char *path, jint pathsize, jboolean speculative) { char libjava[MAXPATHLEN]; struct stat s; if (GetApplicationHome(path, pathsize)) { /* Is JRE co-located with the application? */ - JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path); if (access(libjava, F_OK) == 0) { JLI_TraceLauncher("JRE path is %s\n", path); return JNI_TRUE; @@ -681,7 +676,7 @@ GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) return JNI_FALSE; } /* Does the app ship a private JRE in /jre directory? */ - JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path); if (access(libjava, F_OK) == 0) { JLI_StrCat(path, "/jre"); JLI_TraceLauncher("JRE path is %s\n", path); @@ -690,7 +685,7 @@ GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) } if (GetApplicationHomeFromDll(path, pathsize)) { - JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path); if (stat(libjava, &s) == 0) { JLI_TraceLauncher("JRE path is %s\n", path); return JNI_TRUE; @@ -856,12 +851,12 @@ void* SplashProcAddress(const char* name) { char jrePath[MAXPATHLEN]; char splashPath[MAXPATHLEN]; - if (!GetJREPath(jrePath, sizeof(jrePath), LIBARCHNAME, JNI_FALSE)) { + if (!GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE)) { JLI_ReportErrorMessage(JRE_ERROR1); return NULL; } - ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s", - jrePath, LIBARCHNAME, SPLASHSCREEN_SO); + ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s", + jrePath, SPLASHSCREEN_SO); if (ret >= (int) sizeof(splashPath)) { JLI_ReportErrorMessage(JRE_ERROR11); diff --git a/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c index e2e0f10fad9..385b319391b 100644 --- a/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c +++ b/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c @@ -37,273 +37,10 @@ #include "java_net_Inet4AddressImpl.h" -#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104)) -#define HAS_GLIBC_GETHOSTBY_R 1 -#endif - - -#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) +#if defined(MACOSX) extern jobjectArray lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6); - -/* Use getaddrinfo(3), which is thread safe */ -/************************************************************************ - * Inet4AddressImpl - */ - -/* - * Class: java_net_Inet4AddressImpl - * Method: getLocalHostName - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL -Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) { - char hostname[NI_MAXHOST+1]; - - hostname[0] = '\0'; - if (gethostname(hostname, NI_MAXHOST)) { - /* Something went wrong, maybe networking is not setup? */ - strcpy(hostname, "localhost"); - } else { - struct addrinfo hints, *res; - int error; - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_UNSPEC; - - error = getaddrinfo(hostname, NULL, &hints, &res); - - if (error == 0) { - /* host is known to name service */ - error = getnameinfo(res->ai_addr, - res->ai_addrlen, - hostname, - NI_MAXHOST, - NULL, - 0, - NI_NAMEREQD); - - /* if getnameinfo fails hostname is still the value - from gethostname */ - - freeaddrinfo(res); - } - } - return (*env)->NewStringUTF(env, hostname); -} - -/* - * Find an internet address for a given hostname. Note that this - * code only works for addresses of type INET. The translation - * of %d.%d.%d.%d to an address (int) occurs in java now, so the - * String "host" shouldn't *ever* be a %d.%d.%d.%d string - * - * Class: java_net_Inet4AddressImpl - * Method: lookupAllHostAddr - * Signature: (Ljava/lang/String;)[[B - */ - -JNIEXPORT jobjectArray JNICALL -Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, - jstring host) { - const char *hostname; - jobject name; - jobjectArray ret = 0; - int retLen = 0; - - int getaddrinfo_error=0; - struct addrinfo hints, *res, *resNew = NULL; - - initInetAddressIDs(env); - JNU_CHECK_EXCEPTION_RETURN(env, NULL); - - if (IS_NULL(host)) { - JNU_ThrowNullPointerException(env, "host is null"); - return 0; - } - hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); - CHECK_NULL_RETURN(hostname, NULL); - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_INET; - - /* - * Workaround for Solaris bug 4160367 - if a hostname contains a - * white space then 0.0.0.0 is returned - */ - if (isspace((unsigned char)hostname[0])) { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", - (char *)hostname); - JNU_ReleaseStringPlatformChars(env, host, hostname); - return NULL; - } - - - getaddrinfo_error = getaddrinfo(hostname, NULL, &hints, &res); - -#ifdef MACOSX - if (getaddrinfo_error) { - // If getaddrinfo fails try getifaddrs. - ret = lookupIfLocalhost(env, hostname, JNI_FALSE); - if (ret != NULL || (*env)->ExceptionCheck(env)) { - JNU_ReleaseStringPlatformChars(env, host, hostname); - return ret; - } - } #endif - if (getaddrinfo_error) { - /* report error */ - NET_ThrowUnknownHostExceptionWithGaiError( - env, hostname, getaddrinfo_error); - JNU_ReleaseStringPlatformChars(env, host, hostname); - return NULL; - } else { - int i = 0; - struct addrinfo *itr, *last = NULL, *iterator = res; - while (iterator != NULL) { - int skip = 0; - itr = resNew; - - while (itr != NULL) { - struct sockaddr_in *addr1, *addr2; - - addr1 = (struct sockaddr_in *)iterator->ai_addr; - addr2 = (struct sockaddr_in *)itr->ai_addr; - if (addr1->sin_addr.s_addr == - addr2->sin_addr.s_addr) { - skip = 1; - break; - } - - itr = itr->ai_next; - } - - if (!skip) { - struct addrinfo *next - = (struct addrinfo*) malloc(sizeof(struct addrinfo)); - if (!next) { - JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed"); - ret = NULL; - goto cleanupAndReturn; - } - memcpy(next, iterator, sizeof(struct addrinfo)); - next->ai_next = NULL; - if (resNew == NULL) { - resNew = next; - } else { - last->ai_next = next; - } - last = next; - i++; - } - iterator = iterator->ai_next; - } - - retLen = i; - iterator = resNew; - i = 0; - - name = (*env)->NewStringUTF(env, hostname); - if (IS_NULL(name)) { - goto cleanupAndReturn; - } - - ret = (*env)->NewObjectArray(env, retLen, ia_class, NULL); - if (IS_NULL(ret)) { - /* we may have memory to free at the end of this */ - goto cleanupAndReturn; - } - - while (iterator != NULL) { - /* We need 4 bytes to store ipv4 address; */ - int len = 4; - - jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); - if (IS_NULL(iaObj)) { - /* we may have memory to free at the end of this */ - ret = NULL; - goto cleanupAndReturn; - } - setInetAddress_addr(env, iaObj, ntohl(((struct sockaddr_in*)(iterator->ai_addr))->sin_addr.s_addr)); - setInetAddress_hostName(env, iaObj, name); - (*env)->SetObjectArrayElement(env, ret, retLen - i -1, iaObj); - i++; - iterator = iterator->ai_next; - } - } - -cleanupAndReturn: - { - struct addrinfo *iterator, *tmp; - iterator = resNew; - while (iterator != NULL) { - tmp = iterator; - iterator = iterator->ai_next; - free(tmp); - } - JNU_ReleaseStringPlatformChars(env, host, hostname); - } - - freeaddrinfo(res); - - return ret; - -} - -/* - * Class: java_net_Inet4AddressImpl - * Method: getHostByAddr - * Signature: (I)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL -Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, - jbyteArray addrArray) { - jstring ret = NULL; - - char host[NI_MAXHOST+1]; - jfieldID fid; - int error = 0; - jint family; - struct sockaddr *him ; - int len = 0; - jbyte caddr[4]; - jint addr; - - struct sockaddr_in him4; - struct sockaddr *sa; - - /* - * For IPv4 addresses construct a sockaddr_in structure. - */ - (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr); - addr = ((caddr[0]<<24) & 0xff000000); - addr |= ((caddr[1] <<16) & 0xff0000); - addr |= ((caddr[2] <<8) & 0xff00); - addr |= (caddr[3] & 0xff); - memset((char *) &him4, 0, sizeof(him4)); - him4.sin_addr.s_addr = htonl(addr); - him4.sin_family = AF_INET; - sa = (struct sockaddr *) &him4; - len = sizeof(him4); - - error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0, NI_NAMEREQD); - - if (!error) { - ret = (*env)->NewStringUTF(env, host); - } - - if (ret == NULL) { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", NULL); - } - - return ret; - -} - -#else /* defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) */ - /* the initial size of our hostent buffers */ #ifndef NI_MAXHOST #define NI_MAXHOST 1025 @@ -405,6 +142,17 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, error = getaddrinfo(hostname, NULL, &hints, &res); +#ifdef MACOSX + if (error) { + // If getaddrinfo fails try getifaddrs, see bug 8170910. + ret = lookupIfLocalhost(env, hostname, JNI_FALSE); + if (ret != NULL || (*env)->ExceptionCheck(env)) { + JNU_ReleaseStringPlatformChars(env, host, hostname); + return ret; + } + } +#endif + if (error) { /* report error */ NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error); @@ -475,7 +223,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, } } - cleanupAndReturn: +cleanupAndReturn: { struct addrinfo *iterator, *tmp; iterator = resNew; @@ -535,8 +283,6 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, return ret; } -#endif /* _ALLBSD_SOURCE */ - #define SET_NONBLOCKING(fd) { \ int flags = fcntl(fd, F_GETFL); \ flags |= O_NONBLOCK; \ diff --git a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java index edd756bf3bf..e6b13bba7b1 100644 --- a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java +++ b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,8 @@ package java.io; +import java.io.File; +import java.nio.file.Path; import java.util.Locale; import java.util.Properties; import sun.security.action.GetPropertyAction; @@ -627,6 +629,27 @@ class WinNTFileSystem extends FileSystem { /* -- Basic infrastructure -- */ + // Obtain maximum file component length from GetVolumeInformation which + // expects the path to be null or a root component ending in a backslash + private native int getNameMax0(String path); + + public int getNameMax(String path) { + String s = null; + if (path != null) { + File f = new File(path); + if (f.isAbsolute()) { + Path root = f.toPath().getRoot(); + if (root != null) { + s = root.toString(); + if (!s.endsWith("\\")) { + s = s + "\\"; + } + } + } + } + return getNameMax0(s); + } + @Override public int compare(File f1, File f2) { return f1.getPath().compareToIgnoreCase(f2.getPath()); diff --git a/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c b/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c index 1e29fd23965..5e1664e31fd 100644 --- a/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c +++ b/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -887,3 +887,42 @@ Java_java_io_WinNTFileSystem_getSpace0(JNIEnv *env, jobject this, free(pathbuf); return rv; } + +// pathname is expected to be either null or to contain the root +// of the path terminated by a backslash +JNIEXPORT jint JNICALL +Java_java_io_WinNTFileSystem_getNameMax0(JNIEnv *env, jobject this, + jstring pathname) +{ + BOOL res = 0; + DWORD maxComponentLength; + + if (pathname == NULL) { + res = GetVolumeInformationW(NULL, + NULL, + 0, + NULL, + &maxComponentLength, + NULL, + NULL, + 0); + } else { + WITH_UNICODE_STRING(env, pathname, path) { + res = GetVolumeInformationW(path, + NULL, + 0, + NULL, + &maxComponentLength, + NULL, + NULL, + 0); + } END_UNICODE_STRING(env, path); + } + + if (res == 0) { + JNU_ThrowIOExceptionWithLastError(env, + "Could not get maximum component length"); + } + + return (jint)maxComponentLength; +} diff --git a/jdk/src/java.base/windows/native/libjli/java_md.c b/jdk/src/java.base/windows/native/libjli/java_md.c index adb90a50cc4..385fc8ca36d 100644 --- a/jdk/src/java.base/windows/native/libjli/java_md.c +++ b/jdk/src/java.base/windows/native/libjli/java_md.c @@ -150,22 +150,6 @@ IsJavaw() return _isjavaw; } -/* - * Returns the arch path, to get the current arch use the - * macro GetArch, nbits here is ignored for now. - */ -const char * -GetArchPath(int nbits) -{ -#ifdef _M_AMD64 - return "amd64"; -#elif defined(_M_IA64) - return "ia64"; -#else - return "i386"; -#endif -} - /* * */ @@ -207,8 +191,8 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(2); } - JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg", - jrepath, FILESEP, FILESEP, (char*)GetArch(), FILESEP); + JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%sjvm.cfg", + jrepath, FILESEP, FILESEP); /* Find the specified JVM type */ if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) { diff --git a/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c b/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c index f7dc5c2ebe0..8a901af9af4 100644 --- a/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c +++ b/jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c @@ -113,24 +113,22 @@ Java_java_net_Inet4AddressImpl_getLocalHostName (JNIEnv *env, jobject this) { * Class: java_net_Inet4AddressImpl * Method: lookupAllHostAddr * Signature: (Ljava/lang/String;)[[B - * - * This is almost shared code */ - JNIEXPORT jobjectArray JNICALL Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, - jstring host) { - const char *hostname; - struct hostent *hp; - unsigned int addr[4]; - + jstring host) { jobjectArray ret = NULL; + const char *hostname; + int error = 0; + unsigned int addr[4]; + struct addrinfo hints, *res = NULL, *resNew = NULL, *last = NULL, + *iterator; initInetAddressIDs(env); JNU_CHECK_EXCEPTION_RETURN(env, NULL); if (IS_NULL(host)) { - JNU_ThrowNullPointerException(env, "host argument"); + JNU_ThrowNullPointerException(env, "host argument is null"); return NULL; } hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); @@ -166,9 +164,9 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, /* * Return an byte array with the populated address. */ - address = (addr[3]<<24) & 0xff000000; - address |= (addr[2]<<16) & 0xff0000; - address |= (addr[1]<<8) & 0xff00; + address = (addr[3] << 24) & 0xff000000; + address |= (addr[2] << 16) & 0xff0000; + address |= (addr[1] << 8) & 0xff00; address |= addr[0]; ret = (*env)->NewObjectArray(env, 1, ia_class, NULL); @@ -179,58 +177,95 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); if (IS_NULL(iaObj)) { - ret = NULL; - goto cleanupAndReturn; + ret = NULL; + goto cleanupAndReturn; } setInetAddress_addr(env, iaObj, ntohl(address)); (*env)->SetObjectArrayElement(env, ret, 0, iaObj); - JNU_ReleaseStringPlatformChars(env, host, hostname); - return ret; + goto cleanupAndReturn; } - /* - * Perform the lookup - */ - if ((hp = gethostbyname((char*)hostname)) != NULL) { - struct in_addr **addrp = (struct in_addr **) hp->h_addr_list; - int len = sizeof(struct in_addr); - int i = 0; + // try once, with our static buffer + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME; + hints.ai_family = AF_INET; - while (*addrp != (struct in_addr *) 0) { - i++; - addrp++; + error = getaddrinfo(hostname, NULL, &hints, &res); + + if (error) { + NET_ThrowByNameWithLastError(env, "java/net/UnknownHostException", + hostname); + goto cleanupAndReturn; + } else { + int i = 0; + iterator = res; + while (iterator != NULL) { + // skip duplicates + int skip = 0; + struct addrinfo *iteratorNew = resNew; + while (iteratorNew != NULL) { + struct sockaddr_in *addr1, *addr2; + addr1 = (struct sockaddr_in *)iterator->ai_addr; + addr2 = (struct sockaddr_in *)iteratorNew->ai_addr; + if (addr1->sin_addr.s_addr == addr2->sin_addr.s_addr) { + skip = 1; + break; + } + iteratorNew = iteratorNew->ai_next; + } + + if (!skip) { + struct addrinfo *next + = (struct addrinfo *)malloc(sizeof(struct addrinfo)); + if (!next) { + JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed"); + ret = NULL; + goto cleanupAndReturn; + } + memcpy(next, iterator, sizeof(struct addrinfo)); + next->ai_next = NULL; + if (resNew == NULL) { + resNew = next; + } else { + last->ai_next = next; + } + last = next; + i++; + } + iterator = iterator->ai_next; } + // allocate array - at this point i contains the number of addresses ret = (*env)->NewObjectArray(env, i, ia_class, NULL); - if (IS_NULL(ret)) { goto cleanupAndReturn; } - addrp = (struct in_addr **) hp->h_addr_list; i = 0; - while (*addrp != (struct in_addr *) 0) { - jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); - if (IS_NULL(iaObj)) { - ret = NULL; - goto cleanupAndReturn; - } - setInetAddress_addr(env, iaObj, ntohl((*addrp)->s_addr)); - setInetAddress_hostName(env, iaObj, host); - (*env)->SetObjectArrayElement(env, ret, i, iaObj); - addrp++; - i++; + iterator = resNew; + while (iterator != NULL) { + jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); + if (IS_NULL(iaObj)) { + ret = NULL; + goto cleanupAndReturn; + } + setInetAddress_addr(env, iaObj, ntohl(((struct sockaddr_in *) + (iterator->ai_addr))->sin_addr.s_addr)); + setInetAddress_hostName(env, iaObj, host); + (*env)->SetObjectArrayElement(env, ret, i++, iaObj); + iterator = iterator->ai_next; } - } else if (WSAGetLastError() == WSATRY_AGAIN) { - NET_ThrowByNameWithLastError(env, - JNU_JAVANETPKG "UnknownHostException", - hostname); - } else { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", hostname); } - cleanupAndReturn: JNU_ReleaseStringPlatformChars(env, host, hostname); + while (resNew != NULL) { + last = resNew; + resNew = resNew->ai_next; + free(last); + } + if (res != NULL) { + freeaddrinfo(res); + } return ret; } @@ -238,30 +273,42 @@ cleanupAndReturn: * Class: java_net_Inet4AddressImpl * Method: getHostByAddr * Signature: (I)Ljava/lang/String; + * + * Theoretically the UnknownHostException could be enriched with gai error + * information. But as it is silently ignored anyway, there's no need for this. + * It's only important that either a valid hostname is returned or an + * UnknownHostException is thrown. */ JNIEXPORT jstring JNICALL Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, - jbyteArray addrArray) { - struct hostent *hp; + jbyteArray addrArray) { + jstring ret = NULL; + char host[NI_MAXHOST + 1]; jbyte caddr[4]; jint addr; - (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr); - addr = ((caddr[0]<<24) & 0xff000000); - addr |= ((caddr[1] <<16) & 0xff0000); - addr |= ((caddr[2] <<8) & 0xff00); - addr |= (caddr[3] & 0xff); - addr = htonl(addr); + struct sockaddr_in sa; - hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET); - if (hp == NULL) { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", 0); - return NULL; + // construct a sockaddr_in structure + memset((char *)&sa, 0, sizeof(struct sockaddr_in)); + (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr); + addr = ((caddr[0] << 24) & 0xff000000); + addr |= ((caddr[1] << 16) & 0xff0000); + addr |= ((caddr[2] << 8) & 0xff00); + addr |= (caddr[3] & 0xff); + sa.sin_addr.s_addr = htonl(addr); + sa.sin_family = AF_INET; + + if (getnameinfo((struct sockaddr *)&sa, sizeof(struct sockaddr_in), + host, NI_MAXHOST, NULL, 0, NI_NAMEREQD)) { + JNU_ThrowByName(env, "java/net/UnknownHostException", NULL); + } else { + ret = (*env)->NewStringUTF(env, host); + if (ret == NULL) { + JNU_ThrowByName(env, "java/net/UnknownHostException", NULL); + } } - if (hp->h_name == NULL) { /* Deal with bug in Windows XP */ - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", 0); - return NULL; - } - return JNU_NewStringPlatform(env, hp->h_name); + + return ret; } static jboolean diff --git a/jdk/src/java.compact1/share/classes/module-info.java b/jdk/src/java.compact1/share/classes/module-info.java deleted file mode 100644 index 72d4357759a..00000000000 --- a/jdk/src/java.compact1/share/classes/module-info.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/** - * Aggregates {@code java.base}, {@code java.logging}, and {@code java.scripting}. - */ -module java.compact1 { - requires transitive java.logging; - requires transitive java.scripting; -} - diff --git a/jdk/src/java.compact3/share/classes/module-info.java b/jdk/src/java.compact3/share/classes/module-info.java deleted file mode 100644 index 9783a406a54..00000000000 --- a/jdk/src/java.compact3/share/classes/module-info.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/** - * Supplements {@code java.compact2} with JDBC RowSet, JMX, JNDI, Compiler, - * Instrumentation, Preferences, Security, and XML cryptography APIs. - */ -module java.compact3 { - requires transitive java.compact2; - requires transitive java.compiler; - requires transitive java.instrument; - requires transitive java.management; - requires transitive java.naming; - requires transitive java.prefs; - requires transitive java.security.jgss; - requires transitive java.security.sasl; - requires transitive java.sql.rowset; - requires transitive java.xml.crypto; -} - diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java index 36e703e9f33..7aaf0893e71 100644 --- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java +++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java @@ -34,10 +34,18 @@ import javax.swing.plaf.basic.BasicMenuBarUI; import sun.lwawt.macosx.LWCToolkit; import sun.security.action.GetBooleanAction; -import sun.security.action.GetPropertyAction; // MenuBar implementation for Mac L&F public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvider { + + static { + java.security.AccessController.doPrivileged( + (java.security.PrivilegedAction) () -> { + System.loadLibrary("osxui"); + return null; + }); + } + // Utilities public void uninstallUI(final JComponent c) { if (fScreenMenuBar != null) { @@ -134,7 +142,7 @@ public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvid ScreenMenuBar fScreenMenuBar; boolean useScreenMenuBar = getScreenMenuBarProperty(); - static boolean getScreenMenuBarProperty() { + public static boolean getScreenMenuBarProperty() { // Do not allow AWT to set the screen menu bar if it's embedded in another UI toolkit if (LWCToolkit.isEmbedded()) return false; if (AccessController.doPrivileged( diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java index 0c505b28576..45f48328717 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java +++ b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java @@ -141,12 +141,24 @@ public final class CFontManager extends SunFontManager { } } - protected void registerFontsInDir(String dirName, boolean useJavaRasterizer, int fontRank, boolean defer, boolean resolveSymLinks) { - loadNativeDirFonts(dirName); + protected void registerFontsInDir(final String dirName, boolean useJavaRasterizer, + int fontRank, boolean defer, boolean resolveSymLinks) { + + String[] files = AccessController.doPrivileged((PrivilegedAction) () -> { + return new File(dirName).list(getTrueTypeFilter()); + }); + + if (files == null) { + return; + } else { + for (String f : files) { + loadNativeDirFonts(dirName+File.separator+f); + } + } super.registerFontsInDir(dirName, useJavaRasterizer, fontRank, defer, resolveSymLinks); } - private native void loadNativeDirFonts(String dirName); + private native void loadNativeDirFonts(String fontPath); private native void loadNativeFonts(); void registerFont(String fontName, String fontFamilyName) { diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index d93b4bbcf21..d0c8275dc7c 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -33,11 +33,14 @@ import java.awt.Dialog.ModalityType; import java.awt.event.*; import java.beans.*; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; import javax.swing.*; import sun.awt.*; import sun.awt.AWTAccessor.ComponentAccessor; +import sun.awt.AWTAccessor.WindowAccessor; import sun.java2d.SurfaceData; import sun.java2d.opengl.CGLSurfaceData; import sun.lwawt.*; @@ -1031,6 +1034,11 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return !peer.isSimpleWindow() && target.getFocusableWindowState(); } + private boolean isBlocked() { + LWWindowPeer blocker = (peer != null) ? peer.getBlocker() : null; + return (blocker != null); + } + /* * An utility method for the support of the auto request focus. * Updates the focusable state of the window under certain @@ -1063,29 +1071,70 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return true; } + private boolean isOneOfOwnersOrSelf(CPlatformWindow window) { + while (window != null) { + if (this == window) { + return true; + } + window = window.owner; + } + return false; + } + + private CPlatformWindow getRootOwner() { + CPlatformWindow rootOwner = this; + while (rootOwner.owner != null) { + rootOwner = rootOwner.owner; + } + return rootOwner; + } + private void orderAboveSiblings() { - if (owner == null) { - return; + // Recursively pop up the windows from the very bottom, (i.e. root owner) so that + // the windows are ordered above their nearest owner; ancestors of the window, + // which is going to become 'main window', are placed above their siblings. + CPlatformWindow rootOwner = getRootOwner(); + if (rootOwner.isVisible()) { + CWrapper.NSWindow.orderFront(rootOwner.getNSWindowPtr()); } + final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor(); + orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target)); + } - // NOTE: the logic will fail if we have a hierarchy like: - // visible root owner - // invisible owner - // visible dialog - // However, this is an unlikely scenario for real life apps - if (owner.isVisible()) { - // Recursively pop up the windows from the very bottom so that only - // the very top-most one becomes the main window - owner.orderAboveSiblings(); + private void orderAboveSiblingsImpl(Window[] windows) { + ArrayList childWindows = new ArrayList(); - // Order the window to front of the stack of child windows - final long nsWindowSelfPtr = getNSWindowPtr(); - final long nsWindowOwnerPtr = owner.getNSWindowPtr(); - CWrapper.NSWindow.orderFront(nsWindowOwnerPtr); - CWrapper.NSWindow.orderWindow(nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove, nsWindowOwnerPtr); + final ComponentAccessor componentAccessor = AWTAccessor.getComponentAccessor(); + final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor(); + + // Go through the list of windows and perform ordering. + for (Window w : windows) { + final Object p = componentAccessor.getPeer(w); + if (p instanceof LWWindowPeer) { + CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow(); + if (pw != null && pw.isVisible()) { + // If the window is one of ancestors of 'main window' or is going to become main by itself, + // the window should be ordered above its siblings; otherwise the window is just ordered + // above its nearest parent. + if (pw.isOneOfOwnersOrSelf(this)) { + CWrapper.NSWindow.orderFront(pw.getNSWindowPtr()); + } else { + CWrapper.NSWindow.orderWindow(pw.getNSWindowPtr(), CWrapper.NSWindow.NSWindowAbove, + pw.owner.getNSWindowPtr()); + } + pw.applyWindowLevel(w); + } + } + // Retrieve the child windows for each window from the list and store them for future use. + // Note: we collect data about child windows even for invisible owners, since they may have + // visible children. + childWindows.addAll(Arrays.asList(windowAccessor.getOwnedWindows(w))); + } + // If some windows, which have just been ordered, have any child windows, let's start new iteration + // and order these child windows. + if (!childWindows.isEmpty()) { + orderAboveSiblingsImpl(childWindows.toArray(new Window[0])); } - - applyWindowLevel(target); } protected void applyWindowLevel(Window target) { diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 309bc8ca8b1..9c463003a93 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -25,6 +25,7 @@ package sun.lwawt.macosx; +import com.apple.laf.AquaMenuBarUI; import java.awt.peer.TaskbarPeer; import java.awt.*; import java.awt.datatransfer.Clipboard; @@ -43,6 +44,7 @@ import java.security.*; import java.util.*; import java.util.concurrent.Callable; import java.net.MalformedURLException; +import javax.swing.UIManager; import sun.awt.*; import sun.awt.datatransfer.DataTransferer; @@ -935,4 +937,13 @@ public final class LWCToolkit extends LWToolkit { protected PlatformWindow getPlatformWindowUnderMouse() { return CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse(); } + + @Override + public void updateScreenMenuBarUI() { + if (AquaMenuBarUI.getScreenMenuBarProperty()) { + UIManager.put("MenuBarUI", "com.apple.laf.AquaMenuBarUI"); + } else { + UIManager.put("MenuBarUI", null); + } + } } diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m index 8b76294c32d..ca983d031c1 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m @@ -430,7 +430,22 @@ AWT_ASSERT_APPKIT_THREAD; [super dealloc]; } -// Tests wheather the corresponding Java paltform window is visible or not +// Tests whether window is blocked by modal dialog/window +- (BOOL) isBlocked { + BOOL isBlocked = NO; + + JNIEnv *env = [ThreadUtilities getJNIEnv]; + jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; + if (platformWindow != NULL) { + static JNF_MEMBER_CACHE(jm_isBlocked, jc_CPlatformWindow, "isBlocked", "()Z"); + isBlocked = JNFCallBooleanMethod(env, platformWindow, jm_isBlocked) == JNI_TRUE ? YES : NO; + (*env)->DeleteLocalRef(env, platformWindow); + } + + return isBlocked; +} + +// Tests whether the corresponding Java platform window is visible or not + (BOOL) isJavaPlatformWindowVisible:(NSWindow *)window { BOOL isVisible = NO; @@ -454,8 +469,9 @@ AWT_ASSERT_APPKIT_THREAD; - (void) orderChildWindows:(BOOL)focus { AWT_ASSERT_APPKIT_THREAD; - if (self.isMinimizing) { + if (self.isMinimizing || [self isBlocked]) { // Do not perform any ordering, if iconify is in progress + // or the window is blocked by a modal window return; } @@ -809,18 +825,20 @@ AWT_ASSERT_APPKIT_THREAD; - (void)sendEvent:(NSEvent *)event { if ([event type] == NSLeftMouseDown || [event type] == NSRightMouseDown || [event type] == NSOtherMouseDown) { - // Move parent windows to front and make sure that a child window is displayed - // in front of its nearest parent. - if (self.ownerWindow != nil) { - JNIEnv *env = [ThreadUtilities getJNIEnvUncached]; - jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; - if (platformWindow != NULL) { - static JNF_MEMBER_CACHE(jm_orderAboveSiblings, jc_CPlatformWindow, "orderAboveSiblings", "()V"); - JNFCallVoidMethod(env,platformWindow, jm_orderAboveSiblings); - (*env)->DeleteLocalRef(env, platformWindow); + if ([self isBlocked]) { + // Move parent windows to front and make sure that a child window is displayed + // in front of its nearest parent. + if (self.ownerWindow != nil) { + JNIEnv *env = [ThreadUtilities getJNIEnvUncached]; + jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; + if (platformWindow != NULL) { + static JNF_MEMBER_CACHE(jm_orderAboveSiblings, jc_CPlatformWindow, "orderAboveSiblings", "()V"); + JNFCallVoidMethod(env,platformWindow, jm_orderAboveSiblings); + (*env)->DeleteLocalRef(env, platformWindow); + } } + [self orderChildWindows:YES]; } - [self orderChildWindows:YES]; NSPoint p = [NSEvent mouseLocation]; NSRect frame = [self.nsWindow frame]; diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m index ac82ca85d5a..bcf7893005c 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m @@ -115,19 +115,18 @@ if (keyWindow != nil) { return; } - } - else { - static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem"); - static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event) - - NSUInteger modifiers = [currEvent modifierFlags]; - jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO); - - JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) - } + } + + static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem"); + static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event) + + NSUInteger modifiers = [currEvent modifierFlags]; + jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO); + + JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) } JNF_COCOA_EXIT(env); - + } - (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers { diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m index d374e5a1241..bca21021347 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m @@ -404,19 +404,14 @@ Java_sun_font_CFontManager_loadNativeDirFonts { JNF_COCOA_ENTER(env); - NSString *nsFilePath = JNFJavaToNSString(env, filename); - - FSRef iFile; - OSStatus status = CreateFSRef(&iFile, nsFilePath); - - if (status == noErr) { - ATSFontContainerRef oContainer; - status = ATSFontActivateFromFileReference(&iFile, kATSFontContextLocal, - kATSFontFormatUnspecified, - NULL, kNilOptions, - &oContainer); - } - + NSString *path = JNFJavaToNSString(env, filename); + NSURL *url = [NSURL fileURLWithPath:(NSString *)path]; + bool res = CTFontManagerRegisterFontsForURL((CFURLRef)url, kCTFontManagerScopeProcess, nil); +#ifdef DEBUG + NSLog(@"path is : %@", (NSString*)path); + NSLog(@"url is : %@", (NSString*)url); + printf("res is %d\n", res); +#endif JNF_COCOA_EXIT(env); } diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m index 79cdf5bf7a3..1d9269fc57f 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m @@ -591,7 +591,7 @@ CGGI_CreateImageForGlyph static inline GlyphInfo * CGGI_CreateImageForUnicode (CGGI_GlyphCanvas *canvas, const AWTStrike *strike, - const CGGI_RenderingMode *mode, const UniChar uniChar) + const CGGI_RenderingMode *mode, const UnicodeScalarValue uniChar) { // save the state of the world CGContextSaveGState(canvas->context); @@ -668,7 +668,7 @@ CGGI_FillImagesForGlyphsWithSizedCanvas(CGGI_GlyphCanvas *canvas, const AWTStrike *strike, const CGGI_RenderingMode *mode, jlong glyphInfos[], - const UniChar uniChars[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], const CFIndex len) { @@ -720,7 +720,7 @@ static NSString *threadLocalLCDCanvasKey = static inline void CGGI_FillImagesForGlyphs(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, - const UniChar uniChars[], const CGGlyph glyphs[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], const size_t maxWidth, const size_t maxHeight, const CFIndex len) { @@ -767,7 +767,7 @@ CGGI_FillImagesForGlyphs(jlong *glyphInfos, const AWTStrike *strike, static inline void CGGI_CreateGlyphInfos(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, - const UniChar uniChars[], const CGGlyph glyphs[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], CGSize advances[], CGRect bboxes[], const CFIndex len) { AWTFont *font = strike->fAWTFont; @@ -817,7 +817,7 @@ CGGI_CreateGlyphsAndScanForComplexities(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, jint rawGlyphCodes[], - UniChar uniChars[], CGGlyph glyphs[], + UnicodeScalarValue uniChars[], CGGlyph glyphs[], CGSize advances[], CGRect bboxes[], const CFIndex len) { @@ -860,7 +860,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], CGRect bboxes[len]; CGSize advances[len]; CGGlyph glyphs[len]; - UniChar uniChars[len]; + UnicodeScalarValue uniChars[len]; CGGI_CreateGlyphsAndScanForComplexities(glyphInfos, strike, &mode, rawGlyphCodes, uniChars, glyphs, @@ -871,7 +871,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], // just do one malloc, and carve it up for all the buffers void *buffer = malloc(sizeof(CGRect) * sizeof(CGSize) * - sizeof(CGGlyph) * sizeof(UniChar) * len); + sizeof(CGGlyph) * sizeof(UnicodeScalarValue) * len); if (buffer == NULL) { [[NSException exceptionWithName:NSMallocException reason:@"Failed to allocate memory for the temporary glyph strike and measurement buffers." userInfo:nil] raise]; @@ -880,7 +880,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], CGRect *bboxes = (CGRect *)(buffer); CGSize *advances = (CGSize *)(bboxes + sizeof(CGRect) * len); CGGlyph *glyphs = (CGGlyph *)(advances + sizeof(CGGlyph) * len); - UniChar *uniChars = (UniChar *)(glyphs + sizeof(UniChar) * len); + UnicodeScalarValue *uniChars = (UnicodeScalarValue *)(glyphs + sizeof(UnicodeScalarValue) * len); CGGI_CreateGlyphsAndScanForComplexities(glyphInfos, strike, &mode, rawGlyphCodes, uniChars, glyphs, diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h index a0ede94846c..cbd3dc5923b 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h @@ -32,7 +32,9 @@ #pragma mark --- CoreText Support --- #define HI_SURROGATE_START 0xD800 +#define HI_SURROGATE_END 0xDBFF #define LO_SURROGATE_START 0xDC00 +#define LO_SURROGATE_END 0xDFFF /* * Transform Unicode characters into glyphs. diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m index 1bcd9f55102..5663b3084ac 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m @@ -103,24 +103,34 @@ void CTS_GetGlyphsAsIntsForCharacters size_t i; for (i = 0; i < count; i++) { + UniChar unicode = unicodes[i]; + UniChar nextUnicode = (i+1) < count ? unicodes[i+1] : 0; + bool surrogatePair = unicode >= HI_SURROGATE_START && unicode <= HI_SURROGATE_END + && nextUnicode >= LO_SURROGATE_START && nextUnicode <= LO_SURROGATE_END; + CGGlyph glyph = glyphs[i]; if (glyph > 0) { glyphsAsInts[i] = glyph; + if (surrogatePair) i++; continue; } - UniChar unicode = unicodes[i]; - const CTFontRef fallback = JRSFontCreateFallbackFontForCharacters((CTFontRef)font->fFont, &unicode, 1); + const CTFontRef fallback = JRSFontCreateFallbackFontForCharacters((CTFontRef)font->fFont, &unicodes[i], + surrogatePair ? 2 : 1); if (fallback) { - CTFontGetGlyphsForCharacters(fallback, &unicode, &glyph, 1); + CTFontGetGlyphsForCharacters(fallback, &unicodes[i], &glyphs[i], surrogatePair ? 2 : 1); + glyph = glyphs[i]; CFRelease(fallback); } if (glyph > 0) { - glyphsAsInts[i] = -unicode; // set the glyph code to the negative unicode value + int codePoint = surrogatePair ? (((int)(unicode - HI_SURROGATE_START)) << 10) + + nextUnicode - LO_SURROGATE_START + 0x10000 : unicode; + glyphsAsInts[i] = -codePoint; // set the glyph code to the negative unicode value } else { glyphsAsInts[i] = 0; // CoreText couldn't find a glyph for this character either } + if (surrogatePair) i++; } } @@ -158,8 +168,18 @@ CTFontRef CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode return (CTFontRef)font->fFont; } - UTF16Char character = -glyphCode; - return CTS_CopyCTFallbackFontAndGlyphForUnicode(font, &character, glyphRef, 1); + int codePoint = -glyphCode; + if (codePoint >= 0x10000) { + UTF16Char chars[2]; + CGGlyph glyphs[2]; + CTS_BreakupUnicodeIntoSurrogatePairs(codePoint, chars); + CTFontRef result = CTS_CopyCTFallbackFontAndGlyphForUnicode(font, chars, glyphs, 2); + *glyphRef = glyphs[0]; + return result; + } else { + UTF16Char character = codePoint; + return CTS_CopyCTFallbackFontAndGlyphForUnicode(font, &character, glyphRef, 1); + } } // Breakup a 32 bit unicode value into the component surrogate pairs diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java index 1c194fb3b95..2b94d15317f 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java @@ -541,10 +541,10 @@ public class TIFFIFD extends TIFFDirectory { } // Stream position initially at beginning, left at end - // if ignoreUnknownFields is true, do not load fields for which + // if readUnknownTags is false, do not load fields for which // a tag cannot be found in an allowed TagSet. public void initialize(ImageInputStream stream, boolean isPrimaryIFD, - boolean ignoreUnknownFields) throws IOException { + boolean ignoreMetadata, boolean readUnknownTags) throws IOException { removeTIFFFields(); @@ -553,10 +553,16 @@ public class TIFFIFD extends TIFFDirectory { List tagSetList = getTagSetList(); + // Configure essential tag variables if this is the primary IFD and + // either all metadata are being ignored, or metadata are not being + // ignored but both unknown tags are being ignored and the tag set + // list does not contain the baseline tags. boolean ensureEssentialTags = false; TIFFTagSet baselineTagSet = null; - if (isPrimaryIFD && ignoreUnknownFields - && !tagSetList.contains(BaselineTIFFTagSet.getInstance())) { + if (isPrimaryIFD && + (ignoreMetadata || + (!readUnknownTags && + !tagSetList.contains(BaselineTIFFTagSet.getInstance())))) { ensureEssentialTags = true; initializeEssentialTags(); baselineTagSet = BaselineTIFFTagSet.getInstance(); @@ -590,9 +596,12 @@ public class TIFFIFD extends TIFFDirectory { tag = baselineTagSet.getTag(tagNumber); } - // Ignore unknown fields, fields with unknown type, and fields + // Ignore non-essential fields, unknown fields unless forcibly + // being read, fields with unknown type, and fields // with count out of int range. - if((tag == null && ignoreUnknownFields) + if((ignoreMetadata && + (!ensureEssentialTags || !essentialTags.contains(tagNumber))) + || (tag == null && !readUnknownTags) || (tag != null && !tag.isDataTypeOK(type)) || longCount > Integer.MAX_VALUE) { // Skip the value/offset so as to leave the stream @@ -701,7 +710,8 @@ public class TIFFIFD extends TIFFDirectory { tagSets.add(tag.getTagSet()); TIFFIFD subIFD = new TIFFIFD(tagSets); - subIFD.initialize(stream, false, ignoreUnknownFields); + subIFD.initialize(stream, false, ignoreMetadata, + readUnknownTags); TIFFField f = new TIFFField(tag, type, e.offset, subIFD); addTIFFField(f); } else { diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java index a1455315331..ef68d134892 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java @@ -82,12 +82,13 @@ public class TIFFImageMetadata extends IIOMetadata { } public void initializeFromStream(ImageInputStream stream, - boolean ignoreUnknownFields) + boolean ignoreMetadata, + boolean readUnknownTags) throws IOException { - rootIFD.initialize(stream, true, ignoreUnknownFields); + rootIFD.initialize(stream, true, ignoreMetadata, readUnknownTags); } - public void addShortOrLongField(int tagNumber, int value) { + public void addShortOrLongField(int tagNumber, long value) { TIFFField field = new TIFFField(rootIFD.getTag(tagNumber), value); rootIFD.addTIFFField(field); } diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java index 91778e7e097..3ccc3cd9233 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java @@ -305,16 +305,19 @@ public class TIFFImageReader extends ImageReader { try { // Create an object to store the image metadata List tagSets; + boolean readUnknownTags = false; if (imageReadParam instanceof TIFFImageReadParam) { - tagSets - = ((TIFFImageReadParam) imageReadParam).getAllowedTagSets(); + TIFFImageReadParam tp = (TIFFImageReadParam)imageReadParam; + tagSets = tp.getAllowedTagSets(); + readUnknownTags = tp.getReadUnknownTags(); } else { tagSets = new ArrayList(1); tagSets.add(BaselineTIFFTagSet.getInstance()); } this.imageMetadata = new TIFFImageMetadata(tagSets); - imageMetadata.initializeFromStream(stream, ignoreMetadata); + imageMetadata.initializeFromStream(stream, ignoreMetadata, + readUnknownTags); } catch (IIOException iioe) { throw iioe; } catch (IOException ioe) { diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java index 8e0942d75b7..6d27c01bb93 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java @@ -3015,7 +3015,7 @@ public class TIFFImageWriter extends ImageWriter { List tagSets = new ArrayList(1); tagSets.add(BaselineTIFFTagSet.getInstance()); TIFFIFD rootIFD = new TIFFIFD(tagSets); - rootIFD.initialize(stream, true, true); + rootIFD.initialize(stream, true, false, false); stream.reset(); return rootIFD; diff --git a/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java index 470ad9a17d0..f966a767459 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java +++ b/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,17 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.peer.CheckboxMenuItemPeer; -import java.awt.event.*; -import java.util.EventListener; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; import java.io.IOException; -import javax.accessibility.*; -import sun.awt.AWTAccessor; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.EventListener; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleValue; + +import sun.awt.AWTAccessor; /** * This class represents a check box that can be included in a menu. @@ -43,7 +50,8 @@ import sun.awt.AWTAccessor; * of {@code CheckBoxMenuItem}: *

* Menu labeled Examples, containing items Basic, Simple, Check, and More Examples. The Check item is a CheckBoxMenuItem instance, in the off state. *

* The item labeled {@code Check} shows a check box menu item @@ -84,9 +92,9 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access * @see #getState() * @see #setState(boolean) */ - boolean state = false; + private volatile boolean state; - transient ItemListener itemListener; + private transient volatile ItemListener itemListener; private static final String base = "chkmenuitem"; private static int nameCounter = 0; diff --git a/jdk/src/java.desktop/share/classes/java/awt/Menu.java b/jdk/src/java.desktop/share/classes/java/awt/Menu.java index 70b5ee1f25f..4bd1bba8a0e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/Menu.java +++ b/jdk/src/java.desktop/share/classes/java/awt/Menu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,15 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.KeyEvent; +import java.awt.peer.MenuPeer; import java.io.IOException; import java.io.ObjectInputStream; -import java.util.Vector; import java.util.Enumeration; -import java.awt.peer.MenuPeer; -import java.awt.event.KeyEvent; -import javax.accessibility.*; +import java.util.Vector; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; + import sun.awt.AWTAccessor; /** @@ -78,7 +83,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * @serial * @see #countItems() */ - Vector items = new Vector<>(); + private final Vector items = new Vector<>(); /** * This field indicates whether the menu has the @@ -92,7 +97,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * @serial * @see #isTearOff() */ - boolean tearOff; + private final boolean tearOff; /** * This field will be set to {@code true} @@ -102,7 +107,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * * @serial */ - boolean isHelpMenu; + volatile boolean isHelpMenu; private static final String base = "menu"; private static int nameCounter = 0; @@ -415,8 +420,8 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { if (peer != null) { peer.delItem(index); mi.removeNotify(); - mi.parent = null; } + mi.parent = null; } } diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java index 4a57b0dbf2c..8d0d51d6360 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,16 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.KeyEvent; +import java.awt.peer.MenuBarPeer; import java.io.IOException; import java.io.ObjectInputStream; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; + import sun.awt.AWTAccessor; -import java.awt.peer.MenuBarPeer; -import java.awt.event.KeyEvent; -import javax.accessibility.*; /** * The {@code MenuBar} class encapsulates the platform's @@ -94,7 +99,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible * @serial * @see #countMenus() */ - Vector

menus = new Vector<>(); + private final Vector menus = new Vector<>(); /** * This menu is a special menu dedicated to @@ -106,7 +111,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible * @see #getHelpMenu() * @see #setHelpMenu(Menu) */ - Menu helpMenu; + private volatile Menu helpMenu; private static final String base = "menubar"; private static int nameCounter = 0; @@ -252,8 +257,8 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible if (peer != null) { peer.delMenu(index); m.removeNotify(); - m.parent = null; } + m.parent = null; if (helpMenu == m) { helpMenu = null; m.isHelpMenu = false; diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java index c6097397c98..fb3c72c617e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,21 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; -import java.awt.peer.MenuComponentPeer; import java.awt.event.ActionEvent; +import java.awt.peer.MenuComponentPeer; import java.io.IOException; import java.io.ObjectInputStream; -import sun.awt.AppContext; -import sun.awt.AWTAccessor; -import sun.awt.ComponentFactory; - -import javax.accessibility.*; - import java.security.AccessControlContext; import java.security.AccessController; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleComponent; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleSelection; +import javax.accessibility.AccessibleState; +import javax.accessibility.AccessibleStateSet; + +import sun.awt.AWTAccessor; +import sun.awt.AppContext; +import sun.awt.ComponentFactory; + /** * The abstract class {@code MenuComponent} is the superclass * of all menu-related components. In this respect, the class @@ -60,13 +67,13 @@ public abstract class MenuComponent implements java.io.Serializable { } transient volatile MenuComponentPeer peer; - transient MenuContainer parent; + transient volatile MenuContainer parent; /** * The {@code AppContext} of the {@code MenuComponent}. * This is set in the constructor and never changes. */ - transient AppContext appContext; + private transient volatile AppContext appContext; /** * The menu component's font. This value can be @@ -77,7 +84,7 @@ public abstract class MenuComponent implements java.io.Serializable { * @see #setFont(Font) * @see #getFont() */ - volatile Font font; + private volatile Font font; /** * The menu component's name, which defaults to {@code null}. @@ -85,7 +92,7 @@ public abstract class MenuComponent implements java.io.Serializable { * @see #getName() * @see #setName(String) */ - private String name; + private volatile String name; /** * A variable to indicate whether a name is explicitly set. @@ -94,14 +101,14 @@ public abstract class MenuComponent implements java.io.Serializable { * @serial * @see #setName(String) */ - private boolean nameExplicitlySet = false; + private volatile boolean nameExplicitlySet; /** * Defaults to {@code false}. * @serial * @see #dispatchEvent(AWTEvent) */ - boolean newEventsOnly = false; + volatile boolean newEventsOnly; /* * The menu's AccessControlContext. diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java index 3a70fe2bee0..e0611ccba31 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,15 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; import java.awt.peer.MenuItemPeer; -import java.awt.event.*; -import java.util.EventListener; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; import java.io.IOException; -import javax.accessibility.*; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.EventListener; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleValue; + import sun.awt.AWTAccessor; /** @@ -111,7 +121,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #isEnabled() * @see #setEnabled(boolean) */ - boolean enabled = true; + private volatile boolean enabled = true; /** * {@code label} is the label of a menu item. @@ -121,7 +131,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #getLabel() * @see #setLabel(String) */ - String label; + volatile String label; /** * This field indicates the command that has been issued @@ -134,7 +144,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #setActionCommand(String) * @see #getActionCommand() */ - String actionCommand; + private volatile String actionCommand; /** * The eventMask is ONLY set by subclasses via enableEvents. @@ -144,9 +154,9 @@ public class MenuItem extends MenuComponent implements Accessible { * * @serial */ - long eventMask; + volatile long eventMask; - transient ActionListener actionListener; + private transient volatile ActionListener actionListener; /** * A sequence of key stokes that ia associated with @@ -160,7 +170,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #setShortcut(MenuShortcut) * @see #deleteShortcut() */ - private MenuShortcut shortcut = null; + private volatile MenuShortcut shortcut; private static final String base = "menuitem"; private static int nameCounter = 0; diff --git a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java index 253351f164a..48460749d6e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java +++ b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,9 @@ package java.awt; import java.awt.peer.PopupMenuPeer; -import javax.accessibility.*; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; import sun.awt.AWTAccessor; @@ -48,7 +49,7 @@ public class PopupMenu extends Menu { private static final String base = "popup"; static int nameCounter = 0; - transient boolean isTrayIconPopup = false; + transient volatile boolean isTrayIconPopup; static { AWTAccessor.setPopupMenuAccessor( diff --git a/jdk/src/java.desktop/share/classes/java/awt/Window.java b/jdk/src/java.desktop/share/classes/java/awt/Window.java index ed7d63ae154..8d122be3522 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/Window.java +++ b/jdk/src/java.desktop/share/classes/java/awt/Window.java @@ -4122,6 +4122,10 @@ public class Window extends Container implements Accessible { public void setTrayIconWindow(Window w, boolean isTrayIconWindow) { w.isTrayIconWindow = isTrayIconWindow; } + + public Window[] getOwnedWindows(Window w) { + return w.getOwnedWindows_NoClientCode(); + } }); // WindowAccessor } // static diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java index 7d858548ddb..63ceb3f1706 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java +++ b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java @@ -279,7 +279,7 @@ public class DragSourceContext } /** - * Sets the cursor for this drag operation to the specified + * Sets the custom cursor for this drag operation to the specified * {@code Cursor}. If the specified {@code Cursor} * is {@code null}, the default drag cursor behavior is * activated for this drag operation, otherwise it is deactivated. @@ -298,9 +298,11 @@ public class DragSourceContext } /** - * Returns the current drag {@code Cursor}. + * Returns the current custom drag {@code Cursor}. * - * @return the current drag {@code Cursor} + * @return the current custom drag {@code Cursor}, if it was set + * otherwise returns {@code null}. + * @see #setCursor */ public Cursor getCursor() { return cursor; } diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java index 9d190a92e2c..89c43879ac3 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java +++ b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java @@ -64,27 +64,71 @@ import java.awt.Image; public abstract class AbstractMultiResolutionImage extends java.awt.Image implements MultiResolutionImage { + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getWidth(observer)}. + * + * @return the width of the base image, or -1 if the width is not yet known + * @see #getBaseImage() + * + * @since 9 + */ @Override public int getWidth(ImageObserver observer) { return getBaseImage().getWidth(observer); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getHeight(observer)}. + * + * @return the height of the base image, or -1 if the height is not yet known + * @see #getBaseImage() + * + * @since 9 + */ @Override public int getHeight(ImageObserver observer) { return getBaseImage().getHeight(observer); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getSource()}. + * + * @return the image producer that produces the pixels for the base image + * @see #getBaseImage() + * + * @since 9 + */ @Override public ImageProducer getSource() { return getBaseImage().getSource(); } + /** + * As per the contract of the base {@code Image#getGraphics()} method, + * this implementation will always throw {@code UnsupportedOperationException} + * since only off-screen images can return a {@code Graphics} object. + * + * @return throws {@code UnsupportedOperationException} + * @throws UnsupportedOperationException this method is not supported + */ @Override public Graphics getGraphics() { throw new UnsupportedOperationException("getGraphics() not supported" + " on Multi-Resolution Images"); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getProperty(name, observer)}. + * + * @return the value of the named property in the base image + * @see #getBaseImage() + * + * @since 9 + */ @Override public Object getProperty(String name, ImageObserver observer) { return getBaseImage().getProperty(name, observer); diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html index 2fc49cfec0f..5cff3659bf3 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html +++ b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html @@ -216,22 +216,27 @@ second on the inferred color space.

Metadata Issues

-By default all fields in the TIFF image file directory (IFD) are loaded into -the native image metadata object. In cases where the IFD includes fields which -contain large amounts of data this could be very inefficient. Which fields -are loaded may be controlled by setting which TIFF tags the reader is allowed -to recognize and whether it is ignoring metadata. The reader is informed to -disregard metadata as usual via the ignoreMetadata parameter of +By default all recognized fields in the TIFF image file directory (IFD) are +loaded into the native image metadata object. Which fields are loaded may be +controlled by setting which TIFF tags the reader is allowed to recognize, +whether to read fields with unrecognized tags, and whether to ignore all +metadata. The reader is informed to disregard all metadata as usual via the +ignoreMetadata parameter of ImageReader.setInput(Object,boolean,boolean). It is informed of which TIFFTags to recognize or not to recognize via -TIFFImageReadParam.addAllowedTagSet(TIFFTagSet) -and +TIFFImageReadParam.addAllowedTagSet(TIFFTagSet) and TIFFImageReadParam.removeAllowedTagSet(TIFFTagSet). -If ignoreMetadata is true, then the reader will -load into the native image metadata object only those fields which have a -TIFFTag contained in the one of the allowed -TIFFTagSets. +If ignoreMetadata is true, then only metadata +essential to reading the image will be loaded into the native image metadata +object. If ignoreMetadata is false, then the reader +will by default load into the native image metadata object only those fields +which are either essential to reading the image or have a TIFFTag +contained in the one of the allowed TIFFTagSets. Reading of +fields with tags not in the allowed TIFFTagSets may be forced +by passing in a TIFFImageReadParam on which +TIFFImageReadParam.setReadUnknownTags(boolean) has been +invoked with parameter true.

Use of a TIFFDirectory object may simplify gaining access to metadata values. An instance of @@ -534,7 +539,7 @@ Technical Note #2 ZLib "Deflate/Inflate" compression (see note following this table) - + Adobe Photoshop® TIFF Technical Notes (PDF) @@ -545,9 +550,9 @@ Adobe Photoshop® TIFF Technical Notes (PDF) Deflate "Zip-in-TIFF" compression (see note following this table) - + ZLIB Compressed Data Format Specification, - + DEFLATE Compressed Data Format Specification diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java index 8c9ce8eaffa..d6181990e3f 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java @@ -224,7 +224,7 @@ public final class BaselineTIFFTagSet extends TIFFTagSet { * A value to be used with the "Compression" tag. * * @see #TAG_COMPRESSION - * @see DEFLATE specification + * @see DEFLATE specification * @see TIFF Specification Supplement 2 */ public static final int COMPRESSION_DEFLATE = 32946; diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java index 3ecfe500673..07888435588 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java @@ -29,7 +29,7 @@ import java.util.List; /** * A class representing the extra tags found in a - * TIFF-F (RFC 2036) file. + * TIFF-F (RFC 2036) file. * * @since 9 */ diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java index 4f77c2926bf..18962ed3816 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java @@ -30,10 +30,7 @@ import java.util.List; /** * A class representing the tags found in a GeoTIFF IFD. GeoTIFF is a * standard for annotating georeferenced or geocoded raster imagery. - * The GeoTIFF specification may be found at - * {@code http://www.remotesensing.org/geotiff/spec/geotiffhome.html} - * . This class does not handle the GeoKeys referenced + * This class does not handle the GeoKeys referenced * from a GeoKeyDirectoryTag as those are not TIFF tags per se. * *

The definitions of the data types referenced by the field diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java index 8ac2316d277..b36406b41e8 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java @@ -263,14 +263,16 @@ import com.sun.imageio.plugins.tiff.TIFFIFD; */ public final class TIFFField implements Cloneable { - private static final String[] typeNames = { + private static final long MAX_UINT32 = 0xffffffffL; + + private static final String[] TYPE_NAMES = { null, "Byte", "Ascii", "Short", "Long", "Rational", "SByte", "Undefined", "SShort", "SLong", "SRational", "Float", "Double", "IFDPointer" }; - private static final boolean[] isIntegral = { + private static final boolean[] IS_INTEGRAL = { false, true, false, true, true, false, true, true, true, true, false, @@ -544,6 +546,9 @@ public final class TIFFField implements Cloneable { * @throws IllegalArgumentException if {@code data} is an instance of * a class incompatible with the specified type. * @throws IllegalArgumentException if the size of the data array is wrong. + * @throws IllegalArgumentException if the type of the data array is + * {@code TIFF_LONG}, {@code TIFF_RATIONAL}, or {@code TIFF_IFD_POINTER} + * and any of the elements is negative or greater than {@code 0xffffffff}. */ public TIFFField(TIFFTag tag, int type, int count, Object data) { if(tag == null) { @@ -587,15 +592,50 @@ public final class TIFFField implements Cloneable { case TIFFTag.TIFF_LONG: isDataArrayCorrect = data instanceof long[] && ((long[])data).length == count; + if (isDataArrayCorrect) { + for (long datum : (long[])data) { + if (datum < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_LONG"); + } + if (datum > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_LONG"); + } + } + } break; case TIFFTag.TIFF_IFD_POINTER: isDataArrayCorrect = data instanceof long[] && ((long[])data).length == 1; + if (((long[])data)[0] < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_IFD_POINTER"); + } + if (((long[])data)[0] > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_IFD_POINTER"); + } break; case TIFFTag.TIFF_RATIONAL: isDataArrayCorrect = data instanceof long[][] - && ((long[][])data).length == count - && ((long[][])data)[0].length == 2; + && ((long[][])data).length == count; + if (isDataArrayCorrect) { + for (long[] datum : (long[][])data) { + if (datum.length != 2) { + isDataArrayCorrect = false; + break; + } + if (datum[0] < 0 || datum[1] < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_RATIONAL"); + } + if (datum[0] > MAX_UINT32 || datum[1] > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_RATIONAL"); + } + } + } break; case TIFFTag.TIFF_SSHORT: isDataArrayCorrect = data instanceof short[] @@ -607,8 +647,15 @@ public final class TIFFField implements Cloneable { break; case TIFFTag.TIFF_SRATIONAL: isDataArrayCorrect = data instanceof int[][] - && ((int[][])data).length == count - && ((int[][])data)[0].length == 2; + && ((int[][])data).length == count; + if (isDataArrayCorrect) { + for (int[] datum : (int[][])data) { + if (datum.length != 2) { + isDataArrayCorrect = false; + break; + } + } + } break; case TIFFTag.TIFF_FLOAT: isDataArrayCorrect = data instanceof float[] @@ -658,27 +705,32 @@ public final class TIFFField implements Cloneable { /** * Constructs a {@code TIFFField} with a single non-negative integral - * value. - * The field will have type - * {@link TIFFTag#TIFF_SHORT TIFF_SHORT} if - * {@code val < 65536} and type - * {@link TIFFTag#TIFF_LONG TIFF_LONG} otherwise. The count - * of the field will be unity. + * value. The field will have type {@link TIFFTag#TIFF_SHORT TIFF_SHORT} + * if {@code value} is in {@code [0,0xffff]}, and type + * {@link TIFFTag#TIFF_LONG TIFF_LONG} if {@code value} is in + * {@code [0x10000,0xffffffff]}. The count of the field will be unity. * * @param tag The tag to associate with this field. * @param value The value to associate with this field. * @throws NullPointerException if {@code tag == null}. - * @throws IllegalArgumentException if the derived type is unacceptable - * for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code value < 0}. + * @throws IllegalArgumentException if {@code value} is not in + * {@code [0,0xffffffff]}. + * @throws IllegalArgumentException if {@code value} is in + * {@code [0,0xffff]} and {@code TIFF_SHORT} is an unacceptable type + * for the {@code TIFFTag}, or if {@code value} is in + * {@code [0x10000,0xffffffff]} and {@code TIFF_LONG} is an unacceptable + * type for the {@code TIFFTag}. */ - public TIFFField(TIFFTag tag, int value) { + public TIFFField(TIFFTag tag, long value) { if(tag == null) { throw new NullPointerException("tag == null!"); } if (value < 0) { throw new IllegalArgumentException("value < 0!"); } + if (value > MAX_UINT32) { + throw new IllegalArgumentException("value > 0xffffffff!"); + } this.tag = tag; this.tagNumber = tag.getNumber(); @@ -687,7 +739,8 @@ public final class TIFFField implements Cloneable { if (value < 65536) { if (!tag.isDataTypeOK(TIFFTag.TIFF_SHORT)) { throw new IllegalArgumentException("Illegal data type " - + TIFFTag.TIFF_SHORT + " for " + tag.getName() + " tag"); + + getTypeName(TIFFTag.TIFF_SHORT) + " for tag " + + "\"" + tag.getName() + "\""); } this.type = TIFFTag.TIFF_SHORT; char[] cdata = new char[1]; @@ -696,7 +749,8 @@ public final class TIFFField implements Cloneable { } else { if (!tag.isDataTypeOK(TIFFTag.TIFF_LONG)) { throw new IllegalArgumentException("Illegal data type " - + TIFFTag.TIFF_LONG + " for " + tag.getName() + " tag"); + + getTypeName(TIFFTag.TIFF_LONG) + " for tag " + + "\"" + tag.getName() + "\""); } this.type = TIFFTag.TIFF_LONG; long[] ldata = new long[1]; @@ -799,7 +853,7 @@ public final class TIFFField implements Cloneable { throw new IllegalArgumentException("Unknown data type "+dataType); } - return typeNames[dataType]; + return TYPE_NAMES[dataType]; } /** @@ -812,7 +866,7 @@ public final class TIFFField implements Cloneable { */ public static int getTypeByName(String typeName) { for (int i = TIFFTag.MIN_DATATYPE; i <= TIFFTag.MAX_DATATYPE; i++) { - if (typeName.equals(typeNames[i])) { + if (typeName.equals(TYPE_NAMES[i])) { return i; } } @@ -887,7 +941,7 @@ public final class TIFFField implements Cloneable { * @return Whether the field type is integral. */ public boolean isIntegral() { - return isIntegral[type]; + return IS_INTEGRAL[type]; } /** diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java index 1b8821aef1c..0abf60219e7 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java @@ -46,11 +46,18 @@ import javax.imageio.ImageReadParam; * {@code ExifParentTIFFTagSet}, and {@code GeoTIFFTagSet} * are included. * + *

Forcing reading of fields corresponding to {@code TIFFTag}s + * not in any of the allowed {@code TIFFTagSet}s may be effected via + * {@link #setReadUnknownTags setReadUnknownTags}. + * * @since 9 */ public final class TIFFImageReadParam extends ImageReadParam { - private List allowedTagSets = new ArrayList(4); + private final List allowedTagSets = + new ArrayList(4); + + private boolean readUnknownTags = false; /** * Constructs a {@code TIFFImageReadParam}. Tags defined by @@ -72,7 +79,8 @@ public final class TIFFImageReadParam extends ImageReadParam { /** * Adds a {@code TIFFTagSet} object to the list of allowed - * tag sets. + * tag sets. Attempting to add a duplicate object to the list + * has no effect. * * @param tagSet a {@code TIFFTagSet}. * @@ -83,7 +91,9 @@ public final class TIFFImageReadParam extends ImageReadParam { if (tagSet == null) { throw new IllegalArgumentException("tagSet == null!"); } - allowedTagSets.add(tagSet); + if (!allowedTagSets.contains(tagSet)) { + allowedTagSets.add(tagSet); + } } /** @@ -113,4 +123,27 @@ public final class TIFFImageReadParam extends ImageReadParam { public List getAllowedTagSets() { return allowedTagSets; } + + /** + * Set whether to read fields corresponding to {@code TIFFTag}s not in + * the allowed {@code TIFFTagSet}s. The default setting is {@code false}. + * If the TIFF {@code ImageReader} is ignoring metadata, then a setting + * of {@code true} is overridden as all metadata are ignored except those + * essential to reading the image itself. + * + * @param readUnknownTags Whether to read fields of unrecognized tags + */ + public void setReadUnknownTags(boolean readUnknownTags) { + this.readUnknownTags = readUnknownTags; + } + + /** + * Retrieve the setting of whether to read fields corresponding to unknown + * {@code TIFFTag}s. + * + * @return Whether to read fields of unrecognized tags + */ + public boolean getReadUnknownTags() { + return readUnknownTags; + } } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java index 5bc2f0687a9..542e1cb3c16 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java @@ -182,6 +182,8 @@ public abstract class DefaultRowSorter extends RowSorter { */ private int modelRowCount; + // Whether to print warning about JDK-8160087 + private static boolean warning8160087 = true; /** * Creates an empty DefaultRowSorter. @@ -489,10 +491,7 @@ public abstract class DefaultRowSorter extends RowSorter { */ public int convertRowIndexToView(int index) { if (modelToView == null) { - if (index < 0 || index >= modelRowCount) { - throw new IndexOutOfBoundsException("Invalid index"); - } - return index; + return convertUnsortedUnfiltered(index); } return modelToView[index]; } @@ -504,14 +503,30 @@ public abstract class DefaultRowSorter extends RowSorter { */ public int convertRowIndexToModel(int index) { if (viewToModel == null) { - if (index < 0 || index >= modelRowCount) { - throw new IndexOutOfBoundsException("Invalid index"); - } - return index; + return convertUnsortedUnfiltered(index); } return viewToModel[index].modelIndex; } + private int convertUnsortedUnfiltered(int index) { + if (index < 0 || index >= modelRowCount) { + if(index >= modelRowCount && + index < getModelWrapper().getRowCount()) { + // 8160087 + if(warning8160087) { + warning8160087 = false; + System.err.println("WARNING: row index is bigger than " + + "sorter's row count. Most likely this is a wrong " + + "sorter usage."); + } + } else { + throw new IndexOutOfBoundsException("Invalid index"); + } + } + return index; + } + + private boolean isUnsorted() { List keys = getSortKeys(); int keySize = keys.size(); diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java index 979d2b8a3d7..7582a025eae 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java @@ -27,6 +27,7 @@ package javax.swing; import java.awt.Component; import java.awt.Graphics; import java.awt.Insets; +import java.awt.Toolkit; import java.awt.event.*; import java.beans.JavaBean; import java.beans.BeanProperty; @@ -41,6 +42,8 @@ import java.io.IOException; import javax.swing.plaf.*; import javax.accessibility.*; +import sun.awt.SunToolkit; + /** * An implementation of a menu bar. You add JMenu objects to the * menu bar to construct a menu. When the user selects a JMenu @@ -144,6 +147,10 @@ public class JMenuBar extends JComponent implements Accessible,MenuElement * @see JComponent#updateUI */ public void updateUI() { + Toolkit tk = Toolkit.getDefaultToolkit(); + if (tk instanceof SunToolkit) { + ((SunToolkit)tk).updateScreenMenuBarUI(); + } setUI((MenuBarUI)UIManager.getUI(this)); } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java index 491d16306ea..44576585435 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java @@ -47,6 +47,7 @@ import java.util.Arrays; import java.util.Collections; import sun.awt.AWTAccessor; +import sun.swing.SwingUtilities2; /** * The "viewport" or "porthole" through which you see the underlying @@ -1034,9 +1035,16 @@ public class JViewport extends JComponent implements Accessible private boolean isBlitting() { Component view = getView(); return (scrollMode == BLIT_SCROLL_MODE) && - (view instanceof JComponent) && view.isOpaque(); + (view instanceof JComponent) && view.isOpaque() && !isFPScale(); } + private boolean isFPScale() { + GraphicsConfiguration gc = getGraphicsConfiguration(); + if (gc != null) { + return SwingUtilities2.isFloatingPointScale(gc.getDefaultTransform()); + } + return false; + } /** * Returns the JViewport's one child or null. diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java index 1db490608b7..8737b6bb760 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -45,7 +45,11 @@ import sun.java2d.SunGraphicsEnvironment; import sun.security.action.GetPropertyAction; import com.sun.java.swing.SwingUtilities3; +import java.awt.geom.AffineTransform; +import sun.java2d.SunGraphics2D; +import sun.java2d.pipe.Region; import sun.swing.SwingAccessor; +import sun.swing.SwingUtilities2; import sun.swing.SwingUtilities2.RepaintListener; /** @@ -1517,9 +1521,12 @@ public class RepaintManager // standard Image buffer. boolean paintCompleted = false; Image offscreen; + int sw = w + 1; + int sh = h + 1; + if (repaintManager.useVolatileDoubleBuffer() && (offscreen = getValidImage(repaintManager. - getVolatileOffscreenBuffer(bufferComponent, w, h))) != null) { + getVolatileOffscreenBuffer(bufferComponent, sw, sh))) != null) { VolatileImage vImage = (java.awt.image.VolatileImage)offscreen; GraphicsConfiguration gc = bufferComponent. getGraphicsConfiguration(); @@ -1529,7 +1536,7 @@ public class RepaintManager VolatileImage.IMAGE_INCOMPATIBLE) { repaintManager.resetVolatileDoubleBuffer(gc); offscreen = repaintManager.getVolatileOffscreenBuffer( - bufferComponent,w, h); + bufferComponent, sw, sh); vImage = (java.awt.image.VolatileImage)offscreen; } paintDoubleBuffered(paintingComponent, vImage, g, x, y, @@ -1589,8 +1596,18 @@ public class RepaintManager * Paints a portion of a component to an offscreen buffer. */ protected void paintDoubleBuffered(JComponent c, Image image, - Graphics g, int clipX, int clipY, - int clipW, int clipH) { + Graphics g, int clipX, int clipY, + int clipW, int clipH) { + if (image instanceof VolatileImage && isPixelsCopying(c, g)) { + paintDoubleBufferedFPScales(c, image, g, clipX, clipY, clipW, clipH); + } else { + paintDoubleBufferedImpl(c, image, g, clipX, clipY, clipW, clipH); + } + } + + private void paintDoubleBufferedImpl(JComponent c, Image image, + Graphics g, int clipX, int clipY, + int clipW, int clipH) { Graphics osg = image.getGraphics(); int bw = Math.min(clipW, image.getWidth(null)); int bh = Math.min(clipH, image.getHeight(null)); @@ -1629,6 +1646,76 @@ public class RepaintManager } } + private void paintDoubleBufferedFPScales(JComponent c, Image image, + Graphics g, int clipX, int clipY, + int clipW, int clipH) { + Graphics osg = image.getGraphics(); + Graphics2D g2d = (Graphics2D) g; + Graphics2D osg2d = (Graphics2D) osg; + + AffineTransform identity = new AffineTransform(); + int bw = Math.min(clipW, image.getWidth(null)); + int bh = Math.min(clipH, image.getHeight(null)); + int x, y, maxx, maxy; + + AffineTransform tx = g2d.getTransform(); + double scaleX = tx.getScaleX(); + double scaleY = tx.getScaleY(); + double trX = tx.getTranslateX(); + double trY = tx.getTranslateY(); + + boolean translucent = volatileBufferType != Transparency.OPAQUE; + Composite oldComposite = g2d.getComposite(); + + try { + for (x = clipX, maxx = clipX + clipW; x < maxx; x += bw) { + for (y = clipY, maxy = clipY + clipH; y < maxy; y += bh) { + + // draw x, y, bw, bh + int pixelx1 = Region.clipRound(x * scaleX + trX); + int pixely1 = Region.clipRound(y * scaleY + trY); + int pixelx2 = Region.clipRound((x + bw) * scaleX + trX); + int pixely2 = Region.clipRound((y + bh) * scaleY + trY); + int pixelw = pixelx2 - pixelx1; + int pixelh = pixely2 - pixely1; + + osg2d.setTransform(identity); + if (translucent) { + final Color oldBg = g2d.getBackground(); + g2d.setBackground(c.getBackground()); + g2d.clearRect(pixelx1, pixely1, pixelw, pixelh); + g2d.setBackground(oldBg); + } + + osg2d.setClip(0, 0, pixelw, pixelh); + osg2d.translate(trX - pixelx1, trY - pixely1); + osg2d.scale(scaleX, scaleY); + c.paintToOffscreen(osg, x, y, bw, bh, maxx, maxy); + + g2d.setTransform(identity); + g2d.setClip(pixelx1, pixely1, pixelw, pixelh); + AffineTransform stx = new AffineTransform(); + stx.translate(pixelx1, pixely1); + stx.scale(scaleX, scaleY); + g2d.setTransform(stx); + + if (translucent) { + g2d.setComposite(AlphaComposite.Src); + } + + g2d.drawImage(image, 0, 0, c); + + if (translucent) { + g2d.setComposite(oldComposite); + } + g2d.setTransform(tx); + } + } + } finally { + osg.dispose(); + } + } + /** * If image is non-null with a positive size it * is returned, otherwise null is returned. @@ -1671,8 +1758,32 @@ public class RepaintManager */ protected void dispose() { } - } + private boolean isPixelsCopying(JComponent c, Graphics g) { + + AffineTransform tx = getTransform(g); + GraphicsConfiguration gc = c.getGraphicsConfiguration(); + + if (tx == null || gc == null + || !SwingUtilities2.isFloatingPointScale(tx)) { + return false; + } + + AffineTransform gcTx = gc.getDefaultTransform(); + + return gcTx.getScaleX() == tx.getScaleX() + && gcTx.getScaleY() == tx.getScaleY(); + } + + private static AffineTransform getTransform(Graphics g) { + if (g instanceof SunGraphics2D) { + return ((SunGraphics2D) g).transform; + } else if (g instanceof Graphics2D) { + return ((Graphics2D) g).getTransform(); + } + return null; + } + } private class DoubleBufferInfo { public Image image; diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java index 91132582193..32db72db408 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -571,7 +571,9 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Obsolete class, not used in this version. + * @deprecated As of JDK version 9. Obsolete class. */ + @Deprecated(since = "9") protected class SingleClickListener extends MouseAdapter { /** * Constructs an instance of {@code SingleClickListener}. @@ -584,7 +586,9 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Obsolete class, not used in this version. + * @deprecated As of JDK version 9. Obsolete class. */ + @Deprecated(since = "9") @SuppressWarnings("serial") // Superclass is not serializable across versions protected class FileRenderer extends DefaultListCellRenderer { } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java index 6bb02264dd3..dde3437adf4 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java @@ -26,6 +26,7 @@ package javax.swing.text; import java.awt.*; import java.awt.font.FontRenderContext; +import java.awt.geom.Rectangle2D; import java.lang.ref.SoftReference; import java.security.AccessController; import java.security.PrivilegedAction; @@ -750,7 +751,6 @@ public class WrappedPlainView extends BoxView implements TabExpander { * valid location in the associated document * @see View#modelToView */ - @SuppressWarnings("deprecation") public Shape modelToView(int pos, Shape a, Position.Bias b) throws BadLocationException { Rectangle alloc = a.getBounds(); @@ -777,9 +777,11 @@ public class WrappedPlainView extends BoxView implements TabExpander { if (pos > p0) { Segment segment = SegmentCache.getSharedSegment(); loadText(segment, p0, pos); - alloc.x += Utilities.getTabbedTextWidth(segment, metrics, - alloc.x, WrappedPlainView.this, p0); + float x = alloc.x; + x += Utilities.getTabbedTextWidth(segment, metrics, x, + WrappedPlainView.this, p0); SegmentCache.releaseSharedSegment(segment); + return new Rectangle2D.Float(x, alloc.y, alloc.width, alloc.height); } return alloc; } diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java index b20d8d62367..29a435c96b9 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java @@ -360,6 +360,12 @@ public final class AWTAccessor { * Marks the specified window as an utility window for TrayIcon. */ void setTrayIconWindow(Window w, boolean isTrayIconWindow); + + /** + * Return an array containing all the windows this + * window currently owns. + */ + Window[] getOwnedWindows(Window w); } /** diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java index f2a99711ff7..de1d303a1a9 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java @@ -1857,6 +1857,9 @@ public abstract class SunToolkit extends Toolkit return time == null ? -1 : time; } + public void updateScreenMenuBarUI() { + } + // Cosntant alpha public boolean isWindowOpacitySupported() { return false; diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java index 2fe223647f1..4c0abc9eec8 100644 --- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java @@ -3101,10 +3101,10 @@ public final class SunGraphics2D if (scaleX == 1 && scaleY == 1) { return null; } - sx1 = Region.clipScale(sx1, scaleX); - sx2 = Region.clipScale(sx2, scaleX); - sy1 = Region.clipScale(sy1, scaleY); - sy2 = Region.clipScale(sy2, scaleY); + sx1 = Region.clipRound(sx1 * scaleX); + sx2 = Region.clipRound(sx2 * scaleX); + sy1 = Region.clipRound(sy1 * scaleY); + sy2 = Region.clipRound(sy2 * scaleY); AffineTransform tx = null; if (xform != null) { diff --git a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java index 9671ec9101a..14b3eaa61a0 100644 --- a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java +++ b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java @@ -305,6 +305,12 @@ public final class JLightweightFrame extends LightweightFrame implements RootPan int startY = (int)Math.floor(y * scaleY); int width = (int)Math.ceil((x + w) * scaleX) - startX; int height = (int)Math.ceil((y + h) * scaleY) - startY; + if (startX + width > linestride) { + width = linestride - startX; + } + if (startY + height > bbImage.getHeight()) { + height = bbImage.getHeight() - startY; + } for (int i = 0; i < height; i++) { int from = (startY + i) * linestride + startX; diff --git a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java index 5bf01c5f99d..f55290b1ca1 100644 --- a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java +++ b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java @@ -33,6 +33,7 @@ import java.awt.font.*; import java.awt.geom.Rectangle2D; import java.awt.geom.AffineTransform; import static java.awt.geom.AffineTransform.TYPE_FLIP; +import static java.awt.geom.AffineTransform.TYPE_MASK_SCALE; import static java.awt.geom.AffineTransform.TYPE_TRANSLATION; import java.awt.print.PrinterGraphics; import java.text.BreakIterator; @@ -2162,6 +2163,19 @@ public class SwingUtilities2 { return false; } + public static boolean isFloatingPointScale(AffineTransform tx) { + int type = tx.getType() & ~(TYPE_FLIP | TYPE_TRANSLATION); + if (type == 0) { + return false; + } else if ((type & ~TYPE_MASK_SCALE) == 0) { + double scaleX = tx.getScaleX(); + double scaleY = tx.getScaleY(); + return (scaleX != (int) scaleX) || (scaleY != (int) scaleY); + } else { + return false; + } + } + /** * Returns the client property for the given key if it is set; otherwise * returns the {@L&F} property. diff --git a/jdk/src/java.desktop/share/legal/colorimaging.md b/jdk/src/java.desktop/share/legal/colorimaging.md new file mode 100644 index 00000000000..e5a011b4823 --- /dev/null +++ b/jdk/src/java.desktop/share/legal/colorimaging.md @@ -0,0 +1,5 @@ +## Eastman Kodak Company: Kodak Color Management System (kcms) and portions of color management and imaging software + +### Notice + +Portions Copyright Eastman Kodak Company 1991-2003 diff --git a/jdk/src/java.desktop/share/legal/giflib.md b/jdk/src/java.desktop/share/legal/giflib.md new file mode 100644 index 00000000000..a2c1e7ed741 --- /dev/null +++ b/jdk/src/java.desktop/share/legal/giflib.md @@ -0,0 +1,26 @@ +## GIFLIB v5.1.4 + +### GIFLIB License +

+
+The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
+
+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.
+
+
diff --git a/jdk/src/java.desktop/share/legal/harfbuzz.md b/jdk/src/java.desktop/share/legal/harfbuzz.md new file mode 100644 index 00000000000..0e8033af68c --- /dev/null +++ b/jdk/src/java.desktop/share/legal/harfbuzz.md @@ -0,0 +1,63 @@ +## Harfbuzz v1.3.0 + +### Harfbuzz License + +http://cgit.freedesktop.org/harfbuzz/tree/COPYING + +
+
+HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
+For parts of HarfBuzz that are licensed under different licenses see individual
+files names COPYING in subdirectories where applicable.
+
+Copyright © 2010,2011,2012, 2013  Google, Inc.
+Copyright © 2012, 2013  Mozilla Foundation
+Copyright © 2011  Codethink Limited
+Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
+Copyright © 2009  Keith Stribley
+Copyright (C) 2012 Grigori Goronzy 
+Copyright © 2009, 2011  Martin Hosken and SIL International
+Copyright © 2007  Chris Wilson
+Copyright © 2006  Behdad Esfahbod
+Copyright © 2005  David Turner
+Copyright © 2004,2007,2008,2009,2010, 2013  Red Hat, Inc.
+Copyright © 1998-2004  David Turner and Werner Lemberg
+
+For full copyright notices consult the individual files in the package.
+
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+All source code, except for one section, is licensed as above.   The one
+exception is licensed with a slightly different MIT variant:
+The contents of this directory are licensed under the following terms:
+
+Permission to use, copy, modify, and/or 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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.
+
+
diff --git a/jdk/src/java.desktop/share/legal/jpeg.md b/jdk/src/java.desktop/share/legal/jpeg.md new file mode 100644 index 00000000000..681d9f5bf8a --- /dev/null +++ b/jdk/src/java.desktop/share/legal/jpeg.md @@ -0,0 +1,83 @@ +## JPEG rb6 + +### JPEG License +
+
+Must reproduce following license in documentation and/or other materials
+provided with distribution:
+
+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.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+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.
+
+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".
+
+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.
+
+
+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 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.
+
+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.
+
+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."
+
+
diff --git a/jdk/src/java.desktop/share/legal/lcms.md b/jdk/src/java.desktop/share/legal/lcms.md new file mode 100644 index 00000000000..d74475540d5 --- /dev/null +++ b/jdk/src/java.desktop/share/legal/lcms.md @@ -0,0 +1,27 @@ +## Little Color Management System (LCMS) v2.8 + +### LCMS License +
+
+Little Color Management System
+Copyright (c) 1998-2016 Marti Maria Saguer
+
+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.
+
+
diff --git a/jdk/src/java.desktop/share/legal/libpng.md b/jdk/src/java.desktop/share/legal/libpng.md new file mode 100644 index 00000000000..cd9f613d29f --- /dev/null +++ b/jdk/src/java.desktop/share/legal/libpng.md @@ -0,0 +1,109 @@ +## Libpng v 1.6.23 + +### Libpng 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 following
+this sentence.
+
+This code is released under the libpng license.
+
+libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are
+Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, 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
+   Mans Rullgard
+   Cosmin Truta
+   Gilles Vollant
+   James Yu
+
+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.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, 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, are derived from libpng-0.88,
+and are 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
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
+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:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+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 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.
+
+  2. Altered versions must be plainly marked as such and must not
+     be misrepresented as being the original source.
+
+  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, 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.
+
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+
diff --git a/jdk/src/java.desktop/share/legal/mesa3d.md b/jdk/src/java.desktop/share/legal/mesa3d.md new file mode 100644 index 00000000000..50c2114af6a --- /dev/null +++ b/jdk/src/java.desktop/share/legal/mesa3d.md @@ -0,0 +1,28 @@ +## Mesa 3-D Graphics Library v4.1 + +### Mesa 3-D Graphics Library License +
+
+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.
+
+
diff --git a/jdk/src/java.desktop/share/legal/opengl.md b/jdk/src/java.desktop/share/legal/opengl.md new file mode 100644 index 00000000000..41c811b1c68 --- /dev/null +++ b/jdk/src/java.desktop/share/legal/opengl.md @@ -0,0 +1,27 @@ +## Khronos Group OpenGL Headers v2.1 + +### Khronos Group 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.
+
+
diff --git a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c index 95a92f221ad..41cf1864178 100644 --- a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c +++ b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c @@ -140,7 +140,7 @@ jboolean storeGVData(JNIEnv* env, indices[storei] = baseIndex + cluster; glyphs[storei] = (unsigned int)(glyphInfo[i].codepoint | slot); positions[storei*2] = startX + x + glyphPos[i].x_offset * scale; - positions[(storei*2)+1] = startY + y + glyphPos[i].y_offset * scale; + positions[(storei*2)+1] = startY + y - glyphPos[i].y_offset * scale; x += glyphPos[i].x_advance * scale; y += glyphPos[i].y_advance * scale; storei++; diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java index 85e578b4052..74444b8d2d6 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -123,15 +123,26 @@ public final class XContentWindow extends XWindow { // Change in the size of the content window means, well, change of the size // Change in the location of the content window means change in insets boolean needHandleResize = !(newBounds.equals(getBounds())); + boolean needPaint = width <= 0 || height <= 0; reshape(newBounds); if (needHandleResize) { insLog.fine("Sending RESIZED"); handleResize(newBounds); } + if (needPaint) { + postPaintEvent(target, 0, 0, newBounds.width, newBounds.height); + } } finally { XToolkit.awtUnlock(); } - validateSurface(); + } + + @Override + public void handleExposeEvent(XEvent xev) { + if (width <= 0 || height <= 0) { + return; + } + super.handleExposeEvent(xev); } // NOTE: This method may be called by privileged threads. diff --git a/jdk/src/java.desktop/unix/legal/fontconfig.md b/jdk/src/java.desktop/unix/legal/fontconfig.md new file mode 100644 index 00000000000..abdebf351e7 --- /dev/null +++ b/jdk/src/java.desktop/unix/legal/fontconfig.md @@ -0,0 +1,24 @@ +## FontConfig v2.5 + +### FontConfig License +
+
+Copyright 2001,2003 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.
+
+
diff --git a/jdk/src/java.desktop/unix/legal/xwindows.md b/jdk/src/java.desktop/unix/legal/xwindows.md new file mode 100644 index 00000000000..42b2841a370 --- /dev/null +++ b/jdk/src/java.desktop/unix/legal/xwindows.md @@ -0,0 +1,232 @@ +## X Windows System v6.8.2 + +### X Windows System License +
+
+This is the copyright for the files in src/java.desktop/unix/native/libawt_xawt:
+list.h, multiVis.h, wsutils.h, list.c, multiVis.c
+
+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.
+
+___________________________
+
+
+The files in motif/lib/Xm/util included this copyright:
+mkdirhier.man,xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp,
+ lndir.man, makestrs.man, checktree.c, lndir.c, makestrs.c
+
+Copyright (c) 1993, 1994 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 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
+dealing in this Software without prior written authorization from the
+X Consortium.
+
+_____________________________
+
+Xmos_r.h:
+/*
+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/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
+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.
+*/
+
+_____________________________
+
+Copyright notice for extutil.h:
+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!
+*/
+
+_____________________________
+
+Copyright notice for 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.
+
+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.
+
+*/
+_____________________________________
+
+Copyright notice in keysym2ucs.h:
+
+Copyright 1987, 1994, 1998 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.
+
+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 name of 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.
+
+******************************************************************/
+
+
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp index 080fdc8062e..f2d32860e32 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp @@ -251,7 +251,8 @@ AwtComponent::AwtComponent() m_bPauseDestroy = FALSE; m_MessagesProcessing = 0; - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; if (!sm_PrimaryDynamicTableBuilt) { // do it once. AwtComponent::BuildPrimaryDynamicTable(); @@ -1208,6 +1209,7 @@ void SpyWinMessage(HWND hwnd, UINT message, LPCTSTR szComment) { WIN_MSG(WM_XBUTTONDOWN) WIN_MSG(WM_XBUTTONUP) WIN_MSG(WM_MOUSEWHEEL) + WIN_MSG(WM_MOUSEHWHEEL) WIN_MSG(WM_PARENTNOTIFY) WIN_MSG(WM_ENTERMENULOOP) WIN_MSG(WM_EXITMENULOOP) @@ -1639,6 +1641,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_XBUTTONUP: case WM_MOUSEMOVE: case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: case WM_AWT_MOUSEENTER: case WM_AWT_MOUSEEXIT: curPos = ::GetMessagePos(); @@ -1708,10 +1711,12 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_AWT_MOUSEEXIT: mr = WmMouseExit(static_cast(wParam), myPos.x, myPos.y); break; - case WM_MOUSEWHEEL: + case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: mr = WmMouseWheel(GET_KEYSTATE_WPARAM(wParam), GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - GET_WHEEL_DELTA_WPARAM(wParam)); + GET_WHEEL_DELTA_WPARAM(wParam), + switchMessage == WM_MOUSEHWHEEL); break; } break; @@ -2078,13 +2083,15 @@ MsgRouting AwtComponent::WmShowWindow(BOOL show, UINT status) MsgRouting AwtComponent::WmSetFocus(HWND hWndLostFocus) { - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; return mrDoDefault; } MsgRouting AwtComponent::WmKillFocus(HWND hWndGotFocus) { - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; return mrDoDefault; } @@ -2461,7 +2468,7 @@ MsgRouting AwtComponent::WmMouseExit(UINT flags, int x, int y) } MsgRouting AwtComponent::WmMouseWheel(UINT flags, int x, int y, - int wheelRotation) + int wheelRotation, BOOL isHorizontal) { // convert coordinates to be Component-relative, not screen relative // for wheeling when outside the window, this works similar to @@ -2475,42 +2482,54 @@ MsgRouting AwtComponent::WmMouseWheel(UINT flags, int x, int y, // set some defaults jint scrollType = java_awt_event_MouseWheelEvent_WHEEL_UNIT_SCROLL; - jint scrollLines = 3; + jint scrollUnits = 3; BOOL result; - UINT platformLines; - - m_wheelRotationAmount += wheelRotation; + UINT platformUnits; + jint roundedWheelRotation; + jdouble preciseWheelRotation; // AWT interprets wheel rotation differently than win32, so we need to // decode wheel amount. - jint roundedWheelRotation = m_wheelRotationAmount / (-1 * WHEEL_DELTA); - jdouble preciseWheelRotation = (jdouble) wheelRotation / (-1 * WHEEL_DELTA); + jint modifiers = GetJavaModifiers(); + if (isHorizontal) { + modifiers |= java_awt_event_InputEvent_SHIFT_DOWN_MASK; + m_wheelRotationAmountX += wheelRotation; + roundedWheelRotation = m_wheelRotationAmountX / (WHEEL_DELTA); + preciseWheelRotation = (jdouble) wheelRotation / (WHEEL_DELTA); + result = ::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0, + &platformUnits, 0); + } else { + m_wheelRotationAmountY += wheelRotation; + roundedWheelRotation = m_wheelRotationAmountY / (-1 * WHEEL_DELTA); + preciseWheelRotation = (jdouble) wheelRotation / (-1 * WHEEL_DELTA); + result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, + &platformUnits, 0); + } MSG msg; - result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, - &platformLines, 0); InitMessage(&msg, lastMessage, MAKEWPARAM(flags, wheelRotation), MAKELPARAM(x, y)); if (result) { - if (platformLines == WHEEL_PAGESCROLL) { + if (platformUnits == WHEEL_PAGESCROLL) { scrollType = java_awt_event_MouseWheelEvent_WHEEL_BLOCK_SCROLL; - scrollLines = 1; + scrollUnits = 1; } else { scrollType = java_awt_event_MouseWheelEvent_WHEEL_UNIT_SCROLL; - scrollLines = platformLines; + scrollUnits = platformUnits; } } DTRACE_PRINTLN("calling SendMouseWheelEvent"); SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, ::JVM_CurrentTimeMillis(NULL, 0), - eventPt.x, eventPt.y, GetJavaModifiers(), 0, 0, scrollType, - scrollLines, roundedWheelRotation, preciseWheelRotation, &msg); + eventPt.x, eventPt.y, modifiers, 0, 0, scrollType, + scrollUnits, roundedWheelRotation, preciseWheelRotation, &msg); - m_wheelRotationAmount %= WHEEL_DELTA; + m_wheelRotationAmountX %= WHEEL_DELTA; + m_wheelRotationAmountY %= WHEEL_DELTA; // this message could be propagated up to the parent chain // by the mouse message post processors return mrConsume; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h index bcf96a78669..0d6bf7a0079 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h @@ -522,7 +522,7 @@ public: virtual MsgRouting WmMouseMove(UINT flags, int x, int y); virtual MsgRouting WmMouseExit(UINT flags, int x, int y); virtual MsgRouting WmMouseWheel(UINT flags, int x, int y, - int wheelRotation); + int wheelRotation, BOOL isHorizontal); virtual MsgRouting WmNcMouseDown(WPARAM hitTest, int x, int y, int button); virtual MsgRouting WmNcMouseUp(WPARAM hitTest, int x, int y, int button); virtual MsgRouting WmWindowPosChanging(LPARAM windowPos); @@ -824,7 +824,8 @@ private: int windowMoveLockPosCY; // 6524352: support finer-resolution - int m_wheelRotationAmount; + int m_wheelRotationAmountX; + int m_wheelRotationAmountY; BOOL deadKeyActive; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp index fb65b85a519..e3413714b62 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp @@ -240,6 +240,7 @@ LRESULT CALLBACK AwtDialog::MouseHookProc(int nCode, (wParam == WM_RBUTTONDOWN) || (wParam == WM_MOUSEACTIVATE) || (wParam == WM_MOUSEWHEEL) || + (wParam == WM_MOUSEHWHEEL) || (wParam == WM_NCLBUTTONDOWN) || (wParam == WM_NCMBUTTONDOWN) || (wParam == WM_NCRBUTTONDOWN)) diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp index 6c8d65a47c7..9bc6366d17b 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp @@ -484,7 +484,10 @@ MsgRouting AwtFrame::WmShowWindow(BOOL show, UINT status) if (fgProcessID != ::GetCurrentProcessId()) { AwtWindow* window = (AwtWindow*)GetComponent(GetHWnd()); - if (window != NULL && window->IsFocusableWindow() && window->IsAutoRequestFocus() && + if (window != NULL && + window->IsFocusableWindow() && + window->IsAutoRequestFocus() && + !::IsWindowVisible(GetHWnd()) && // the window is really showing !::IsWindow(GetModalBlocker(GetHWnd()))) { // When the Java process is not allowed to set the foreground window diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp index 0fffffbf725..4a0ac907f62 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp @@ -1590,7 +1590,7 @@ BOOL AwtToolkit::PreProcessMouseMsg(AwtComponent* p, MSG& msg) * the mouse, not the Component with the input focus. */ - if (msg.message == WM_MOUSEWHEEL) { + if (msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL) { //i.e. mouse is over client area for this window DWORD hWndForWheelProcess; DWORD hWndForWheelThread = ::GetWindowThreadProcessId(hWndForWheel, &hWndForWheelProcess); diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h b/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h index d0131af99fe..ba8a4492591 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,6 +45,10 @@ extern const UINT SYSCOMMAND_IMM; #define WM_MOUSEWHEEL 0x020A #endif //WM_MOUSEWHEEL +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif //WM_MOUSEHWHEEL + #ifndef WHEEL_DELTA #define WHEEL_DELTA 120 #endif //WHEEL_DELTA @@ -54,12 +58,16 @@ extern const UINT SYSCOMMAND_IMM; #endif //WHEEL_PAGESCROLL #ifndef SPI_GETWHEELSCROLLLINES -#define SPI_GETWHEELSCROLLLINES 104 +#define SPI_GETWHEELSCROLLLINES 0x0068 #endif //SPI_GETWHEELSCROLLLINES +#ifndef SPI_GETWHEELSCROLLCHARS +#define SPI_GETWHEELSCROLLCHARS 0x006C +#endif //SPI_GETWHEELSCROLLCHARS + #ifndef SM_MOUSEWHEELPRESENT #define SM_MOUSEWHEELPRESENT 75 -#endif //SPI_GETWHEELSCROLLLINES +#endif //SM_MOUSEWHEELPRESENT #ifndef COLOR_HOTLIGHT #define COLOR_HOTLIGHT 26 diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java index e0860f8e1f0..f2014eee794 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,7 +51,9 @@ import javax.management.remote.TargetedNotification; import com.sun.jmx.remote.util.ClassLogger; import com.sun.jmx.remote.util.EnvHelp; +import java.lang.reflect.UndeclaredThrowableException; import java.rmi.UnmarshalException; +import java.util.concurrent.RejectedExecutionException; public abstract class ClientNotifForwarder { @@ -559,10 +561,38 @@ public abstract class ClientNotifForwarder { } } } else { - executor.execute(this); + try { + executor.execute(this); + } catch (Exception e) { + if (isRejectedExecutionException(e)) { + // We reached here because the executor was shutdown. + // If executor was supplied by client, then it was shutdown + // abruptly or JMXConnector was shutdown along with executor + // while this thread was suspended at L564. + if (!(executor instanceof LinearExecutor)) { + // Spawn new executor that will do cleanup if JMXConnector is closed + // or keep notif system running otherwise + executor = new LinearExecutor(); + executor.execute(this); + } + } else { + throw e; + } + } } } + private boolean isRejectedExecutionException(Exception e) { + Throwable cause = e; + while (cause != null) { + if (cause instanceof RejectedExecutionException) { + return true; + } + cause = cause.getCause(); + } + return false; + } + void dispatchNotification(TargetedNotification tn, Integer myListenerID, Map listeners) { @@ -866,7 +896,7 @@ public abstract class ClientNotifForwarder { // ------------------------------------------------- private final ClassLoader defaultClassLoader; - private final Executor executor; + private Executor executor; private final Map infoList = new HashMap(); diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java index 0e3e1094d67..510b6885a91 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java @@ -27,7 +27,6 @@ package com.sun.jndi.ldap.pool; import java.util.ArrayList; // JDK 1.2 import java.util.List; -import java.util.Iterator; import java.lang.ref.Reference; import java.lang.ref.SoftReference; @@ -290,23 +289,28 @@ final class Connections implements PoolCallback { * @param threshold an entry idle since this time has expired. * @return true if no more connections in list */ - synchronized boolean expire(long threshold) { - Iterator iter = conns.iterator(); - ConnectionDesc entry; - while (iter.hasNext()) { - entry = iter.next(); + boolean expire(long threshold) { + List clonedConns; + synchronized(this) { + clonedConns = new ArrayList<>(conns); + } + List expired = new ArrayList<>(); + + for (ConnectionDesc entry : clonedConns) { + d("expire(): ", entry); if (entry.expire(threshold)) { - d("expire(): removing ", entry); - td("Expired ", entry); - - iter.remove(); // remove from pool - - // Don't need to call notify() because we're - // removing only idle connections. If there were - // idle connections, then there should be no waiters. + expired.add(entry); + td("expire(): Expired ", entry); } } - return conns.isEmpty(); // whether whole list has 'expired' + + synchronized (this) { + conns.removeAll(expired); + // Don't need to call notify() because we're + // removing only idle connections. If there were + // idle connections, then there should be no waiters. + return conns.isEmpty(); // whether whole list has 'expired' + } } /** diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java index a2813bf9233..504c87ddd43 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java @@ -25,11 +25,11 @@ package com.sun.jndi.ldap.pool; +import java.util.ArrayList; import java.util.Map; import java.util.WeakHashMap; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedList; import java.io.PrintStream; @@ -166,17 +166,25 @@ final public class Pool { * and removed. */ public void expire(long threshold) { + Collection copy; synchronized (map) { - Iterator iter = map.values().iterator(); - Connections conns; - while (iter.hasNext()) { - conns = iter.next().getConnections(); - if (conns.expire(threshold)) { - d("expire(): removing ", conns); - iter.remove(); - } + copy = new ArrayList<>(map.values()); + } + + ArrayList removed = new ArrayList<>(); + Connections conns; + for (ConnectionsRef ref : copy) { + conns = ref.getConnections(); + if (conns.expire(threshold)) { + d("expire(): removing ", conns); + removed.add(ref); } } + + synchronized (map) { + map.values().removeAll(removed); + } + expungeStaleConnections(); } diff --git a/jdk/src/java.naming/share/classes/module-info.java b/jdk/src/java.naming/share/classes/module-info.java index b8964699610..f524a4c0bcd 100644 --- a/jdk/src/java.naming/share/classes/module-info.java +++ b/jdk/src/java.naming/share/classes/module-info.java @@ -37,7 +37,6 @@ module java.naming { exports com.sun.jndi.toolkit.ctx to jdk.naming.dns; exports com.sun.jndi.toolkit.url to - java.corba, jdk.naming.dns, jdk.naming.rmi; uses javax.naming.ldap.StartTlsResponse; diff --git a/jdk/src/java.se/share/classes/module-info.java b/jdk/src/java.se/share/classes/module-info.java index cbd67e5b747..2756756588a 100644 --- a/jdk/src/java.se/share/classes/module-info.java +++ b/jdk/src/java.se/share/classes/module-info.java @@ -26,12 +26,25 @@ /** * Defines the core Java SE API. *

- * The modules defining - * CORBA and Java EE APIs are not required by this module, but they are - * required by {@code java.se.ee}. + * The modules defining CORBA and Java EE APIs are not required by + * this module, but they are required by {@code java.se.ee}. */ module java.se { - requires transitive java.compact3; + requires transitive java.compiler; requires transitive java.datatransfer; requires transitive java.desktop; + requires transitive java.instrument; + requires transitive java.logging; + requires transitive java.management; + requires transitive java.naming; + requires transitive java.prefs; + requires transitive java.rmi; + requires transitive java.scripting; + requires transitive java.security.jgss; + requires transitive java.security.sasl; + requires transitive java.sql; + requires transitive java.sql.rowset; + requires transitive java.xml; + requires transitive java.xml.crypto; } + diff --git a/jdk/src/java.security.jgss/share/classes/module-info.java b/jdk/src/java.security.jgss/share/classes/module-info.java index 6380721852c..78a72496ace 100644 --- a/jdk/src/java.security.jgss/share/classes/module-info.java +++ b/jdk/src/java.security.jgss/share/classes/module-info.java @@ -42,6 +42,12 @@ module java.security.jgss { jdk.security.jgss; exports sun.security.krb5.internal.ktab to jdk.security.auth; + + // Opens for reflective instantiation of sun.net.www.protocol.http.spnego.NegotiatorImpl + // to sun.net.www.protocol.http.HttpURLConnection + opens sun.net.www.protocol.http.spnego to + java.base; + provides java.security.Provider with sun.security.jgss.SunProvider; provides sun.security.ssl.ClientKeyExchangeService with sun.security.krb5.internal.ssl.Krb5KeyExchangeService; diff --git a/jdk/src/java.smartcardio/unix/legal/pcsclite.md b/jdk/src/java.smartcardio/unix/legal/pcsclite.md new file mode 100644 index 00000000000..f90e9cc517d --- /dev/null +++ b/jdk/src/java.smartcardio/unix/legal/pcsclite.md @@ -0,0 +1,41 @@ +## PC/SC Lite for Suse Linux v1.1.1 + +### PC/SC Lite for Suse Linux License +

+
+Copyright (c) 1999-2004 David Corcoran 
+Copyright (c) 1999-2004 Ludovic Rousseau 
+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. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+     This product includes software developed by:
+      David Corcoran 
+      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.
+
+Changes to this license can be made only by the copyright author with
+explicit written consent.
+
+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.
+
+
diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java index a32cf8f564d..7fe59001940 100644 --- a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java +++ b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java @@ -41,46 +41,41 @@ import jdk.internal.reflect.Reflection; /** - *

The basic service for managing a set of JDBC drivers.
- * NOTE: The {@link javax.sql.DataSource} interface, new in the - * JDBC 2.0 API, provides another way to connect to a data source. - * The use of a DataSource object is the preferred means of + * The basic service for managing a set of JDBC drivers. + *

+ * NOTE: The {@link javax.sql.DataSource} interface, provides + * another way to connect to a data source. + * The use of a {@code DataSource} object is the preferred means of * connecting to a data source. - * - *

As part of its initialization, the DriverManager class will - * attempt to load the driver classes referenced in the "jdbc.drivers" - * system property. This allows a user to customize the JDBC Drivers - * used by their applications. For example in your - * ~/.hotjava/properties file you might specify: - * 

- * jdbc.drivers=foo.bah.Driver:wombat.sql.Driver:bad.taste.ourDriver
- *
- *

The DriverManager methods getConnection and - * getDrivers have been enhanced to support the Java Standard Edition - * Service Provider mechanism. JDBC 4.0 Drivers must - * include the file META-INF/services/java.sql.Driver. This file contains the name of the JDBC drivers - * implementation of java.sql.Driver. For example, to load the my.sql.Driver class, - * the META-INF/services/java.sql.Driver file would contain the entry: - * 

- * my.sql.Driver
- *
- * - *

Applications no longer need to explicitly load JDBC drivers using Class.forName(). Existing programs - * which currently load JDBC drivers using Class.forName() will continue to work without - * modification. - * - *

When the method getConnection is called, - * the DriverManager will attempt to - * locate a suitable driver from amongst those loaded at - * initialization and those loaded explicitly using the same classloader - * as the current applet or application. - * *

- * Starting with the Java 2 SDK, Standard Edition, version 1.3, a - * logging stream can be set only if the proper - * permission has been granted. Normally this will be done with - * the tool PolicyTool, which can be used to grant permission - * java.sql.SQLPermission "setLog". + * As part of its initialization, the {@code DriverManager} class will + * attempt to load available JDBC drivers by using: + *

    + *
  • The {@code jdbc.drivers} system property which contains a + * colon separated list of fully qualified class names of JDBC drivers. Each + * driver is loaded using the {@linkplain ClassLoader#getSystemClassLoader + * system class loader}: + *
      + *
    • {@code jdbc.drivers=foo.bah.Driver:wombat.sql.Driver:bad.taste.ourDriver} + *
    + * + *
  • Service providers of the {@code java.sql.Driver} class, that are loaded + * via the {@linkplain ServiceLoader#load service-provider loading} mechanism. + *
+ * + *

+ * @ImplNote + * {@code DriverManager} initialization is done lazily and looks up service + * providers using the thread context class loader. The drivers loaded and + * available to an application will depend on the thread context class loader of + * the thread that triggers driver initialization by {@code DriverManager}. + * + *

When the method {@code getConnection} is called, + * the {@code DriverManager} will attempt to + * locate a suitable driver from amongst those loaded at + * initialization and those loaded explicitly using the same class loader + * as the current application. + * * @see Driver * @see Connection */ @@ -137,29 +132,15 @@ public class DriverManager { /** * Sets the logging/tracing PrintWriter object * that is used by the DriverManager and all drivers. - *

- * There is a minor versioning problem created by the introduction - * of the method setLogWriter. The - * method setLogWriter cannot create a PrintStream object - * that will be returned by getLogStream---the Java platform does - * not provide a backward conversion. As a result, a new application - * that uses setLogWriter and also uses a JDBC 1.0 driver that uses - * getLogStream will likely not see debugging information written - * by that driver. *

- * Starting with the Java 2 SDK, Standard Edition, version 1.3 release, this method checks - * to see that there is an SQLPermission object before setting - * the logging stream. If a SecurityManager exists and its - * checkPermission method denies setting the log writer, this - * method throws a java.lang.SecurityException. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("setLog")} + * permission to check that the caller is allowed to call {@code setLogWriter}. * * @param out the new logging/tracing PrintStream object; * null to disable logging and tracing - * @throws SecurityException - * if a security manager exists and its - * checkPermission method denies - * setting the log writer - * + * @throws SecurityException if a security manager exists and its + * {@code checkPermission} method denies permission to set the log writer. * @see SecurityManager#checkPermission * @see #getLogWriter * @since 1.2 @@ -374,8 +355,9 @@ public class DriverManager { * If a {@code null} value is specified for the driver to be removed, then no * action is taken. *

- * If a security manager exists and its {@code checkPermission} denies - * permission, then a {@code SecurityException} will be thrown. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("deregisterDriver")} + * permission to check that the caller is allowed to deregister a JDBC Driver. *

* If the specified driver is not found in the list of registered drivers, * then no action is taken. If the driver was found, it will be removed @@ -501,17 +483,14 @@ public class DriverManager { * by the DriverManager * and all drivers. *

- * In the Java 2 SDK, Standard Edition, version 1.3 release, this method checks - * to see that there is an SQLPermission object before setting - * the logging stream. If a SecurityManager exists and its - * checkPermission method denies setting the log writer, this - * method throws a java.lang.SecurityException. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("setLog")} + * permission to check that the caller is allowed to call {@code setLogStream}. * * @param out the new logging/tracing PrintStream; to disable, set to null * @deprecated Use {@code setLogWriter} * @throws SecurityException if a security manager exists and its - * checkPermission method denies setting the log stream - * + * {@code checkPermission} method denies permission to set the log stream. * @see SecurityManager#checkPermission * @see #getLogStream */ diff --git a/jdk/src/java.xml.crypto/share/legal/santuario.md b/jdk/src/java.xml.crypto/share/legal/santuario.md new file mode 100644 index 00000000000..0d8be1b527f --- /dev/null +++ b/jdk/src/java.xml.crypto/share/legal/santuario.md @@ -0,0 +1,225 @@ +## Apache Santuario v1.5.4 + +### Notice +

+
+  Apache Santuario - XML Security for Java
+  Copyright 1999-2015 The Apache Software Foundation
+
+  This product includes software developed at
+  The Apache Software Foundation (http://www.apache.org/).
+
+  It was originally based on software copyright (c) 2001, Institute for
+  Data Communications Systems, .
+
+  The development of this software was partly funded by the European
+  Commission in the  project in the ISIS Programme.
+
+
+ +### Apache 2.0 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.
+
+
diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java index cd3cf14164e..297779d39c8 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,10 +25,8 @@ package com.sun.java.accessibility.util; -import java.util.*; import java.awt.*; import java.awt.event.*; -import javax.accessibility.*; import javax.swing.*; import javax.swing.event.*; import sun.awt.AWTPermissions; @@ -55,7 +53,7 @@ public class AWTEventMonitor { * @deprecated This field is unused; to get the component with focus use the * getComponentWithFocus method. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected Component componentWithFocus = null; static private Component componentWithFocus_private = null; @@ -69,7 +67,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ComponentListener componentListener = null; static private ComponentListener componentListener_private = null; @@ -82,7 +80,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ContainerListener containerListener = null; static private ContainerListener containerListener_private = null; @@ -95,7 +93,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected FocusListener focusListener = null; static private FocusListener focusListener_private = null; @@ -108,7 +106,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected KeyListener keyListener = null; static private KeyListener keyListener_private = null; @@ -121,7 +119,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected MouseListener mouseListener = null; static private MouseListener mouseListener_private = null; @@ -134,7 +132,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected MouseMotionListener mouseMotionListener = null; static private MouseMotionListener mouseMotionListener_private = null; @@ -147,7 +145,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected WindowListener windowListener = null; static private WindowListener windowListener_private = null; @@ -162,7 +160,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ActionListener actionListener = null; static private ActionListener actionListener_private = null; @@ -175,7 +173,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected AdjustmentListener adjustmentListener = null; static private AdjustmentListener adjustmentListener_private = null; @@ -188,7 +186,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ItemListener itemListener = null; static private ItemListener itemListener_private = null; @@ -201,7 +199,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected TextListener textListener = null; static private TextListener textListener_private = null; @@ -212,13 +210,8 @@ public class AWTEventMonitor { * This listener calls the other registered listeners when an event * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. - * - * @deprecated This field is unused. */ - @Deprecated - static protected AWTEventsListener awtListener = new AWTEventsListener(); - - static private final AWTEventsListener awtListener_private = new AWTEventsListener(); + static private final AWTEventsListener awtListener = new AWTEventsListener(); /** * Returns the component that currently has keyboard focus. The return @@ -253,7 +246,7 @@ public class AWTEventMonitor { static public void addComponentListener(ComponentListener l) { if (componentListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.COMPONENT); + awtListener.installListeners(EventID.COMPONENT); } componentListener_private = AWTEventMulticaster.add(componentListener_private, l); } @@ -268,7 +261,7 @@ public class AWTEventMonitor { static public void removeComponentListener(ComponentListener l) { componentListener_private = AWTEventMulticaster.remove(componentListener_private, l); if (componentListener_private == null) { - awtListener_private.removeListeners(EventID.COMPONENT); + awtListener.removeListeners(EventID.COMPONENT); } } @@ -335,7 +328,7 @@ public class AWTEventMonitor { static public void addKeyListener(KeyListener l) { if (keyListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.KEY); + awtListener.installListeners(EventID.KEY); } keyListener_private = AWTEventMulticaster.add(keyListener_private, l); } @@ -350,7 +343,7 @@ public class AWTEventMonitor { static public void removeKeyListener(KeyListener l) { keyListener_private = AWTEventMulticaster.remove(keyListener_private, l); if (keyListener_private == null) { - awtListener_private.removeListeners(EventID.KEY); + awtListener.removeListeners(EventID.KEY); } } @@ -367,7 +360,7 @@ public class AWTEventMonitor { static public void addMouseListener(MouseListener l) { if (mouseListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.MOUSE); + awtListener.installListeners(EventID.MOUSE); } mouseListener_private = AWTEventMulticaster.add(mouseListener_private, l); } @@ -382,7 +375,7 @@ public class AWTEventMonitor { static public void removeMouseListener(MouseListener l) { mouseListener_private = AWTEventMulticaster.remove(mouseListener_private, l); if (mouseListener_private == null) { - awtListener_private.removeListeners(EventID.MOUSE); + awtListener.removeListeners(EventID.MOUSE); } } @@ -399,7 +392,7 @@ public class AWTEventMonitor { static public void addMouseMotionListener(MouseMotionListener l) { if (mouseMotionListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.MOTION); + awtListener.installListeners(EventID.MOTION); } mouseMotionListener_private = AWTEventMulticaster.add(mouseMotionListener_private, l); } @@ -414,7 +407,7 @@ public class AWTEventMonitor { static public void removeMouseMotionListener(MouseMotionListener l) { mouseMotionListener_private = AWTEventMulticaster.remove(mouseMotionListener_private, l); if (mouseMotionListener_private == null) { - awtListener_private.removeListeners(EventID.MOTION); + awtListener.removeListeners(EventID.MOTION); } } @@ -431,7 +424,7 @@ public class AWTEventMonitor { static public void addWindowListener(WindowListener l) { if (windowListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.WINDOW); + awtListener.installListeners(EventID.WINDOW); } windowListener_private = AWTEventMulticaster.add(windowListener_private, l); } @@ -446,7 +439,7 @@ public class AWTEventMonitor { static public void removeWindowListener(WindowListener l) { windowListener_private = AWTEventMulticaster.remove(windowListener_private, l); if (windowListener_private == null) { - awtListener_private.removeListeners(EventID.WINDOW); + awtListener.removeListeners(EventID.WINDOW); } } @@ -463,7 +456,7 @@ public class AWTEventMonitor { static public void addActionListener(ActionListener l) { if (actionListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ACTION); + awtListener.installListeners(EventID.ACTION); } actionListener_private = AWTEventMulticaster.add(actionListener_private, l); } @@ -478,7 +471,7 @@ public class AWTEventMonitor { static public void removeActionListener(ActionListener l) { actionListener_private = AWTEventMulticaster.remove(actionListener_private, l); if (actionListener_private == null) { - awtListener_private.removeListeners(EventID.ACTION); + awtListener.removeListeners(EventID.ACTION); } } @@ -496,7 +489,7 @@ public class AWTEventMonitor { static public void addAdjustmentListener(AdjustmentListener l) { if (adjustmentListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ADJUSTMENT); + awtListener.installListeners(EventID.ADJUSTMENT); } adjustmentListener_private = AWTEventMulticaster.add(adjustmentListener_private, l); } @@ -511,7 +504,7 @@ public class AWTEventMonitor { static public void removeAdjustmentListener(AdjustmentListener l) { adjustmentListener_private = AWTEventMulticaster.remove(adjustmentListener_private, l); if (adjustmentListener_private == null) { - awtListener_private.removeListeners(EventID.ADJUSTMENT); + awtListener.removeListeners(EventID.ADJUSTMENT); } } @@ -528,7 +521,7 @@ public class AWTEventMonitor { static public void addItemListener(ItemListener l) { if (itemListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ITEM); + awtListener.installListeners(EventID.ITEM); } itemListener_private = AWTEventMulticaster.add(itemListener_private, l); } @@ -543,7 +536,7 @@ public class AWTEventMonitor { static public void removeItemListener(ItemListener l) { itemListener_private = AWTEventMulticaster.remove(itemListener_private, l); if (itemListener_private == null) { - awtListener_private.removeListeners(EventID.ITEM); + awtListener.removeListeners(EventID.ITEM); } } @@ -560,7 +553,7 @@ public class AWTEventMonitor { static public void addTextListener(TextListener l) { if (textListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.TEXT); + awtListener.installListeners(EventID.TEXT); } textListener_private = AWTEventMulticaster.add(textListener_private, l); } @@ -575,7 +568,7 @@ public class AWTEventMonitor { static public void removeTextListener(TextListener l) { textListener_private = AWTEventMulticaster.remove(textListener_private, l); if (textListener_private == null) { - awtListener_private.removeListeners(EventID.TEXT); + awtListener.removeListeners(EventID.TEXT); } } diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java index 603ba035ae7..e26718d15b5 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ public class AccessibilityEventMonitor { * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ - static protected final AccessibilityEventListener accessibilityListener = + static private final AccessibilityEventListener accessibilityListener = new AccessibilityEventListener(); /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java index bbb0fcb18b3..c5dcda4df3e 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -71,7 +71,7 @@ public class SwingEventMonitor extends AWTEventMonitor { * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ - static protected final SwingEventListener swingListener = new SwingEventListener(); + static private final SwingEventListener swingListener = new SwingEventListener(); /** * Adds the specified listener to receive all {@link EventID#ANCESTOR ANCESTOR} diff --git a/jdk/src/jdk.crypto.ec/share/legal/ecc.md b/jdk/src/jdk.crypto.ec/share/legal/ecc.md new file mode 100644 index 00000000000..6d4fc59a453 --- /dev/null +++ b/jdk/src/jdk.crypto.ec/share/legal/ecc.md @@ -0,0 +1,530 @@ +## Mozilla Elliptic Curve Cryptography + +### Notice +
+
+This notice is provided with respect to Elliptic Curve Cryptography,
+which is included with JRE, JDK, and OpenJDK.
+
+You are receiving a copy of the Elliptic Curve Cryptography library in source
+form with the JDK and OpenJDK source distributions, and as object code in
+the JRE & JDK runtimes.
+
+In the case of the JRE & JDK runtimes, the terms of the Oracle license do
+NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
+following license, separately from Oracle's JDK & JRE.  If you do not wish to
+install the Elliptic Curve Cryptography library, you may delete the
+Elliptic Curve Cryptography library:
+   - On Solaris and Linux systems: delete $(JAVA_HOME)/lib/libsunec.so
+   - On Mac OSX systems: delete $(JAVA_HOME)/lib/libsunec.dylib
+   - On Windows systems: delete $(JAVA_HOME)\bin\sunec.dll
+
+
+ +### LGPL 2.1 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.
+
+    
+    Copyright (C)   
+
+    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.
+
+  , 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/module-info.java b/jdk/src/jdk.crypto.token/share/classes/module-info.java similarity index 98% rename from jdk/src/jdk.crypto.pkcs11/share/classes/module-info.java rename to jdk/src/jdk.crypto.token/share/classes/module-info.java index 07f4c1bf3e1..b587d0d4a33 100644 --- a/jdk/src/jdk.crypto.pkcs11/share/classes/module-info.java +++ b/jdk/src/jdk.crypto.token/share/classes/module-info.java @@ -23,7 +23,7 @@ * questions. */ -module jdk.crypto.pkcs11 { +module jdk.crypto.token { // Depends on SunEC provider for EC related functionality requires jdk.crypto.ec; provides java.security.Provider with sun.security.pkcs11.SunPKCS11; diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Config.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Config.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/KeyCache.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/KeyCache.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/KeyCache.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/KeyCache.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Cipher.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Cipher.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DHKeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11DHKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DHKeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11DHKeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Digest.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Digest.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Digest.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Digest.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECKeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11ECKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11ECKeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11ECKeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Key.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Key.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyAgreement.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyAgreement.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyAgreement.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyAgreement.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyStore.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11KeyStore.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Mac.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Mac.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Mac.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Mac.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11RSACipher.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11RSACipher.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecureRandom.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11SecureRandom.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11SecureRandom.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11SecureRandom.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Signature.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Signature.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Util.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Util.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Util.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/P11Util.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Secmod.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Secmod.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Session.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Session.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Session.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Session.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SessionManager.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/SessionManager.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SessionManager.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/SessionManager.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/SunPKCS11.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/SunPKCS11.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/TemplateManager.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/TemplateManager.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/TemplateManager.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/TemplateManager.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Token.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Token.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Token.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/Token.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Constants.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/Constants.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Constants.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/Constants.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Functions.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/Functions.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/Functions.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/Functions.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java b/jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java rename to jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java diff --git a/jdk/src/jdk.crypto.token/share/legal/pkcs11cryptotoken.md b/jdk/src/jdk.crypto.token/share/legal/pkcs11cryptotoken.md new file mode 100644 index 00000000000..6f7e3fb92ec --- /dev/null +++ b/jdk/src/jdk.crypto.token/share/legal/pkcs11cryptotoken.md @@ -0,0 +1,20 @@ +## PKCS #11 Cryptographic Token Interface, v2.20 amendment 3 Header Files + +### PKCS #11 Cryptographic Token Interface License +
+
+License to copy and use this software is granted provided that it is
+identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
+(Cryptoki)" in all material mentioning or referencing this software.
+
+License is also granted to make and use derivative works provided that
+such works are identified as "derived from the RSA Security Inc. PKCS #11
+Cryptographic Token Interface (Cryptoki)" in all material mentioning or
+referencing the derived work.
+
+RSA Security Inc. makes no representations concerning either the
+merchantability of this software or the suitability of this software for
+any particular purpose. It is provided "as is" without express or implied
+warranty of any kind.
+
+
diff --git a/jdk/src/jdk.crypto.token/share/legal/pkcs11wrapper.md b/jdk/src/jdk.crypto.token/share/legal/pkcs11wrapper.md new file mode 100644 index 00000000000..9eb453bca8d --- /dev/null +++ b/jdk/src/jdk.crypto.token/share/legal/pkcs11wrapper.md @@ -0,0 +1,46 @@ +## IAIK (Institute for Applied Information Processing and Communication) PKCS#11 wrapper files v1 + +### IAIK 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:
+
+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 IAIK of Graz University of
+    Technology."
+
+   Alternately, this acknowledgment may appear in the software itself, if and
+   wherever such third-party acknowledgments normally appear.
+
+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.
+
+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.
+
+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.
+
+
diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h b/jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h rename to jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h diff --git a/jdk/src/jdk.crypto.pkcs11/solaris/conf/security/sunpkcs11-solaris.cfg b/jdk/src/jdk.crypto.token/solaris/conf/security/sunpkcs11-solaris.cfg similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/solaris/conf/security/sunpkcs11-solaris.cfg rename to jdk/src/jdk.crypto.token/solaris/conf/security/sunpkcs11-solaris.cfg diff --git a/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c b/jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c rename to jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c diff --git a/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h b/jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h rename to jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h diff --git a/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c b/jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c rename to jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c diff --git a/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h b/jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h rename to jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h diff --git a/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c b/jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c rename to jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c diff --git a/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h b/jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h rename to jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h diff --git a/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c b/jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c rename to jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c diff --git a/jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h b/jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h similarity index 100% rename from jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h rename to jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h diff --git a/jdk/src/jdk.internal.le/share/legal/jline.md b/jdk/src/jdk.internal.le/share/legal/jline.md new file mode 100644 index 00000000000..c3c114ba4be --- /dev/null +++ b/jdk/src/jdk.internal.le/share/legal/jline.md @@ -0,0 +1,39 @@ +## JLine v2.12.1 + +### JLine License +
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+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 JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
diff --git a/jdk/src/jdk.internal.opt/share/legal/jopt-simple.md b/jdk/src/jdk.internal.opt/share/legal/jopt-simple.md new file mode 100644 index 00000000000..0d40507edaf --- /dev/null +++ b/jdk/src/jdk.internal.opt/share/legal/jopt-simple.md @@ -0,0 +1,27 @@ +## jopt-simple v4.6 + +### MIT License +
+
+Copyright (c) 2004-2015 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.
+
+
diff --git a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java index d74edd570e8..3c6061cf18b 100644 --- a/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java +++ b/jdk/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java @@ -430,7 +430,7 @@ public final class JarSigner { * SHA384withECDSA for a 384-bit EC key. * * @implNote This implementation makes use of comparable strengths - * as defined in Tables 2 and 3 of NIST SP 800-57 Part 1-Rev.3. + * as defined in Tables 2 and 3 of NIST SP 800-57 Part 1-Rev.4. * Specifically, if a DSA or RSA key with a key size greater than 7680 * bits, or an EC key with a key size greater than or equal to 512 bits, * SHA-512 will be used as the hash function for the signature. diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java index 62992138361..1b5d48a6b4a 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java @@ -34,6 +34,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import jdk.internal.module.ModuleResolution; /** * Parser for GNU Style Options. @@ -158,6 +159,31 @@ class GNUStyleOptions { ModuleFinder.of(paths)); } }, + new Option(false, OptionType.CREATE_UPDATE, "--do-not-resolve-by-default") { + void process(Main jartool, String opt, String arg) { + ModuleResolution mres = jartool.moduleResolution; + jartool.moduleResolution = mres.withDoNotResolveByDefault(); + } + boolean isExtra() { return true; } + }, + new Option(true, OptionType.CREATE_UPDATE, "--warn-if-resolved") { + void process(Main jartool, String opt, String arg) throws BadArgs { + ModuleResolution mres = ModuleResolution.empty(); + if (jartool.moduleResolution.doNotResolveByDefault()) + mres.withDoNotResolveByDefault(); + + if (arg.equals("deprecated")) { + jartool.moduleResolution = mres.withDeprecated(); + } else if (arg.equals("deprecated-for-removal")) { + jartool.moduleResolution = mres.withDeprecatedForRemoval(); + } else if (arg.equals("incubating")) { + jartool.moduleResolution = mres.withIncubating(); + } else { + throw new BadArgs("error.bad.reason", arg); + } + } + boolean isExtra() { return true; } + }, new Option(false, OptionType.CREATE_UPDATE_INDEX, "--no-compress", "-0") { void process(Main jartool, String opt, String arg) { jartool.flag0 = true; @@ -175,17 +201,20 @@ class GNUStyleOptions { // Other options new Option(true, true, OptionType.OTHER, "--help", "-h") { void process(Main jartool, String opt, String arg) throws BadArgs { - if (jartool.info == null) { - if (arg == null) { - jartool.info = Main.Info.HELP; - return; - } - - if (!arg.equals("compat")) - throw new BadArgs("error.illegal.option", arg).showUsage(true); - - jartool.info = Main.Info.COMPAT_HELP; + if (arg == null) { + jartool.info = Main.Info.HELP; + return; } + + if (!arg.equals("compat")) + throw new BadArgs("error.illegal.option", arg).showUsage(true); + + jartool.info = Main.Info.COMPAT_HELP; + } + }, + new Option(false, OptionType.OTHER, "--help-extra") { + void process(Main jartool, String opt, String arg) throws BadArgs { + jartool.info = Main.Info.HELP_EXTRA; } }, new Option(false, OptionType.OTHER, "--version") { @@ -229,6 +258,8 @@ class GNUStyleOptions { boolean isHidden() { return false; } + boolean isExtra() { return false; } + boolean matches(String opt) { for (String a : aliases) { if (a.equals(opt)) { @@ -292,6 +323,14 @@ class GNUStyleOptions { } static void printHelp(PrintWriter out) { + printHelp(out, false); + } + + static void printHelpExtra(PrintWriter out) { + printHelp(out, true); + } + + private static void printHelp(PrintWriter out, boolean printExtra) { out.format("%s%n", Main.getMsg("main.help.preopt")); for (OptionType type : OptionType.values()) { boolean typeHeadingWritten = false; @@ -304,6 +343,9 @@ class GNUStyleOptions { if (o.isHidden() || name.equals("h")) { continue; } + if (o.isExtra() && !printExtra) { + continue; + } if (!typeHeadingWritten) { out.format("%n%s%n", Main.getMsg("main.help.opt." + type.name)); typeHeadingWritten = true; diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java index 6d00af822ff..8e0fc0160de 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java @@ -47,7 +47,6 @@ import java.nio.file.StandardCopyOption; import java.util.*; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -57,11 +56,11 @@ import java.util.jar.Pack200.*; import java.util.jar.Manifest; import java.text.MessageFormat; -import jdk.internal.misc.JavaLangModuleAccess; -import jdk.internal.misc.SharedSecrets; import jdk.internal.module.Checks; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModuleResolution; import jdk.internal.util.jar.JarIndex; import static jdk.internal.util.jar.JarIndex.INDEX_NAME; @@ -211,6 +210,7 @@ class Main { /* To support additional GNU Style informational options */ enum Info { HELP(GNUStyleOptions::printHelp), + HELP_EXTRA(GNUStyleOptions::printHelpExtra), COMPAT_HELP(GNUStyleOptions::printCompatHelp), USAGE_TRYHELP(GNUStyleOptions::printUsageTryHelp), VERSION(GNUStyleOptions::printVersion); @@ -225,6 +225,7 @@ class Main { /* Modular jar related options */ Version moduleVersion; Pattern modulesToHash; + ModuleResolution moduleResolution = ModuleResolution.empty(); ModuleFinder moduleFinder = ModuleFinder.of(); private static final String MODULE_INFO = "module-info.class"; @@ -1991,12 +1992,13 @@ class Main { .collect(joining(" ")); } - private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); - private void printModuleDescriptor(InputStream entryInputStream) throws IOException { - ModuleDescriptor md = ModuleDescriptor.read(entryInputStream); + ModuleInfo.Attributes attrs = ModuleInfo.read(entryInputStream, null); + ModuleDescriptor md = attrs.descriptor(); + ModuleHashes hashes = attrs.recordedHashes(); + StringBuilder sb = new StringBuilder(); sb.append("\n"); if (md.isOpen()) @@ -2043,15 +2045,24 @@ class Main { md.osVersion().ifPresent(v -> sb.append("\n operating-system-version " + v)); - JLMA.hashes(md).ifPresent(hashes -> - hashes.names().stream().sorted().forEach( + if (hashes != null) { + hashes.names().stream().sorted().forEach( mod -> sb.append("\n hashes ").append(mod).append(" ") .append(hashes.algorithm()).append(" ") - .append(hashes.hashFor(mod)))); + .append(toHex(hashes.hashFor(mod)))); + } output(sb.toString()); } + private static String toHex(byte[] ba) { + StringBuilder sb = new StringBuilder(ba.length); + for (byte b: ba) { + sb.append(String.format("%02x", b & 0xff)); + } + return sb.toString(); + } + private static String toBinaryName(String classname) { return (classname.replace('.', '/')) + ".class"; } @@ -2212,6 +2223,10 @@ class Main { } } + if (moduleResolution.value() != 0) { + extender.moduleResolution(moduleResolution); + } + extender.write(baos); return baos.toByteArray(); } @@ -2228,13 +2243,12 @@ class Main { // Create a module finder that finds the modular JAR // being created/updated URI uri = Paths.get(fname).toUri(); - ModuleReference mref = new ModuleReference(descriptor, uri, - new Supplier<>() { - @Override - public ModuleReader get() { - throw new UnsupportedOperationException("should not reach here"); - } - }); + ModuleReference mref = new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException("should not reach here"); + } + }; // Compose a module finder with the module path and // the modular JAR being created or updated diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties index dd1d0ff4ee0..c575f3b3c00 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties @@ -46,6 +46,8 @@ error.bad.eflag=\ together! error.bad.dflag=\ '-d, --print-module-descriptor' option requires no input file(s) to be specified: {0} +error.bad.reason=\ + bad reason: {0}, must be one of deprecated, deprecated-for-removal, or incubating error.nosuch.fileordir=\ {0} : no such file or directory error.write.file=\ @@ -246,6 +248,12 @@ main.help.opt.create.update.hash-modules=\ main.help.opt.create.update.module-path=\ \ -p, --module-path Location of module dependence for generating\n\ \ the hash +main.help.opt.create.update.do-not-resolve-by-default=\ +\ --do-not-resolve-by-default Exclude from the default root set of modules +main.help.opt.create.update.warn-if-resolved=\ +\ --warn-if-resolved Hint for a tool to issue a warning if the module\n\ +\ is resolved. One of deprecated, deprecated-for-removal,\n\ +\ or incubating main.help.opt.create.update.index=\ \ Operation modifiers valid only in create, update, and generate-index mode:\n main.help.opt.create.update.index.no-compress=\ @@ -254,6 +262,8 @@ main.help.opt.other=\ \ Other options:\n main.help.opt.other.help=\ \ -?, --help[:compat] Give this, or optionally the compatibility, help +main.help.opt.other.help-extra=\ +\ --help-extra Give help on extra options main.help.opt.other.version=\ \ --version Print program version main.help.postopt=\ diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java index b5cd9c67abd..2cd645345c7 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/MethodImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -315,10 +315,14 @@ public abstract class MethodImpl extends TypeComponentImpl return; } Value nthArgValue = arguments.get(paramCount - 1); - if (nthArgValue == null) { + if (nthArgValue == null && argCount == paramCount) { + // We have one varargs parameter and it is null + // so we don't have to do anything. return; } - Type nthArgType = nthArgValue.type(); + // If the first varargs parameter is null, then don't + // access its type since it can't be an array. + Type nthArgType = (nthArgValue == null) ? null : nthArgValue.type(); if (nthArgType instanceof ArrayTypeImpl) { if (argCount == paramCount && ((ArrayTypeImpl)nthArgType).isAssignableTo(lastParamType)) { diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c index 6ff7025bbf6..1f3aa41f65b 100644 --- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c +++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -249,16 +249,19 @@ private jboolean isValid(void); int lastLn = 0; int sti; + if (cnt < 0) { + return; + } loadDebugInfo(env, clazz); if (!isValid()) { return; /* no SDE or not SourceMap - return unchanged */ } sti = stratumTableIndex(globalDefaultStratumId); - if (sti == baseStratumIndex) { + if (sti == baseStratumIndex || sti < 0) { return; /* Java stratum - return unchanged */ } LOG_MISC(("SDE is re-ordering the line table")); - for (; cnt-->0; ++fromEntry) { + for (; cnt-- > 0; ++fromEntry) { int jplsLine = fromEntry->line_number; int lti = stiLineTableIndex(sti, jplsLine); if (lti >= 0) { diff --git a/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c b/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c index 33e062e087d..9692f4f83ae 100644 --- a/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c +++ b/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -196,18 +196,10 @@ dbgsysSetSocketOption(int fd, jint cmd, jboolean on, jvalue value) } else if (cmd == SO_LINGER) { struct linger arg; arg.l_onoff = on; - - if(on) { - arg.l_linger = (unsigned short)value.i; - if(setsockopt(fd, SOL_SOCKET, SO_LINGER, - (char*)&arg, sizeof(arg)) < 0) { - return SYS_ERR; - } - } else { - if (setsockopt(fd, SOL_SOCKET, SO_LINGER, - (char*)&arg, sizeof(arg)) < 0) { - return SYS_ERR; - } + arg.l_linger = (on) ? (unsigned short)value.i : 0; + if (setsockopt(fd, SOL_SOCKET, SO_LINGER, + (char*)&arg, sizeof(arg)) < 0) { + return SYS_ERR; } } else if (cmd == SO_SNDBUF) { jint buflen = value.i; diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java index c02630df4c1..27f79dd74d1 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java @@ -34,9 +34,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.UncheckedIOException; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.io.UncheckedIOException; import java.io.Writer; import java.lang.module.ModuleDescriptor; import java.nio.charset.StandardCharsets; @@ -58,10 +58,10 @@ import java.util.Set; import static java.util.stream.Collectors.*; import jdk.tools.jlink.internal.BasicImageWriter; -import jdk.tools.jlink.internal.plugins.FileCopierPlugin.SymImageFile; import jdk.tools.jlink.internal.ExecutableImage; import jdk.tools.jlink.plugin.ResourcePool; import jdk.tools.jlink.plugin.ResourcePoolEntry; +import jdk.tools.jlink.plugin.ResourcePoolEntry.Type; import jdk.tools.jlink.plugin.ResourcePoolModule; import jdk.tools.jlink.plugin.PluginException; @@ -70,6 +70,13 @@ import jdk.tools.jlink.plugin.PluginException; * Default Image Builder. This builder creates the default runtime image layout. */ public final class DefaultImageBuilder implements ImageBuilder { + // Top-level directory names in a modular runtime image + public static final String BIN_DIRNAME = "bin"; + public static final String CONF_DIRNAME = "conf"; + public static final String INCLUDE_DIRNAME = "include"; + public static final String LIB_DIRNAME = "lib"; + public static final String LEGAL_DIRNAME = "legal"; + public static final String MAN_DIRNAME = "man"; /** * The default java executable Image. @@ -123,6 +130,7 @@ public final class DefaultImageBuilder implements ImageBuilder { } private final Path root; + private final Map launchers; private final Path mdir; private final Set modules = new HashSet<>(); private String targetOsName; @@ -133,28 +141,13 @@ public final class DefaultImageBuilder implements ImageBuilder { * @param root The image root directory. * @throws IOException */ - public DefaultImageBuilder(Path root) throws IOException { - Objects.requireNonNull(root); - - this.root = root; + public DefaultImageBuilder(Path root, Map launchers) throws IOException { + this.root = Objects.requireNonNull(root); + this.launchers = Objects.requireNonNull(launchers); this.mdir = root.resolve("lib"); Files.createDirectories(mdir); } - private void storeRelease(ResourcePool pool) throws IOException { - Properties props = new Properties(); - Optional release = pool.findEntry("/java.base/release"); - if (release.isPresent()) { - try (InputStream is = release.get().content()) { - props.load(is); - } - } - File r = new File(root.toFile(), "release"); - try (FileOutputStream fo = new FileOutputStream(r)) { - props.store(fo, null); - } - } - @Override public void storeFiles(ResourcePool files) { try { @@ -172,10 +165,8 @@ public final class DefaultImageBuilder implements ImageBuilder { throw new PluginException("TargetPlatform attribute is missing for java.base module"); } - // store 'release' file - storeRelease(files); + Path bin = root.resolve(BIN_DIRNAME); - Path bin = root.resolve("bin"); // check any duplicated resource files Map> duplicates = new HashMap<>(); files.entries() @@ -224,19 +215,27 @@ public final class DefaultImageBuilder implements ImageBuilder { } // jspawnhelper is in lib or lib/ - Path lib = root.resolve("lib"); + Path lib = root.resolve(LIB_DIRNAME); if (Files.isDirectory(lib)) { Files.find(lib, 2, (path, attrs) -> { return path.getFileName().toString().equals("jspawnhelper") || path.getFileName().toString().equals("jexec"); }).forEach(this::setExecutable); } + + // read-only legal notices/license files + Path legal = root.resolve(LEGAL_DIRNAME); + if (Files.isDirectory(legal)) { + Files.find(legal, 2, (path, attrs) -> { + return attrs.isRegularFile(); + }).forEach(this::setReadOnly); + } } // If native files are stripped completely, /bin dir won't exist! // So, don't bother generating launcher scripts. if (Files.isDirectory(bin)) { - prepareApplicationFiles(files, modules); + prepareApplicationFiles(files); } } catch (IOException ex) { throw new PluginException(ex); @@ -247,22 +246,44 @@ public final class DefaultImageBuilder implements ImageBuilder { * Generates launcher scripts. * * @param imageContent The image content. - * @param modules The set of modules that the runtime image contains. * @throws IOException */ - protected void prepareApplicationFiles(ResourcePool imageContent, Set modules) throws IOException { + protected void prepareApplicationFiles(ResourcePool imageContent) throws IOException { // generate launch scripts for the modules with a main class - for (String module : modules) { + for (Map.Entry entry : launchers.entrySet()) { + String launcherEntry = entry.getValue(); + int slashIdx = launcherEntry.indexOf("/"); + String module, mainClassName; + if (slashIdx == -1) { + module = launcherEntry; + mainClassName = null; + } else { + module = launcherEntry.substring(0, slashIdx); + assert !module.isEmpty(); + mainClassName = launcherEntry.substring(slashIdx + 1); + assert !mainClassName.isEmpty(); + } + String path = "/" + module + "/module-info.class"; Optional res = imageContent.findEntry(path); if (!res.isPresent()) { throw new IOException("module-info.class not found for " + module + " module"); } - Optional mainClass; ByteArrayInputStream stream = new ByteArrayInputStream(res.get().contentBytes()); - mainClass = ModuleDescriptor.read(stream).mainClass(); - if (mainClass.isPresent()) { - Path cmd = root.resolve("bin").resolve(module); + Optional mainClass = ModuleDescriptor.read(stream).mainClass(); + if (mainClassName == null && mainClass.isPresent()) { + mainClassName = mainClass.get(); + } + + if (mainClassName != null) { + // make sure main class exists! + if (!imageContent.findEntry("/" + module + "/" + + mainClassName.replace('.', '/') + ".class").isPresent()) { + throw new IllegalArgumentException(module + " does not have main class: " + mainClassName); + } + + String launcherFile = entry.getKey(); + Path cmd = root.resolve("bin").resolve(launcherFile); // generate shell script for Unix platforms StringBuilder sb = new StringBuilder(); sb.append("#!/bin/sh") @@ -273,7 +294,7 @@ public final class DefaultImageBuilder implements ImageBuilder { .append("\n"); sb.append("$DIR/java $JLINK_VM_OPTIONS -m ") .append(module).append('/') - .append(mainClass.get()) + .append(mainClassName) .append(" $@\n"); try (BufferedWriter writer = Files.newBufferedWriter(cmd, @@ -287,7 +308,7 @@ public final class DefaultImageBuilder implements ImageBuilder { } // generate .bat file for Windows if (isWindows()) { - Path bat = root.resolve("bin").resolve(module + ".bat"); + Path bat = root.resolve(BIN_DIRNAME).resolve(launcherFile + ".bat"); sb = new StringBuilder(); sb.append("@echo off") .append("\r\n"); @@ -297,7 +318,7 @@ public final class DefaultImageBuilder implements ImageBuilder { .append("\r\n"); sb.append("\"%DIR%\\java\" %JLINK_VM_OPTIONS% -m ") .append(module).append('/') - .append(mainClass.get()) + .append(mainClassName) .append(" %*\r\n"); try (BufferedWriter writer = Files.newBufferedWriter(bat, @@ -306,6 +327,8 @@ public final class DefaultImageBuilder implements ImageBuilder { writer.write(sb.toString()); } } + } else { + throw new IllegalArgumentException(module + " doesn't contain main class & main not specified in command line"); } } } @@ -331,6 +354,7 @@ public final class DefaultImageBuilder implements ImageBuilder { String module = "/" + entry.moduleName() + "/"; String filename = entry.path().substring(module.length()); + // Remove radical native|config|... return filename.substring(filename.indexOf('/') + 1); } @@ -344,23 +368,27 @@ public final class DefaultImageBuilder implements ImageBuilder { String filename = entryToFileName(entry); return Paths.get(nativeDir(filename), filename); case NATIVE_CMD: - return Paths.get("bin", entryToFileName(entry)); + return Paths.get(BIN_DIRNAME, entryToFileName(entry)); case CONFIG: - return Paths.get("conf", entryToFileName(entry)); + return Paths.get(CONF_DIRNAME, entryToFileName(entry)); case HEADER_FILE: - return Paths.get("include", entryToFileName(entry)); + return Paths.get(INCLUDE_DIRNAME, entryToFileName(entry)); case MAN_PAGE: - return Paths.get("man", entryToFileName(entry)); + return Paths.get(MAN_DIRNAME, entryToFileName(entry)); + case LEGAL_NOTICE: + return Paths.get(LEGAL_DIRNAME, entryToFileName(entry)); case TOP: return Paths.get(entryToFileName(entry)); - case OTHER: - return Paths.get("other", entryToFileName(entry)); default: throw new IllegalArgumentException("invalid type: " + entry); } } private void accept(ResourcePoolEntry file) throws IOException { + if (file.linkedTarget() != null && file.type() != Type.LEGAL_NOTICE) { + throw new UnsupportedOperationException("symbolic link not implemented: " + file); + } + try (InputStream in = file.content()) { switch (file.type()) { case NATIVE_LIB: @@ -373,28 +401,26 @@ public final class DefaultImageBuilder implements ImageBuilder { p.toFile().setExecutable(true); break; case CONFIG: - writeEntry(in, root.resolve(entryToImagePath(file))); - break; case HEADER_FILE: - writeEntry(in, root.resolve(entryToImagePath(file))); - break; case MAN_PAGE: writeEntry(in, root.resolve(entryToImagePath(file))); break; - case TOP: - break; - case OTHER: - String filename = entryToFileName(file); - if (file instanceof SymImageFile) { - SymImageFile sym = (SymImageFile) file; - Path target = root.resolve(sym.getTargetPath()); - if (!Files.exists(target)) { - throw new IOException("Sym link target " + target - + " doesn't exist"); - } - writeSymEntry(root.resolve(filename), target); + case LEGAL_NOTICE: + Path source = entryToImagePath(file); + if (file.linkedTarget() == null) { + writeEntry(in, root.resolve(source)); } else { - writeEntry(in, root.resolve(filename)); + Path target = entryToImagePath(file.linkedTarget()); + Path relPath = source.getParent().relativize(target); + writeSymLinkEntry(root.resolve(source), relPath); + } + break; + case TOP: + // Copy TOP files of the "java.base" module (only) + if ("java.base".equals(file.moduleName())) { + writeEntry(in, root.resolve(entryToImagePath(file))); + } else { + throw new InternalError("unexpected TOP entry: " + file.path()); } break; default: @@ -417,16 +443,36 @@ public final class DefaultImageBuilder implements ImageBuilder { Files.createLink(dstFile, target); } + /* + * Create a symbolic link to the given target if the target platform + * supports symbolic link; otherwise, it will create a tiny file + * to contain the path to the target. + */ + private void writeSymLinkEntry(Path dstFile, Path target) throws IOException { + Objects.requireNonNull(dstFile); + Objects.requireNonNull(target); + Files.createDirectories(Objects.requireNonNull(dstFile.getParent())); + if (!isWindows() && root.getFileSystem() + .supportedFileAttributeViews() + .contains("posix")) { + Files.createSymbolicLink(dstFile, target); + } else { + try (BufferedWriter writer = Files.newBufferedWriter(dstFile)) { + writer.write(String.format("Please see %s%n", target.toString())); + } + } + } + private String nativeDir(String filename) { if (isWindows()) { if (filename.endsWith(".dll") || filename.endsWith(".diz") || filename.endsWith(".pdb") || filename.endsWith(".map")) { - return "bin"; + return BIN_DIRNAME; } else { - return "lib"; + return LIB_DIRNAME; } } else { - return "lib"; + return LIB_DIRNAME; } } @@ -449,6 +495,21 @@ public final class DefaultImageBuilder implements ImageBuilder { } } + /** + * chmod ugo-w file + */ + private void setReadOnly(Path file) { + try { + Set perms = Files.getPosixFilePermissions(file); + perms.remove(PosixFilePermission.OWNER_WRITE); + perms.remove(PosixFilePermission.GROUP_WRITE); + perms.remove(PosixFilePermission.OTHERS_WRITE); + Files.setPosixFilePermissions(file, perms); + } catch (IOException ioe) { + throw new UncheckedIOException(ioe); + } + } + private static void createUtf8File(File file, String content) throws IOException { try (OutputStream fout = new FileOutputStream(file); Writer output = new OutputStreamWriter(fout, "UTF-8")) { @@ -465,7 +526,7 @@ public final class DefaultImageBuilder implements ImageBuilder { private static void patchScripts(ExecutableImage img, List args) throws IOException { Objects.requireNonNull(args); if (!args.isEmpty()) { - Files.find(img.getHome().resolve("bin"), 2, (path, attrs) -> { + Files.find(img.getHome().resolve(BIN_DIRNAME), 2, (path, attrs) -> { return img.getModules().contains(path.getFileName().toString()); }).forEach((p) -> { try { @@ -497,7 +558,7 @@ public final class DefaultImageBuilder implements ImageBuilder { } public static ExecutableImage getExecutableImage(Path root) { - Path binDir = root.resolve("bin"); + Path binDir = root.resolve(BIN_DIRNAME); if (Files.exists(binDir.resolve("java")) || Files.exists(binDir.resolve("java.exe"))) { return new DefaultExecutableImage(root, retrieveModules(root)); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java index 9c896071e57..c56346b6994 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Archive.java @@ -48,6 +48,7 @@ public interface Archive { NATIVE_LIB, NATIVE_CMD, HEADER_FILE, + LEGAL_NOTICE, MAN_PAGE, SERVICE; } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java index 01fd19d062a..579198152eb 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ArchiveEntryResourcePoolEntry.java @@ -66,19 +66,21 @@ final class ArchiveEntryResourcePoolEntry extends AbstractResourcePoolEntry { private static ResourcePoolEntry.Type getImageFileType(Archive.Entry entry) { switch(entry.type()) { case CLASS_OR_RESOURCE: - return ResourcePoolEntry.Type.CLASS_OR_RESOURCE; + return Type.CLASS_OR_RESOURCE; case CONFIG: - return ResourcePoolEntry.Type.CONFIG; - case NATIVE_CMD: - return ResourcePoolEntry.Type.NATIVE_CMD; - case NATIVE_LIB: - return ResourcePoolEntry.Type.NATIVE_LIB; + return Type.CONFIG; case HEADER_FILE: - return ResourcePoolEntry.Type.HEADER_FILE; + return Type.HEADER_FILE; + case LEGAL_NOTICE: + return Type.LEGAL_NOTICE; case MAN_PAGE: - return ResourcePoolEntry.Type.MAN_PAGE; + return Type.MAN_PAGE; + case NATIVE_CMD: + return Type.NATIVE_CMD; + case NATIVE_LIB: + return Type.NATIVE_LIB; default: - return ResourcePoolEntry.Type.OTHER; + throw new IllegalArgumentException("Unknown archive entry type: " + entry.type()); } } } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java index 4a5cbffe579..0eb7ade59fa 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java @@ -53,7 +53,9 @@ import jdk.tools.jlink.internal.ImagePluginStack.ImageProvider; import jdk.tools.jlink.plugin.PluginException; import jdk.tools.jlink.builder.DefaultImageBuilder; import jdk.tools.jlink.plugin.Plugin; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.Checks; +import jdk.internal.module.ModulePath; +import jdk.internal.module.ModuleResolution; /** * Implementation for the jlink tool. @@ -108,6 +110,27 @@ public class JlinkTask { Path path = Paths.get(arg); task.options.output = path; }, "--output"), + new Option(true, (task, opt, arg) -> { + String[] values = arg.split("="); + // check values + if (values.length != 2 || values[0].isEmpty() || values[1].isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.value.format", arg); + } else { + String commandName = values[0]; + String moduleAndMain = values[1]; + int idx = moduleAndMain.indexOf("/"); + if (idx != -1) { + if (moduleAndMain.substring(0, idx).isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.module.name.empty", arg); + } + + if (moduleAndMain.substring(idx + 1).isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.main.class.empty", arg); + } + } + task.options.launchers.put(commandName, moduleAndMain); + } + }, "--launcher"), new Option(true, (task, opt, arg) -> { if ("little".equals(arg)) { task.options.endian = ByteOrder.LITTLE_ENDIAN; @@ -168,6 +191,7 @@ public class JlinkTask { final Set limitMods = new HashSet<>(); final Set addMods = new HashSet<>(); Path output; + final Map launchers = new HashMap<>(); Path packagedModulesPath; ByteOrder endian = ByteOrder.nativeOrder(); boolean ignoreSigning = false; @@ -260,7 +284,8 @@ public class JlinkTask { config.getModules(), config.getByteOrder(), null, - IGNORE_SIGNING_DEFAULT); + IGNORE_SIGNING_DEFAULT, + null); // Then create the Plugin Stack ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(plugins); @@ -284,7 +309,7 @@ public class JlinkTask { } private void postProcessOnly(Path existingImage) throws Exception { - PluginsConfiguration config = taskHelper.getPluginsConfig(null); + PluginsConfiguration config = taskHelper.getPluginsConfig(null, null); ExecutableImage img = DefaultImageBuilder.getExecutableImage(existingImage); if (img == null) { throw taskHelper.newBadArgs("err.existing.image.invalid"); @@ -328,11 +353,12 @@ public class JlinkTask { roots, options.endian, options.packagedModulesPath, - options.ignoreSigning); + options.ignoreSigning, + log); // Then create the Plugin Stack ImagePluginStack stack = ImagePluginConfiguration. - parseConfiguration(taskHelper.getPluginsConfig(options.output)); + parseConfiguration(taskHelper.getPluginsConfig(options.output, options.launchers)); //Ask the stack to proceed stack.operate(imageProvider); @@ -344,9 +370,7 @@ public class JlinkTask { */ private ModuleFinder modulePathFinder() { Path[] entries = options.modulePath.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, entries); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, entries); if (!options.limitMods.isEmpty()) { finder = limitFinder(finder, options.limitMods, Collections.emptySet()); } @@ -364,8 +388,7 @@ public class JlinkTask { Set roots) { Path[] entries = paths.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, entries); + ModuleFinder finder = new ModulePath(Runtime.version(), true, entries); // if limitmods is specified then limit the universe if (!limitMods.isEmpty()) { @@ -386,7 +409,8 @@ public class JlinkTask { Set roots, ByteOrder order, Path retainModulesPath, - boolean ignoreSigning) + boolean ignoreSigning, + PrintWriter log) throws IOException { if (roots.isEmpty()) { @@ -398,6 +422,27 @@ public class JlinkTask { ModuleFinder.of(), roots); + // emit warning for modules that end with a digit + cf.modules().stream() + .map(ResolvedModule::name) + .filter(mn -> !Checks.hasLegalModuleNameLastCharacter(mn)) + .forEach(mn -> System.err.println("WARNING: Module name \"" + + mn + "\" may soon be illegal")); + + // emit a warning for any incubating modules in the configuration + if (log != null) { + String im = cf.modules() + .stream() + .map(ResolvedModule::reference) + .filter(ModuleResolution::hasIncubatingWarning) + .map(ModuleReference::descriptor) + .map(ModuleDescriptor::name) + .collect(Collectors.joining(", ")); + + if (!"".equals(im)) + log.println("WARNING: Using incubator modules: " + im); + } + Map mods = cf.modules().stream() .collect(Collectors.toMap(ResolvedModule::name, JlinkTask::toPathLocation)); return new ImageHelper(cf, mods, order, retainModulesPath, ignoreSigning); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java index 0a528ee9a7b..2450db657ee 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JmodArchive.java @@ -130,14 +130,16 @@ public class JmodArchive implements Archive { return EntryType.CLASS_OR_RESOURCE; case CONFIG: return EntryType.CONFIG; + case HEADER_FILES: + return EntryType.HEADER_FILE; + case LEGAL_NOTICES: + return EntryType.LEGAL_NOTICE; + case MAN_PAGES: + return EntryType.MAN_PAGE; case NATIVE_LIBS: return EntryType.NATIVE_LIB; case NATIVE_CMDS: return EntryType.NATIVE_CMD; - case HEADER_FILES: - return EntryType.HEADER_FILE; - case MAN_PAGES: - return EntryType.MAN_PAGE; default: throw new InternalError("unexpected entry: " + section); } @@ -145,13 +147,28 @@ public class JmodArchive implements Archive { private Entry toEntry(JmodFile.Entry entry) { EntryType type = toEntryType(entry.section()); + String prefix = entry.section().jmodDir(); String name = entry.name(); - String path = entry.section().jmodDir() + "/" + name; - - // Entry.path() contains the kind of file native, conf, bin, ... - // Keep it to avoid naming conflict (eg: native/jvm.cfg and config/jvm.cfg + String path = prefix + "/" + name; String resourceName = name; - if (type != EntryType.CLASS_OR_RESOURCE) { + + // The resource name represents the path of ResourcePoolEntry + // and its subpath defines the ultimate path to be written + // to the image relative to the directory corresponding to that + // resource type. + // + // For classes and resources, the resource name does not have + // a prefix (/). They will be written to the jimage. + // + // For other kind of entries, it will keep the section name as + // the prefix for unique identification. The subpath (taking + // out the section name) is the pathname to be written to the + // corresponding directory in the image. + // + if (type == EntryType.LEGAL_NOTICE) { + // legal notices are written to per-module directory + resourceName = prefix + "/" + moduleName + "/" + name; + } else if (type != EntryType.CLASS_OR_RESOURCE) { resourceName = path; } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java index 63ce3cd7593..9c81c7740c6 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java @@ -28,6 +28,7 @@ package jdk.tools.jlink.internal; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.io.IOException; import java.io.UncheckedIOException; @@ -78,10 +79,12 @@ final class ResourcePoolConfiguration { } private static ModuleReference moduleReference(ModuleDescriptor desc) { - return new ModuleReference(desc, null, () -> { - IOException ioe = new IOException(""); - throw new UncheckedIOException(ioe); - }); + return new ModuleReference(desc, null) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } + }; } private static Map allModRefs(ResourcePool pool) { diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java index 664e60eaa06..e2a0218732b 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolEntryFactory.java @@ -51,6 +51,12 @@ public final class ResourcePoolEntryFactory { original.path(), original.type(), file); } + public static ResourcePoolEntry createSymbolicLink(String path, + ResourcePoolEntry.Type type, + ResourcePoolEntry target) { + return new SymLinkResourcePoolEntry(moduleFrom(path), path, type, target); + } + private static String moduleFrom(String path) { Objects.requireNonNull(path); if (path.isEmpty() || path.charAt(0) != '/') { diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java index 10d1e7305e2..e3b046172f7 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java @@ -52,8 +52,8 @@ public class ResourcePoolManager { String p = "/" + mod.name() + "/module-info.class"; Optional content = mod.findEntry(p); if (!content.isPresent()) { - throw new PluginException("No module-info for " + mod.name() - + " module"); + throw new PluginException("module-info.class not found for " + + mod.name() + " module"); } ByteBuffer bb = ByteBuffer.wrap(content.get().contentBytes()); try { diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java new file mode 100644 index 00000000000..6f96c36c452 --- /dev/null +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/SymLinkResourcePoolEntry.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.tools.jlink.internal; + +import jdk.tools.jlink.plugin.ResourcePoolEntry; + +import java.io.InputStream; +import java.util.Objects; + +/** + * A symbolic link ResourcePoolEntry. It will be created in the image + * as a symbolic link to the target when the target platform supports + * symbolic links; otherwise, it will create a file containing the + * path to the target file. + */ +public class SymLinkResourcePoolEntry extends AbstractResourcePoolEntry { + private final ResourcePoolEntry target; + + /** + * Create a new SymLinkResourcePoolEntry. + * + * @param module The module name. + * @param path The path for the resource content. + * @param type The data type. + * @param target Target entry in the image + */ + public SymLinkResourcePoolEntry(String module, + String path, + ResourcePoolEntry.Type type, + ResourcePoolEntry target) { + super(module, path, type); + this.target = Objects.requireNonNull(target); + } + + @Override + public long contentLength() { + return target.contentLength(); + } + + @Override + public InputStream content() { + return target.content(); + } + + @Override + public ResourcePoolEntry linkedTarget() { + return target; + } +} diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java index fc7d85fbff7..19044f57e65 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java @@ -58,7 +58,7 @@ import jdk.tools.jlink.internal.Jlink.PluginsConfiguration; import jdk.tools.jlink.internal.plugins.PluginsResourceBundle; import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin; import jdk.tools.jlink.internal.plugins.StripDebugPlugin; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModulePath; /** * @@ -403,7 +403,7 @@ public final class TaskHelper { return null; } - private PluginsConfiguration getPluginsConfig(Path output + private PluginsConfiguration getPluginsConfig(Path output, Map launchers ) throws IOException, BadArgs { if (output != null) { if (Files.exists(output)) { @@ -440,9 +440,9 @@ public final class TaskHelper { // recreate or postprocessing don't require an output directory. ImageBuilder builder = null; if (output != null) { - builder = new DefaultImageBuilder(output); - + builder = new DefaultImageBuilder(output, launchers); } + return new Jlink.PluginsConfiguration(pluginsList, builder, lastSorter); } @@ -745,9 +745,9 @@ public final class TaskHelper { + bundleHelper.getMessage(key, args)); } - public PluginsConfiguration getPluginsConfig(Path output) + public PluginsConfiguration getPluginsConfig(Path output, Map launchers) throws IOException, BadArgs { - return pluginOptions.getPluginsConfig(output); + return pluginOptions.getPluginsConfig(output, launchers); } public Path getExistingImage() { @@ -765,9 +765,7 @@ public final class TaskHelper { static Layer createPluginsLayer(List paths) { Path[] dirs = paths.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, dirs); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, dirs); Configuration bootConfiguration = Layer.boot().configuration(); try { Configuration cf = bootConfiguration diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java index 5b06d8135f2..dd0889d3786 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java @@ -49,6 +49,7 @@ import java.util.Set; */ public final class AppRuntimeImageBuilder { private Path outputDir = null; + private Map launchers = Collections.emptyMap(); private List modulePath = null; private Set addModules = null; private Set limitModules = null; @@ -62,6 +63,10 @@ public final class AppRuntimeImageBuilder { outputDir = value; } + public void setLaunchers(Map value) { + launchers = value; + } + public void setModulePath(List value) { modulePath = value; } @@ -120,7 +125,7 @@ public final class AppRuntimeImageBuilder { // build the image Jlink.PluginsConfiguration pluginConfig = new Jlink.PluginsConfiguration( - plugins, new DefaultImageBuilder(outputDir), null); + plugins, new DefaultImageBuilder(outputDir, launchers), null); Jlink jlink = new Jlink(); jlink.build(jlinkConfig, pluginConfig); } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java deleted file mode 100644 index a0384bb7fd7..00000000000 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java +++ /dev/null @@ -1,263 +0,0 @@ -/* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package jdk.tools.jlink.internal.plugins; - -import java.io.File; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.FileVisitResult; -import java.nio.file.FileVisitor; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import jdk.tools.jlink.internal.PathResourcePoolEntry; -import jdk.tools.jlink.plugin.PluginException; -import jdk.tools.jlink.plugin.ResourcePool; -import jdk.tools.jlink.plugin.ResourcePoolBuilder; -import jdk.tools.jlink.plugin.ResourcePoolEntry; -import jdk.tools.jlink.plugin.Plugin; -import jdk.tools.jlink.internal.Utils; - -/** - * - * Copy files to image from various locations. - */ -public class FileCopierPlugin implements Plugin { - - public static final String NAME = "copy-files"; - - private static final class CopiedFile { - - Path source; - Path target; - } - private final List files = new ArrayList<>(); - - /** - * Symbolic link to another path. - */ - public static abstract class SymImageFile extends PathResourcePoolEntry { - - private final String targetPath; - - public SymImageFile(String targetPath, String module, String path, - ResourcePoolEntry.Type type, Path file) { - super(module, path, type, file); - this.targetPath = targetPath; - } - - public String getTargetPath() { - return targetPath; - } - } - - private static final class SymImageFileImpl extends SymImageFile { - - public SymImageFileImpl(String targetPath, Path file, String module, - String path, ResourcePoolEntry.Type type) { - super(targetPath, module, path, type, file); - } - } - - private static final class DirectoryCopy implements FileVisitor { - - private final Path source; - private final ResourcePoolBuilder pool; - private final String targetDir; - private final List symlinks = new ArrayList<>(); - - DirectoryCopy(Path source, ResourcePoolBuilder pool, String targetDir) { - this.source = source; - this.pool = pool; - this.targetDir = targetDir; - } - - @Override - public FileVisitResult preVisitDirectory(Path dir, - BasicFileAttributes attrs) throws IOException { - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path file, - BasicFileAttributes attrs) throws IOException { - Objects.requireNonNull(file); - Objects.requireNonNull(attrs); - String path = targetDir + "/" + source.relativize(file); - if (attrs.isSymbolicLink()) { - Path symTarget = Files.readSymbolicLink(file); - if (!Files.exists(symTarget)) { - // relative to file parent? - Path parent = file.getParent(); - if (parent != null) { - symTarget = parent.resolve(symTarget); - } - } - if (!Files.exists(symTarget)) { - System.err.println("WARNING: Skipping sym link, target " - + Files.readSymbolicLink(file) + "not found"); - return FileVisitResult.CONTINUE; - } - SymImageFileImpl impl = new SymImageFileImpl(symTarget.toString(), - file, path, Objects.requireNonNull(file.getFileName()).toString(), - ResourcePoolEntry.Type.OTHER); - symlinks.add(impl); - } else { - addFile(pool, file, path); - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) - throws IOException { - if (exc != null) { - throw exc; - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFileFailed(Path file, IOException exc) - throws IOException { - throw exc; - } - } - - private static void addFile(ResourcePoolBuilder pool, Path file, String path) - throws IOException { - Objects.requireNonNull(pool); - Objects.requireNonNull(file); - Objects.requireNonNull(path); - ResourcePoolEntry impl = ResourcePoolEntry.create( - "/java.base/other/" + path, - ResourcePoolEntry.Type.OTHER, file); - try { - pool.add(impl); - } catch (Exception ex) { - throw new IOException(ex); - } - } - - @Override - public void configure(Map config) { - List arguments = Utils.parseList(config.get(NAME)); - if (arguments.isEmpty()) { - throw new RuntimeException("Invalid argument for " + NAME); - } - - String javahome = System.getProperty("java.home"); - for (String a : arguments) { - int i = a.indexOf("="); - CopiedFile cf = new CopiedFile(); - if (i == -1) { - Path file = Paths.get(a); - if (file.isAbsolute()) { - cf.source = file; - // The target is the image root directory. - cf.target = file.getFileName(); - } else { - file = new File(javahome, a).toPath(); - cf.source = file; - cf.target = Paths.get(a); - } - } else { - String target = a.substring(i + 1); - String f = a.substring(0, i); - Path file = Paths.get(f); - if (file.isAbsolute()) { - cf.source = file; - } else { - cf.source = new File(javahome, - file.toFile().getPath()).toPath(); - } - cf.target = Paths.get(target); - } - if (!Files.exists(cf.source)) { - System.err.println("Skipping file " + cf.source - + ", it doesn't exist"); - } else { - files.add(cf); - } - } - } - - @Override - public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) { - in.transformAndCopy((file) -> { - return file; - }, out); - - // Add new files. - try { - for (CopiedFile file : files) { - if (Files.isRegularFile(file.source)) { - addFile(out, file.source, file.target.toString()); - } else if (Files.isDirectory(file.source)) { - DirectoryCopy dc = new DirectoryCopy(file.source, - out, file.target.toString()); - Files.walkFileTree(file.source, dc); - // Add symlinks after actual content - for (SymImageFile imf : dc.symlinks) { - try { - out.add(imf); - } catch (Exception ex) { - throw new PluginException(ex); - } - } - } - } - } catch (IOException ex) { - throw new UncheckedIOException(ex); - } - - return out.build(); - } - - @Override - public String getName() { - return NAME; - } - - @Override - public String getDescription() { - return PluginsResourceBundle.getDescription(NAME); - } - - @Override - public boolean hasArguments() { - return true; - } - - @Override - public String getArgumentsDescription() { - return PluginsResourceBundle.getArgument(NAME); - } -} diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java new file mode 100644 index 00000000000..4cf5b0c6186 --- /dev/null +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package jdk.tools.jlink.internal.plugins; + +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import jdk.tools.jlink.internal.ModuleSorter; +import jdk.tools.jlink.internal.Utils; +import jdk.tools.jlink.plugin.Plugin; +import jdk.tools.jlink.plugin.PluginException; +import jdk.tools.jlink.plugin.ResourcePool; +import jdk.tools.jlink.plugin.ResourcePoolBuilder; +import jdk.tools.jlink.plugin.ResourcePoolEntry; +import jdk.tools.jlink.plugin.ResourcePoolEntry.Type; +import jdk.tools.jlink.plugin.ResourcePoolModule; + +/** + * A plugin to de-duplicate the legal notices from JMOD files. + * + * For a de-duplicated legal notice, the actual copy will be in + * the base module and with symbolic links in other modules. + * On platform that does not support symbolic links, a file + * will be created to contain the path to the linked target. + */ +public final class LegalNoticeFilePlugin implements Plugin { + + private static final String NAME = "dedup-legal-notices"; + private static final String ERROR_IF_NOT_SAME_CONTENT = "error-if-not-same-content"; + private final Map> licenseOrNotice = + new HashMap<>(); + + private boolean errorIfNotSameContent = false; + + @Override + public String getName() { + return NAME; + } + + @Override + public Set getState() { + return EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL); + } + + @Override + public void configure(Map config) { + String arg = config.get(NAME); + if (arg != null) { + if (arg.equals(ERROR_IF_NOT_SAME_CONTENT)) { + errorIfNotSameContent = true; + } else { + throw new IllegalArgumentException(NAME + ": " + arg); + } + } + } + + @Override + public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) { + // Sort modules in the topological order + // process all legal notices/licenses entries + new ModuleSorter(in.moduleView()) + .sorted() + .flatMap(ResourcePoolModule::entries) + .filter(entry -> entry.type() == Type.LEGAL_NOTICE) + .forEach(this::dedupLegalNoticeEntry); + + in.entries() + .filter(entry -> entry.type() != Type.LEGAL_NOTICE) + .forEach(out::add); + + licenseOrNotice.values().stream() + .flatMap(List::stream) + .forEach(out::add); + return out.build(); + } + + private void dedupLegalNoticeEntry(ResourcePoolEntry entry) { + Path path = Utils.getJRTFSPath(entry.path()); + Path filename = path.getFileName(); + + List entries = + licenseOrNotice.computeIfAbsent(filename.toString(), _k -> new ArrayList<>()); + + Optional otarget = entries.stream() + .filter(e -> e.linkedTarget() == null) + .filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes())) + .findFirst(); + if (!otarget.isPresent()) { + if (errorIfNotSameContent) { + // all legal notices of the same file name are expected + // to contain the same content + Optional ores = + entries.stream().filter(e -> e.linkedTarget() == null) + .findAny(); + + if (ores.isPresent()) { + throw new PluginException(ores.get().path() + " " + + entry.path() + " contain different content"); + } + } + entries.add(entry); + } else { + entries.add(ResourcePoolEntry.createSymLink(entry.path(), + entry.type(), + otarget.get())); + } + } + + @Override + public Category getType() { + return Category.TRANSFORMER; + } + + @Override + public String getDescription() { + return PluginsResourceBundle.getDescription(NAME); + } + + @Override + public boolean hasArguments() { + return true; + } + + @Override + public String getArgumentsDescription() { + return PluginsResourceBundle.getArgument(NAME); + } +} diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java similarity index 66% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java rename to jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java index 6be8c5f2acf..32281d4323e 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,14 +37,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; +import java.util.TreeSet; import java.util.function.IntSupplier; import jdk.internal.misc.JavaLangModuleAccess; import jdk.internal.misc.SharedSecrets; import jdk.internal.module.Checks; +import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo.Attributes; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModuleResolution; import jdk.internal.module.SystemModules; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; @@ -55,7 +58,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*; import jdk.tools.jlink.plugin.PluginException; import jdk.tools.jlink.plugin.ResourcePool; import jdk.tools.jlink.plugin.Plugin; -import jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin.SystemModulesClassGenerator.*; import jdk.tools.jlink.plugin.ResourcePoolBuilder; import jdk.tools.jlink.plugin.ResourcePoolEntry; @@ -67,10 +69,10 @@ import jdk.tools.jlink.plugin.ResourcePoolEntry; * * This plugin will override jdk.internal.module.SystemModules class * - * @see java.lang.module.SystemModuleFinder + * @see jdk.internal.module.SystemModuleFinder * @see SystemModules */ -public final class SystemModuleDescriptorPlugin implements Plugin { +public final class SystemModulesPlugin implements Plugin { private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); @@ -79,7 +81,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { PluginsResourceBundle.getDescription(NAME); private boolean enabled; - public SystemModuleDescriptorPlugin() { + public SystemModulesPlugin() { this.enabled = true; } @@ -126,20 +128,18 @@ public final class SystemModuleDescriptorPlugin implements Plugin { assert module.name().equals(data.moduleName()); try { - ByteArrayInputStream bain = new ByteArrayInputStream(data.contentBytes()); - ModuleDescriptor md = ModuleDescriptor.read(bain); - validateNames(md); + ModuleInfo moduleInfo = new ModuleInfo(data.contentBytes(), module.packages()); + generator.addModule(moduleInfo); - Set packages = module.packages(); - generator.addModule(md, module.packages()); + // link-time validation + moduleInfo.validateNames(); + // check if any exported or open package is not present + moduleInfo.validatePackages(); - // add Packages attribute if not exist - if (md.packages().isEmpty() && packages.size() > 0) { - bain.reset(); - ModuleInfoRewriter minfoWriter = - new ModuleInfoRewriter(bain, module.packages()); + // Packages attribute needs update + if (moduleInfo.shouldAddPackagesAttribute()) { // replace with the overridden version - data = data.copyWithContent(minfoWriter.getBytes()); + data = data.copyWithContent(moduleInfo.getBytes()); } out.add(data); } catch (IOException e) { @@ -164,61 +164,119 @@ public final class SystemModuleDescriptorPlugin implements Plugin { return out.build(); } - /* - * Add Packages attribute - */ - class ModuleInfoRewriter extends ByteArrayOutputStream { - final ModuleInfoExtender extender; - ModuleInfoRewriter(InputStream in, Set packages) throws IOException { - this.extender = ModuleInfoExtender.newExtender(in); - // Add Packages attribute - this.extender.packages(packages); - this.extender.write(this); + class ModuleInfo { + final ModuleDescriptor descriptor; + final ModuleHashes recordedHashes; + final ModuleResolution moduleResolution; + final Set packages; + final ByteArrayInputStream bain; + + ModuleInfo(byte[] bytes, Set packages) throws IOException { + this.bain = new ByteArrayInputStream(bytes); + this.packages = packages; + + Attributes attrs = jdk.internal.module.ModuleInfo.read(bain, null); + this.descriptor = attrs.descriptor(); + this.recordedHashes = attrs.recordedHashes(); + this.moduleResolution = attrs.moduleResolution(); + + if (descriptor.isAutomatic()) { + throw new InternalError("linking automatic module is not supported"); + } } - byte[] getBytes() { - return buf; + String moduleName() { + return descriptor.name(); } - } - void validateNames(ModuleDescriptor md) { - Checks.requireModuleName(md.name()); - for (Requires req : md.requires()) { - Checks.requireModuleName(req.name()); + /** + * Validates names in ModuleDescriptor + */ + void validateNames() { + Checks.requireModuleName(descriptor.name()); + for (Requires req : descriptor.requires()) { + Checks.requireModuleName(req.name()); + } + for (Exports e : descriptor.exports()) { + Checks.requirePackageName(e.source()); + if (e.isQualified()) + e.targets().forEach(Checks::requireModuleName); + } + for (Opens opens : descriptor.opens()) { + Checks.requirePackageName(opens.source()); + if (opens.isQualified()) + opens.targets().forEach(Checks::requireModuleName); + } + for (Provides provides : descriptor.provides()) { + Checks.requireServiceTypeName(provides.service()); + provides.providers().forEach(Checks::requireServiceProviderName); + } + for (String service : descriptor.uses()) { + Checks.requireServiceTypeName(service); + } + for (String pn : descriptor.packages()) { + Checks.requirePackageName(pn); + } } - for (Exports e : md.exports()) { - Checks.requirePackageName(e.source()); - if (e.isQualified()) - e.targets().forEach(Checks::requireModuleName); - } - for (Opens opens : md.opens()) { - Checks.requirePackageName(opens.source()); - if (opens.isQualified()) - opens.targets().forEach(Checks::requireModuleName); - } - for (Provides provides : md.provides()) { - Checks.requireServiceTypeName(provides.service()); - provides.providers().forEach(Checks::requireServiceProviderName); - } - for (String service : md.uses()) { - Checks.requireServiceTypeName(service); - } - for (String pn : md.packages()) { - Checks.requirePackageName(pn); - } - } - /* - * Returns the initial capacity for a new Set or Map of the given size - * to avoid resizing. - */ - static final int initialCapacity(int size) { - if (size == 0) { - return 0; - } else { - // Adjust to try and get size/capacity as close to the - // HashSet/HashMap default load factor without going over. - return (int)(Math.ceil((double)size / 0.75)); + + /** + * Validates if exported and open packages are present + */ + void validatePackages() { + Set nonExistPackages = new TreeSet<>(); + descriptor.exports().stream() + .map(Exports::source) + .filter(pn -> !packages.contains(pn)) + .forEach(nonExistPackages::add); + + descriptor.opens().stream() + .map(Opens::source) + .filter(pn -> !packages.contains(pn)) + .forEach(nonExistPackages::add); + + if (!nonExistPackages.isEmpty()) { + throw new PluginException("Packages that are exported or open in " + + descriptor.name() + " are not present: " + nonExistPackages); + } + } + + /** + * Returns true if the PackagesAttribute should be written + */ + boolean shouldAddPackagesAttribute() { + return descriptor.packages().isEmpty() && packages.size() > 0; + } + + /** + * Returns the bytes for the module-info.class with PackagesAttribute + * if it contains at least one package + */ + byte[] getBytes() throws IOException { + bain.reset(); + + // add Packages attribute if not exist + if (shouldAddPackagesAttribute()) { + return new ModuleInfoRewriter(bain, packages).getBytes(); + } else { + return bain.readAllBytes(); + } + } + + class ModuleInfoRewriter extends ByteArrayOutputStream { + final ModuleInfoExtender extender; + ModuleInfoRewriter(InputStream in, Set packages) throws IOException { + this.extender = ModuleInfoExtender.newExtender(in); + // Add Packages attribute + if (packages.size() > 0) { + this.extender.packages(packages); + } + this.extender.write(this); + } + + byte[] getBytes() { + return buf; + } } } @@ -239,30 +297,31 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "java/lang/module/ModuleDescriptor$Exports$Modifier"; private static final String OPENS_MODIFIER_CLASSNAME = "java/lang/module/ModuleDescriptor$Opens$Modifier"; + private static final String MODULE_HASHES_ARRAY_SIGNATURE = + "[Ljdk/internal/module/ModuleHashes;"; + private static final String MODULE_RESOLUTION_CLASSNAME = + "jdk/internal/module/ModuleResolution"; + private static final String MODULE_RESOLUTIONS_ARRAY_SIGNATURE = + "[Ljdk/internal/module/ModuleResolution;"; // static variables in SystemModules class private static final String MODULE_NAMES = "MODULE_NAMES"; - private static final String MODULES_TO_HASH = "MODULES_TO_HASH"; private static final String PACKAGE_COUNT = "PACKAGES_IN_BOOT_LAYER"; private static final int MAX_LOCAL_VARS = 256; private final int BUILDER_VAR = 0; private final int MD_VAR = 1; // variable for ModuleDescriptor + private final int MH_VAR = 1; // variable for ModuleHashes private int nextLocalVar = 2; // index to next local variable private final ClassWriter cw; + + // Method visitor for generating the SystemModules::modules() method private MethodVisitor mv; - private int nextModulesIndex = 0; // list of all ModuleDescriptorBuilders, invoked in turn when building. - private final List builders = new ArrayList<>(); - - // module name to hash - private final Map modulesToHash = new HashMap<>(); - - // module name to index in MODULES_TO_HASH - private final Map modulesToHashIndex = new HashMap<>(); + private final List moduleInfos = new ArrayList<>(); // A builder to create one single Set instance for a given set of // names or modifiers to reduce the footprint @@ -284,7 +343,8 @@ public final class SystemModuleDescriptorPlugin implements Plugin { * * static Map map = new HashMap<>(); */ - private void clinit(int numModules, int numPackages) { + private void clinit(int numModules, int numPackages, + boolean hasSplitPackages) { cw.visit(Opcodes.V1_8, ACC_PUBLIC+ACC_FINAL+ACC_SUPER, CLASSNAME, null, "java/lang/Object", null); @@ -293,65 +353,44 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "[Ljava/lang/String;", null, null) .visitEnd(); - // public static byte[][] MODULES_TO_HASH - cw.visitField(ACC_PUBLIC+ACC_FINAL+ACC_STATIC, MODULES_TO_HASH, - "[[B", null, null) - .visitEnd(); - // public static int PACKAGES_IN_BOOT_LAYER; cw.visitField(ACC_PUBLIC+ACC_FINAL+ACC_STATIC, PACKAGE_COUNT, "I", null, numPackages) .visitEnd(); - this.mv = cw.visitMethod(ACC_STATIC, "", "()V", - null, null); - mv.visitCode(); + MethodVisitor clinit = + cw.visitMethod(ACC_STATIC, "", "()V", + null, null); + clinit.visitCode(); // create the MODULE_NAMES array - pushInt(numModules); - mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); + pushInt(clinit, numModules); + clinit.visitTypeInsn(ANEWARRAY, "java/lang/String"); int index = 0; - for (ModuleDescriptorBuilder builder : builders) { - mv.visitInsn(DUP); // arrayref - pushInt(index++); - mv.visitLdcInsn(builder.md.name()); // value - mv.visitInsn(AASTORE); + for (ModuleInfo minfo : moduleInfos) { + clinit.visitInsn(DUP); // arrayref + pushInt(clinit, index++); + clinit.visitLdcInsn(minfo.moduleName()); // value + clinit.visitInsn(AASTORE); } - mv.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULE_NAMES, + clinit.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULE_NAMES, "[Ljava/lang/String;"); - // create the MODULES_TO_HASH array - pushInt(numModules); - mv.visitTypeInsn(ANEWARRAY, "[B"); + clinit.visitInsn(RETURN); + clinit.visitMaxs(0, 0); + clinit.visitEnd(); - index = 0; - for (ModuleDescriptorBuilder builder : builders) { - String mn = builder.md.name(); - byte[] recordedHash = modulesToHash.get(mn); - if (recordedHash != null) { - mv.visitInsn(DUP); // arrayref - pushInt(index); - pushInt(recordedHash.length); - mv.visitIntInsn(NEWARRAY, T_BYTE); - for (int i = 0; i < recordedHash.length; i++) { - mv.visitInsn(DUP); // arrayref - pushInt(i); - mv.visitIntInsn(BIPUSH, recordedHash[i]); - mv.visitInsn(BASTORE); - } - mv.visitInsn(AASTORE); - modulesToHashIndex.put(mn, index); - } - index++; - } - - mv.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULES_TO_HASH, "[[B"); - - mv.visitInsn(RETURN); - mv.visitMaxs(0, 0); - mv.visitEnd(); + // public static boolean hasSplitPackages(); + MethodVisitor split = + cw.visitMethod(ACC_PUBLIC+ACC_STATIC, "hasSplitPackages", + "()Z", null, null); + split.visitCode(); + split.visitInsn(hasSplitPackages ? ICONST_1 : ICONST_0); + split.visitInsn(IRETURN); + split.visitMaxs(0, 0); + split.visitEnd(); } @@ -360,9 +399,9 @@ public final class SystemModuleDescriptorPlugin implements Plugin { * prepares mapping from various Sets to SetBuilders to emit an * optimized number of sets during build. */ - public void addModule(ModuleDescriptor md, Set packages) { - ModuleDescriptorBuilder builder = new ModuleDescriptorBuilder(md, packages); - builders.add(builder); + public void addModule(ModuleInfo moduleInfo) { + ModuleDescriptor md = moduleInfo.descriptor; + moduleInfos.add(moduleInfo); // exports for (Exports e : md.exports()) { @@ -383,45 +422,133 @@ public final class SystemModuleDescriptorPlugin implements Plugin { // uses dedupSetBuilder.stringSet(md.uses()); - - // hashes - JLMA.hashes(md).ifPresent(mh -> modulesToHash.putAll(mh.hashes())); } /* * Generate bytecode for SystemModules */ public ClassWriter getClassWriter() { - int numModules = builders.size(); - int numPackages = 0; - for (ModuleDescriptorBuilder builder : builders) { - numPackages += builder.md.packages().size(); + int numModules = moduleInfos.size(); + Set allPackages = new HashSet<>(); + int packageCount = 0; + for (ModuleInfo minfo : moduleInfos) { + allPackages.addAll(minfo.packages); + packageCount += minfo.packages.size(); } - this.clinit(numModules, numPackages); - this.mv = cw.visitMethod(ACC_PUBLIC+ACC_STATIC, - "modules", "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, - "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, null); + int numPackages = allPackages.size(); + boolean hasSplitPackages = (numPackages < packageCount); + clinit(numModules, numPackages, hasSplitPackages); + + // generate SystemModules::descriptors + genDescriptorsMethod(); + // generate SystemModules::hashes + genHashesMethod(); + // generate SystemModules::moduleResolutions + genModuleResolutionsMethod(); + + return cw; + } + + /* + * Generate bytecode for SystemModules::descriptors method + */ + private void genDescriptorsMethod() { + this.mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, + "descriptors", + "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, + "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, + null); mv.visitCode(); - pushInt(numModules); + pushInt(mv, moduleInfos.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor"); mv.visitVarInsn(ASTORE, MD_VAR); - for (ModuleDescriptorBuilder builder : builders) { - builder.build(); + for (int index = 0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + new ModuleDescriptorBuilder(minfo.descriptor, + minfo.packages, + index).build(); } mv.visitVarInsn(ALOAD, MD_VAR); mv.visitInsn(ARETURN); mv.visitMaxs(0, 0); mv.visitEnd(); - return cw; + + } + + /* + * Generate bytecode for SystemModules::hashes method + */ + private void genHashesMethod() { + MethodVisitor hmv = + cw.visitMethod(ACC_PUBLIC + ACC_STATIC, + "hashes", + "()" + MODULE_HASHES_ARRAY_SIGNATURE, + "()" + MODULE_HASHES_ARRAY_SIGNATURE, + null); + hmv.visitCode(); + pushInt(hmv, moduleInfos.size()); + hmv.visitTypeInsn(ANEWARRAY, "jdk/internal/module/ModuleHashes"); + hmv.visitVarInsn(ASTORE, MH_VAR); + + for (int index = 0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + if (minfo.recordedHashes != null) { + new ModuleHashesBuilder(minfo.recordedHashes, + index, + hmv).build(); + } + } + + hmv.visitVarInsn(ALOAD, MH_VAR); + hmv.visitInsn(ARETURN); + hmv.visitMaxs(0, 0); + hmv.visitEnd(); + + } + + /* + * Generate bytecode for SystemModules::methodResoultions method + */ + private void genModuleResolutionsMethod() { + MethodVisitor mresmv = + cw.visitMethod(ACC_PUBLIC+ACC_STATIC, + "moduleResolutions", + "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE, + "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE, + null); + mresmv.visitCode(); + pushInt(mresmv, moduleInfos.size()); + mresmv.visitTypeInsn(ANEWARRAY, MODULE_RESOLUTION_CLASSNAME); + mresmv.visitVarInsn(ASTORE, 0); + + for (int index=0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + if (minfo.moduleResolution != null) { + mresmv.visitVarInsn(ALOAD, 0); + pushInt(mresmv, index); + mresmv.visitTypeInsn(NEW, MODULE_RESOLUTION_CLASSNAME); + mresmv.visitInsn(DUP); + mresmv.visitLdcInsn(minfo.moduleResolution.value()); + mresmv.visitMethodInsn(INVOKESPECIAL, + MODULE_RESOLUTION_CLASSNAME, + "", + "(I)V", false); + mresmv.visitInsn(AASTORE); + } + } + mresmv.visitVarInsn(ALOAD, 0); + mresmv.visitInsn(ARETURN); + mresmv.visitMaxs(0, 0); + mresmv.visitEnd(); } public boolean isOverriddenClass(String path) { return path.equals("/java.base/" + CLASSNAME + ".class"); } - void pushInt(int num) { + void pushInt(MethodVisitor mv, int num) { if (num <= 5) { mv.visitInsn(ICONST_0 + num); } else if (num < Byte.MAX_VALUE) { @@ -460,6 +587,8 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "(Ljava/lang/String;Ljava/util/List;)" + PROVIDES_TYPE; static final String REQUIRES_SET_STRING_SIG = "(Ljava/util/Set;Ljava/lang/String;)" + REQUIRES_TYPE; + static final String REQUIRES_SET_STRING_STRING_SIG = + "(Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)" + REQUIRES_TYPE; // method signature for Builder instance methods that // return this Builder instance @@ -473,20 +602,18 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "([" + REQUIRES_TYPE + ")" + BUILDER_TYPE; static final String SET_SIG = "(Ljava/util/Set;)" + BUILDER_TYPE; static final String STRING_SIG = "(Ljava/lang/String;)" + BUILDER_TYPE; - static final String STRING_BYTE_ARRAY_SIG = - "(Ljava/lang/String;[B)" + BUILDER_TYPE; static final String BOOLEAN_SIG = "(Z)" + BUILDER_TYPE; - final ModuleDescriptor md; final Set packages; - - ModuleDescriptorBuilder(ModuleDescriptor md, Set packages) { + final int index; + ModuleDescriptorBuilder(ModuleDescriptor md, Set packages, int index) { if (md.isAutomatic()) { throw new InternalError("linking automatic module is not supported"); } this.md = md; this.packages = packages; + this.index = index; } void build() { @@ -517,12 +644,6 @@ public final class SystemModuleDescriptorPlugin implements Plugin { // main class md.mainClass().ifPresent(this::mainClass); - // hashes - JLMA.hashes(md).ifPresent(mh -> { - algorithm(mh.algorithm()); - mh.names().forEach(mn -> moduleHash(mn, mh.hashFor(mn))); - }); - putModuleDescriptor(); } @@ -554,7 +675,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitInsn(ICONST_0); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - methodName, BOOLEAN_SIG, false); + methodName, BOOLEAN_SIG, false); mv.visitInsn(POP); } @@ -563,12 +684,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void putModuleDescriptor() { mv.visitVarInsn(ALOAD, MD_VAR); - pushInt(nextModulesIndex++); + pushInt(mv, index); mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(md.hashCode()); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "build", "(I)Ljava/lang/module/ModuleDescriptor;", - false); + "build", "(I)Ljava/lang/module/ModuleDescriptor;", + false); mv.visitInsn(AASTORE); } @@ -580,31 +701,42 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void requires(Set requires) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(requires.size()); + pushInt(mv, requires.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Requires"); int arrayIndex = 0; for (Requires require : requires) { - mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); - newRequires(require.modifiers(), require.name()); + String compiledVersion = null; + if (require.compiledVersion().isPresent()) { + compiledVersion = require.compiledVersion().get().toString(); + } + + mv.visitInsn(DUP); // arrayref + pushInt(mv, arrayIndex++); + newRequires(require.modifiers(), require.name(), compiledVersion); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "requires", REQUIRES_ARRAY_SIG, false); + "requires", REQUIRES_ARRAY_SIG, false); } /* - * Invoke Builder.newRequires(Set mods, String mn) + * Invoke Builder.newRequires(Set mods, String mn, String compiledVersion) * * Set mods = ... - * Builder.newRequires(mods, mn); + * Builder.newRequires(mods, mn, compiledVersion); */ - void newRequires(Set mods, String name) { + void newRequires(Set mods, String name, String compiledVersion) { int varIndex = dedupSetBuilder.indexOfRequiresModifiers(mods); mv.visitVarInsn(ALOAD, varIndex); mv.visitLdcInsn(name); - mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newRequires", REQUIRES_SET_STRING_SIG, false); + if (compiledVersion != null) { + mv.visitLdcInsn(compiledVersion); + mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, + "newRequires", REQUIRES_SET_STRING_STRING_SIG, false); + } else { + mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, + "newRequires", REQUIRES_SET_STRING_SIG, false); + } } /* @@ -615,17 +747,17 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void exports(Set exports) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(exports.size()); + pushInt(mv, exports.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Exports"); int arrayIndex = 0; for (Exports export : exports) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newExports(export.modifiers(), export.source(), export.targets()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "exports", EXPORTS_ARRAY_SIG, false); + "exports", EXPORTS_ARRAY_SIG, false); } /* @@ -664,22 +796,21 @@ public final class SystemModuleDescriptorPlugin implements Plugin { /** * Call Builder::newOpens to create Opens instances and * then pass it to the builder by calling: - * Builder.opens(Opens[]) - * + * Builder.opens(Opens[]) */ void opens(Set opens) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(opens.size()); + pushInt(mv, opens.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Opens"); int arrayIndex = 0; for (Opens open : opens) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newOpens(open.modifiers(), open.source(), open.targets()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "opens", OPENS_ARRAY_SIG, false); + "opens", OPENS_ARRAY_SIG, false); } /* @@ -705,12 +836,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitLdcInsn(pn); mv.visitVarInsn(ALOAD, stringSetIndex); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newOpens", OPENS_MODIFIER_SET_STRING_SET_SIG, false); + "newOpens", OPENS_MODIFIER_SET_STRING_SET_SIG, false); } else { mv.visitVarInsn(ALOAD, modifiersSetIndex); mv.visitLdcInsn(pn); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newOpens", OPENS_MODIFIER_SET_STRING_SIG, false); + "newOpens", OPENS_MODIFIER_SET_STRING_SIG, false); } } @@ -722,7 +853,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitVarInsn(ALOAD, varIndex); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "uses", SET_SIG, false); + "uses", SET_SIG, false); mv.visitInsn(POP); } @@ -734,17 +865,17 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void provides(Collection provides) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(provides.size()); + pushInt(mv, provides.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Provides"); int arrayIndex = 0; for (Provides provide : provides) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newProvides(provide.service(), provide.providers()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "provides", PROVIDES_ARRAY_SIG, false); + "provides", PROVIDES_ARRAY_SIG, false); } /* @@ -758,19 +889,19 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void newProvides(String service, List providers) { mv.visitLdcInsn(service); - pushInt(providers.size()); + pushInt(mv, providers.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); int arrayIndex = 0; for (String provider : providers) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); mv.visitLdcInsn(provider); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKESTATIC, "java/util/List", - "of", "([Ljava/lang/Object;)Ljava/util/List;", true); + "of", "([Ljava/lang/Object;)Ljava/util/List;", true); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newProvides", PROVIDES_STRING_LIST_SIG, false); + "newProvides", PROVIDES_STRING_LIST_SIG, false); } /* @@ -781,7 +912,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitVarInsn(ALOAD, varIndex); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "packages", SET_SIG, false); + "packages", SET_SIG, false); mv.visitInsn(POP); } @@ -792,7 +923,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(cn); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "mainClass", STRING_SIG, false); + "mainClass", STRING_SIG, false); mv.visitInsn(POP); } @@ -803,48 +934,97 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(v.toString()); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "version", STRING_SIG, false); + "version", STRING_SIG, false); mv.visitInsn(POP); } + } + + class ModuleHashesBuilder { + private static final String MODULE_HASHES_BUILDER = + "jdk/internal/module/ModuleHashes$Builder"; + private static final String MODULE_HASHES_BUILDER_TYPE = + "L" + MODULE_HASHES_BUILDER + ";"; + static final String STRING_BYTE_ARRAY_SIG = + "(Ljava/lang/String;[B)" + MODULE_HASHES_BUILDER_TYPE; + + final ModuleHashes recordedHashes; + final MethodVisitor hmv; + final int index; + + ModuleHashesBuilder(ModuleHashes hashes, int index, MethodVisitor hmv) { + this.recordedHashes = hashes; + this.hmv = hmv; + this.index = index; + } + + /** + * Build ModuleHashes + */ + void build() { + if (recordedHashes == null) + return; + + // new jdk.internal.module.ModuleHashes.Builder + newModuleHashesBuilder(); + + // Invoke ModuleHashes.Builder::hashForModule + recordedHashes + .names() + .forEach(mn -> hashForModule(mn, recordedHashes.hashFor(mn))); + + // Put ModuleHashes into the hashes array + pushModuleHashes(); + } + + + /* + * Create ModuleHashes.Builder instance + */ + void newModuleHashesBuilder() { + hmv.visitTypeInsn(NEW, MODULE_HASHES_BUILDER); + hmv.visitInsn(DUP); + hmv.visitLdcInsn(recordedHashes.algorithm()); + pushInt(hmv, ((4 * recordedHashes.names().size()) / 3) + 1); + hmv.visitMethodInsn(INVOKESPECIAL, MODULE_HASHES_BUILDER, + "", "(Ljava/lang/String;I)V", false); + hmv.visitVarInsn(ASTORE, BUILDER_VAR); + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + } + + + /* + * Invoke ModuleHashes.Builder::build and put the returned + * ModuleHashes to the hashes array + */ + void pushModuleHashes() { + hmv.visitVarInsn(ALOAD, MH_VAR); + pushInt(hmv, index); + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER, + "build", "()Ljdk/internal/module/ModuleHashes;", + false); + hmv.visitInsn(AASTORE); + } /* - * Invoke Builder.algorithm(String a); + * Invoke ModuleHashes.Builder.hashForModule(String name, byte[] hash); */ - void algorithm(String alg) { - mv.visitVarInsn(ALOAD, BUILDER_VAR); - mv.visitLdcInsn(alg); - mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "algorithm", STRING_SIG, false); - mv.visitInsn(POP); - } + void hashForModule(String name, byte[] hash) { + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + hmv.visitLdcInsn(name); - /* - * Invoke Builder.moduleHash(String name, byte[] hash); - */ - void moduleHash(String name, byte[] hash) { - mv.visitVarInsn(ALOAD, BUILDER_VAR); - mv.visitLdcInsn(name); - - // must exist - Integer index = modulesToHashIndex.get(name); - if (index != null) { - mv.visitFieldInsn(GETSTATIC, CLASSNAME, MODULES_TO_HASH, "[[B"); - pushInt(index); - mv.visitInsn(AALOAD); - assert(Objects.equals(hash, modulesToHash.get(name))); - } else { - pushInt(hash.length); - mv.visitIntInsn(NEWARRAY, T_BYTE); - for (int i = 0; i < hash.length; i++) { - mv.visitInsn(DUP); // arrayref - pushInt(i); - mv.visitIntInsn(BIPUSH, hash[i]); - mv.visitInsn(BASTORE); - } + pushInt(hmv, hash.length); + hmv.visitIntInsn(NEWARRAY, T_BYTE); + for (int i = 0; i < hash.length; i++) { + hmv.visitInsn(DUP); // arrayref + pushInt(hmv, i); + hmv.visitIntInsn(BIPUSH, hash[i]); + hmv.visitInsn(BASTORE); } - mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "moduleHash", STRING_BYTE_ARRAY_SIG, false); - mv.visitInsn(POP); + + hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER, + "hashForModule", STRING_BYTE_ARRAY_SIG, false); + hmv.visitInsn(POP); } } @@ -1039,12 +1219,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "of", sb.toString(), true); } else { // call Set.of(E... elements) - pushInt(elements.size()); + pushInt(mv, elements.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); int arrayIndex = 0; for (T t : elements) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex); + pushInt(mv, arrayIndex); visitElement(t, mv); // value mv.visitInsn(AASTORE); arrayIndex++; diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java index 9dcc83abf8a..cf09709036c 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolEntry.java @@ -52,21 +52,23 @@ public interface ResourcePoolEntry { *
  • *
      CLASS_OR_RESOURCE: A java class or resource file.
    *
      CONFIG: A configuration file.
    - *
      NATIVE_CMD: A native process launcher.
    + *
      HEADER_FILE: A header file.
    + *
      LEGAL_NOTICE: A legal notice.
    + *
      MAN_PAGE: A man page.
    + *
      NATIVE_CMD: A native executable launcher.
    *
      NATIVE_LIB: A native library.
    *
      TOP: A top-level file in the jdk run-time image directory.
    - *
      OTHER: Other kind of file.
    *
    • */ public enum Type { CLASS_OR_RESOURCE, CONFIG, + HEADER_FILE, + LEGAL_NOTICE, + MAN_PAGE, NATIVE_CMD, NATIVE_LIB, - HEADER_FILE, - MAN_PAGE, - TOP, - OTHER + TOP } /** @@ -104,6 +106,17 @@ public interface ResourcePoolEntry { */ public InputStream content(); + /** + * Returns a target linked with this entry. + * + * @implSpec The default implementation returns {@code null}. + * + * @return the target ResourcePoolEntry linked with this entry. + */ + public default ResourcePoolEntry linkedTarget() { + return null; + } + /** * The ResourcePoolEntry content as an array of bytes. * @@ -199,4 +212,21 @@ public interface ResourcePoolEntry { public static ResourcePoolEntry create(String path, Path file) { return create(path, Type.CLASS_OR_RESOURCE, file); } + + /** + * Create a ResourcePoolEntry for a resource the given path and type. + * If the target platform supports symbolic links, it will be created + * as a symbolic link to the given target entry; otherwise, the + * ResourcePoolEntry contains the relative path to the target entry. + * + * @param path The resource path. + * @param type The ResourcePoolEntry type. + * @param target The target entry + * @return A new ResourcePoolEntry + */ + public static ResourcePoolEntry createSymLink(String path, + ResourcePoolEntry.Type type, + ResourcePoolEntry target) { + return ResourcePoolEntryFactory.createSymbolicLink(path, type, target); + } } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties index a56c77be18d..5f88c60a6ee 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties @@ -53,6 +53,11 @@ main.opt.limit-modules=\ main.opt.output=\ \ --output Location of output path +main.opt.launcher=\ +\ --launcher = Launcher command name for the module\n\ +\ --launcher =/
    \n\ +\ Launcher command name for the module and the main class + main.command.files=\ \ @ Read options from file @@ -91,6 +96,9 @@ main.extended.help.footer=\ err.unknown.byte.order:unknown byte order {0} +err.launcher.main.class.empty:launcher main class name cannot be empty: {0} +err.launcher.module.name.empty:launcher module name cannot be empty: {0} +err.launcher.value.format:launcher value should be of form =[/]: {0} err.output.must.be.specified:--output must be specified err.modulepath.must.be.specified:--module-path must be specified err.mods.must.be.specified:no modules specified to {0} diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties index 2bd58f644f6..3c2983e8d7e 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties @@ -52,11 +52,12 @@ compact-cp.description=Constant Pool strings sharing.\n\ By default, all resources are compressed. You can express the set \n\ of resources to compress or not compress (use ^ for negation). -copy-files.argument== to copy to the image>. +dedup-legal-notices.argument=[error-if-not-same-content] -copy-files.description=\ -If files to copy are not absolute path, JDK home dir is used.\n\ -e.g.: jrt-fs.jar,LICENSE,/home/me/myfile.txt=somewhere/conf.txt +dedup-legal-notices.description=\ +De-duplicate all legal notices. If error-if-not-same-content is\n\ +specified then it will be an error if two files of the same filename\n\ +are different. exclude-files.argument= of files to exclude diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java index 40dad9f52fe..ecc53f9ea0a 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java @@ -31,7 +31,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import java.io.PrintWriter; import java.io.UncheckedIOException; import java.lang.module.Configuration; @@ -67,6 +66,7 @@ import java.util.Comparator; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -84,7 +84,6 @@ import java.util.jar.JarOutputStream; import java.util.stream.Collectors; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import java.util.stream.Stream; import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; @@ -100,10 +99,11 @@ import jdk.internal.joptsimple.OptionSet; import jdk.internal.joptsimple.OptionSpec; import jdk.internal.joptsimple.ValueConverter; import jdk.internal.loader.ResourceHelper; -import jdk.internal.misc.JavaLangModuleAccess; -import jdk.internal.misc.SharedSecrets; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModulePath; +import jdk.internal.module.ModuleResolution; import jdk.tools.jlink.internal.Utils; import static java.util.stream.Collectors.joining; @@ -165,6 +165,7 @@ public class JmodTask { Mode mode; Path jmodFile; boolean help; + boolean helpExtra; boolean version; List classpath; List cmds; @@ -172,6 +173,7 @@ public class JmodTask { List libs; List headerFiles; List manPages; + List legalNotices;; ModuleFinder moduleFinder; Version moduleVersion; String mainClass; @@ -179,6 +181,7 @@ public class JmodTask { String osArch; String osVersion; Pattern modulesToHash; + ModuleResolution moduleResolution; boolean dryrun; List excludes; Path extractDir; @@ -192,7 +195,7 @@ public class JmodTask { showUsageSummary(); return EXIT_CMDERR; } - if (options.help) { + if (options.help || options.helpExtra) { showHelp(); return EXIT_OK; } @@ -288,8 +291,8 @@ public class JmodTask { private boolean describe() throws IOException { try (JmodFile jf = new JmodFile(options.jmodFile)) { try (InputStream in = jf.getInputStream(Section.CLASSES, MODULE_INFO)) { - ModuleDescriptor md = ModuleDescriptor.read(in); - printModuleDescriptor(md); + ModuleInfo.Attributes attrs = ModuleInfo.read(in, null); + printModuleDescriptor(attrs.descriptor(), attrs.recordedHashes()); return true; } catch (IOException e) { throw new CommandException("err.module.descriptor.not.found"); @@ -303,9 +306,7 @@ public class JmodTask { .collect(joining(" ")); } - private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); - - private void printModuleDescriptor(ModuleDescriptor md) + private void printModuleDescriptor(ModuleDescriptor md, ModuleHashes hashes) throws IOException { StringBuilder sb = new StringBuilder(); @@ -351,15 +352,24 @@ public class JmodTask { md.osVersion().ifPresent(v -> sb.append("\n operating-system-version " + v)); - JLMA.hashes(md).ifPresent( - hashes -> hashes.names().stream().sorted().forEach( - mod -> sb.append("\n hashes ").append(mod).append(" ") - .append(hashes.algorithm()).append(" ") - .append(hashes.hashFor(mod)))); + if (hashes != null) { + hashes.names().stream().sorted().forEach( + mod -> sb.append("\n hashes ").append(mod).append(" ") + .append(hashes.algorithm()).append(" ") + .append(toHex(hashes.hashFor(mod)))); + } out.println(sb.toString()); } + private String toHex(byte[] ba) { + StringBuilder sb = new StringBuilder(ba.length); + for (byte b: ba) { + sb.append(String.format("%02x", b & 0xff)); + } + return sb.toString(); + } + private boolean create() throws IOException { JmodFileWriter jmod = new JmodFileWriter(); @@ -392,6 +402,7 @@ public class JmodTask { final List classpath = options.classpath; final List headerFiles = options.headerFiles; final List manPages = options.manPages; + final List legalNotices = options.legalNotices; final Version moduleVersion = options.moduleVersion; final String mainClass = options.mainClass; @@ -400,6 +411,7 @@ public class JmodTask { final String osVersion = options.osVersion; final List excludes = options.excludes; final Hasher hasher = hasher(); + final ModuleResolution moduleResolution = options.moduleResolution; JmodFileWriter() { } @@ -413,11 +425,12 @@ public class JmodTask { // classes processClasses(out, classpath); - processSection(out, Section.NATIVE_CMDS, cmds); - processSection(out, Section.NATIVE_LIBS, libs); processSection(out, Section.CONFIG, configs); processSection(out, Section.HEADER_FILES, headerFiles); + processSection(out, Section.LEGAL_NOTICES, legalNotices); processSection(out, Section.MAN_PAGES, manPages); + processSection(out, Section.NATIVE_CMDS, cmds); + processSection(out, Section.NATIVE_LIBS, libs); } @@ -508,6 +521,10 @@ public class JmodTask { } } + if (moduleResolution != null && moduleResolution.value() != 0) { + extender.moduleResolution(moduleResolution); + } + // write the (possibly extended or modified) module-info.class out.writeEntry(extender.toByteArray(), Section.CLASSES, MODULE_INFO); } @@ -536,12 +553,12 @@ public class JmodTask { } URI uri = options.jmodFile.toUri(); - ModuleReference mref = new ModuleReference(descriptor, uri, new Supplier<>() { + ModuleReference mref = new ModuleReference(descriptor, uri) { @Override - public ModuleReader get() { + public ModuleReader open() { throw new UnsupportedOperationException(); } - }); + }; // compose a module finder with the module path and also // a module finder that can find the jmod file being created @@ -677,39 +694,41 @@ public class JmodTask { if (paths == null) return; - for (Path p : paths) + for (Path p : paths) { processSection(out, section, p); + } } - void processSection(JmodOutputStream out, Section section, Path top) + void processSection(JmodOutputStream out, Section section, Path path) throws IOException { - Files.walkFileTree(top, Set.of(FileVisitOption.FOLLOW_LINKS), - Integer.MAX_VALUE, new SimpleFileVisitor() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) - throws IOException - { - Path relPath = top.relativize(file); - if (relPath.toString().equals(MODULE_INFO) - && !Section.CLASSES.equals(section)) - warning("warn.ignore.entry", MODULE_INFO, section); + Files.walkFileTree(path, Set.of(FileVisitOption.FOLLOW_LINKS), + Integer.MAX_VALUE, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException + { + Path relPath = path.relativize(file); + if (relPath.toString().equals(MODULE_INFO) + && !Section.CLASSES.equals(section)) + warning("warn.ignore.entry", MODULE_INFO, section); - if (!relPath.toString().equals(MODULE_INFO) - && !matches(relPath, excludes)) { - try (InputStream in = Files.newInputStream(file)) { - out.writeEntry(in, section, relPath.toString()); - } catch (IOException x) { - if (x.getMessage().contains("duplicate entry")) { - warning("warn.ignore.duplicate.entry", relPath.toString(), section); - return FileVisitResult.CONTINUE; + if (!relPath.toString().equals(MODULE_INFO) + && !matches(relPath, excludes)) { + try (InputStream in = Files.newInputStream(file)) { + out.writeEntry(in, section, relPath.toString()); + } catch (IOException x) { + if (x.getMessage().contains("duplicate entry")) { + warning("warn.ignore.duplicate.entry", + relPath.toString(), section); + return FileVisitResult.CONTINUE; + } + throw x; } - throw x; } + return FileVisitResult.CONTINUE; } - return FileVisitResult.CONTINUE; - } - }); + }); } boolean matches(Path path, List matchers) { @@ -1136,6 +1155,28 @@ public class JmodTask { @Override public String valuePattern() { return "module-version"; } } + static class WarnIfResolvedReasonConverter + implements ValueConverter + { + @Override + public ModuleResolution convert(String value) { + if (value.equals("deprecated")) + return ModuleResolution.empty().withDeprecated(); + else if (value.equals("deprecated-for-removal")) + return ModuleResolution.empty().withDeprecatedForRemoval(); + else if (value.equals("incubating")) + return ModuleResolution.empty().withIncubating(); + else + throw new CommandException("err.bad.WarnIfResolvedReason", value); + } + + @Override public Class valueType() { + return ModuleResolution.class; + } + + @Override public String valuePattern() { return "reason"; } + } + static class PatternConverter implements ValueConverter { @Override public Pattern convert(String value) { @@ -1179,12 +1220,24 @@ public class JmodTask { */ private static final class JmodHelpFormatter extends BuiltinHelpFormatter { - private JmodHelpFormatter() { super(80, 2); } + private final Options opts; + + private JmodHelpFormatter(Options opts) { + super(80, 2); + this.opts = opts; + } @Override public String format(Map options) { - Map all = new HashMap<>(); + Map all = new LinkedHashMap<>(); all.putAll(options); + + // extra options + if (!opts.helpExtra) { + all.remove("do-not-resolve-by-default"); + all.remove("warn-if-resolved"); + } + all.put(CMD_FILENAME, new OptionDescriptor() { @Override public Collection options() { @@ -1240,7 +1293,8 @@ public class JmodTask { private final OptionParser parser = new OptionParser("hp"); private void handleOptions(String[] args) { - parser.formatHelpWith(new JmodHelpFormatter()); + options = new Options(); + parser.formatHelpWith(new JmodHelpFormatter(options)); OptionSpec classPath = parser.accepts("class-path", getMessage("main.opt.class-path")) @@ -1266,7 +1320,7 @@ public class JmodTask { .withValuesConvertedBy(new ExtractDirPathConverter()); OptionSpec dryrun - = parser.accepts("dry-run", getMessage("main.opt.dry-run")); + = parser.accepts("dry-run", getMessage("main.opt.dry-run")); OptionSpec excludes = parser.accepts("exclude", getMessage("main.opt.exclude")) @@ -1282,11 +1336,14 @@ public class JmodTask { = parser.acceptsAll(Set.of("h", "help"), getMessage("main.opt.help")) .forHelp(); + OptionSpec helpExtra + = parser.accepts("help-extra", getMessage("main.opt.help-extra")); + OptionSpec headerFiles - = parser.accepts("header-files", getMessage("main.opt.header-files")) - .withRequiredArg() - .withValuesSeparatedBy(File.pathSeparatorChar) - .withValuesConvertedBy(DirPathConverter.INSTANCE); + = parser.accepts("header-files", getMessage("main.opt.header-files")) + .withRequiredArg() + .withValuesSeparatedBy(File.pathSeparatorChar) + .withValuesConvertedBy(DirPathConverter.INSTANCE); OptionSpec libs = parser.accepts("libs", getMessage("main.opt.libs")) @@ -1294,13 +1351,20 @@ public class JmodTask { .withValuesSeparatedBy(File.pathSeparatorChar) .withValuesConvertedBy(DirPathConverter.INSTANCE); + OptionSpec legalNotices + = parser.accepts("legal-notices", getMessage("main.opt.legal-notices")) + .withRequiredArg() + .withValuesSeparatedBy(File.pathSeparatorChar) + .withValuesConvertedBy(DirPathConverter.INSTANCE); + + OptionSpec mainClass = parser.accepts("main-class", getMessage("main.opt.main-class")) .withRequiredArg() .describedAs(getMessage("main.opt.main-class.arg")); OptionSpec manPages - = parser.accepts("man-pages", getMessage("main.opt.man-pages")) + = parser.accepts("man-pages", getMessage("main.opt.man-pages")) .withRequiredArg() .withValuesSeparatedBy(File.pathSeparatorChar) .withValuesConvertedBy(DirPathConverter.INSTANCE); @@ -1332,6 +1396,15 @@ public class JmodTask { .withRequiredArg() .describedAs(getMessage("main.opt.os-version.arg")); + OptionSpec doNotResolveByDefault + = parser.accepts("do-not-resolve-by-default", + getMessage("main.opt.do-not-resolve-by-default")); + + OptionSpec warnIfResolved + = parser.accepts("warn-if-resolved", getMessage("main.opt.warn-if-resolved")) + .withRequiredArg() + .withValuesConvertedBy(new WarnIfResolvedReasonConverter()); + OptionSpec version = parser.accepts("version", getMessage("main.opt.version")); @@ -1341,9 +1414,9 @@ public class JmodTask { try { OptionSet opts = parser.parse(args); - if (opts.has(help) || opts.has(version)) { - options = new Options(); + if (opts.has(help) || opts.has(helpExtra) || opts.has(version)) { options.help = opts.has(help); + options.helpExtra = opts.has(helpExtra); options.version = opts.has(version); return; // informational message will be shown } @@ -1352,7 +1425,6 @@ public class JmodTask { if (words.isEmpty()) throw new CommandException("err.missing.mode").showUsage(true); String verb = words.get(0); - options = new Options(); try { options.mode = Enum.valueOf(Mode.class, verb.toUpperCase()); } catch (IllegalArgumentException e) { @@ -1377,9 +1449,11 @@ public class JmodTask { options.headerFiles = opts.valuesOf(headerFiles); if (opts.has(manPages)) options.manPages = opts.valuesOf(manPages); + if (opts.has(legalNotices)) + options.legalNotices = opts.valuesOf(legalNotices); if (opts.has(modulePath)) { Path[] dirs = opts.valuesOf(modulePath).toArray(new Path[0]); - options.moduleFinder = JLMA.newModulePath(Runtime.version(), true, dirs); + options.moduleFinder = new ModulePath(Runtime.version(), true, dirs); } if (opts.has(moduleVersion)) options.moduleVersion = opts.valueOf(moduleVersion); @@ -1391,6 +1465,13 @@ public class JmodTask { options.osArch = opts.valueOf(osArch); if (opts.has(osVersion)) options.osVersion = opts.valueOf(osVersion); + if (opts.has(warnIfResolved)) + options.moduleResolution = opts.valueOf(warnIfResolved); + if (opts.has(doNotResolveByDefault)) { + if (options.moduleResolution == null) + options.moduleResolution = ModuleResolution.empty(); + options.moduleResolution = options.moduleResolution.withDoNotResolveByDefault(); + } if (opts.has(hashModules)) { options.modulesToHash = opts.valueOf(hashModules); // if storing hashes then the module path is required diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties index bdf56359773..f87810236d0 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties @@ -47,6 +47,7 @@ main.opt.mode.hash=\ \hash - Records hashes of tied modules. main.opt.help=Print this usage message +main.opt.help-extra=Print help on extra options main.opt.version=Version information main.opt.class-path=Application jar files|dir containing classes main.opt.libs=Location of native libraries @@ -58,6 +59,7 @@ main.opt.exclude=Exclude files matching the supplied comma separated pattern\ \ list, each element using one the following forms: ,\ \ glob: or regex: main.opt.header-files=Location of header files +main.opt.legal-notices=Location of legal notices main.opt.module-version= Module version main.opt.main-class=Main class main.opt.main-class.arg=class-name @@ -73,6 +75,9 @@ main.opt.hash-modules=Compute and record hashes to tie a packaged module\ \ with modules matching the given and depending upon it directly\ \ or indirectly. The hashes are recorded in the JMOD file being created, or\ \ a JMOD file or modular JAR on the module path specified the jmod hash command. +main.opt.do-not-resolve-by-default=Exclude from the default root set of modules +main.opt.warn-if-resolved=Hint for a tool to issue a warning if the module \ +is resolved. One of deprecated, deprecated-for-removal, or incubating main.opt.cmdfile=Read options from the specified file @@ -95,6 +100,8 @@ err.invalid.class.path.entry=invalid class path entry: {0} err.file.already.exists=file already exists: {0} err.jmod.not.found=no jmod file found: {0} err.bad.pattern=bad pattern {0} +err.bad.WarnIfResolvedReason=bad reason: {0}, must be one of deprecated,\ +\ deprecated-for-removal, or incubating err.unknown.option=unknown option(s): {0} err.missing.arg=no value given for {0} err.internal.error=internal error: {0} {1} {2} @@ -104,6 +111,6 @@ warn.invalid.arg=Invalid classname or pathname not exist: {0} warn.no.module.hashes=No hashes recorded: no module specified for hashing depends on {0} warn.module.resolution.fail=No hashes recorded: {0} warn.ignore.entry=ignoring entry {0}, in section {1} -warn.ignore.duplicate.entry=ignoring duplicate entry {0}, in section{1} +warn.ignore.duplicate.entry=ignoring duplicate entry {0}, in section {1} diff --git a/jdk/src/jdk.jlink/share/classes/module-info.java b/jdk/src/jdk.jlink/share/classes/module-info.java index e20c763b256..69c4ae9952e 100644 --- a/jdk/src/jdk.jlink/share/classes/module-info.java +++ b/jdk/src/jdk.jlink/share/classes/module-info.java @@ -36,12 +36,12 @@ module jdk.jlink { jdk.tools.jlink.internal.Main.JlinkToolProvider; provides jdk.tools.jlink.plugin.Plugin with - jdk.tools.jlink.internal.plugins.FileCopierPlugin, jdk.tools.jlink.internal.plugins.StripDebugPlugin, jdk.tools.jlink.internal.plugins.ExcludePlugin, jdk.tools.jlink.internal.plugins.ExcludeFilesPlugin, jdk.tools.jlink.internal.plugins.ExcludeJmodSectionPlugin, - jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin, + jdk.tools.jlink.internal.plugins.LegalNoticeFilePlugin, + jdk.tools.jlink.internal.plugins.SystemModulesPlugin, jdk.tools.jlink.internal.plugins.StripNativeCommandsPlugin, jdk.tools.jlink.internal.plugins.OrderResourcesPlugin, jdk.tools.jlink.internal.plugins.DefaultCompressPlugin, diff --git a/jdk/src/jdk.localedata/share/legal/cldr.md b/jdk/src/jdk.localedata/share/legal/cldr.md new file mode 100644 index 00000000000..21e6d4caae6 --- /dev/null +++ b/jdk/src/jdk.localedata/share/legal/cldr.md @@ -0,0 +1,42 @@ +## Unicode Common Local Data Repository (CLDR) v29 + +### CLDR License +
    +
+Copyright © 1991-2016 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) this copyright and permission notice appear with all copies
+of the Data Files or Software,
+(b) this copyright and 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.
+
+
    diff --git a/jdk/src/jdk.localedata/share/legal/thaidict.md b/jdk/src/jdk.localedata/share/legal/thaidict.md new file mode 100644 index 00000000000..f8b1133ca51 --- /dev/null +++ b/jdk/src/jdk.localedata/share/legal/thaidict.md @@ -0,0 +1,31 @@ +## Thai Dictionary + +### Thai Dictionary 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.
+
+
    diff --git a/jdk/src/jdk.pack200/share/classes/module-info.java b/jdk/src/jdk.pack/share/classes/module-info.java similarity index 98% rename from jdk/src/jdk.pack200/share/classes/module-info.java rename to jdk/src/jdk.pack/share/classes/module-info.java index ffca94f972a..3cedd0990ec 100644 --- a/jdk/src/jdk.pack200/share/classes/module-info.java +++ b/jdk/src/jdk.pack/share/classes/module-info.java @@ -23,6 +23,6 @@ * questions. */ -module jdk.pack200 { +module jdk.pack { } diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp b/jdk/src/jdk.pack/share/native/common-unpack/bands.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/bands.cpp diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/bands.h b/jdk/src/jdk.pack/share/native/common-unpack/bands.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/bands.h rename to jdk/src/jdk.pack/share/native/common-unpack/bands.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp b/jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/bytes.h b/jdk/src/jdk.pack/share/native/common-unpack/bytes.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/bytes.h rename to jdk/src/jdk.pack/share/native/common-unpack/bytes.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp b/jdk/src/jdk.pack/share/native/common-unpack/coding.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/coding.cpp diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/coding.h b/jdk/src/jdk.pack/share/native/common-unpack/coding.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/coding.h rename to jdk/src/jdk.pack/share/native/common-unpack/coding.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/constants.h b/jdk/src/jdk.pack/share/native/common-unpack/constants.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/constants.h rename to jdk/src/jdk.pack/share/native/common-unpack/constants.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/defines.h b/jdk/src/jdk.pack/share/native/common-unpack/defines.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/defines.h rename to jdk/src/jdk.pack/share/native/common-unpack/defines.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp b/jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp similarity index 99% rename from jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp index 435d5ddcf0f..8f7a09d1243 100644 --- a/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp +++ b/jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp @@ -2293,10 +2293,15 @@ void unpacker::read_ics() { number.set(null,0); name = n.slice(dollar2+1, nlen); } - if (number.ptr == null) + if (number.ptr == null) { + if (dollar1 < 0) { + abort(); + return; + } pkgOuter = n.slice(0, dollar1); - else + } else { pkgOuter.set(null,0); + } PRINTCR((5,"=> %s$ 0%s $%s", pkgOuter.string(), number.string(), name.string())); @@ -4197,6 +4202,7 @@ void unpacker::write_bc_ops() { // Note that insnMap has one entry for all these bytes. --wp; // not really part of the code int size = bc_escsize.getInt(); + if (size < 0) { assert(false); continue; } ensure_put_space(size); for (int j = 0; j < size; j++) putu1_fast(bc_escbyte.getByte()); diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/unpack.h b/jdk/src/jdk.pack/share/native/common-unpack/unpack.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/unpack.h rename to jdk/src/jdk.pack/share/native/common-unpack/unpack.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp b/jdk/src/jdk.pack/share/native/common-unpack/utils.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/utils.cpp diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/utils.h b/jdk/src/jdk.pack/share/native/common-unpack/utils.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/utils.h rename to jdk/src/jdk.pack/share/native/common-unpack/utils.h diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp b/jdk/src/jdk.pack/share/native/common-unpack/zip.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp rename to jdk/src/jdk.pack/share/native/common-unpack/zip.cpp diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/zip.h b/jdk/src/jdk.pack/share/native/common-unpack/zip.h similarity index 100% rename from jdk/src/jdk.pack200/share/native/common-unpack/zip.h rename to jdk/src/jdk.pack/share/native/common-unpack/zip.h diff --git a/jdk/src/jdk.pack200/share/native/libunpack/jni.cpp b/jdk/src/jdk.pack/share/native/libunpack/jni.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/libunpack/jni.cpp rename to jdk/src/jdk.pack/share/native/libunpack/jni.cpp diff --git a/jdk/src/jdk.pack200/share/native/unpack200/main.cpp b/jdk/src/jdk.pack/share/native/unpack200/main.cpp similarity index 100% rename from jdk/src/jdk.pack200/share/native/unpack200/main.cpp rename to jdk/src/jdk.pack/share/native/unpack200/main.cpp diff --git a/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest b/jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest similarity index 100% rename from jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest rename to jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java index 54971142527..641fa2f06cb 100644 --- a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java @@ -27,8 +27,10 @@ package sun.misc; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.misc.VM; +import jdk.internal.ref.Cleaner; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; +import sun.nio.ch.DirectBuffer; import java.lang.reflect.Field; import java.security.ProtectionDomain; @@ -1228,4 +1230,28 @@ public final class Unsafe { public void fullFence() { theInternalUnsafe.fullFence(); } + + /** + * Invokes the given direct byte buffer's cleaner, if any. + * + * @param directBuffer a direct byte buffer + * @throws NullPointerException if {@code directBuffer} is null + * @throws IllegalArgumentException if {@code directBuffer} is non-direct, + * or is a {@link java.nio.Buffer#slice slice}, or is a + * {@link java.nio.Buffer#duplicate duplicate} + * @since 9 + */ + public void invokeCleaner(java.nio.ByteBuffer directBuffer) { + if (!directBuffer.isDirect()) + throw new IllegalArgumentException("buffer is non-direct"); + + DirectBuffer db = (DirectBuffer)directBuffer; + if (db.attachment() != null) + throw new IllegalArgumentException("duplicate or slice"); + + Cleaner cleaner = db.cleaner(); + if (cleaner != null) { + cleaner.clean(); + } + } } diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 7959eaa0622..cc645799e09 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -205,6 +205,8 @@ sun/rmi/rmic/newrmic/equivalence/run.sh 8145980 generic- java/rmi/transport/dgcDeadLock/DGCDeadLock.java 8029360 macosx-all +java/rmi/registry/readTest/readTest.sh 7146543 generic-all + ############################################################################ # jdk_security @@ -215,12 +217,12 @@ sun/security/tools/keytool/ListKeychainStore.sh 8156889 macosx-a sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java 8026393 generic-all -sun/security/krb5/auto/HttpNegotiateServer.java 8038079 generic-all - sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java 8161232 macosx-all sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java 8171043 windows-all +javax/net/ssl/DTLS/PacketLossRetransmission.java 8169086 macosx-x64 + ############################################################################ # jdk_sound @@ -232,6 +234,8 @@ javax/sound/sampled/Clip/Drain/ClipDrain.java 7062792 generic-all javax/sound/sampled/Mixers/DisabledAssertionCrash.java 7067310 generic-all +javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java 8168881 generic-all + ############################################################################ # jdk_imageio @@ -263,7 +267,8 @@ tools/jimage/JImageExtractTest.java 8169713 generic- tools/jimage/JImageListTest.java 8169713 generic-all tools/jimage/JImageVerifyTest.java 8169713 generic-all -tools/jlink/ModuleNamesOrderTest.java 8171070 generic-all + +tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java 8169971 windows-x64 ############################################################################ @@ -287,8 +292,6 @@ com/sun/jdi/sde/SourceDebugExtensionTest.java 8158066 windows- # jdk_util -java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java 8062512 generic-all - java/util/BitSet/BitSetStreamTest.java 8079538 generic-all diff --git a/jdk/test/com/sun/jdi/EvalArraysAsList.sh b/jdk/test/com/sun/jdi/EvalArraysAsList.sh new file mode 100644 index 00000000000..fa5cd93c53a --- /dev/null +++ b/jdk/test/com/sun/jdi/EvalArraysAsList.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# @test +# @bug 8160024 +# @summary jdb returns invalid argument count if first parameter to Arrays.asList is null +# +# @run shell/timeout=300 EvalArraysAsList.sh +# +# The test checks if evaluation of the expression java.util.Arrays.asList(null, "a") +# works normally and does not throw an IllegalArgumentException. + +classname=EvalArraysAsList + +createJavaFile() +{ + cat < $classname.java.1 +public class $classname { + public static void main(String[] args) { + java.util.List l = java.util.Arrays.asList(null, "a"); + System.out.println("java.util.Arrays.asList(null, \"a\") returns: " + l); + return; // @1 breakpoint + } +} +EOF +} + +# drive jdb by sending cmds to it and examining its output +dojdbCmds() +{ + setBkpts @1 + runToBkpt @1 + + cmd eval "java.util.Arrays.asList(null, null)" + jdbFailIfPresent "IllegalArgumentException" 3 + + cmd eval "java.util.Arrays.asList(null, \"a\")" + jdbFailIfPresent "IllegalArgumentException" 3 + + cmd eval "java.util.Arrays.asList(\"a\", null)" + jdbFailIfPresent "IllegalArgumentException" 3 +} + + +mysetup() +{ + if [ -z "$TESTSRC" ] ; then + TESTSRC=. + fi + + for ii in . $TESTSRC $TESTSRC/.. ; do + if [ -r "$ii/ShellScaffold.sh" ] ; then + . $ii/ShellScaffold.sh + break + fi + done +} + +# You could replace this next line with the contents +# of ShellScaffold.sh and this script will run just the same. +mysetup + +runit +pass diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java index 368731e9d85..748e49a0915 100644 --- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -226,9 +226,10 @@ public class DcmdMBeanPermissionsTest { sm.grantPermission(new RuntimePermission("createClassLoader")); sm.grantPermission(new ReflectPermission("suppressAccessChecks")); sm.grantPermission(new java.util.logging.LoggingPermission("control", "")); - sm.grantPermission(new java.lang.RuntimePermission("exitVM.97")); + sm.grantPermission(new java.lang.RuntimePermission("exitVM.*")); sm.grantPermission(new java.lang.RuntimePermission("modifyThreadGroup")); sm.grantPermission(new java.lang.RuntimePermission("modifyThread")); + sm.grantPermission(new java.security.SecurityPermission("getProperty.jdk.jar.disabledAlgorithms")); for(MBeanOperationInfo opInfo : info.getOperations()) { Permission opPermission = new MBeanPermission(info.getClassName(), opInfo.getName(), diff --git a/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java new file mode 100644 index 00000000000..6db02253f42 --- /dev/null +++ b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8169589 + * @summary Activating a dialog puts to back another dialog owned by the same frame + * @author Dmitry Markov + * @library ../../regtesthelpers + * @build Util + * @run main DialogAboveFrameTest + */ + +import java.awt.Color; +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.Point; +import java.awt.Robot; + +import test.java.awt.regtesthelpers.Util; + +public class DialogAboveFrameTest { + public static void main(String[] args) { + Robot robot = Util.createRobot(); + + Frame frame = new Frame("Frame"); + frame.setBackground(Color.BLUE); + frame.setBounds(200, 50, 300, 300); + frame.setVisible(true); + + Dialog dialog1 = new Dialog(frame, "Dialog 1", false); + dialog1.setBackground(Color.RED); + dialog1.setBounds(100, 100, 200, 200); + dialog1.setVisible(true); + + Dialog dialog2 = new Dialog(frame, "Dialog 2", false); + dialog2.setBackground(Color.GREEN); + dialog2.setBounds(400, 100, 200, 200); + dialog2.setVisible(true); + + Util.waitForIdle(robot); + + Util.clickOnComp(dialog2, robot); + Util.waitForIdle(robot); + + Point point = dialog1.getLocationOnScreen(); + int x = point.x + (int)(dialog1.getWidth() * 0.9); + int y = point.y + (int)(dialog1.getHeight() * 0.9); + + try { + if (!robot.getPixelColor(x, y).equals(dialog1.getBackground())) { + throw new RuntimeException("Test FAILED: Dialog is behind the frame"); + } + } finally { + frame.dispose(); + dialog1.dispose(); + dialog2.dispose(); + } + } +} + diff --git a/jdk/test/java/awt/JAWT/JAWT.sh b/jdk/test/java/awt/JAWT/JAWT.sh index ab511d8a71e..d01ff022a42 100644 --- a/jdk/test/java/awt/JAWT/JAWT.sh +++ b/jdk/test/java/awt/JAWT/JAWT.sh @@ -122,7 +122,7 @@ esac # Skip unsupported platforms case `uname -m` in - arm* | ppc* ) + arm* | ppc* | s390* ) echo "Test passed. Not supported on current architecture." exit 0 ;; diff --git a/jdk/test/java/awt/JAWT/Makefile.unix b/jdk/test/java/awt/JAWT/Makefile.unix index b3be2f9a624..978d6cee043 100644 --- a/jdk/test/java/awt/JAWT/Makefile.unix +++ b/jdk/test/java/awt/JAWT/Makefile.unix @@ -1,4 +1,4 @@ -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ LINK = ld J_INC = $(TESTJAVA)/include INCLUDES = -I$(J_INC) -I$(J_INC)/$(SYST) -I. -LIBS = -L$(TESTJAVA)/lib/$(ARCH) -ljawt -lX11 +LIBS = -L$(TESTJAVA)/lib -ljawt -lX11 all: $(CLASSES) libmylib.so diff --git a/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java b/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java new file mode 100644 index 00000000000..18dc47912aa --- /dev/null +++ b/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Frame; +import java.awt.Menu; +import java.awt.MenuBar; +import java.awt.PopupMenu; +import java.awt.Window; + +/** + * @test + * @bug 8165769 + * @key headful + */ +public final class WrongParentAfterRemoveMenu { + + public static void main(final String[] args) { + testMenuBar(); + testComponent(); + testFrame(); + } + + private static void testFrame() { + // peer exists + Frame frame = new Frame(); + try { + frame.pack(); + PopupMenu popupMenu = new PopupMenu(); + frame.add(popupMenu); + checkParent(popupMenu, frame); + frame.remove(popupMenu); + checkParent(popupMenu, null); + } finally { + frame.dispose(); + } + // peer is null + frame = new Frame(); + PopupMenu popupMenu = new PopupMenu(); + frame.add(popupMenu); + checkParent(popupMenu, frame); + frame.remove(popupMenu); + checkParent(popupMenu, null); + } + + private static void testComponent() { + // peer exists + Window w = new Window(null); + try { + w.pack(); + PopupMenu popupMenu = new PopupMenu(); + w.add(popupMenu); + checkParent(popupMenu, w); + w.remove(popupMenu); + checkParent(popupMenu, null); + } finally { + w.dispose(); + } + // peer is null + w = new Window(null); + PopupMenu popupMenu = new PopupMenu(); + w.add(popupMenu); + checkParent(popupMenu, w); + w.remove(popupMenu); + checkParent(popupMenu, null); + } + + private static void testMenuBar() { + // peer exists + MenuBar mb = new MenuBar(); + try { + mb.addNotify(); + Menu m1 = new Menu(); + Menu m2 = new Menu(); + m1.add(m2); + mb.add(m1); + checkParent(m1, mb); + checkParent(m2, m1); + m1.remove(m2); + checkParent(m2, null); + mb.remove(m1); + checkParent(m1, null); + } finally { + mb.removeNotify(); + } + // peer is null + mb = new MenuBar(); + Menu m1 = new Menu(); + Menu m2 = new Menu(); + m1.add(m2); + mb.add(m1); + checkParent(m1, mb); + checkParent(m2, m1); + m1.remove(m2); + checkParent(m2, null); + mb.remove(m1); + checkParent(m1, null); + } + + private static void checkParent(final Menu menu, final Object parent) { + if (menu.getParent() != parent) { + System.err.println("Expected: " + parent); + System.err.println("Actual: " + menu.getParent()); + throw new RuntimeException("Wrong parent"); + } + } +} diff --git a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java index 26c4f728599..a4c026b7931 100644 --- a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java +++ b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java @@ -44,9 +44,11 @@ import java.util.Map; import javax.imageio.ImageIO; /** - * @test @bug 8145174 8151787 + * @test + * @bug 8145174 8151787 8168657 * @summary HiDPI splash screen support on Linux * @modules java.desktop/sun.java2d + * @requires (os.family == "linux") * @run main UnixMultiResolutionSplashTest */ public class UnixMultiResolutionSplashTest { diff --git a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java index 5ef5f1d67e3..06d4dc43b55 100644 --- a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java +++ b/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java @@ -25,6 +25,7 @@ test @bug 6242241 @summary Tests basic DnD functionality in an applet + @requires (os.family == "windows") @author Your Name: Alexey Utkin area=dnd @run applet/manual=yesno DnDFileGroupDescriptor.html */ diff --git a/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java b/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java new file mode 100644 index 00000000000..9a87243d898 --- /dev/null +++ b/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java @@ -0,0 +1,88 @@ +/* + * Copyright 2016 JetBrains s.r.o. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please 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 8169202 + * @summary verify font fallback for surrogate pairs on macOS + * @requires os.family == "mac" + */ + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.font.GlyphVector; +import java.awt.image.BufferedImage; +import java.util.function.Consumer; + +public class SurrogatesFallbackTest { + private static final int CHARACTER = 0x1d400; // MATHEMATICAL BOLD CAPITAL A + private static final Font FONT = new Font("Menlo", // expected to fallback to STIXGeneral for the character above + Font.PLAIN, + 12); + private static final int IMAGE_WIDTH = 20; + private static final int IMAGE_HEIGHT = 20; + private static final int GLYPH_X = 5; + private static final int GLYPH_Y = 15; + + public static void main(String[] args) { + BufferedImage noGlyph = createImage(g -> {}); + BufferedImage missingGlyph = createImage(g -> { + GlyphVector gv = FONT.createGlyphVector(g.getFontRenderContext(), new int[]{FONT.getMissingGlyphCode()}); + g.drawGlyphVector(gv, GLYPH_X, GLYPH_Y); + }); + BufferedImage surrogateCharGlyph = createImage(g -> { + g.setFont(FONT); + g.drawString(new String(Character.toChars(CHARACTER)), GLYPH_X, GLYPH_Y); + }); + + if (imagesAreEqual(surrogateCharGlyph, noGlyph)) { + throw new RuntimeException("Character was not rendered"); + } + if (imagesAreEqual(surrogateCharGlyph, missingGlyph)) { + throw new RuntimeException("Character is rendered as missing"); + } + } + + private static BufferedImage createImage(Consumer drawing) { + BufferedImage image = new BufferedImage(IMAGE_WIDTH, IMAGE_HEIGHT, BufferedImage.TYPE_INT_RGB); + Graphics2D g = image.createGraphics(); + g.setColor(Color.white); + g.fillRect(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT); + g.setColor(Color.black); + drawing.accept(g); + g.dispose(); + return image; + } + + private static boolean imagesAreEqual(BufferedImage i1, BufferedImage i2) { + if (i1.getWidth() != i2.getWidth() || i1.getHeight() != i2.getHeight()) return false; + for (int i = 0; i < i1.getWidth(); i++) { + for (int j = 0; j < i1.getHeight(); j++) { + if (i1.getRGB(i, j) != i2.getRGB(i, j)) { + return false; + } + } + } + return true; + } +} + diff --git a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java new file mode 100644 index 00000000000..e74edf8b8ed --- /dev/null +++ b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + */ + +/* @test + * @summary verify Arab Diacritic Positioning + * @bug 8168759 + */ + +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.Rectangle; +import java.awt.font.FontRenderContext; +import java.awt.font.TextLayout; +import java.util.Locale; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; + +public class ArabicDiacriticTest { + + static final String SAMPLE = + "\u0627\u0644\u0639\u064e\u0631\u064e\u0628\u0650\u064a\u064e\u0651\u0629"; + + static final String STR1 = "\u0644\u0639\u064e\u0629"; + static final String STR2 = "\u0644\u0639\u0629"; + + static JFrame frame; + static final String FONT = "DejaVu Sans"; + + public static void main(String args[]) throws Exception { + showText(); // for a human + measureText(); // for the test harness + Thread.sleep(5000); + frame.dispose(); + } + + static void showText() { + SwingUtilities.invokeLater(() -> { + frame = new JFrame(); + JLabel label = new JLabel(SAMPLE); + Font font = new Font(FONT, Font.PLAIN, 36); + label.setFont(font); + frame.setLayout(new GridLayout(3,1)); + frame.add(label); + label = new JLabel(STR1); + label.setFont(font); + frame.add(label); + label = new JLabel(STR2); + label.setFont(font); + frame.add(label); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + }); + } + + static void measureText() { + Font font = new Font(FONT, Font.PLAIN, 36); + if (!font.getFamily(Locale.ENGLISH).equals(FONT)) { + return; + } + FontRenderContext frc = new FontRenderContext(null, false, false); + TextLayout tl1 = new TextLayout(STR1, font, frc); + TextLayout tl2 = new TextLayout(STR2, font, frc); + Rectangle r1 = tl1.getPixelBounds(frc, 0f, 0f); + Rectangle r2 = tl2.getPixelBounds(frc, 0f, 0f); + if (r1.height > r2.height) { + System.out.println(font); + System.out.println(r1); + System.out.println(r2); + throw new RuntimeException("BAD BOUNDS"); + } + } +} diff --git a/jdk/test/java/io/File/createTempFile/NameTooLong.java b/jdk/test/java/io/File/createTempFile/NameTooLong.java new file mode 100644 index 00000000000..b86bd73d746 --- /dev/null +++ b/jdk/test/java/io/File/createTempFile/NameTooLong.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8148023 + * @summary Verify that createTempFile() will not fail for long component names. + */ + +import java.io.File; +import java.io.IOException; + +public class NameTooLong { + public static void main(String[] args) { + String[][] prefixSuffix = new String[][] { + new String[] {"1234567890123456789012345678901234567xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890","txt"}, + new String[] {"prefix","1234567890123456789012345678901234567xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890.txt"}, + new String[] {"prefix",".txt1234567890123456789012345678901234567xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"} + }; + + int failures = 0; + int index = 0; + for (String[] ps : prefixSuffix) { + File f; + try { + f = File.createTempFile(ps[0], ps[1]); + String s = f.toPath().getFileName().toString(); + if (!s.startsWith(ps[0].substring(0, 3))) { + System.err.printf("%s did not start with %s%n", s, + ps[0].substring(0, 3)); + failures++; + } + if (ps[1].startsWith(".") + && !s.contains(ps[1].substring(0, 4))) { + System.err.printf("%s did not contain %s%n", s, + ps[1].substring(0, 4));; + failures++; + } + } catch (IOException e) { + failures++; + System.err.println(); + e.printStackTrace(); + System.err.println(); + } + index++; + } + + if (failures != 0) { + throw new RuntimeException("Test failed!"); + } + } +} diff --git a/jdk/test/java/io/FilePermission/Invalid.java b/jdk/test/java/io/FilePermission/Invalid.java index 38c6a98b46c..2a343d7049c 100644 --- a/jdk/test/java/io/FilePermission/Invalid.java +++ b/jdk/test/java/io/FilePermission/Invalid.java @@ -37,6 +37,9 @@ public class Invalid { public static void main(String args[]) throws Exception { + // Allmighty + FilePermission af = new FilePermission("<>", "read"); + // Normal FilePermission fp = new FilePermission("a", "read"); @@ -57,6 +60,9 @@ public class Invalid { // Invalid implies itself Asserts.assertTrue(fp1.implies(fp1)); + // <> implies invalid + Asserts.assertTrue(af.implies(fp1)); + // and not implies or implied by anything else, including other // invalid ones Asserts.assertFalse(fp.implies(fp1)); diff --git a/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java index 1c7f7b42f93..722ccd788d5 100644 --- a/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java +++ b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java @@ -62,7 +62,7 @@ public class CheckSecurityProvider { if (os.equals("SunOS")) { layer.findModule("jdk.crypto.ucrypto") .ifPresent(m -> expected.add("com.oracle.security.ucrypto.UcryptoProvider")); - layer.findModule("jdk.crypto.pkcs11") + layer.findModule("jdk.crypto.token") .ifPresent(m -> expected.add("sun.security.pkcs11.SunPKCS11")); } expected.add("sun.security.provider.Sun"); @@ -91,7 +91,7 @@ public class CheckSecurityProvider { expected.add("apple.security.AppleProvider"); } if (!os.equals("SunOS")) { - layer.findModule("jdk.crypto.pkcs11") + layer.findModule("jdk.crypto.token") .ifPresent(m -> expected.add("sun.security.pkcs11.SunPKCS11")); } diff --git a/jdk/test/java/lang/StackTraceElement/ModuleFrames.java b/jdk/test/java/lang/StackTraceElement/ModuleFrames.java index a3b66759a13..6f23160fdee 100644 --- a/jdk/test/java/lang/StackTraceElement/ModuleFrames.java +++ b/jdk/test/java/lang/StackTraceElement/ModuleFrames.java @@ -27,6 +27,9 @@ * @run testng ModuleFrames */ +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Arrays; import org.testng.annotations.Test; @@ -47,11 +50,30 @@ public class ModuleFrames { assertEquals(topFrame.getModuleName(), "java.base", "Expected top frame to be in module java.base"); - assertTrue(topFrame.toString().contains("java.base"), - "Expected toString of top frame to include java.base"); + assertTrue(topFrame.toString().startsWith("java.base"), + "Expected toString of top frame to omit loader name, start with module name: java.base"); + + assertTrue(!topFrame.toString().contains("@"), + "Expected toString of top frame not to include module version ('@')"); + + Path home = Paths.get(System.getProperty("java.home")); + boolean isImage = Files.exists(home.resolve("lib").resolve("modules")); + if (isImage) { + assertTrue(!topFrame.getModuleVersion().isEmpty(), + "Expected non-empty STE.getModuleVersion() for top frame"); + } assertNull(thisFrame.getModuleName(), "Expected frame for test not to have a module name"); + + assertTrue(thisFrame.toString().startsWith(this.getClass().getName()), + "Expected toString to start with class name (no loader or module name"); + + ClassLoader testCL = this.getClass().getClassLoader(); + if (ClassLoader.getSystemClassLoader().getClass().isInstance(testCL)) { + assertEquals(thisFrame.getClassLoaderName(), "app", + "Expect STE to have loader name of \"app\""); + } } } diff --git a/jdk/test/java/lang/StrictMath/ExpTests.java b/jdk/test/java/lang/StrictMath/ExpTests.java new file mode 100644 index 00000000000..0a2e1f0304d --- /dev/null +++ b/jdk/test/java/lang/StrictMath/ExpTests.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8139688 + * @key randomness + * @library /lib/testlibrary/ + * @build jdk.testlibrary.RandomFactory + * @build Tests + * @build FdlibmTranslit + * @build ExpTests + * @run main ExpTests + * @summary Tests specifically for StrictMath.exp + */ + +import jdk.testlibrary.RandomFactory; + +/** + * The role of this test is to verify that the FDLIBM exp algorithm is + * being used by running golden file style tests on values that may + * vary from one conforming exponential implementation to another. + */ + +public class ExpTests { + private ExpTests(){} + + public static void main(String [] argv) { + int failures = 0; + + failures += testExp(); + failures += testAgainstTranslit(); + + if (failures > 0) { + System.err.println("Testing the exponential incurred " + + failures + " failures."); + throw new RuntimeException(); + } + } + + // From the fdlibm source, the overflow threshold in hex is: + // 0x4086_2E42_FEFA_39EF. + static final double EXP_OVERFLOW_THRESH = Double.longBitsToDouble(0x4086_2E42_FEFA_39EFL); + + // From the fdlibm source, the underflow threshold in hex is: + // 0xc087_4910_D52D_3051L. + static final double EXP_UNDERFLOW_THRESH = Double.longBitsToDouble(0xc087_4910_D52D_3051L); + + static int testExp() { + int failures = 0; + + double [][] testCases = { + // Some of these could be moved to common Math/StrictMath exp testing. + {Double.NaN, Double.NaN}, + {Double.MAX_VALUE, Double.POSITIVE_INFINITY}, + {Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY}, + {Double.NEGATIVE_INFINITY, +0.0}, + {EXP_OVERFLOW_THRESH, 0x1.ffff_ffff_fff2ap1023}, + {Math.nextUp(EXP_OVERFLOW_THRESH), Double.POSITIVE_INFINITY}, + {Math.nextDown(EXP_UNDERFLOW_THRESH), +0.0}, + {EXP_UNDERFLOW_THRESH, +Double.MIN_VALUE}, + }; + + for(double[] testCase: testCases) + failures+=testExpCase(testCase[0], testCase[1]); + + return failures; + } + + static int testExpCase(double input, double expected) { + int failures = 0; + + failures+=Tests.test("StrictMath.exp(double)", input, + StrictMath.exp(input), expected); + return failures; + } + + // Initialize shared random number generator + private static java.util.Random random = RandomFactory.getRandom(); + + /** + * Test StrictMath.exp against transliteration port of exp. + */ + private static int testAgainstTranslit() { + int failures = 0; + + double[] decisionPoints = { + // Near overflow threshold + EXP_OVERFLOW_THRESH - 512*Math.ulp(EXP_OVERFLOW_THRESH), + + // Near underflow threshold + EXP_UNDERFLOW_THRESH - 512*Math.ulp(EXP_UNDERFLOW_THRESH), + + // Straddle algorithm conditional checks + Double.longBitsToDouble(0x4086_2E42_0000_0000L - 512L), + Double.longBitsToDouble(0x3fd6_2e42_0000_0000L - 512L), + Double.longBitsToDouble(0x3FF0_A2B2_0000_0000L - 512L), + Double.longBitsToDouble(0x3e30_0000_0000_0000L - 512L), + + // Other notable points + Double.MIN_NORMAL - Math.ulp(Double.MIN_NORMAL)*512, + -Double.MIN_VALUE*512, + }; + + for (double decisionPoint : decisionPoints) { + double ulp = Math.ulp(decisionPoint); + failures += testRange(decisionPoint - 1024*ulp, ulp, 1_024); + } + + // Try out some random values + for (int i = 0; i < 100; i++) { + double x = Tests.createRandomDouble(random); + failures += testRange(x, Math.ulp(x), 100); + } + + return failures; + } + + private static int testRange(double start, double increment, int count) { + int failures = 0; + double x = start; + for (int i = 0; i < count; i++, x += increment) { + failures += testExpCase(x, FdlibmTranslit.Exp.compute(x)); + } + return failures; + } +} diff --git a/jdk/test/java/lang/StrictMath/FdlibmTranslit.java b/jdk/test/java/lang/StrictMath/FdlibmTranslit.java index 64d4ca6112a..5ad48cb4b44 100644 --- a/jdk/test/java/lang/StrictMath/FdlibmTranslit.java +++ b/jdk/test/java/lang/StrictMath/FdlibmTranslit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,8 @@ public class FdlibmTranslit { */ private static double __LO(double x, int low) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L)|low ); + return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L) | + (low & 0x0000_0000_FFFF_FFFFL)); } /** @@ -65,7 +66,8 @@ public class FdlibmTranslit { */ private static double __HI(double x, int high) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL)|( ((long)high)) << 32 ); + return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL) | + ( ((long)high)) << 32 ); } public static double hypot(double x, double y) { @@ -250,4 +252,136 @@ public class FdlibmTranslit { return w; } } + + /** + * Returns the exponential of x. + * + * Method + * 1. Argument reduction: + * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. + * Given x, find r and integer k such that + * + * x = k*ln2 + r, |r| <= 0.5*ln2. + * + * Here r will be represented as r = hi-lo for better + * accuracy. + * + * 2. Approximation of exp(r) by a special rational function on + * the interval [0,0.34658]: + * Write + * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... + * We use a special Reme algorithm on [0,0.34658] to generate + * a polynomial of degree 5 to approximate R. The maximum error + * of this polynomial approximation is bounded by 2**-59. In + * other words, + * R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5 + * (where z=r*r, and the values of P1 to P5 are listed below) + * and + * | 5 | -59 + * | 2.0+P1*z+...+P5*z - R(z) | <= 2 + * | | + * The computation of exp(r) thus becomes + * 2*r + * exp(r) = 1 + ------- + * R - r + * r*R1(r) + * = 1 + r + ----------- (for better accuracy) + * 2 - R1(r) + * where + * 2 4 10 + * R1(r) = r - (P1*r + P2*r + ... + P5*r ). + * + * 3. Scale back to obtain exp(x): + * From step 1, we have + * exp(x) = 2^k * exp(r) + * + * Special cases: + * exp(INF) is INF, exp(NaN) is NaN; + * exp(-INF) is 0, and + * for finite argument, only exp(0)=1 is exact. + * + * Accuracy: + * according to an error analysis, the error is always less than + * 1 ulp (unit in the last place). + * + * Misc. info. + * For IEEE double + * if x > 7.09782712893383973096e+02 then exp(x) overflow + * if x < -7.45133219101941108420e+02 then exp(x) underflow + * + * Constants: + * The hexadecimal values are the intended ones for the following + * constants. The decimal values may be used, provided that the + * compiler will convert from decimal to binary accurately enough + * to produce the hexadecimal values shown. + */ + static class Exp { + private static final double one = 1.0; + private static final double[] halF = {0.5,-0.5,}; + private static final double huge = 1.0e+300; + private static final double twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ + private static final double o_threshold= 7.09782712893383973096e+02; /* 0x40862E42, 0xFEFA39EF */ + private static final double u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ + private static final double[] ln2HI ={ 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ + -6.93147180369123816490e-01}; /* 0xbfe62e42, 0xfee00000 */ + private static final double[] ln2LO ={ 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */ + -1.90821492927058770002e-10,}; /* 0xbdea39ef, 0x35793c76 */ + private static final double invln2 = 1.44269504088896338700e+00; /* 0x3ff71547, 0x652b82fe */ + private static final double P1 = 1.66666666666666019037e-01; /* 0x3FC55555, 0x5555553E */ + private static final double P2 = -2.77777777770155933842e-03; /* 0xBF66C16C, 0x16BEBD93 */ + private static final double P3 = 6.61375632143793436117e-05; /* 0x3F11566A, 0xAF25DE2C */ + private static final double P4 = -1.65339022054652515390e-06; /* 0xBEBBBD41, 0xC5D26BF1 */ + private static final double P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ + + public static strictfp double compute(double x) { + double y,hi=0,lo=0,c,t; + int k=0,xsb; + /*unsigned*/ int hx; + + hx = __HI(x); /* high word of x */ + xsb = (hx>>31)&1; /* sign bit of x */ + hx &= 0x7fffffff; /* high word of |x| */ + + /* filter out non-finite argument */ + if(hx >= 0x40862E42) { /* if |x|>=709.78... */ + if(hx>=0x7ff00000) { + if(((hx&0xfffff)|__LO(x))!=0) + return x+x; /* NaN */ + else return (xsb==0)? x:0.0; /* exp(+-inf)={inf,0} */ + } + if(x > o_threshold) return huge*huge; /* overflow */ + if(x < u_threshold) return twom1000*twom1000; /* underflow */ + } + + /* argument reduction */ + if(hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ + if(hx < 0x3FF0A2B2) { /* and |x| < 1.5 ln2 */ + hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb; + } else { + k = (int)(invln2*x+halF[xsb]); + t = k; + hi = x - t*ln2HI[0]; /* t*ln2HI is exact here */ + lo = t*ln2LO[0]; + } + x = hi - lo; + } + else if(hx < 0x3e300000) { /* when |x|<2**-28 */ + if(huge+x>one) return one+x;/* trigger inexact */ + } + else k = 0; + + /* x is now in primary range */ + t = x*x; + c = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); + if(k==0) return one-((x*c)/(c-2.0)-x); + else y = one-((lo-(x*c)/(2.0-c))-hi); + if(k >= -1021) { + y = __HI(y, __HI(y) + (k<<20)); /* add k to y's exponent */ + return y; + } else { + y = __HI(y, __HI(y) + ((k+1000)<<20));/* add k to y's exponent */ + return y*twom1000; + } + } + } } diff --git a/jdk/test/java/lang/invoke/DropLookupModeTest.java b/jdk/test/java/lang/invoke/DropLookupModeTest.java new file mode 100644 index 00000000000..be7d0a60e54 --- /dev/null +++ b/jdk/test/java/lang/invoke/DropLookupModeTest.java @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @run testng DropLookupModeTest + * @summary Basic unit tests Lookup::dropLookupMode + */ + +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodHandles.Lookup; +import static java.lang.invoke.MethodHandles.Lookup.*; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +@Test +public class DropLookupModeTest { + + /** + * Basic test of dropLookupMode + */ + public void testBasic() { + final Lookup fullPowerLookup = MethodHandles.lookup(); + final Class lc = fullPowerLookup.lookupClass(); + assertTrue(fullPowerLookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE)); + + Lookup lookup = fullPowerLookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE)); + + lookup = fullPowerLookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE)); + + lookup = fullPowerLookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE)); + + lookup = fullPowerLookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC)); + + lookup = fullPowerLookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + /** + * Starting with a full power Lookup, use dropLookupMode to create new Lookups + * with reduced access. + */ + public void testReducingAccess() { + Lookup lookup = MethodHandles.lookup(); + final Class lc = lookup.lookupClass(); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE)); + + lookup = lookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE)); + + lookup = lookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE)); + + lookup = lookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE)); + + lookup = lookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = lookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + + // repeat with lookup has no access + lookup = lookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + /** + * Test dropLookupMode on the public Lookup. + */ + public void testPublicLookup() { + final Lookup publicLookup = MethodHandles.publicLookup(); + final Class lc = publicLookup.lookupClass(); + assertTrue(publicLookup.lookupModes() == PUBLIC); + + Lookup lookup = publicLookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + @DataProvider(name = "badInput") + public Object[][] badInput() { + return new Object[][] { + { 0, null }, + { (PACKAGE|PRIVATE), null }, // two modes + { Integer.MAX_VALUE, null }, + { Integer.MIN_VALUE, null }, + }; + } + + /** + * Check that IllegalArgumentException is thrown for bad input + */ + @Test(dataProvider = "badInput", expectedExceptions = {IllegalArgumentException.class}) + public void testBadInput(Integer modeToDrop, Object ignore) { + MethodHandles.lookup().dropLookupMode(modeToDrop); + } + +} \ No newline at end of file diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java b/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java index 87dfbd7f06e..823ae8797b5 100644 --- a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java +++ b/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java @@ -84,8 +84,7 @@ public class PrivateLookupInTests { // Invoke MethodHandles.privateLookupIn with a reduced-power caller public void testReducedAccessCallerSameModule() throws Throwable { - // drop access - Lookup caller = MethodHandles.lookup().in(publicType); + Lookup caller = MethodHandles.lookup().dropLookupMode(PACKAGE); assertTrue((caller.lookupModes() & PRIVATE) == 0); assertTrue((caller.lookupModes() & PACKAGE) == 0); assertTrue((caller.lookupModes() & MODULE) != 0); diff --git a/jdk/test/java/lang/module/ModuleDescriptorTest.java b/jdk/test/java/lang/module/ModuleDescriptorTest.java index efaa498d558..276ecf71048 100644 --- a/jdk/test/java/lang/module/ModuleDescriptorTest.java +++ b/jdk/test/java/lang/module/ModuleDescriptorTest.java @@ -23,8 +23,7 @@ /** * @test - * @modules java.base/java.lang.module:open - * java.base/jdk.internal.module + * @modules java.base/jdk.internal.module * @run testng ModuleDescriptorTest * @summary Basic test for java.lang.module.ModuleDescriptor and its builder */ @@ -41,16 +40,13 @@ import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Provides; import java.lang.module.ModuleDescriptor.Requires.Modifier; import java.lang.module.ModuleDescriptor.Version; -import java.lang.reflect.Constructor; import java.lang.reflect.Module; import java.nio.ByteBuffer; import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import static java.lang.module.ModuleDescriptor.Requires.Modifier.*; @@ -66,10 +62,20 @@ public class ModuleDescriptorTest { public Object[][] invalidJavaIdentifiers() { return new Object[][]{ - { null, null }, - { ".foo", null }, - { "foo.", null }, - { "[foo]", null }, + { null, null }, + { "1", null }, + { "1foo", null }, + { ".foo", null }, + { "foo.", null }, + { "[foo]", null }, + { "foo.1", null }, + { "1foo.bar", null }, + { "foo.1bar", null }, + { "foo.[bar]", null }, + { "foo..bar", null }, + { "foo.bar.1", null }, + { "foo.bar.1gus", null }, + { "foo.bar.[gus]", null }, }; } @@ -86,6 +92,15 @@ public class ModuleDescriptorTest { .next(); } + private Requires requires(Set mods, String mn, Version v) { + return ModuleDescriptor.module("m") + .requires(mods, mn, v) + .build() + .requires() + .iterator() + .next(); + } + private Requires requires(String mn) { return requires(Collections.emptySet(), mn); } @@ -103,6 +118,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertTrue(r.modifiers().isEmpty()); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithOneModifier() { @@ -111,6 +127,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithTwoModifiers() { @@ -119,6 +136,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE, SYNTHETIC)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithAllModifiers() { @@ -127,6 +145,18 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE, STATIC, SYNTHETIC, MANDATED)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); + } + + public void testRequiresWithCompiledVersion() { + Version v = Version.parse("1.0"); + Requires r = requires(Set.of(), "foo", v); + assertEquals(r, r); + assertTrue(r.compareTo(r) == 0); + assertEquals(r.modifiers(), Set.of()); + assertEquals(r.name(), "foo"); + assertTrue(r.compiledVersion().isPresent()); + assertEquals(r.compiledVersion().get().toString(), "1.0"); } @Test(expectedExceptions = IllegalStateException.class) @@ -167,6 +197,16 @@ public class ModuleDescriptorTest { ModuleDescriptor.module("m").requires((Requires) null); } + @Test(expectedExceptions = NullPointerException.class) + public void testRequiresWithNullModifiers() { + ModuleDescriptor.module("m").requires(null, "foo"); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testRequiresWithNullVersion() { + ModuleDescriptor.module("m").requires(Set.of(), "foo", null); + } + public void testRequiresCompare() { Requires r1 = requires(EnumSet.noneOf(Modifier.class), "foo"); Requires r2 = requires(EnumSet.noneOf(Modifier.class), "bar"); @@ -190,6 +230,20 @@ public class ModuleDescriptorTest { assertTrue(r2.compareTo(r1) == 0); } + public void testRequiresCompareWithSameCompiledVersion() { + Requires r1 = requires(Set.of(), "foo", Version.parse("2.0")); + Requires r2 = requires(Set.of(), "foo", Version.parse("2.0")); + assertTrue(r1.compareTo(r2) == 0); + assertTrue(r2.compareTo(r1) == 0); + } + + public void testRequiresCompareWithDifferentCompiledVersion() { + Requires r1 = requires(Set.of(), "foo", Version.parse("1.0")); + Requires r2 = requires(Set.of(), "foo", Version.parse("2.0")); + assertTrue(r1.compareTo(r2) < 0); + assertTrue(r2.compareTo(r1) > 0); + } + public void testRequiresEqualsAndHashCode() { Requires r1 = requires("foo"); Requires r2 = requires("foo"); @@ -208,6 +262,17 @@ public class ModuleDescriptorTest { r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo"); r2 = requires(Set.of(), "foo"); assertNotEquals(r1, r2); + + Version v1 = Version.parse("1.0"); + r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + r2 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + assertEquals(r1, r2); + assertTrue(r1.hashCode() == r2.hashCode()); + + Version v2 = Version.parse("2.0"); + r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + r2 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v2); + assertNotEquals(r1, r2); } public void testRequiresToString() { @@ -938,7 +1003,7 @@ public class ModuleDescriptorTest { }; // basic test reading module-info.class - public void testRead1() throws Exception { + public void testRead() throws Exception { Module base = Object.class.getModule(); try (InputStream in = base.getResourceAsStream("module-info.class")) { @@ -954,45 +1019,6 @@ public class ModuleDescriptorTest { assertEquals(descriptor.name(), "java.base"); } } - - /** - * Test reading a module-info.class that has a module name, requires, - * and qualified exports with module names that are not supported in the - * Java Language. - */ - public void testRead2() throws Exception { - // use non-public constructor to create a Builder that is not strict - Constructor ctor = Builder.class.getDeclaredConstructor(String.class, boolean.class); - ctor.setAccessible(true); - - Builder builder = (ModuleDescriptor.Builder) ctor.newInstance("m?1", false); - ModuleDescriptor descriptor = builder - .requires("java.base") - .requires("-m1") - .exports("p", Set.of("m2-")) - .build(); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ModuleInfoWriter.write(descriptor, baos); - ByteBuffer bb = ByteBuffer.wrap(baos.toByteArray()); - - descriptor = ModuleDescriptor.read(bb); - assertEquals(descriptor.name(), "m?1"); - - Set requires = descriptor.requires() - .stream() - .map(Requires::name) - .collect(Collectors.toSet()); - assertTrue(requires.size() == 2); - assertTrue(requires.contains("java.base")); - assertTrue(requires.contains("-m1")); - - assertTrue(descriptor.exports().size() == 1); - Exports e = descriptor.exports().iterator().next(); - assertTrue(e.targets().size() == 1); - assertTrue(e.targets().contains("m2-")); - } - /** * Test ModuleDescriptor with a packager finder */ diff --git a/jdk/test/java/lang/module/ModuleNamesTest.java b/jdk/test/java/lang/module/ModuleNamesTest.java new file mode 100644 index 00000000000..c0790eab202 --- /dev/null +++ b/jdk/test/java/lang/module/ModuleNamesTest.java @@ -0,0 +1,261 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @modules java.base/jdk.internal.misc + * java.base/jdk.internal.module + * @run testng ModuleNamesTest + * @summary Basic test of reading a module-info.class with module names that + * are legal in class files but not legal in the Java Language + */ + +import java.io.ByteArrayOutputStream; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleDescriptor.Builder; +import java.lang.module.ModuleDescriptor.Exports; +import java.lang.module.ModuleDescriptor.Opens; +import java.lang.module.ModuleDescriptor.Requires; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.Set; + +import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModuleInfoWriter; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +@Test +public class ModuleNamesTest { + + @DataProvider(name = "legalModuleNames") + public Object[][] legalModuleNames() { + return new Object[][] { + + { ".", "." }, + { ".foo", ".foo" }, + { "foo.", "foo." }, + { "foo.bar", "foo.bar" }, + + { "..", ".." }, + { "..foo", "..foo" }, + { "foo..", "foo.." }, + { "foo..bar", "foo..bar" }, + + { "[", "[" }, + { "[foo", "[foo" }, + { "foo[", "foo[" }, + { "foo[bar", "foo[bar" }, + + { ";", ";" }, + { ";foo", ";foo" }, + { "foo;", "foo;" }, + { "foo;bar", "foo;bar" }, + + { "\\\\", "\\" }, + { "\\\\foo", "\\foo" }, + { "foo\\\\", "foo\\" }, + { "foo\\\\bar", "foo\\bar" }, + + { "\\\\\\\\", "\\\\" }, + { "\\\\\\\\foo", "\\\\foo" }, + { "foo\\\\\\\\", "foo\\\\" }, + { "foo\\\\\\\\bar", "foo\\\\bar" }, + + { "\\:", ":" }, + { "\\:foo", ":foo" }, + { "foo\\:", "foo:" }, + { "foo\\:bar", "foo:bar" }, + + { "\\:\\:", "::" }, + { "\\:\\:foo", "::foo" }, + { "foo\\:\\:", "foo::" }, + { "foo\\:\\:bar", "foo::bar" }, + + { "\\@", "@" }, + { "\\@foo", "@foo" }, + { "foo\\@", "foo@" }, + { "foo\\@bar", "foo@bar" }, + + { "\\@\\@", "@@" }, + { "\\@\\@foo", "@@foo" }, + { "foo\\@\\@", "foo@@" }, + { "foo\\@\\@bar", "foo@@bar" }, + + { makeString("", 0x20, ""), " " }, + { makeString("foo", 0x20, ""), "foo " }, + { makeString("", 0x20, "foo"), " foo" }, + { makeString("foo", 0x20, "bar"), "foo bar" }, + }; + } + + @DataProvider(name = "illegalModuleNames") + public Object[][] illegalModuleNames() { + return new Object[][] { + + { "", null }, + + { ":", null }, + { ":foo", null }, + { "foo:", null }, + { "foo:bar", null }, + + { "@", null }, + { "@foo", null }, + { "foo@", null }, + { "foo@bar", null }, + + { "\\", null }, + { "\\foo", null }, + { "foo\\", null }, + { "foo\\bar", null }, + + { makeString("", 0x00, ""), null }, + { makeString("", 0x00, "foo"), null }, + { makeString("foo", 0x00, ""), null }, + { makeString("foo", 0x00, "bar"), null }, + + { makeString("", 0x1f, ""), null }, + { makeString("", 0x1f, "foo"), null }, + { makeString("foo", 0x1f, ""), null }, + { makeString("foo", 0x1f, "bar"), null }, + + }; + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalModuleName(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder(mn).requires("java.base").build(); + ByteBuffer bb = toBuffer(md); + String name = ModuleDescriptor.read(bb).name(); + assertEquals(name, expected); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalModuleName(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder(mn).requires("java.base").build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalRequires(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m").requires("java.base").requires(mn).build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional requires = descriptor.requires().stream() + .filter(r -> !r.name().equals("java.base")) + .findAny(); + assertTrue(requires.isPresent()); + assertEquals(requires.get().name(), expected); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalRequires(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m").requires("java.base").requires(mn).build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalExports(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .exports("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional export = descriptor.exports().stream().findAny(); + assertTrue(export.isPresent()); + assertTrue(export.get().targets().contains(expected)); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalExports(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .exports("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalOpens(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .opens("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional opens = descriptor.opens().stream().findAny(); + assertTrue(opens.isPresent()); + assertTrue(opens.get().targets().contains(expected)); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalOpens(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .opens("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + /** + * Returns a Builder that does not validate module names. + */ + private Builder newBuilder(String mn) { + return SharedSecrets.getJavaLangModuleAccess() + .newModuleBuilder(mn, false, false, false); + } + + /** + * Returns a {@code ByteBuffer} containing the given module descriptor + * in module-info.class format. + */ + private ByteBuffer toBuffer(ModuleDescriptor descriptor) throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ModuleInfoWriter.write(descriptor, baos); + return ByteBuffer.wrap(baos.toByteArray()); + } + + /** + * Returns a string containing a given code point. + */ + private String makeString(String prefix, int codePoint, String suffix) { + StringBuilder sb = new StringBuilder(); + sb.append(prefix); + sb.appendCodePoint(codePoint); + sb.append(suffix); + return sb.toString(); + } +} diff --git a/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java b/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java index 63c4c7404e0..d956c249651 100644 --- a/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java +++ b/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java @@ -24,7 +24,7 @@ /** * @test * @library /lib/testlibrary - * @modules java.base/jdk.internal.misc + * @modules java.base/jdk.internal.module * jdk.compiler * @build ModuleReaderTest CompilerUtils JarUtils * @run testng ModuleReaderTest @@ -53,7 +53,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.spi.ToolProvider; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModulePath; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -216,9 +216,7 @@ public class ModuleReaderTest { */ void test(Path mp) throws IOException { - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, mp); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, mp); ModuleReference mref = finder.find(TEST_MODULE).get(); ModuleReader reader = mref.open(); diff --git a/jdk/test/java/lang/module/ModuleReferenceTest.java b/jdk/test/java/lang/module/ModuleReferenceTest.java index 6b480bb8b2c..bf2db124de5 100644 --- a/jdk/test/java/lang/module/ModuleReferenceTest.java +++ b/jdk/test/java/lang/module/ModuleReferenceTest.java @@ -31,7 +31,6 @@ import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.net.URI; -import java.util.function.Supplier; import org.testng.annotations.Test; import static org.testng.Assert.*; @@ -39,8 +38,13 @@ import static org.testng.Assert.*; @Test public class ModuleReferenceTest { - private Supplier makeSupplier() { - return () -> { throw new UnsupportedOperationException(); }; + private ModuleReference newModuleReference(ModuleDescriptor descriptor, URI uri) { + return new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } + }; } public void testBasic() throws Exception { @@ -53,25 +57,16 @@ public class ModuleReferenceTest { URI uri = URI.create("module:/m"); - Supplier supplier = makeSupplier(); - - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); + ModuleReference mref = newModuleReference(descriptor, uri); assertTrue(mref.descriptor().equals(descriptor)); assertTrue(mref.location().get().equals(uri)); - - // check that the supplier is called - try { - mref.open(); - assertTrue(false); - } catch (UnsupportedOperationException expected) { } } - @Test(expectedExceptions = { NullPointerException.class }) public void testNullDescriptor() throws Exception { URI location = URI.create("module:/m"); - new ModuleReference(null, location, makeSupplier()); + newModuleReference(null, location); } public void testNullLocation() { @@ -79,55 +74,8 @@ public class ModuleReferenceTest { = ModuleDescriptor.module("m") .exports("p") .build(); - Supplier supplier = makeSupplier(); - ModuleReference mref = new ModuleReference(descriptor, null, supplier); + ModuleReference mref = newModuleReference(descriptor, null); assertTrue(!mref.location().isPresent()); } - @Test(expectedExceptions = { NullPointerException.class }) - public void testNullSupplier() throws Exception { - ModuleDescriptor descriptor = ModuleDescriptor.module("m").build(); - URI location = URI.create("module:/m"); - new ModuleReference(descriptor, location, null); - } - - - public void testEqualsAndHashCode() { - ModuleDescriptor descriptor1 - = ModuleDescriptor.module("m1") - .exports("p") - .build(); - ModuleDescriptor descriptor2 - = ModuleDescriptor.module("m1") - .exports("p") - .build(); - - URI uri = URI.create("module:/m1"); - Supplier supplier = makeSupplier(); - - ModuleReference mref1 = new ModuleReference(descriptor1, uri, supplier); - ModuleReference mref2 = new ModuleReference(descriptor2, uri, supplier); - ModuleReference mref3 = new ModuleReference(descriptor1, null, supplier); - - assertTrue(mref1.equals(mref1)); - assertTrue(mref1.equals(mref2)); - assertTrue(mref2.equals(mref1)); - assertTrue(mref1.hashCode() == mref2.hashCode()); - - assertTrue(mref3.equals(mref3)); - assertFalse(mref3.equals(mref1)); - assertFalse(mref1.equals(mref3)); - } - - - public void testToString() { - ModuleDescriptor descriptor = ModuleDescriptor.module("m1").build(); - URI uri = URI.create("module:/m1"); - Supplier supplier = makeSupplier(); - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); - String s = mref.toString(); - assertTrue(s.contains("m1")); - assertTrue(s.contains(uri.toString())); - } - } diff --git a/jdk/test/java/lang/reflect/Module/AnnotationsTest.java b/jdk/test/java/lang/reflect/Module/AnnotationsTest.java index 1746d6d40e9..0390698b282 100644 --- a/jdk/test/java/lang/reflect/Module/AnnotationsTest.java +++ b/jdk/test/java/lang/reflect/Module/AnnotationsTest.java @@ -119,7 +119,6 @@ public class AnnotationsTest { List attrs = new ArrayList<>(); attrs.add(new ClassFileAttributes.ModuleAttribute()); attrs.add(new ClassFileAttributes.ModulePackagesAttribute()); - attrs.add(new ClassFileAttributes.ModuleVersionAttribute()); attrs.add(new ClassFileAttributes.ModuleTargetAttribute()); cr.accept(cv, attrs.toArray(new Attribute[0]), 0); diff --git a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java index 7a4ce531b0b..47feb498c51 100644 --- a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java +++ b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java @@ -21,10 +21,11 @@ * questions. */ -/** +/* * @test * @bug 4167874 - * @modules jdk.httpserver + * @modules java.logging + * jdk.httpserver * @library ../../../../com/sun/net/httpserver * @library /lib/testlibrary * @build FileServerHandler jdk.testlibrary.FileUtils @@ -33,10 +34,13 @@ * @summary URL-downloaded jar files can consume all available file descriptors */ -import java.io.*; -import java.net.*; -import java.lang.reflect.*; -import com.sun.net.httpserver.*; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URLClassLoader; +import java.net.InetSocketAddress; +import java.net.URL; +import com.sun.net.httpserver.HttpContext; +import com.sun.net.httpserver.HttpServer; public class CloseTest extends Common { @@ -130,7 +134,7 @@ public class CloseTest extends Common { // load tests loadClass ("com.foo.TestClass1", loader, false); loadClass ("com.foo.TestClass", loader, true); - loadClass ("java.sql.Array", loader, true); + loadClass ("java.util.ArrayList", loader, true); // now check we can delete the path rm_minus_rf (new File(name)); diff --git a/jdk/test/java/nio/charset/coders/BashStreams.java b/jdk/test/java/nio/charset/coders/BashStreams.java index 1658021210b..b8f775d9e8b 100644 --- a/jdk/test/java/nio/charset/coders/BashStreams.java +++ b/jdk/test/java/nio/charset/coders/BashStreams.java @@ -23,7 +23,7 @@ /* @test * @summary Stochastic test of charset-based streams - * @key randomness intermittent + * @key randomness */ import java.io.*; diff --git a/jdk/test/java/rmi/Naming/LookupNameWithColon.java b/jdk/test/java/rmi/Naming/LookupNameWithColon.java index a0d1e9389a0..cdd2473a490 100644 --- a/jdk/test/java/rmi/Naming/LookupNameWithColon.java +++ b/jdk/test/java/rmi/Naming/LookupNameWithColon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,7 +45,7 @@ public class LookupNameWithColon { "multiple:colons:in:name" }; - Registry reg = TestLibrary.createRegistryOnUnusedPort(); + Registry reg = TestLibrary.createRegistryOnEphemeralPort(); int port = TestLibrary.getRegistryPort(reg); for (int i = 0; i < names.length; i++) { diff --git a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java b/jdk/test/java/rmi/Naming/RmiIsNoScheme.java index a044ff10207..1f202cfc43c 100644 --- a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java +++ b/jdk/test/java/rmi/Naming/RmiIsNoScheme.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ public class RmiIsNoScheme implements Remote, Serializable { System.err.println("\nRegression test for bug 4626311\n"); try { - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); int registryPort = TestLibrary.getRegistryPort(registry); Naming.rebind("//:" + registryPort + "/RmiIsNoScheme", new RmiIsNoScheme()); diff --git a/jdk/test/java/rmi/Naming/UnderscoreHost.java b/jdk/test/java/rmi/Naming/UnderscoreHost.java index c253ec20441..6cfa9c9f8b7 100644 --- a/jdk/test/java/rmi/Naming/UnderscoreHost.java +++ b/jdk/test/java/rmi/Naming/UnderscoreHost.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -80,7 +80,7 @@ public class UnderscoreHost extends UnicastRemoteObject implements Remote { try { HostVerifyingSocketFactory hvf = new HostVerifyingSocketFactory(); RMISocketFactory.setSocketFactory(hvf); - Registry r = TestLibrary.createRegistryOnUnusedPort(); + Registry r = TestLibrary.createRegistryOnEphemeralPort(); int port = TestLibrary.getRegistryPort(r); t = new UnderscoreHost(); r.rebind(NAME, t); diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java index 815bb22e17b..bfa12177eb0 100644 --- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java +++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,8 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary RMID ActivationLibrary + * java.base/sun.nio.ch + * @build TestLibrary RMID ActivationLibrary RMIDSelectorProvider * DownloadActivationGroup MyActivationGroupImpl DownloadActivationGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 DownloadActivationGroup */ @@ -123,7 +124,7 @@ public class DownloadActivationGroup * Start rmid. */ RMID.removeLog(); - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); String execPolicyOption = "-Dsun.rmi.activation.execPolicy=none"; rmid.addOptions(new String[] { execPolicyOption }); rmid.start(); diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy new file mode 100644 index 00000000000..f2c4f1dbfaa --- /dev/null +++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/rmid.security.policy @@ -0,0 +1,7 @@ +grant { + permission java.lang.RuntimePermission "selectorProvider"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read"; + permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept"; +}; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java index 521598de8f0..9a316e7dac1 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,8 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary RMID ActivationLibrary + * java.base/sun.nio.ch + * @build TestLibrary RMID ActivationLibrary RMIDSelectorProvider * @run main/othervm/policy=security.policy/timeout=480 IdempotentActiveGroup */ @@ -63,7 +64,7 @@ public class IdempotentActiveGroup { try { RMID.removeLog(); - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); rmid.start(); System.err.println("Create group descriptor"); diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy new file mode 100644 index 00000000000..f2c4f1dbfaa --- /dev/null +++ b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/rmid.security.policy @@ -0,0 +1,7 @@ +grant { + permission java.lang.RuntimePermission "selectorProvider"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read"; + permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept"; +}; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java index 3e7798c687c..27bb48b60e8 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java @@ -110,7 +110,7 @@ public class ModifyDescriptor try { RMID.removeLog(); - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); rmid.start(); /* diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java index 5099ab175bf..43318ce0eb0 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,8 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary RMID ActivationLibrary + * java.base/sun.nio.ch + * @build TestLibrary RMID ActivationLibrary RMIDSelectorProvider * CanCreateStubs StubClassesPermitted_Stub * @run main/othervm/java.security.policy=security.policy/secure=java.lang.SecurityManager/timeout=240 StubClassesPermitted */ @@ -84,7 +85,7 @@ public class StubClassesPermitted try { TestLibrary.suggestSecurityManager("java.lang.SecurityManager"); - registry = TestLibrary.createRegistryOnUnusedPort(); + registry = TestLibrary.createRegistryOnEphemeralPort(); registryPort = TestLibrary.getRegistryPort(registry); // must run with java.lang.SecurityManager or the test @@ -98,7 +99,7 @@ public class StubClassesPermitted // start an rmid. RMID.removeLog(); - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); rmid.start(); //rmid.addOptions(new String[] {"-C-Djava.rmi.server.logCalls=true"}); diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy index 0c1df59fe99..640fb78d7bd 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy +++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy @@ -4,4 +4,9 @@ grant { // test needs to export a set of internal APIs to access them from unamed module permission com.sun.rmi.rmid.ExecOptionPermission "*"; + permission java.lang.RuntimePermission "selectorProvider"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read"; + permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept"; }; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java index 7f4e1d22dee..fcd21614e6e 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,8 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary RMID ActivationLibrary ActivateMe + * java.base/sun.nio.ch + * @build TestLibrary RMID ActivationLibrary ActivateMe RMIDSelectorProvider * @run main/othervm/policy=security.policy UnregisterGroup */ @@ -76,7 +77,7 @@ public class UnregisterGroup extends Activatable implements ActivateMe try { RMID.removeLog(); - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); rmid.start(); /* Cause activation groups to have a security policy that will diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy index 0e43c5d37ab..ce485f61343 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy +++ b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy @@ -1,4 +1,9 @@ grant { permission com.sun.rmi.rmid.ExecOptionPermission "-Djava.security.manager=default"; permission com.sun.rmi.rmid.ExecOptionPermission "-Djava.security.policy=*"; + permission java.lang.RuntimePermission "selectorProvider"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read"; + permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept"; }; diff --git a/jdk/test/java/rmi/registry/emptyName/EmptyName.java b/jdk/test/java/rmi/registry/emptyName/EmptyName.java index e3f271ae589..97b82a188e5 100644 --- a/jdk/test/java/rmi/registry/emptyName/EmptyName.java +++ b/jdk/test/java/rmi/registry/emptyName/EmptyName.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ import java.rmi.server.RemoteObject; public class EmptyName { public static void main(String[] args) throws Exception { - Registry impl = TestLibrary.createRegistryOnUnusedPort(); + Registry impl = TestLibrary.createRegistryOnEphemeralPort(); Registry stub = (Registry) RemoteObject.toStub(impl); stub.bind("", stub); stub.lookup(""); diff --git a/jdk/test/java/rmi/registry/reexport/Reexport.java b/jdk/test/java/rmi/registry/reexport/Reexport.java index a0c9707a74a..b0b29ef9bd4 100644 --- a/jdk/test/java/rmi/registry/reexport/Reexport.java +++ b/jdk/test/java/rmi/registry/reexport/Reexport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary JavaVM RegistryRunner RegistryRunner_Stub + * @build TestLibrary REGISTRY RegistryRunner * @run main/othervm Reexport */ @@ -54,27 +54,20 @@ public class Reexport { static public void main(String[] argv) { Registry reg = null; - int regPort = TestLibrary.getUnusedRandomPort(); - try { System.err.println("\nregression test for 4120329\n"); // establish the registry (we hope) - System.err.println("Starting registry on port " + regPort); - Reexport.makeRegistry(regPort); + makeRegistry(); // Get a handle to the registry System.err.println("Creating duplicate registry, this should fail..."); - reg = createReg(true, regPort); - - if (reg != null) { - TestLibrary.bomb("failed was able to duplicate the registry?!?"); - } + reg = createReg(true); // Kill the first registry. System.err.println("Bringing down the first registry"); try { - Reexport.killRegistry(regPort); + killRegistry(); } catch (Exception foo) { } @@ -82,7 +75,7 @@ public class Reexport { System.err.println("Trying again to start our own " + "registry... this should work"); - reg = createReg(false, regPort); + reg = createReg(false); if (reg == null) { TestLibrary.bomb("Could not create registry on second try"); @@ -94,17 +87,19 @@ public class Reexport { TestLibrary.bomb(e); } finally { // dont leave the registry around to affect other tests. - killRegistry(regPort); - + killRegistry(); reg = null; } } - static Registry createReg(boolean remoteOk, int port) { + static Registry createReg(boolean remoteOk) { Registry reg = null; try { reg = LocateRegistry.createRegistry(port); + if (remoteOk) { + TestLibrary.bomb("Remote registry is up, an Exception is expected!"); + } } catch (Throwable e) { if (remoteOk) { System.err.println("EXPECTING PORT IN USE EXCEPTION:"); @@ -114,43 +109,29 @@ public class Reexport { TestLibrary.bomb((Exception) e); } } - return reg; } - public static void makeRegistry(int p) { - // sadly, we can't kill a registry if we have too-close control - // over it. We must make it in a subprocess, and then kill the - // subprocess when it has served our needs. - + public static void makeRegistry() { try { - JavaVM jvm = new JavaVM("RegistryRunner", "", Integer.toString(p)); - jvm.start(); - Reexport.subreg = jvm; + subreg = REGISTRY.createREGISTRY(); + subreg.start(); + port = subreg.getPort(); + System.out.println("Starting registry on port " + port); } catch (IOException e) { // one of these is summarily dropped, can't remember which one System.out.println ("Test setup failed - cannot run rmiregistry"); TestLibrary.bomb("Test setup failed - cannot run test", e); } - // Slop - wait for registry to come up. This is stupid. - try { - Thread.sleep (5000); - } catch (Exception whatever) { - } } - private static JavaVM subreg = null; + private static REGISTRY subreg = null; + private static int port = -1; - public static void killRegistry(int port) { - if (Reexport.subreg != null) { - - RegistryRunner.requestExit(port); - - try { - Reexport.subreg.waitFor(); - } catch (InterruptedException ie) { - } + public static void killRegistry() { + if (subreg != null) { + subreg.shutdown(); + subreg = null; } - Reexport.subreg = null; } } diff --git a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java b/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java index 8aeba6dd6aa..a8e9f1e93aa 100644 --- a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java +++ b/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -313,7 +313,7 @@ public class AppleUserImpl extends UnicastRemoteObject implements AppleUser { synchronized (user) { // create new registry and bind new AppleUserImpl in registry - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); registryPort = TestLibrary.getRegistryPort(registry); LocateRegistry.getRegistry(registryPort).rebind("AppleUser", user); diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java index 86512a9d225..3509a3fbae5 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java @@ -32,7 +32,8 @@ * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary Echo EchoImpl EchoImpl_Stub + * java.base/sun.nio.ch + * @build TestLibrary Echo EchoImpl EchoImpl_Stub RMIDSelectorProvider * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory */ @@ -42,7 +43,7 @@ import java.rmi.*; import java.rmi.registry.*; public class UseCustomSocketFactory { - static final int REGISTRY_PORT = TestLibrary.getUnusedRandomPort(); + static int registryPort = -1; static String[] protocol = new String[] { "", "compress", "xor" }; @@ -53,7 +54,8 @@ public class UseCustomSocketFactory { TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager"); try { - LocateRegistry.createRegistry(REGISTRY_PORT); + Registry reg = LocateRegistry.createRegistry(0); + registryPort = TestLibrary.getRegistryPort(reg); } catch (RemoteException e) { TestLibrary.bomb("creating registry", e); } @@ -61,7 +63,7 @@ public class UseCustomSocketFactory { RMID rmid = null; try { - rmid = RMID.createRMID(); + rmid = RMID.createRMIDOnEphemeralPort(); rmid.addArguments(new String[] { "-C-Djava.security.policy=" + TestParams.defaultGroupPolicy + @@ -89,7 +91,7 @@ public class UseCustomSocketFactory { "-Djava.security.policy=" + TestParams.defaultPolicy + " -Drmi.registry.port=" + - REGISTRY_PORT + + registryPort + " -Djava.rmi.activation.port=" + rmidPort, protocol[i]); @@ -107,7 +109,7 @@ public class UseCustomSocketFactory { long stopTime = System.currentTimeMillis() + 24000; do { try { - echo[i] = (Echo) Naming.lookup("//:" + REGISTRY_PORT + + echo[i] = (Echo) Naming.lookup("//:" + registryPort + "/EchoServer"); break; } catch (NotBoundException e) { @@ -137,7 +139,7 @@ public class UseCustomSocketFactory { } finally { serverVM.destroy(); try { - Naming.unbind("//:" + REGISTRY_PORT + "/EchoServer"); + Naming.unbind("//:" + registryPort + "/EchoServer"); } catch (RemoteException | NotBoundException | MalformedURLException e) { TestLibrary.bomb("unbinding EchoServer", e); } diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy new file mode 100644 index 00000000000..f2c4f1dbfaa --- /dev/null +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/rmid.security.policy @@ -0,0 +1,7 @@ +grant { + permission java.lang.RuntimePermission "selectorProvider"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read"; + permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read"; + permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept"; +}; diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy index 6c8a471c993..324624d5bc7 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy @@ -20,6 +20,13 @@ grant { permission java.util.PropertyPermission "java.security.policy", "read"; permission java.util.PropertyPermission "java.security.manager", "read"; + // used by TestLibrary to get the RMI Registry port + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.proxy"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp"; + // used by TestLibrary to determine test environment permission java.util.PropertyPermission "test.*", "read"; permission java.util.PropertyPermission "user.dir", "read"; diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java index 1a39bc79b64..0b6dc76a3b0 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ public class UseCustomSocketFactory { System.out.println("\nRegression test for bug 4148850\n"); TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager"); - int registryPort = TestLibrary.getUnusedRandomPort(); + int registryPort = -1; try { impl = new HelloImpl(); @@ -68,9 +68,10 @@ public class UseCustomSocketFactory { * allow the rmiregistry to be secure. */ registry = LocateRegistry. - createRegistry(registryPort, + createRegistry(0, new Compress.CompressRMIClientSocketFactory(), new Compress.CompressRMIServerSocketFactory()); + registryPort = TestLibrary.getRegistryPort(registry); registry.rebind("/HelloServer", impl); checkStub(registry, "RMIServerSocket"); diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy index 523ea94a7a2..70bf79ac69e 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy @@ -22,6 +22,13 @@ grant { permission java.util.PropertyPermission "java.security.policy", "read"; permission java.util.PropertyPermission "java.security.manager", "read"; + // used by TestLibrary to get the RMI Registry port + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.proxy"; + permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp"; + // test needs to export rmid and communicate with objects on arbitrary ports permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; }; diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java index 21ff49ce8ec..4df810af015 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,7 @@ public class UseCustomSocketFactory { TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager"); try { - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); registryPort = TestLibrary.getRegistryPort(registry); } catch (RemoteException e) { TestLibrary.bomb("creating registry", e); diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java b/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java index 27530b99bae..9c46f36b6cf 100644 --- a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java +++ b/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -80,7 +80,7 @@ public class KeepAliveDuringCall implements ShutdownMonitor { UnicastRemoteObject.exportObject(obj); System.err.println("exported shutdown monitor"); - Registry localRegistry = TestLibrary.createRegistryOnUnusedPort(); + Registry localRegistry = TestLibrary.createRegistryOnEphemeralPort(); int registryPort = TestLibrary.getRegistryPort(localRegistry); System.err.println("created local registry"); diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java b/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java index f529f64ce0f..9979b6934ec 100644 --- a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java +++ b/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ public class UnexportLeak implements Ping { public static void main(String[] args) { try { System.err.println("\nRegression test for bug 4331349\n"); - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); int registryPort = TestLibrary.getRegistryPort(registry); Remote obj = new UnexportLeak(); WeakReference wr = new WeakReference(obj); diff --git a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java b/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java index 0694209dffe..df3dde5ee29 100644 --- a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java +++ b/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,7 @@ public class FiniteGCLatency implements Remote, Unreferenced { try { UnicastRemoteObject.exportObject(obj); System.err.println("exported remote object"); - Registry registry1 = TestLibrary.createRegistryOnUnusedPort(); + Registry registry1 = TestLibrary.createRegistryOnEphemeralPort(); int port = TestLibrary.getRegistryPort(registry1); System.err.println("created registry"); diff --git a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java b/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java index f468779c9a7..2c4bb4d6b9f 100644 --- a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java +++ b/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -122,7 +122,7 @@ public class UnreferencedContext implements Remote, Unreferenced, Runnable { UnicastRemoteObject.exportObject(obj); System.err.println("exported remote object"); - Registry registry1 = TestLibrary.createRegistryOnUnusedPort(); + Registry registry1 = TestLibrary.createRegistryOnEphemeralPort(); int port = TestLibrary.getRegistryPort(registry1); System.err.println("created registry"); diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/jdk/test/java/rmi/testlibrary/JavaVM.java index 04f1589262d..087e700391e 100644 --- a/jdk/test/java/rmi/testlibrary/JavaVM.java +++ b/jdk/test/java/rmi/testlibrary/JavaVM.java @@ -22,6 +22,7 @@ */ import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.File; import java.io.IOException; @@ -37,6 +38,26 @@ import java.util.concurrent.TimeoutException; */ public class JavaVM { + static class CachedOutputStream extends OutputStream { + ByteArrayOutputStream ba; + OutputStream os; + + public CachedOutputStream(OutputStream os) { + this.os = os; + this.ba = new ByteArrayOutputStream(); + } + + public void write(int b) throws IOException { + ba.write(b); + os.write(b); + } + + public void reset() throws IOException { + os.flush(); + ba.reset(); + } + } + public static final long POLLTIME_MS = 100L; protected Process vm = null; @@ -44,8 +65,8 @@ public class JavaVM { private String classname = ""; protected String args = ""; protected String options = ""; - private OutputStream outputStream = System.out; - private OutputStream errorStream = System.err; + protected CachedOutputStream outputStream = new CachedOutputStream(System.out); + protected CachedOutputStream errorStream = new CachedOutputStream(System.err); private String policyFileName = null; private StreamPipe outPipe; private StreamPipe errPipe; @@ -76,8 +97,8 @@ public class JavaVM { String options, String args, OutputStream out, OutputStream err) { this(classname, options, args); - this.outputStream = out; - this.errorStream = err; + this.outputStream = new CachedOutputStream(out); + this.errorStream = new CachedOutputStream(err); } // Prepends passed opts array to current options @@ -117,6 +138,8 @@ public class JavaVM { * Exec the VM as specified in this object's constructor. */ private void start0() throws IOException { + outputStream.reset(); + errorStream.reset(); if (vm != null) throw new IllegalStateException("JavaVM already started"); diff --git a/jdk/test/java/rmi/testlibrary/REGISTRY.java b/jdk/test/java/rmi/testlibrary/REGISTRY.java new file mode 100644 index 00000000000..d372198160b --- /dev/null +++ b/jdk/test/java/rmi/testlibrary/REGISTRY.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.OutputStream; +import java.io.IOException; + +/** + * Class to run and control rmiregistry in a sub-process. + * + * We can't kill a registry if we have too-close control + * over it. We must make it in a subprocess, and then kill the + * subprocess when it has served our needs. + */ +public class REGISTRY extends JavaVM { + + private static double startTimeout = 20_000 * TestLibrary.getTimeoutFactor(); + + private int port = -1; + + private REGISTRY(OutputStream out, OutputStream err, + String options, int port) { + super("RegistryRunner", options, Integer.toString(port), out, err); + this.port = port; + } + + public static REGISTRY createREGISTRY() { + return createREGISTRY(System.out, System.err, "", 0); + } + + public static REGISTRY createREGISTRY(OutputStream out, OutputStream err, + String options, int port) { + options += " --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED" + + " --add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED" + + " --add-exports=java.rmi/sun.rmi.transport=ALL-UNNAMED" + + " --add-exports=java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"; + REGISTRY reg = new REGISTRY(out, err, options, port); + return reg; + } + + /** + * Starts the registry in a sub-process and waits up to + * the given timeout period to confirm that it's running, + * and get the port where it's running. + */ + public void start() throws IOException { + super.start(); + long startTime = System.currentTimeMillis(); + long deadline = TestLibrary.computeDeadline(startTime, (long)startTimeout); + while (true) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { } + + String output = outputStream.ba.toString(); + port = RegistryRunner.getRegistryPort(output); + if (port != -1) { + break; + } + if (System.currentTimeMillis() > deadline) { + TestLibrary.bomb("Failed to start registry, giving up after " + + (System.currentTimeMillis() - startTime) + "ms.", null); + } + } + } + + /** + * Shuts down the registry. + */ + public void shutdown() { + RegistryRunner.requestExit(port); + } + + /** + * Gets the port where the registry is serving. + */ + public int getPort() { + return port; + } +} diff --git a/jdk/test/java/rmi/testlibrary/RegistryRunner.java b/jdk/test/java/rmi/testlibrary/RegistryRunner.java index 6290c79f98f..f79403ca617 100644 --- a/jdk/test/java/rmi/testlibrary/RegistryRunner.java +++ b/jdk/test/java/rmi/testlibrary/RegistryRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,13 +28,16 @@ import java.rmi.registry.*; import java.rmi.server.*; /** - * Class to run a registry whos VM can be told to exit remotely; using + * Class to run a registry whose VM can be told to exit remotely; using * the rmiregistry in this fashion makes tests more robust under * windows where Process.destroy() seems not to be 100% reliable. */ public class RegistryRunner extends UnicastRemoteObject implements RemoteExiter { + private static final String PORT_LABEL_START = "RegistryRunner.port.start:"; + private static final String PORT_LABEL_END = "RegistryRunner.port.end"; + private static Registry registry = null; private static RemoteExiter exiter = null; @@ -59,16 +62,16 @@ public class RegistryRunner extends UnicastRemoteObject public static void requestExit(int port) { try { - RemoteExiter exiter = + RemoteExiter e = (RemoteExiter) Naming.lookup("rmi://localhost:" + port + "/RemoteExiter"); try { - exiter.exit(); + e.exit(); } catch (RemoteException re) { } - exiter = null; + e = null; } catch (java.net.MalformedURLException mfue) { // will not happen } catch (NotBoundException nbe) { @@ -79,7 +82,21 @@ public class RegistryRunner extends UnicastRemoteObject } } + public static int getRegistryPort(String output) { + int idxStart = output.indexOf(PORT_LABEL_START); + int idxEnd = output.indexOf(PORT_LABEL_END); + if (idxStart == -1 || idxEnd == -1) { + return -1; + } + idxStart = idxStart+PORT_LABEL_START.length(); + String portStr = output.substring(idxStart, idxEnd); + int port = Integer.valueOf(portStr); + System.err.println("registry is running at port: " + port); + return port; + } + public static void main(String[] args) { + try { if (args.length == 0) { System.err.println("Usage: "); @@ -88,17 +105,23 @@ public class RegistryRunner extends UnicastRemoteObject int port = -1; try { port = Integer.parseInt(args[0]); - } catch (NumberFormatException nfe) { - } + } catch (NumberFormatException ignore) { } // create a registry registry = LocateRegistry.createRegistry(port); + if (port == 0) { + port = TestLibrary.getRegistryPort(registry); + } // create a remote object to tell this VM to exit exiter = new RegistryRunner(); Naming.rebind("rmi://localhost:" + port + "/RemoteExiter", exiter); + // this output is important for REGISTRY to get the port + // where rmiregistry is serving + System.out.println(PORT_LABEL_START + port + PORT_LABEL_END); + } catch (Exception e) { System.err.println(e.getMessage()); e.printStackTrace(); diff --git a/jdk/test/java/rmi/testlibrary/RegistryRunner_Stub.java b/jdk/test/java/rmi/testlibrary/RegistryRunner_Stub.java deleted file mode 100644 index 679c0d1f962..00000000000 --- a/jdk/test/java/rmi/testlibrary/RegistryRunner_Stub.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -// Stub class generated by rmic, do not edit. -// Contents subject to change without notice. - -public final class RegistryRunner_Stub - extends java.rmi.server.RemoteStub - implements RemoteExiter, java.rmi.Remote -{ - private static final long serialVersionUID = 2; - - private static java.lang.reflect.Method $method_exit_0; - - static { - try { - $method_exit_0 = RemoteExiter.class.getMethod("exit", new java.lang.Class[] {}); - } catch (java.lang.NoSuchMethodException e) { - throw new java.lang.NoSuchMethodError( - "stub class initialization failed"); - } - } - - // constructors - public RegistryRunner_Stub(java.rmi.server.RemoteRef ref) { - super(ref); - } - - // methods from remote interfaces - - // implementation of exit() - public void exit() - throws java.rmi.RemoteException - { - try { - ref.invoke(this, $method_exit_0, null, -6307240473358936408L); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } -} diff --git a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java b/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java index 19d4d6cc808..359e971b002 100644 --- a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java +++ b/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,7 @@ public class CheckFQDN extends UnicastRemoteObject System.err.println ("\nRegression test for bug/rfe 4115683\n"); - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); REGISTRY_PORT = TestLibrary.getRegistryPort(registry); registry.bind("CheckFQDN", checkFQDN); diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java b/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java index b54cbfb3d2c..8e35c8b65a8 100644 --- a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java +++ b/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,6 +30,7 @@ * @library ../../testlibrary * @modules java.rmi/sun.rmi.registry * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport:open * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp * @build TestLibrary CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak @@ -90,7 +91,7 @@ public class CheckLeaseLeak extends UnicastRemoteObject implements LeaseLeak { try { Registry registry = - TestLibrary.createRegistryOnUnusedPort(); + TestLibrary.createRegistryOnEphemeralPort(); int registryPort = TestLibrary.getRegistryPort(registry); leakServer = new CheckLeaseLeak(); diff --git a/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java b/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java index fc7341f7be3..d99e967cc7f 100644 --- a/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java +++ b/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,12 +30,10 @@ * java.rmi.ConnectException or ConnectIOException, not a MarshalException. * @author Peter Jones * - * @library ../../testlibrary * @modules java.rmi/sun.rmi.registry * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary * @run main/othervm HandshakeFailure */ @@ -49,7 +47,6 @@ import java.rmi.registry.Registry; public class HandshakeFailure { - private static final int PORT = TestLibrary.getUnusedRandomPort(); private static final int TIMEOUT = 10000; public static void main(String[] args) throws Exception { @@ -57,12 +54,13 @@ public class HandshakeFailure { /* * Listen on port... */ - ServerSocket serverSocket = new ServerSocket(PORT); + ServerSocket serverSocket = new ServerSocket(0); + int port = serverSocket.getLocalPort(); /* * (Attempt RMI call to port in separate thread.) */ - Registry registry = LocateRegistry.getRegistry(PORT); + Registry registry = LocateRegistry.getRegistry(port); Connector connector = new Connector(registry); Thread t = new Thread(connector); t.setDaemon(true); @@ -93,7 +91,7 @@ public class HandshakeFailure { System.err.println(); if (connector.exception instanceof MarshalException) { - System.err.println( + throw new RuntimeException( "TEST FAILED: MarshalException thrown, expecting " + "java.rmi.ConnectException or ConnectIOException"); } else if (connector.exception instanceof ConnectException || diff --git a/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java b/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java index 7a20f20234c..d763b55c455 100644 --- a/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java +++ b/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,12 +33,10 @@ * this point (because no data for the invocation has yet been written). * @author Peter Jones * - * @library ../../testlibrary * @modules java.rmi/sun.rmi.registry * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp - * @build TestLibrary * @run main/othervm HandshakeTimeout */ @@ -51,7 +49,6 @@ import java.rmi.registry.Registry; public class HandshakeTimeout { - private static final int PORT = TestLibrary.getUnusedRandomPort(); private static final int TIMEOUT = 10000; public static void main(String[] args) throws Exception { @@ -62,12 +59,13 @@ public class HandshakeTimeout { /* * Listen on port, but never process connections made to it. */ - ServerSocket serverSocket = new ServerSocket(PORT); + ServerSocket serverSocket = new ServerSocket(0); + int port = serverSocket.getLocalPort(); /* * Attempt RMI call to port in separate thread. */ - Registry registry = LocateRegistry.getRegistry(PORT); + Registry registry = LocateRegistry.getRegistry(port); Connector connector = new Connector(registry); Thread t = new Thread(connector); t.setDaemon(true); @@ -91,7 +89,7 @@ public class HandshakeTimeout { System.err.println(); if (connector.exception instanceof MarshalException) { - System.err.println( + throw new RuntimeException( "TEST FAILED: MarshalException thrown, expecting " + "java.rmi.ConnectException or ConnectIOException"); } else if (connector.exception instanceof ConnectException || diff --git a/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java b/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java index 38c2e2a0042..5e2da339922 100644 --- a/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java +++ b/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,6 @@ import java.rmi.Remote; import java.rmi.server.UnicastRemoteObject; public class RapidExportUnexport { - private static final int PORT = TestLibrary.getUnusedRandomPort(); private static final int REPS = 100; private static final long TIMEOUT = 60000; @@ -55,7 +54,7 @@ public class RapidExportUnexport { long start = System.currentTimeMillis(); for (int i = 0; i < REPS; i++) { System.err.println(i); - UnicastRemoteObject.exportObject(impl, PORT); + UnicastRemoteObject.exportObject(impl, 0); UnicastRemoteObject.unexportObject(impl, true); Thread.sleep(1); // work around BindException (bug?) } diff --git a/jdk/test/java/security/Signature/NoProvider.java b/jdk/test/java/security/Signature/NoProvider.java new file mode 100644 index 00000000000..782f06f1759 --- /dev/null +++ b/jdk/test/java/security/Signature/NoProvider.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8165751 + * @summary Verify that that a subclass of Signature that does not contain a + * provider can be used to verify. + * @run main/othervm -Djava.security.debug=provider NoProvider + */ + +import java.security.*; + +public class NoProvider { + + private static class NoProviderPublicKey implements PublicKey { + + public String getAlgorithm() { + return "NoProvider"; + } + public String getFormat() { + return "none"; + } + public byte[] getEncoded() { + return new byte[1]; + } + } + + private static class NoProviderSignature extends Signature { + + public NoProviderSignature() { + super("NoProvider"); + } + + protected void engineInitVerify(PublicKey publicKey) + throws InvalidKeyException { + // do nothing + } + + protected void engineInitSign(PrivateKey privateKey) + throws InvalidKeyException { + // do nothing + } + + protected void engineUpdate(byte b) throws SignatureException { + // do nothing + } + + protected void engineUpdate(byte[] b, int off, int len) + throws SignatureException { + // do nothing + } + + protected byte[] engineSign() throws SignatureException { + return new byte[1]; + } + + protected boolean engineVerify(byte[] sigBytes) + throws SignatureException { + return false; + } + + @Deprecated + protected void engineSetParameter(String param, Object value) + throws InvalidParameterException { + // do nothing + } + + @Deprecated + protected Object engineGetParameter(String param) + throws InvalidParameterException { + return null; + } + } + + public static void main(String[] args) throws Exception { + new NoProviderSignature().initVerify(new NoProviderPublicKey()); + } +} diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java index 5cc0bdc67bc..b8071b05753 100644 --- a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java +++ b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ import java.text.SimpleDateFormat; import java.time.chrono.JapaneseDate; +import java.time.chrono.JapaneseEra; +import java.time.format.TextStyle; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -140,6 +142,27 @@ public class SupplementalJapaneseEraTest { System.err.printf("JapaneseDate: got=\"%s\", expected=\"%s\"%n", got, expected); errors++; } + JapaneseEra jera = jdate.getEra(); + got = jera.getDisplayName(TextStyle.FULL, Locale.US); + if (!NEW_ERA_NAME.equals(got)) { + System.err.printf("JapaneseEra (FULL): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_NAME); + errors++; + } + got = jera.getDisplayName(TextStyle.SHORT, Locale.US); + if (!NEW_ERA_NAME.equals(got)) { + System.err.printf("JapaneseEra (SHORT): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_NAME); + errors++; + } + got = jera.getDisplayName(TextStyle.NARROW, Locale.US); + if (!NEW_ERA_ABBR.equals(got)) { + System.err.printf("JapaneseEra (NARROW): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_ABBR); + errors++; + } + got = jera.getDisplayName(TextStyle.NARROW_STANDALONE, Locale.US); + if (!NEW_ERA_ABBR.equals(got)) { + System.err.printf("JapaneseEra (NARROW_STANDALONE): got=\"%s\", expected=\"%s\"%n", got, NEW_ERA_ABBR); + errors++; + } } private static void testValidation(String eraName) { diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh index ade093c734b..5feb37d2e36 100644 --- a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh +++ b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ # # @test -# @bug 8048123 +# @bug 8048123 8054214 # @summary Test for jdk.calendar.japanese.supplemental.era support # @build SupplementalJapaneseEraTest # @run shell SupplementalJapaneseEraTest.sh diff --git a/jdk/test/java/util/Map/Collisions.java b/jdk/test/java/util/Map/Collisions.java index 7b825fc9537..62f78a59698 100644 --- a/jdk/test/java/util/Map/Collisions.java +++ b/jdk/test/java/util/Map/Collisions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,427 +24,155 @@ /* * @test * @bug 7126277 - * @run main Collisions -shortrun + * @run testng/othervm -Dtest.map.collisions.shortrun=true Collisions * @summary Ensure Maps behave well with lots of hashCode() collisions. - * @author Mike Duigou */ -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListMap; +import java.util.BitSet; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.function.Supplier; -public class Collisions { +import org.testng.annotations.Test; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; - /** - * Number of elements per map. - */ - private static final int TEST_SIZE = 5000; +public class Collisions extends MapWithCollisionsProviders { - static final class HashableInteger implements Comparable { + @Test(dataProvider = "mapsWithObjects") + void testIntegerIteration(String desc, Supplier> ms, IntKey val) { + Map map = ms.get(); + int mapSize = map.size(); - final int value; - final int hashmask; //yes duplication - - HashableInteger(int value, int hashmask) { - this.value = value; - this.hashmask = hashmask; + BitSet all = new BitSet(mapSize); + for (Map.Entry each : map.entrySet()) { + assertFalse(all.get(each.getKey().getValue()), "Iteration: key already seen"); + all.set(each.getKey().getValue()); } - @Override - public boolean equals(Object obj) { - if (obj instanceof HashableInteger) { - HashableInteger other = (HashableInteger) obj; + all.flip(0, mapSize); + assertTrue(all.isEmpty(), "Iteration: some keys not visited"); - return other.value == value; - } - - return false; + for (IntKey each : map.keySet()) { + assertFalse(all.get(each.getValue()), "Iteration: key already seen"); + all.set(each.getValue()); } - @Override - public int hashCode() { - return value % hashmask; - } - - @Override - public int compareTo(HashableInteger o) { - return value - o.value; - } - - @Override - public String toString() { - return Integer.toString(value); - } - } - - private static Object[][] makeTestData(int size) { - HashableInteger UNIQUE_OBJECTS[] = new HashableInteger[size]; - HashableInteger COLLIDING_OBJECTS[] = new HashableInteger[size]; - String UNIQUE_STRINGS[] = new String[size]; - String COLLIDING_STRINGS[] = new String[size]; - - for (int i = 0; i < size; i++) { - UNIQUE_OBJECTS[i] = new HashableInteger(i, Integer.MAX_VALUE); - COLLIDING_OBJECTS[i] = new HashableInteger(i, 10); - UNIQUE_STRINGS[i] = unhash(i); - COLLIDING_STRINGS[i] = (0 == i % 2) - ? UNIQUE_STRINGS[i / 2] - : "\u0000\u0000\u0000\u0000\u0000" + COLLIDING_STRINGS[i - 1]; - } - - return new Object[][] { - new Object[]{"Unique Objects", UNIQUE_OBJECTS}, - new Object[]{"Colliding Objects", COLLIDING_OBJECTS}, - new Object[]{"Unique Strings", UNIQUE_STRINGS}, - new Object[]{"Colliding Strings", COLLIDING_STRINGS} - }; - } - - /** - * Returns a string with a hash equal to the argument. - * - * @return string with a hash equal to the argument. - */ - public static String unhash(int target) { - StringBuilder answer = new StringBuilder(); - if (target < 0) { - // String with hash of Integer.MIN_VALUE, 0x80000000 - answer.append("\\u0915\\u0009\\u001e\\u000c\\u0002"); - - if (target == Integer.MIN_VALUE) { - return answer.toString(); - } - // Find target without sign bit set - target = target & Integer.MAX_VALUE; - } - - unhash0(answer, target); - return answer.toString(); - } - - private static void unhash0(StringBuilder partial, int target) { - int div = target / 31; - int rem = target % 31; - - if (div <= Character.MAX_VALUE) { - if (div != 0) { - partial.append((char) div); - } - partial.append((char) rem); - } else { - unhash0(partial, div); - partial.append((char) rem); - } - } - - private static void realMain(String[] args) throws Throwable { - boolean shortRun = args.length > 0 && args[0].equals("-shortrun"); - - Object[][] mapKeys = makeTestData(shortRun ? (TEST_SIZE / 2) : TEST_SIZE); - - // loop through data sets - for (Object[] keys_desc : mapKeys) { - Map[] maps = (Map[]) new Map[]{ - new HashMap<>(), - new Hashtable<>(), - new IdentityHashMap<>(), - new LinkedHashMap<>(), - new TreeMap<>(), - new WeakHashMap<>(), - new ConcurrentHashMap<>(), - new ConcurrentSkipListMap<>() - }; - - // for each map type. - for (Map map : maps) { - String desc = (String) keys_desc[0]; - Object[] keys = (Object[]) keys_desc[1]; - try { - testMap(map, desc, keys); - } catch(Exception all) { - unexpected("Failed for " + map.getClass().getName() + " with " + desc, all); - } - } - } - } - - private static void testMap(Map map, String keys_desc, T[] keys) { - System.out.println(map.getClass() + " : " + keys_desc); - System.out.flush(); - testInsertion(map, keys_desc, keys); - - if (keys[0] instanceof HashableInteger) { - testIntegerIteration((Map) map, (HashableInteger[]) keys); - } else { - testStringIteration((Map) map, (String[]) keys); - } - - testContainsKey(map, keys_desc, keys); - - testRemove(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testKeysIteratorRemove(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testValuesIteratorRemove(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testEntriesIteratorRemove(map, keys_desc, keys); - - check(map.isEmpty()); - } - - private static void testInsertion(Map map, String keys_desc, T[] keys) { - check(map.size() == 0 && map.isEmpty(), "map empty"); - - for (int i = 0; i < keys.length; i++) { - check(map.size() == i, "insertion: map expected size m%d != i%d", map.size(), i); - check(null == map.put(keys[i], keys[i]), "insertion: put(%s[%d])", keys_desc, i); - check(map.containsKey(keys[i]), "insertion: containsKey(%s[%d])", keys_desc, i); - check(map.containsValue(keys[i]), "insertion: containsValue(%s[%d])", keys_desc, i); - } - - check(map.size() == keys.length, "map expected size m%d != k%d", map.size(), keys.length); - } - - private static void testIntegerIteration(Map map, HashableInteger[] keys) { - check(map.size() == keys.length, "map expected size m%d != k%d", map.size(), keys.length); - - BitSet all = new BitSet(keys.length); - for (Map.Entry each : map.entrySet()) { - check(!all.get(each.getKey().value), "Iteration: key already seen"); - all.set(each.getKey().value); - } - - all.flip(0, keys.length); - check(all.isEmpty(), "Iteration: some keys not visited"); - - for (HashableInteger each : map.keySet()) { - check(!all.get(each.value), "Iteration: key already seen"); - all.set(each.value); - } - - all.flip(0, keys.length); - check(all.isEmpty(), "Iteration: some keys not visited"); + all.flip(0, mapSize); + assertTrue(all.isEmpty(), "Iteration: some keys not visited"); int count = 0; - for (HashableInteger each : map.values()) { + for (IntKey each : map.values()) { count++; } - check(map.size() == count, "Iteration: value count matches size m%d != c%d", map.size(), count); + assertEquals(map.size(), count, + String.format("Iteration: value count matches size m%d != c%d", map.size(), count)); } - private static void testStringIteration(Map map, String[] keys) { - check(map.size() == keys.length, "map expected size m%d != k%d", map.size(), keys.length); + @Test(dataProvider = "mapsWithStrings") + void testStringIteration(String desc, Supplier> ms, String val) { + Map map = ms.get(); + int mapSize = map.size(); - BitSet all = new BitSet(keys.length); + BitSet all = new BitSet(mapSize); for (Map.Entry each : map.entrySet()) { String key = each.getKey(); boolean longKey = key.length() > 5; - int index = key.hashCode() + (longKey ? keys.length / 2 : 0); - check(!all.get(index), "key already seen"); + int index = key.hashCode() + (longKey ? mapSize / 2 : 0); + assertFalse(all.get(index), "key already seen"); all.set(index); } - all.flip(0, keys.length); - check(all.isEmpty(), "some keys not visited"); + all.flip(0, mapSize); + assertTrue(all.isEmpty(), "some keys not visited"); for (String each : map.keySet()) { boolean longKey = each.length() > 5; - int index = each.hashCode() + (longKey ? keys.length / 2 : 0); - check(!all.get(index), "key already seen"); + int index = each.hashCode() + (longKey ? mapSize / 2 : 0); + assertFalse(all.get(index), "key already seen"); all.set(index); } - all.flip(0, keys.length); - check(all.isEmpty(), "some keys not visited"); + all.flip(0, mapSize); + assertTrue(all.isEmpty(), "some keys not visited"); int count = 0; for (String each : map.values()) { count++; } - check(map.size() == keys.length, "value count matches size m%d != k%d", map.size(), keys.length); + assertEquals(map.size(), mapSize, + String.format("value count matches size m%d != k%d", map.size(), mapSize)); } - private static void testContainsKey(Map map, String keys_desc, T[] keys) { - for (int i = 0; i < keys.length; i++) { - T each = keys[i]; - check(map.containsKey(each), "containsKey: %s[%d]%s", keys_desc, i, each); - } - } - - private static void testRemove(Map map, String keys_desc, T[] keys) { - check(map.size() == keys.length, "remove: map expected size m%d != k%d", map.size(), keys.length); + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testRemove(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); for (int i = 0; i < keys.length; i++) { - T each = keys[i]; - check(null != map.remove(each), "remove: %s[%d]%s", keys_desc, i, each); + Object each = keys[i]; + assertNotNull(map.remove(each), + String.format("remove: %s[%d]%s", desc, i, each)); } - check(map.size() == 0 && map.isEmpty(), "remove: map empty. size=%d", map.size()); + assertTrue(map.size() == 0 && map.isEmpty(), + String.format("remove: map empty. size=%d", map.size())); } - private static void testKeysIteratorRemove(Map map, String keys_desc, T[] keys) { - check(map.size() == keys.length, "remove: map expected size m%d != k%d", map.size(), keys.length); + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testKeysIteratorRemove(String desc, Supplier> ms, Object val) { + Map map = ms.get(); - Iterator each = map.keySet().iterator(); + Iterator each = map.keySet().iterator(); while (each.hasNext()) { - T t = each.next(); + Object t = each.next(); each.remove(); - check(!map.containsKey(t), "not removed: %s", each); + assertFalse(map.containsKey(t), String.format("not removed: %s", each)); } - check(map.size() == 0 && map.isEmpty(), "remove: map empty. size=%d", map.size()); + assertTrue(map.size() == 0 && map.isEmpty(), + String.format("remove: map empty. size=%d", map.size())); } - private static void testValuesIteratorRemove(Map map, String keys_desc, T[] keys) { - check(map.size() == keys.length, "remove: map expected size m%d != k%d", map.size(), keys.length); + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testValuesIteratorRemove(String desc, Supplier> ms, Object val) { + Map map = ms.get(); - Iterator each = map.values().iterator(); + Iterator each = map.values().iterator(); while (each.hasNext()) { - T t = each.next(); + Object t = each.next(); each.remove(); - check(!map.containsValue(t), "not removed: %s", each); + assertFalse(map.containsValue(t), String.format("not removed: %s", each)); } - check(map.size() == 0 && map.isEmpty(), "remove: map empty. size=%d", map.size()); + assertTrue(map.size() == 0 && map.isEmpty(), + String.format("remove: map empty. size=%d", map.size())); } - private static void testEntriesIteratorRemove(Map map, String keys_desc, T[] keys) { - check(map.size() == keys.length, "remove: map expected size m%d != k%d", map.size(), keys.length); + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testEntriesIteratorRemove(String desc, Supplier> ms, Object val) { + Map map = ms.get(); - Iterator> each = map.entrySet().iterator(); + Iterator> each = map.entrySet().iterator(); while (each.hasNext()) { - Map.Entry t = each.next(); - T key = t.getKey(); - T value = t.getValue(); + Map.Entry t = each.next(); + Object key = t.getKey(); + Object value = t.getValue(); each.remove(); - check((map instanceof IdentityHashMap) || !map.entrySet().contains(t), "not removed: %s", each); - check(!map.containsKey(key), "not removed: %s", each); - check(!map.containsValue(value), "not removed: %s", each); + assertTrue((map instanceof IdentityHashMap) || !map.entrySet().contains(t), + String.format("not removed: %s", each)); + assertFalse(map.containsKey(key), + String.format("not removed: %s", each)); + assertFalse(map.containsValue(value), + String.format("not removed: %s", each)); } - check(map.size() == 0 && map.isEmpty(), "remove: map empty. size=%d", map.size()); + assertTrue(map.size() == 0 && map.isEmpty(), + String.format("remove: map empty. size=%d", map.size())); } - //--------------------- Infrastructure --------------------------- - static volatile int passed = 0, failed = 0; - - static void pass() { - passed++; - } - - static void fail() { - failed++; - (new Error("Failure")).printStackTrace(System.err); - } - - static void fail(String msg) { - failed++; - (new Error("Failure: " + msg)).printStackTrace(System.err); - } - - static void abort() { - fail(); - System.exit(1); - } - - static void abort(String msg) { - fail(msg); - System.exit(1); - } - - static void unexpected(String msg, Throwable t) { - System.err.println("Unexpected: " + msg); - unexpected(t); - } - - static void unexpected(Throwable t) { - failed++; - t.printStackTrace(System.err); - } - - static void check(boolean cond) { - if (cond) { - pass(); - } else { - fail(); - } - } - - static void check(boolean cond, String desc) { - if (cond) { - pass(); - } else { - fail(desc); - } - } - - static void check(boolean cond, String fmt, int i) { - if (cond) { - pass(); - } else { - fail(String.format(fmt, i)); - } - } - - static void check(boolean cond, String fmt, Object o) { - if (cond) { - pass(); - } else { - fail(String.format(fmt, o)); - } - } - - static void check(boolean cond, String fmt, int i1, int i2) { - if (cond) { - pass(); - } else { - fail(String.format(fmt, i1, i2)); - } - } - - static void check(boolean cond, String fmt, String s, int i) { - if (cond) { - pass(); - } else { - fail(String.format(fmt, s, i)); - } - } - - static void check(boolean cond, String fmt, String s, int i, Object o) { - if (cond) { - pass(); - } else { - fail(String.format(fmt, s, i, o)); - } - } - - static void equal(Object x, Object y) { - if (Objects.equals(x, y)) { - pass(); - } else { - fail(x + " not equal to " + y); - } - } - - public static void main(String[] args) throws Throwable { - Thread.currentThread().setName(Collisions.class.getName()); -// Thread.currentThread().setPriority(Thread.MAX_PRIORITY); - try { - realMain(args); - } catch (Throwable t) { - unexpected(t); - } - - System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); - if (failed > 0) { - throw new Error("Some tests failed"); - } - } } diff --git a/jdk/test/java/util/Map/InPlaceOpsCollisions.java b/jdk/test/java/util/Map/InPlaceOpsCollisions.java index c368d83af13..22ac0c24c09 100644 --- a/jdk/test/java/util/Map/InPlaceOpsCollisions.java +++ b/jdk/test/java/util/Map/InPlaceOpsCollisions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,325 +24,162 @@ /* * @test * @bug 8005698 - * @run main InPlaceOpsCollisions -shortrun + * @run testng/othervm -Dtest.map.collisions.shortrun=true InPlaceOpsCollisions * @summary Ensure overrides of in-place operations in Maps behave well with lots of collisions. - * @author Brent Christian */ -import java.util.*; -import java.util.function.*; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Supplier; -public class InPlaceOpsCollisions { +import org.testng.annotations.Test; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; - /** - * Number of elements per map. - */ - private static final int TEST_SIZE = 5000; +public class InPlaceOpsCollisions extends MapWithCollisionsProviders { - static final class HashableInteger implements Comparable { - - final int value; - final int hashmask; //yes duplication - - HashableInteger(int value, int hashmask) { - this.value = value; - this.hashmask = hashmask; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof HashableInteger) { - HashableInteger other = (HashableInteger) obj; - - return other.value == value; - } - - return false; - } - - @Override - public int hashCode() { - return value % hashmask; - } - - @Override - public int compareTo(HashableInteger o) { - return value - o.value; - } - - @Override - public String toString() { - return Integer.toString(value); - } - } - - static HashableInteger EXTRA_INT_VAL; - static String EXTRA_STRING_VAL; - - private static Object[][] makeTestData(int size) { - HashableInteger UNIQUE_OBJECTS[] = new HashableInteger[size]; - HashableInteger COLLIDING_OBJECTS[] = new HashableInteger[size]; - String UNIQUE_STRINGS[] = new String[size]; - String COLLIDING_STRINGS[] = new String[size]; - - for (int i = 0; i < size; i++) { - UNIQUE_OBJECTS[i] = new HashableInteger(i, Integer.MAX_VALUE); - COLLIDING_OBJECTS[i] = new HashableInteger(i, 10); - UNIQUE_STRINGS[i] = unhash(i); - COLLIDING_STRINGS[i] = (0 == i % 2) - ? UNIQUE_STRINGS[i / 2] - : "\u0000\u0000\u0000\u0000\u0000" + COLLIDING_STRINGS[i - 1]; - } - EXTRA_INT_VAL = new HashableInteger(size, Integer.MAX_VALUE); - EXTRA_STRING_VAL = new String ("Extra Value"); - - return new Object[][] { - new Object[]{"Unique Objects", UNIQUE_OBJECTS}, - new Object[]{"Colliding Objects", COLLIDING_OBJECTS}, - new Object[]{"Unique Strings", UNIQUE_STRINGS}, - new Object[]{"Colliding Strings", COLLIDING_STRINGS} - }; - } - - /** - * Returns a string with a hash equal to the argument. - * - * @return string with a hash equal to the argument. - */ - public static String unhash(int target) { - StringBuilder answer = new StringBuilder(); - if (target < 0) { - // String with hash of Integer.MIN_VALUE, 0x80000000 - answer.append("\\u0915\\u0009\\u001e\\u000c\\u0002"); - - if (target == Integer.MIN_VALUE) { - return answer.toString(); - } - // Find target without sign bit set - target = target & Integer.MAX_VALUE; - } - - unhash0(answer, target); - return answer.toString(); - } - - private static void unhash0(StringBuilder partial, int target) { - int div = target / 31; - int rem = target % 31; - - if (div <= Character.MAX_VALUE) { - if (div != 0) { - partial.append((char) div); - } - partial.append((char) rem); - } else { - unhash0(partial, div); - partial.append((char) rem); - } - } - - private static void realMain(String[] args) throws Throwable { - boolean shortRun = args.length > 0 && args[0].equals("-shortrun"); - - Object[][] mapKeys = makeTestData(shortRun ? (TEST_SIZE / 2) : TEST_SIZE); - - // loop through data sets - for (Object[] keys_desc : mapKeys) { - Map[] maps = (Map[]) new Map[]{ - new HashMap<>(), - new LinkedHashMap<>(), - }; - - // for each map type. - for (Map map : maps) { - String desc = (String) keys_desc[0]; - Object[] keys = (Object[]) keys_desc[1]; - try { - testInPlaceOps(map, desc, keys); - } catch(Exception all) { - unexpected("Failed for " + map.getClass().getName() + " with " + desc, all); - } - } - } - } - - private static void testInsertion(Map map, String keys_desc, T[] keys) { - check("map empty", (map.size() == 0) && map.isEmpty()); - - for (int i = 0; i < keys.length; i++) { - check(String.format("insertion: map expected size m%d != i%d", map.size(), i), - map.size() == i); - check(String.format("insertion: put(%s[%d])", keys_desc, i), null == map.put(keys[i], keys[i])); - check(String.format("insertion: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); - check(String.format("insertion: containsValue(%s[%d])", keys_desc, i), map.containsValue(keys[i])); - } - - check(String.format("map expected size m%d != k%d", map.size(), keys.length), - map.size() == keys.length); - } - - - private static void testInPlaceOps(Map map, String keys_desc, T[] keys) { - System.out.println(map.getClass() + " : " + keys_desc + ", testInPlaceOps"); - System.out.flush(); - - testInsertion(map, keys_desc, keys); - testPutIfAbsent(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testRemoveMapping(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testReplaceOldValue(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testReplaceIfMapped(map, keys_desc, keys); - - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeIfAbsent(map, keys_desc, keys, (k) -> getExtraVal(keys[0])); - - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeIfAbsent(map, keys_desc, keys, (k) -> null); - - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeIfPresent(map, keys_desc, keys, (k, v) -> getExtraVal(keys[0])); - - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeIfPresent(map, keys_desc, keys, (k, v) -> null); - - if (!keys_desc.contains("Strings")) { // avoid parseInt() number format error - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeNonNull(map, keys_desc, keys); - } - - map.clear(); - testInsertion(map, keys_desc, keys); - testComputeNull(map, keys_desc, keys); - - if (!keys_desc.contains("Strings")) { // avoid parseInt() number format error - map.clear(); - testInsertion(map, keys_desc, keys); - testMergeNonNull(map, keys_desc, keys); - } - - map.clear(); - testInsertion(map, keys_desc, keys); - testMergeNull(map, keys_desc, keys); - } - - - - private static void testPutIfAbsent(Map map, String keys_desc, T[] keys) { - T extraVal = getExtraVal(keys[0]); - T retVal; + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testPutIfAbsent(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + Object retVal; removeOddKeys(map, keys); for (int i = 0; i < keys.length; i++) { - retVal = map.putIfAbsent(keys[i], extraVal); + retVal = map.putIfAbsent(keys[i], val); if (i % 2 == 0) { // even: not absent, not put - check(String.format("putIfAbsent: (%s[%d]) retVal", keys_desc, i), retVal == keys[i]); - check(String.format("putIfAbsent: get(%s[%d])", keys_desc, i), keys[i] == map.get(keys[i])); - check(String.format("putIfAbsent: containsValue(%s[%d])", keys_desc, i), map.containsValue(keys[i])); + + assertEquals(retVal, keys[i], + String.format("putIfAbsent: (%s[%d]) retVal", desc, i)); + assertEquals(keys[i], map.get(keys[i]), + String.format("putIfAbsent: get(%s[%d])", desc, i)); + assertTrue(map.containsValue(keys[i]), + String.format("putIfAbsent: containsValue(%s[%d])", desc, i)); } else { // odd: absent, was put - check(String.format("putIfAbsent: (%s[%d]) retVal", keys_desc, i), retVal == null); - check(String.format("putIfAbsent: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); - check(String.format("putIfAbsent: !containsValue(%s[%d])", keys_desc, i), !map.containsValue(keys[i])); + assertNull(retVal, + String.format("putIfAbsent: (%s[%d]) retVal", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("putIfAbsent: get(%s[%d])", desc, i)); + assertFalse(map.containsValue(keys[i]), + String.format("putIfAbsent: !containsValue(%s[%d])", desc, i)); } - check(String.format("insertion: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertTrue(map.containsKey(keys[i]), + String.format("insertion: containsKey(%s[%d])", desc, i)); } - check(String.format("map expected size m%d != k%d", map.size(), keys.length), - map.size() == keys.length); + assertEquals(map.size(), keys.length, + String.format("map expected size m%d != k%d", map.size(), keys.length)); } - private static void testRemoveMapping(Map map, String keys_desc, T[] keys) { - T extraVal = getExtraVal(keys[0]); + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testRemoveMapping(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); boolean removed; int removes = 0; - remapOddKeys(map, keys); + remapOddKeys(map, keys, val); for (int i = 0; i < keys.length; i++) { removed = map.remove(keys[i], keys[i]); if (i % 2 == 0) { // even: original mapping, should be removed - check(String.format("removeMapping: retVal(%s[%d])", keys_desc, i), removed); - check(String.format("removeMapping: get(%s[%d])", keys_desc, i), null == map.get(keys[i])); - check(String.format("removeMapping: !containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); - check(String.format("removeMapping: !containsValue(%s[%d])", keys_desc, i), !map.containsValue(keys[i])); + assertTrue(removed, + String.format("removeMapping: retVal(%s[%d])", desc, i)); + assertNull(map.get(keys[i]), + String.format("removeMapping: get(%s[%d])", desc, i)); + assertFalse(map.containsKey(keys[i]), + String.format("removeMapping: !containsKey(%s[%d])", desc, i)); + assertFalse(map.containsValue(keys[i]), + String.format("removeMapping: !containsValue(%s[%d])", desc, i)); removes++; } else { // odd: new mapping, not removed - check(String.format("removeMapping: retVal(%s[%d])", keys_desc, i), !removed); - check(String.format("removeMapping: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); - check(String.format("removeMapping: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); - check(String.format("removeMapping: containsValue(%s[%d])", keys_desc, i), map.containsValue(extraVal)); + assertFalse(removed, + String.format("removeMapping: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("removeMapping: get(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("removeMapping: containsKey(%s[%d])", desc, i)); + assertTrue(map.containsValue(val), + String.format("removeMapping: containsValue(%s[%d])", desc, i)); } } - check(String.format("map expected size m%d != k%d", map.size(), keys.length - removes), - map.size() == keys.length - removes); + assertEquals(map.size(), keys.length - removes, + String.format("map expected size m%d != k%d", map.size(), keys.length - removes)); } - private static void testReplaceOldValue(Map map, String keys_desc, T[] keys) { - // remap odds to extraVal - // call replace to replace for extraVal, for all keys + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testReplaceOldValue(String desc, Supplier> ms, Object val) { + // remap odds to val + // call replace to replace for val, for all keys // check that all keys map to value from keys array - T extraVal = getExtraVal(keys[0]); + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); boolean replaced; - remapOddKeys(map, keys); + remapOddKeys(map, keys, val); for (int i = 0; i < keys.length; i++) { - replaced = map.replace(keys[i], extraVal, keys[i]); + replaced = map.replace(keys[i], val, keys[i]); if (i % 2 == 0) { // even: original mapping, should not be replaced - check(String.format("replaceOldValue: retVal(%s[%d])", keys_desc, i), !replaced); + assertFalse(replaced, + String.format("replaceOldValue: retVal(%s[%d])", desc, i)); } else { // odd: new mapping, should be replaced - check(String.format("replaceOldValue: get(%s[%d])", keys_desc, i), replaced); + assertTrue(replaced, + String.format("replaceOldValue: get(%s[%d])", desc, i)); } - check(String.format("replaceOldValue: get(%s[%d])", keys_desc, i), keys[i] == map.get(keys[i])); - check(String.format("replaceOldValue: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); - check(String.format("replaceOldValue: containsValue(%s[%d])", keys_desc, i), map.containsValue(keys[i])); -// removes++; + assertEquals(keys[i], map.get(keys[i]), + String.format("replaceOldValue: get(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("replaceOldValue: containsKey(%s[%d])", desc, i)); + assertTrue(map.containsValue(keys[i]), + String.format("replaceOldValue: containsValue(%s[%d])", desc, i)); } - check(String.format("replaceOldValue: !containsValue(%s[%s])", keys_desc, extraVal.toString()), !map.containsValue(extraVal)); - check(String.format("map expected size m%d != k%d", map.size(), keys.length), - map.size() == keys.length); + assertFalse(map.containsValue(val), + String.format("replaceOldValue: !containsValue(%s[%s])", desc, val)); + assertEquals(map.size(), keys.length, + String.format("map expected size m%d != k%d", map.size(), keys.length)); } - // TODO: Test case for key mapped to null value - private static void testReplaceIfMapped(Map map, String keys_desc, T[] keys) { + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testReplaceIfMapped(String desc, Supplier> ms, Object val) { // remove odd keys // call replace for all keys[] // odd keys should remain absent, even keys should be mapped to EXTRA, no value from keys[] should be in map - T extraVal = getExtraVal(keys[0]); + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); int expectedSize1 = 0; removeOddKeys(map, keys); int expectedSize2 = map.size(); for (int i = 0; i < keys.length; i++) { - T retVal = map.replace(keys[i], extraVal); + Object retVal = map.replace(keys[i], val); if (i % 2 == 0) { // even: still in map, should be replaced - check(String.format("replaceIfMapped: retVal(%s[%d])", keys_desc, i), retVal == keys[i]); - check(String.format("replaceIfMapped: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); - check(String.format("replaceIfMapped: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertEquals(retVal, keys[i], + String.format("replaceIfMapped: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("replaceIfMapped: get(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("replaceIfMapped: containsKey(%s[%d])", desc, i)); expectedSize1++; } else { // odd: was removed, should not be replaced - check(String.format("replaceIfMapped: retVal(%s[%d])", keys_desc, i), retVal == null); - check(String.format("replaceIfMapped: get(%s[%d])", keys_desc, i), null == map.get(keys[i])); - check(String.format("replaceIfMapped: containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); + assertNull(retVal, + String.format("replaceIfMapped: retVal(%s[%d])", desc, i)); + assertNull(map.get(keys[i]), + String.format("replaceIfMapped: get(%s[%d])", desc, i)); + assertFalse(map.containsKey(keys[i]), + String.format("replaceIfMapped: containsKey(%s[%d])", desc, i)); } - check(String.format("replaceIfMapped: !containsValue(%s[%d])", keys_desc, i), !map.containsValue(keys[i])); + assertFalse(map.containsValue(keys[i]), + String.format("replaceIfMapped: !containsValue(%s[%d])", desc, i)); } - check(String.format("replaceIfMapped: containsValue(%s[%s])", keys_desc, extraVal.toString()), map.containsValue(extraVal)); - check(String.format("map expected size#1 m%d != k%d", map.size(), expectedSize1), - map.size() == expectedSize1); - check(String.format("map expected size#2 m%d != k%d", map.size(), expectedSize2), - map.size() == expectedSize2); + assertTrue(map.containsValue(val), + String.format("replaceIfMapped: containsValue(%s[%s])", desc, val)); + assertEquals(map.size(), expectedSize1, + String.format("map expected size#1 m%d != k%d", map.size(), expectedSize1)); + assertEquals(map.size(), expectedSize2, + String.format("map expected size#2 m%d != k%d", map.size(), expectedSize2)); } - private static void testComputeIfAbsent(Map map, String keys_desc, T[] keys, - Function mappingFunction) { + private static void testComputeIfAbsent(Map map, String desc, T[] keys, + Function mappingFunction) { // remove a third of the keys // call computeIfAbsent for all keys, func returns EXTRA // check that removed keys now -> EXTRA, other keys -> original val @@ -353,29 +190,54 @@ public class InPlaceOpsCollisions { for (int i = 0; i < keys.length; i++) { retVal = map.computeIfAbsent(keys[i], mappingFunction); if (i % 3 != 2) { // key present, not computed - check(String.format("computeIfAbsent: (%s[%d]) retVal", keys_desc, i), retVal == keys[i]); - check(String.format("computeIfAbsent: get(%s[%d])", keys_desc, i), keys[i] == map.get(keys[i])); - check(String.format("computeIfAbsent: containsValue(%s[%d])", keys_desc, i), map.containsValue(keys[i])); - check(String.format("insertion: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertEquals(retVal, keys[i], + String.format("computeIfAbsent: (%s[%d]) retVal", desc, i)); + assertEquals(keys[i], map.get(keys[i]), + String.format("computeIfAbsent: get(%s[%d])", desc, i)); + assertTrue(map.containsValue(keys[i]), + String.format("computeIfAbsent: containsValue(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("insertion: containsKey(%s[%d])", desc, i)); expectedSize++; } else { // key absent, computed unless function return null - check(String.format("computeIfAbsent: (%s[%d]) retVal", keys_desc, i), retVal == expectedVal); - check(String.format("computeIfAbsent: get(%s[%d])", keys_desc, i), expectedVal == map.get(keys[i])); - check(String.format("computeIfAbsent: !containsValue(%s[%d])", keys_desc, i), !map.containsValue(keys[i])); + assertEquals(retVal, expectedVal, + String.format("computeIfAbsent: (%s[%d]) retVal", desc, i)); + assertEquals(expectedVal, map.get(keys[i]), + String.format("computeIfAbsent: get(%s[%d])", desc, i)); + assertFalse(map.containsValue(keys[i]), + String.format("computeIfAbsent: !containsValue(%s[%d])", desc, i)); // mapping should not be added if function returns null - check(String.format("insertion: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i]) != (expectedVal == null)); - if (expectedVal != null) { expectedSize++; } + assertTrue(map.containsKey(keys[i]) != (expectedVal == null), + String.format("insertion: containsKey(%s[%d])", desc, i)); + if (expectedVal != null) { + expectedSize++; + } } } if (expectedVal != null) { - check(String.format("computeIfAbsent: containsValue(%s[%s])", keys_desc, expectedVal), map.containsValue(expectedVal)); + assertTrue(map.containsValue(expectedVal), + String.format("computeIfAbsent: containsValue(%s[%s])", desc, expectedVal)); } - check(String.format("map expected size m%d != k%d", map.size(), expectedSize), - map.size() == expectedSize); + assertEquals(map.size(), expectedSize, + String.format("map expected size m%d != k%d", map.size(), expectedSize)); } - private static void testComputeIfPresent(Map map, String keys_desc, T[] keys, - BiFunction mappingFunction) { + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testComputeIfAbsentNonNull(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + testComputeIfAbsent(map, desc, keys, (k) -> val); + } + + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testComputeIfAbsentNull(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + testComputeIfAbsent(map, desc, keys, (k) -> null); + } + + private static void testComputeIfPresent(Map map, String desc, T[] keys, + BiFunction mappingFunction) { // remove a third of the keys // call testComputeIfPresent for all keys[] // removed keys should remain absent, even keys should be mapped to $RESULT @@ -388,156 +250,205 @@ public class InPlaceOpsCollisions { T retVal = map.computeIfPresent(keys[i], mappingFunction); if (i % 3 != 2) { // key present if (funcResult == null) { // was removed - check(String.format("replaceIfMapped: containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); + assertFalse(map.containsKey(keys[i]), + String.format("replaceIfMapped: containsKey(%s[%d])", desc, i)); } else { // value was replaced - check(String.format("replaceIfMapped: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertTrue(map.containsKey(keys[i]), + String.format("replaceIfMapped: containsKey(%s[%d])", desc, i)); expectedSize1++; } - check(String.format("computeIfPresent: retVal(%s[%s])", keys_desc, i), retVal == funcResult); - check(String.format("replaceIfMapped: get(%s[%d])", keys_desc, i), funcResult == map.get(keys[i])); + assertEquals(retVal, funcResult, + String.format("computeIfPresent: retVal(%s[%s])", desc, i)); + assertEquals(funcResult, map.get(keys[i]), + String.format("replaceIfMapped: get(%s[%d])", desc, i)); } else { // odd: was removed, should not be replaced - check(String.format("replaceIfMapped: retVal(%s[%d])", keys_desc, i), retVal == null); - check(String.format("replaceIfMapped: get(%s[%d])", keys_desc, i), null == map.get(keys[i])); - check(String.format("replaceIfMapped: containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); + assertNull(retVal, + String.format("replaceIfMapped: retVal(%s[%d])", desc, i)); + assertNull(map.get(keys[i]), + String.format("replaceIfMapped: get(%s[%d])", desc, i)); + assertFalse(map.containsKey(keys[i]), + String.format("replaceIfMapped: containsKey(%s[%d])", desc, i)); } - check(String.format("replaceIfMapped: !containsValue(%s[%d])", keys_desc, i), !map.containsValue(keys[i])); + assertFalse(map.containsValue(keys[i]), + String.format("replaceIfMapped: !containsValue(%s[%d])", desc, i)); } - check(String.format("map expected size#1 m%d != k%d", map.size(), expectedSize1), - map.size() == expectedSize1); + assertEquals(map.size(), expectedSize1, + String.format("map expected size#1 m%d != k%d", map.size(), expectedSize1)); } - private static void testComputeNonNull(Map map, String keys_desc, T[] keys) { + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testComputeIfPresentNonNull(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + testComputeIfPresent(map, desc, keys, (k, v) -> val); + } + + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testComputeIfPresentNull(String desc, Supplier> ms, Object val) { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + testComputeIfPresent(map, desc, keys, (k, v) -> null); + } + + @Test(dataProvider = "hashMapsWithObjects") + void testComputeNonNull(String desc, Supplier> ms, IntKey val) { // remove a third of the keys // call compute() for all keys[] // all keys should be present: removed keys -> EXTRA, others to k-1 - BiFunction mappingFunction = (k, v) -> { - if (v == null) { - return getExtraVal(keys[0]); - } else { - return keys[Integer.parseInt(k.toString()) - 1]; - } - }; - T extraVal = getExtraVal(keys[0]); + Map map = ms.get(); + IntKey[] keys = map.keySet().stream().sorted().toArray(IntKey[]::new); + BiFunction mappingFunction = (k, v) -> { + if (v == null) { + return val; + } else { + return keys[k.getValue() - 1]; + } + }; removeThirdKeys(map, keys); for (int i = 1; i < keys.length; i++) { - T retVal = map.compute(keys[i], mappingFunction); + IntKey retVal = map.compute(keys[i], mappingFunction); if (i % 3 != 2) { // key present, should be mapped to k-1 - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == keys[i-1]); - check(String.format("compute: get(%s[%d])", keys_desc, i), keys[i-1] == map.get(keys[i])); + assertEquals(retVal, keys[i - 1], + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(keys[i - 1], map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); } else { // odd: was removed, should be replaced with EXTRA - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == extraVal); - check(String.format("compute: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); + assertEquals(retVal, val, + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); } - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertTrue(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); } - check(String.format("map expected size#1 m%d != k%d", map.size(), keys.length), - map.size() == keys.length); - check(String.format("compute: containsValue(%s[%s])", keys_desc, extraVal.toString()), map.containsValue(extraVal)); - check(String.format("compute: !containsValue(%s,[null])", keys_desc), !map.containsValue(null)); + assertEquals(map.size(), keys.length, + String.format("map expected size#1 m%d != k%d", map.size(), keys.length)); + assertTrue(map.containsValue(val), + String.format("compute: containsValue(%s[%s])", desc, val)); + assertFalse(map.containsValue(null), + String.format("compute: !containsValue(%s,[null])", desc)); } - private static void testComputeNull(Map map, String keys_desc, T[] keys) { + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testComputeNull(String desc, Supplier> ms, Object val) { // remove a third of the keys // call compute() for all keys[] // removed keys should -> EXTRA // for other keys: func returns null, should have no mapping - BiFunction mappingFunction = (k, v) -> { + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + BiFunction mappingFunction = (k, v) -> { // if absent/null -> EXTRA // if present -> null if (v == null) { - return getExtraVal(keys[0]); + return val; } else { return null; } }; - T extraVal = getExtraVal(keys[0]); int expectedSize = 0; removeThirdKeys(map, keys); for (int i = 0; i < keys.length; i++) { - T retVal = map.compute(keys[i], mappingFunction); + Object retVal = map.compute(keys[i], mappingFunction); if (i % 3 != 2) { // key present, func returned null, should be absent from map - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == null); - check(String.format("compute: get(%s[%d])", keys_desc, i), null == map.get(keys[i])); - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); - check(String.format("compute: containsValue(%s[%s])", keys_desc, i), !map.containsValue(keys[i])); + assertNull(retVal, + String.format("compute: retVal(%s[%d])", desc, i)); + assertNull(map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); + assertFalse(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); + assertFalse(map.containsValue(keys[i]), + String.format("compute: containsValue(%s[%s])", desc, i)); } else { // odd: was removed, should now be mapped to EXTRA - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == extraVal); - check(String.format("compute: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertEquals(retVal, val, + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); expectedSize++; } } - check(String.format("compute: containsValue(%s[%s])", keys_desc, extraVal.toString()), map.containsValue(extraVal)); - check(String.format("map expected size#1 m%d != k%d", map.size(), expectedSize), - map.size() == expectedSize); + assertTrue(map.containsValue(val), + String.format("compute: containsValue(%s[%s])", desc, val)); + assertEquals(map.size(), expectedSize, + String.format("map expected size#1 m%d != k%d", map.size(), expectedSize)); } - private static void testMergeNonNull(Map map, String keys_desc, T[] keys) { + @Test(dataProvider = "hashMapsWithObjects") + void testMergeNonNull(String desc, Supplier> ms, IntKey val) { // remove a third of the keys // call merge() for all keys[] // all keys should be present: removed keys now -> EXTRA, other keys -> k-1 + Map map = ms.get(); + IntKey[] keys = map.keySet().stream().sorted().toArray(IntKey[]::new); // Map to preceding key - BiFunction mappingFunction = (k, v) -> keys[Integer.parseInt(k.toString()) - 1]; - T extraVal = getExtraVal(keys[0]); + BiFunction mappingFunction + = (k, v) -> keys[k.getValue() - 1]; removeThirdKeys(map, keys); for (int i = 1; i < keys.length; i++) { - T retVal = map.merge(keys[i], extraVal, mappingFunction); + IntKey retVal = map.merge(keys[i], val, mappingFunction); if (i % 3 != 2) { // key present, should be mapped to k-1 - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == keys[i-1]); - check(String.format("compute: get(%s[%d])", keys_desc, i), keys[i-1] == map.get(keys[i])); + assertEquals(retVal, keys[i - 1], + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(keys[i - 1], map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); } else { // odd: was removed, should be replaced with EXTRA - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == extraVal); - check(String.format("compute: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); + assertEquals(retVal, val, + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); } - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertTrue(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); } - check(String.format("map expected size#1 m%d != k%d", map.size(), keys.length), - map.size() == keys.length); - check(String.format("compute: containsValue(%s[%s])", keys_desc, extraVal.toString()), map.containsValue(extraVal)); - check(String.format("compute: !containsValue(%s,[null])", keys_desc), !map.containsValue(null)); - + assertEquals(map.size(), keys.length, + String.format("map expected size#1 m%d != k%d", map.size(), keys.length)); + assertTrue(map.containsValue(val), + String.format("compute: containsValue(%s[%s])", desc, val)); + assertFalse(map.containsValue(null), + String.format("compute: !containsValue(%s,[null])", desc)); } - private static void testMergeNull(Map map, String keys_desc, T[] keys) { + @Test(dataProvider = "mapsWithObjectsAndStrings") + void testMergeNull(String desc, Supplier> ms, Object val) { // remove a third of the keys // call merge() for all keys[] // result: removed keys -> EXTRA, other keys absent - BiFunction mappingFunction = (k, v) -> null; - T extraVal = getExtraVal(keys[0]); + Map map = ms.get(); + Object[] keys = map.keySet().toArray(); + BiFunction mappingFunction = (k, v) -> null; int expectedSize = 0; removeThirdKeys(map, keys); for (int i = 0; i < keys.length; i++) { - T retVal = map.merge(keys[i], extraVal, mappingFunction); + Object retVal = map.merge(keys[i], val, mappingFunction); if (i % 3 != 2) { // key present, func returned null, should be absent from map - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == null); - check(String.format("compute: get(%s[%d])", keys_desc, i), null == map.get(keys[i])); - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), !map.containsKey(keys[i])); + assertNull(retVal, + String.format("compute: retVal(%s[%d])", desc, i)); + assertNull(map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); + assertFalse(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); } else { // odd: was removed, should now be mapped to EXTRA - check(String.format("compute: retVal(%s[%d])", keys_desc, i), retVal == extraVal); - check(String.format("compute: get(%s[%d])", keys_desc, i), extraVal == map.get(keys[i])); - check(String.format("compute: containsKey(%s[%d])", keys_desc, i), map.containsKey(keys[i])); + assertEquals(retVal, val, + String.format("compute: retVal(%s[%d])", desc, i)); + assertEquals(val, map.get(keys[i]), + String.format("compute: get(%s[%d])", desc, i)); + assertTrue(map.containsKey(keys[i]), + String.format("compute: containsKey(%s[%d])", desc, i)); expectedSize++; } - check(String.format("compute: containsValue(%s[%s])", keys_desc, i), !map.containsValue(keys[i])); - } - check(String.format("compute: containsValue(%s[%s])", keys_desc, extraVal.toString()), map.containsValue(extraVal)); - check(String.format("map expected size#1 m%d != k%d", map.size(), expectedSize), - map.size() == expectedSize); - } - - /* - * Return the EXTRA val for the key type being used - */ - private static T getExtraVal(T key) { - if (key instanceof HashableInteger) { - return (T)EXTRA_INT_VAL; - } else { - return (T)EXTRA_STRING_VAL; + assertFalse(map.containsValue(keys[i]), + String.format("compute: containsValue(%s[%s])", desc, i)); } + assertTrue(map.containsValue(val), + String.format("compute: containsValue(%s[%s])", desc, val)); + assertEquals(map.size(), expectedSize, + String.format("map expected size#1 m%d != k%d", map.size(), expectedSize)); } /* @@ -551,8 +462,8 @@ public class InPlaceOpsCollisions { removes++; } } - check(String.format("map expected size m%d != k%d", map.size(), keys.length - removes), - map.size() == keys.length - removes); + assertEquals(map.size(), keys.length - removes, + String.format("map expected size m%d != k%d", map.size(), keys.length - removes)); } /* @@ -570,95 +481,19 @@ public class InPlaceOpsCollisions { removes++; } } - check(String.format("map expected size m%d != k%d", map.size(), keys.length - removes), - map.size() == keys.length - removes); + assertEquals(map.size(), keys.length - removes, + String.format("map expected size m%d != k%d", map.size(), keys.length - removes)); } /* * Re-map the odd-numbered keys to map to the EXTRA value */ - private static void remapOddKeys(Map map, /*String keys_desc, */ T[] keys) { - T extraVal = getExtraVal(keys[0]); + private static void remapOddKeys(Map map, T[] keys, T val) { for (int i = 0; i < keys.length; i++) { if (i % 2 != 0) { - map.put(keys[i], extraVal); + map.put(keys[i], val); } } } - //--------------------- Infrastructure --------------------------- - static volatile int passed = 0, failed = 0; - - static void pass() { - passed++; - } - - static void fail() { - failed++; - (new Error("Failure")).printStackTrace(System.err); - } - - static void fail(String msg) { - failed++; - (new Error("Failure: " + msg)).printStackTrace(System.err); - } - - static void abort() { - fail(); - System.exit(1); - } - - static void abort(String msg) { - fail(msg); - System.exit(1); - } - - static void unexpected(String msg, Throwable t) { - System.err.println("Unexpected: " + msg); - unexpected(t); - } - - static void unexpected(Throwable t) { - failed++; - t.printStackTrace(System.err); - } - - static void check(boolean cond) { - if (cond) { - pass(); - } else { - fail(); - } - } - - static void check(String desc, boolean cond) { - if (cond) { - pass(); - } else { - fail(desc); - } - } - - static void equal(Object x, Object y) { - if (Objects.equals(x, y)) { - pass(); - } else { - fail(x + " not equal to " + y); - } - } - - public static void main(String[] args) throws Throwable { - Thread.currentThread().setName(Collisions.class.getName()); -// Thread.currentThread().setPriority(Thread.MAX_PRIORITY); - try { - realMain(args); - } catch (Throwable t) { - unexpected(t); - } - - System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); - if (failed > 0) { - throw new Error("Some tests failed"); - } - } } diff --git a/jdk/test/java/util/Map/MapWithCollisionsProviders.java b/jdk/test/java/util/Map/MapWithCollisionsProviders.java new file mode 100644 index 00000000000..3e687a21b6f --- /dev/null +++ b/jdk/test/java/util/Map/MapWithCollisionsProviders.java @@ -0,0 +1,286 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.function.Supplier; + +import org.testng.annotations.DataProvider; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertEquals; + +public class MapWithCollisionsProviders { + + private static final int TEST_SIZE + = Boolean.valueOf(System.getProperty("test.map.collisions.shortrun")) + ? 2500 + : 5000; + + private static final IntKey EXTRA_INTKEY_VAL + = new IntKey(TEST_SIZE, Integer.MAX_VALUE); + + private static final String EXTRA_STRING_VAL = "Extra Value"; + + public static final class IntKey implements Comparable { + + private final int value; + private final int hashmask; //yes duplication + + IntKey(int value, int hashmask) { + this.value = value; + this.hashmask = hashmask; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof IntKey) { + IntKey other = (IntKey) obj; + + return other.value == value; + } + + return false; + } + + @Override + public int hashCode() { + return value % hashmask; + } + + @Override + public int compareTo(IntKey o) { + return value - o.value; + } + + @Override + public String toString() { + return Integer.toString(value); + } + + public int getValue() { + return value; + } + } + + private static Object[] createUniqueObjectKeys() { + IntKey UNIQUE_OBJECTS[] = new IntKey[TEST_SIZE]; + for (int i = 0; i < TEST_SIZE; i++) { + UNIQUE_OBJECTS[i] = new IntKey(i, Integer.MAX_VALUE); + } + return UNIQUE_OBJECTS; + } + + private static Object[] createUniqueStringKeys() { + String UNIQUE_STRINGS[] = new String[TEST_SIZE]; + for (int i = 0; i < TEST_SIZE; i++) { + UNIQUE_STRINGS[i] = unhash(i); + } + return UNIQUE_STRINGS; + } + + private static Object[] createCollidingObjectKeys() { + IntKey COLLIDING_OBJECTS[] = new IntKey[TEST_SIZE]; + for (int i = 0; i < TEST_SIZE; i++) { + COLLIDING_OBJECTS[i] = new IntKey(i, 10); + } + return COLLIDING_OBJECTS; + } + + private static Object[] createCollidingStringKeys() { + String COLLIDING_STRINGS[] = new String[TEST_SIZE]; + String UNIQUE_STRINGS[] = new String[TEST_SIZE]; + for (int i = 0; i < TEST_SIZE; i++) { + UNIQUE_STRINGS[i] = unhash(i); + COLLIDING_STRINGS[i] = (0 == i % 2) + ? UNIQUE_STRINGS[i / 2] + : "\u0000\u0000\u0000\u0000\u0000" + COLLIDING_STRINGS[i - 1]; + } + return COLLIDING_STRINGS; + } + + /** + * Returns a string with a hash equal to the argument. + * + * @return string with a hash equal to the argument. + */ + private static String unhash(int target) { + StringBuilder answer = new StringBuilder(); + if (target < 0) { + // String with hash of Integer.MIN_VALUE, 0x80000000 + answer.append("\\u0915\\u0009\\u001e\\u000c\\u0002"); + + if (target == Integer.MIN_VALUE) { + return answer.toString(); + } + // Find target without sign bit set + target = target & Integer.MAX_VALUE; + } + + unhash0(answer, target); + return answer.toString(); + } + + private static void unhash0(StringBuilder partial, int target) { + int div = target / 31; + int rem = target % 31; + + if (div <= Character.MAX_VALUE) { + if (div != 0) { + partial.append((char) div); + } + partial.append((char) rem); + } else { + unhash0(partial, div); + partial.append((char) rem); + } + } + + private static Map fillMap(Map m, T[] keys) { + for (T k : keys) { + m.put(k, k); + assertTrue(m.containsKey(k)); + assertTrue(m.containsValue(k)); + } + assertEquals(m.size(), keys.length); + return m; + } + + private static Supplier> createMap(Map m, T[] keys) { + return () -> fillMap(m, keys); + } + + private static Object[] createCase(String desc, Map m, T[] keys, T val) { + return new Object[]{desc, createMap(m, keys), val}; + } + + private static Collection makeMapsMoreTypes(String desc, + T[] keys, + T val) { + Collection cases = new ArrayList<>(); + cases.add(createCase("Hashtable with " + desc, + new Hashtable<>(), keys, val)); + cases.add(createCase("IdentityHashMap with " + desc, + new IdentityHashMap<>(), keys, val)); + cases.add(createCase("TreeMap with " + desc, + new TreeMap<>(), keys, val)); + cases.add(createCase("WeakHashMap with " + desc, + new WeakHashMap<>(), keys, val)); + cases.add(createCase("ConcurrentHashMap with " + desc, + new ConcurrentHashMap<>(), keys, val)); + cases.add(createCase("ConcurrentSkipListMap with " + desc, + new ConcurrentSkipListMap<>(), keys, val)); + return cases; + } + + private static Collection makeMapsHashMap(String desc, + T[] keys, + T val) { + Collection cases = new ArrayList<>(); + cases.add(createCase("HashMap with " + desc, + new HashMap<>(), keys, val)); + cases.add(createCase("LinkedHashMap with " + desc, + new LinkedHashMap<>(), keys, val)); + return cases; + } + + private static Collection makeMaps(String desc, T[] keys, T val) { + Collection cases = new ArrayList<>(); + cases.addAll(makeMapsHashMap(desc, keys, val)); + cases.addAll(makeMapsMoreTypes(desc, keys, val)); + return cases; + } + + private static Collection makeObjectsCases(String desc, T[] keys) { + return makeMaps(desc, keys, EXTRA_INTKEY_VAL); + } + + private static Collection makeStringsCases(String desc, + T[] keys) { + return makeMaps(desc, keys, EXTRA_STRING_VAL); + } + + private static final Collection mapsWithObjectsCases + = new ArrayList<>() { + { + addAll(makeObjectsCases("unique objects", createUniqueObjectKeys())); + addAll(makeObjectsCases("colliding objects", createCollidingObjectKeys())); + } + }; + + private static final Collection mapsWithStringsCases + = new ArrayList<>() { + { + addAll(makeStringsCases("unique strings", createUniqueStringKeys())); + addAll(makeStringsCases("colliding strings", createCollidingStringKeys())); + } + }; + + private static final Collection mapsWithObjectsAndStringsCases + = new ArrayList<>() { + { + addAll(mapsWithObjectsCases); + addAll(mapsWithStringsCases); + } + }; + + private static final Collection hashMapsWithObjectsCases + = new ArrayList<>() { + { + addAll(makeMapsHashMap("unique objects", + createUniqueObjectKeys(), EXTRA_INTKEY_VAL)); + addAll(makeMapsHashMap("collisions objects", + createCollidingObjectKeys(), EXTRA_INTKEY_VAL)); + } + }; + + @DataProvider + public Iterator mapsWithObjects() { + return mapsWithObjectsCases.iterator(); + } + + @DataProvider + public Iterator mapsWithStrings() { + return mapsWithStringsCases.iterator(); + } + + @DataProvider + public Iterator mapsWithObjectsAndStrings() { + return mapsWithObjectsAndStringsCases.iterator(); + } + + @DataProvider + public Iterator hashMapsWithObjects() { + return hashMapsWithObjectsCases.iterator(); + } + +} diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java b/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java deleted file mode 100644 index ac2ecc85994..00000000000 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -/* - * @test - * @bug 6959653 - * @summary Test ResourceBundle.Control provided using SPI. - * @build UserDefaultControlTest - * @run shell UserDefaultControlTest.sh - */ - -import java.io.*; -import java.net.*; -import java.util.*; - -public class UserDefaultControlTest { - public static void main(String[] args) { - ResourceBundle rb = ResourceBundle.getBundle("com.foo.XmlRB", Locale.ROOT); - String type = rb.getString("type"); - if (!type.equals("XML")) { - throw new RuntimeException("Root Locale: type: got " + type - + ", expected XML (ASCII)"); - } - - rb = ResourceBundle.getBundle("com.foo.XmlRB", Locale.JAPAN); - type = rb.getString("type"); - // Expect fullwidth "XML" - if (!type.equals("\uff38\uff2d\uff2c")) { - throw new RuntimeException("Locale.JAPAN: type: got " + type - + ", expected \uff38\uff2d\uff2c (fullwidth XML)"); - } - - try { - rb = ResourceBundle.getBundle("com.bar.XmlRB", Locale.JAPAN); - throw new RuntimeException("com.bar.XmlRB test failed."); - } catch (MissingResourceException e) { - // OK - } - } -} diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/UserXMLControl.java b/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/UserXMLControl.java deleted file mode 100644 index 58809f01043..00000000000 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/UserXMLControl.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.foo; - -import java.io.*; -import java.net.*; -import java.util.*; -import static java.util.ResourceBundle.Control.*; - -public class UserXMLControl extends ResourceBundle.Control { - @Override - public List getFormats(String baseName) { - if (baseName == null) { - throw new NullPointerException(); - } - return Arrays.asList("xml"); - } - - @Override - public ResourceBundle newBundle(String baseName, Locale locale, - String format, - ClassLoader loader, - boolean reload) - throws IllegalAccessException, - InstantiationException, IOException { - if (baseName == null || locale == null - || format == null || loader == null) { - throw new NullPointerException(); - } - ResourceBundle bundle = null; - if (format.equals("xml")) { - String bundleName = toBundleName(baseName, locale); - String resourceName = toResourceName(bundleName, format); - URL url = loader.getResource(resourceName); - if (url != null) { - URLConnection connection = url.openConnection(); - if (connection != null) { - if (reload) { - // disable caches if reloading - connection.setUseCaches(false); - } - try (InputStream stream = connection.getInputStream()) { - if (stream != null) { - BufferedInputStream bis = new BufferedInputStream(stream); - bundle = new XMLResourceBundle(bis); - } - } - } - } - } - return bundle; - } - - private static class XMLResourceBundle extends ResourceBundle { - private Properties props; - - XMLResourceBundle(InputStream stream) throws IOException { - props = new Properties(); - props.loadFromXML(stream); - } - - protected Object handleGetObject(String key) { - if (key == null) { - throw new NullPointerException(); - } - return props.get(key); - } - - public Enumeration getKeys() { - // Not implemented - return null; - } - } -} diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml b/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml deleted file mode 100644 index 689df75b896..00000000000 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - -]> - - - Test data for UserDefaultControlTest.java - XML - diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml b/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml deleted file mode 100644 index fb273f53c2a..00000000000 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/XmlRB_ja.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - -]> - - - Test data for UserDefaultControlTest.java - ＸＭＬ - diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/java.util.spi.ResourceBundleControlProvider b/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/java.util.spi.ResourceBundleControlProvider deleted file mode 100644 index 7c2a19d621d..00000000000 --- a/jdk/test/java/util/spi/ResourceBundleControlProvider/providersrc/java.util.spi.ResourceBundleControlProvider +++ /dev/null @@ -1 +0,0 @@ -com.foo.UserControlProvider diff --git a/jdk/test/java/util/spi/ResourceBundleControlProvider/rbcontrolprovider.jar b/jdk/test/java/util/spi/ResourceBundleControlProvider/rbcontrolprovider.jar deleted file mode 100644 index b7e6a491d79..00000000000 Binary files a/jdk/test/java/util/spi/ResourceBundleControlProvider/rbcontrolprovider.jar and /dev/null differ diff --git a/jdk/test/javax/crypto/NullCipher/TestNPE.java b/jdk/test/javax/crypto/NullCipher/TestNPE.java index 0e216d0226d..c81ce74367a 100644 --- a/jdk/test/javax/crypto/NullCipher/TestNPE.java +++ b/jdk/test/javax/crypto/NullCipher/TestNPE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,10 +23,12 @@ /* * @test - * @bug 4937853 + * @bug 4937853 8170876 * @summary Make sure normal calls of NullCipher does not throw NPE. * @author Valerie Peng * @key randomness + * @run main TestNPE + * @run main/othervm -Djava.security.debug=provider TestNPE */ import java.util.Arrays; import java.security.AlgorithmParameters; diff --git a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java index 14a5741cbf8..c24ebe21320 100644 --- a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java @@ -223,7 +223,7 @@ public class MultiPageImageTIFFFieldTest { ImageReader reader = getTIFFReader(); ImageInputStream s = ImageIO.createImageInputStream(new File(FILENAME)); - reader.setInput(s, false, true); + reader.setInput(s, false, false); int ni = reader.getNumImages(true); check(ni == 2, "invalid number of images"); diff --git a/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java b/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java new file mode 100644 index 00000000000..3734b865adb --- /dev/null +++ b/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java @@ -0,0 +1,269 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8154058 + * @author a.stepanov + * @summary Some checks for ignoring metadata + * @run main ReadUnknownTagsTest + */ + +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; +import javax.imageio.*; +import javax.imageio.metadata.*; + +import javax.imageio.stream.*; +import javax.imageio.plugins.tiff.*; + + +public class ReadUnknownTagsTest { + + private final static int SZ = 50; + private final static Color C = Color.RED; + + private final static int DESCRIPTION_TAG = + BaselineTIFFTagSet.TAG_IMAGE_DESCRIPTION; + private final static String DESCRIPTION = "A Test Image"; + + private final static int FAX_TAG = FaxTIFFTagSet.TAG_CLEAN_FAX_DATA; + private final static short FAX_DATA = + FaxTIFFTagSet.CLEAN_FAX_DATA_ERRORS_UNCORRECTED; + + private final boolean ignoreMetadata; + private final boolean readUnknownTags; + + public ReadUnknownTagsTest(boolean ignoreMetadata, + boolean readUnknownTags) { + this.ignoreMetadata = ignoreMetadata; + this.readUnknownTags = readUnknownTags; + } + + private ImageWriter getTIFFWriter() { + + java.util.Iterator writers = + ImageIO.getImageWritersByFormatName("TIFF"); + if (!writers.hasNext()) { + throw new RuntimeException("No writers available for TIFF format"); + } + return writers.next(); + } + + private ImageReader getTIFFReader() { + + java.util.Iterator readers = + ImageIO.getImageReadersByFormatName("TIFF"); + if (!readers.hasNext()) { + throw new RuntimeException("No readers available for TIFF format"); + } + return readers.next(); + } + + + private void writeImage() throws Exception { + + String fn = "test-" + ignoreMetadata + ".tiff"; + OutputStream s = new BufferedOutputStream(new FileOutputStream(fn)); + try (ImageOutputStream ios = ImageIO.createImageOutputStream(s)) { + + ImageWriter writer = getTIFFWriter(); + writer.setOutput(ios); + + BufferedImage img = new BufferedImage(SZ, SZ, + BufferedImage.TYPE_INT_RGB); + Graphics g = img.getGraphics(); + g.setColor(C); + g.fillRect(0, 0, SZ, SZ); + g.dispose(); + + ImageWriteParam param = writer.getDefaultWriteParam(); + + IIOMetadata md = writer.getDefaultImageMetadata( + new ImageTypeSpecifier(img), param); + + TIFFDirectory dir = TIFFDirectory.createFromMetadata(md); + + TIFFTag descTag = + BaselineTIFFTagSet.getInstance().getTag(DESCRIPTION_TAG); + dir.addTIFFField(new TIFFField(descTag, TIFFTag.TIFF_ASCII, 1, + new String[] {DESCRIPTION})); + + TIFFTag faxTag = FaxTIFFTagSet.getInstance().getTag(FAX_TAG); + dir.addTIFFField(new TIFFField(faxTag, FAX_DATA)); + + writer.write(new IIOImage(img, null, dir.getAsMetadata())); + + ios.flush(); + writer.dispose(); + } + s.close(); + } + + private void readAndCheckImage() throws Exception { + + ImageReader reader = getTIFFReader(); + + String fn = "test-" + ignoreMetadata + ".tiff"; + ImageInputStream s = ImageIO.createImageInputStream(new File(fn)); + + reader.setInput(s, false, ignoreMetadata); + + int ni = reader.getNumImages(true); + check(ni == 1, "invalid number of images"); + + + TIFFImageReadParam param = new TIFFImageReadParam(); + // fax data are allowed by default + param.removeAllowedTagSet(FaxTIFFTagSet.getInstance()); + + // readUnknownTags setting + if (param.getReadUnknownTags()) { + throw new RuntimeException("Default readUnknownTags is not false"); + } + param.setReadUnknownTags(readUnknownTags); + if (param.getReadUnknownTags() != readUnknownTags) { + throw new RuntimeException("Incorrect readUnknownTags setting " + + "\"" + readUnknownTags + "\""); + } + + // read images and metadata + IIOImage i = reader.readAll(0, param); + BufferedImage bi = (BufferedImage) i.getRenderedImage(); + + check(bi.getWidth() == SZ, "invalid width"); + check(bi.getHeight() == SZ, "invalid height"); + Color c = new Color(bi.getRGB(SZ / 2, SZ / 2)); + check(c.equals(C), "invalid color"); + + IIOMetadata metadata = i.getMetadata(); + + // + // Verify presence of image metadata + // + if (metadata == null) { + throw new RuntimeException("No image metadata retrieved"); + } + + TIFFDirectory dir = TIFFDirectory.createFromMetadata(metadata); + + // + // Verify presence of essential ImageWidth field regardless of + // settings of ignoreMetadata and readUnknownTags + // + int failures = 0; + if (!dir.containsTIFFField(BaselineTIFFTagSet.TAG_IMAGE_WIDTH)) { + System.err.println("Metadata is missing essential ImageWidth tag"); + failures++; + } else { + TIFFField widthField = + dir.getTIFFField(BaselineTIFFTagSet.TAG_IMAGE_WIDTH); + System.out.printf("ImageWidth: %d%n", widthField.getAsLong(0)); + } + + // + // Verify presence of non-essential baseline ImageDescription field + // if and only if ignoreMetadata == false + // + boolean hasDescription = dir.containsTIFFField(DESCRIPTION_TAG); + System.out.println("ImageDescription (" + !ignoreMetadata + "): " + + hasDescription); + if (ignoreMetadata && hasDescription) { + System.err.println + ("Description metadata present despite ignoreMetadata"); + failures++; + } else if (!ignoreMetadata && !hasDescription) { + System.err.println + ("Description metadata absent despite !ignoreMetadata"); + failures++; + } + + // + // Verify presence of CleanFaxData field if and only if + // ignoreMetadata == false and readUnknownTags == true + // + boolean shouldHaveFaxField = !ignoreMetadata && readUnknownTags; + boolean hasFaxField = dir.containsTIFFField(FAX_TAG); + System.out.println("CleanFaxData (" + shouldHaveFaxField + "): " + + hasFaxField); + + if (ignoreMetadata) { + if (hasFaxField) { + System.err.println + ("Fax metadata present despite ignoreMetadata"); + failures++; + } + } else { // !ignoreMetadata + if (!readUnknownTags && hasFaxField) { + System.err.println + ("Fax metadata present despite !readUnknownTags"); + failures++; + } else if (readUnknownTags && !hasFaxField) { + System.err.println + ("Fax metadata absent despite readUnknownTags"); + failures++; + } + } + + if (failures > 0) { + throw new RuntimeException("Test failed for ignoreMetadata " + + ignoreMetadata + " and readUnknownTags " + readUnknownTags); + } + } + + public void run() { + try { + writeImage(); + readAndCheckImage(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void check(boolean ok, String msg) { + if (!ok) { throw new RuntimeException(msg); } + } + + public static void main(String[] args) { + int failures = 0; + + System.out.println(); + for (boolean ignoreMetadata : new boolean[] {false, true}) { + for (boolean readUnknownTags : new boolean[] {false, true}) { + try { + System.out.printf + ("ignoreMetadata: %s, readUnknownTags: %s%n", + ignoreMetadata, readUnknownTags); + (new ReadUnknownTagsTest(ignoreMetadata, + readUnknownTags)).run(); + } catch (Exception e) { + e.printStackTrace(); + failures++; + } finally { + System.out.println(); + } + } + } + } +} diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java index 39c2474512c..570f5f224c7 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java @@ -154,7 +154,7 @@ public class TIFFDirectoryTest { "must return null TIFFField"); long offset = 4L; - long a[] = {Long.MIN_VALUE, 0, Long.MAX_VALUE}; + long a[] = {0, Integer.MAX_VALUE, (1 << 32) - 1}; int v = 100500; TIFFField f1 = new TIFFField(tag1, type, offset, d), diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java index 936a5e3af68..9b05bbb8fd2 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java @@ -23,7 +23,7 @@ /** * @test - * @bug 8152183 8149562 + * @bug 8152183 8149562 8169725 8169728 * @author a.stepanov * @summary Some checks for TIFFField methods * @run main TIFFFieldTest @@ -65,7 +65,26 @@ public class TIFFFieldTest { ok = false; try { new TIFFField(tag, -1); } catch (IllegalArgumentException e) { ok = true; } - check(ok, CONSTRUCT + "invalid count"); + check(ok, CONSTRUCT + "negative value"); + + ok = false; + try { new TIFFField(tag, 1L << 32); } + catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value > 0xffffffff"); + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_SHORT); + new TIFFField(t, 0x10000); + } catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value 0x10000 incompatible with TIFF_SHORT"); + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + new TIFFField(t, 0xffff); + } catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value 0xffff incompatible with TIFF_LONG"); // check value type recognition int v = 1 << 16; @@ -152,6 +171,94 @@ public class TIFFFieldTest { check((f.getDirectory() == null) && !f.hasDirectory(), "must not have directory"); + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[6][3]; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_SRATIONAL); + int[][] tiffSRationals = new int[6][3]; + new TIFFField(t, TIFFTag.TIFF_SRATIONAL, tiffSRationals.length, + tiffSRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + long[] tiffLongs = new long[] {0, -7, 10}; + new TIFFField(t, TIFFTag.TIFF_LONG, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + long[] tiffLongs = new long[] {0, 7, 0x100000000L}; + new TIFFField(t, TIFFTag.TIFF_LONG, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_IFD_POINTER); + long[] tiffLongs = new long[] {-7}; + new TIFFField(t, TIFFTag.TIFF_IFD_POINTER, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_IFD_POINTER); + long[] tiffLongs = new long[] {0x100000000L}; + new TIFFField(t, TIFFTag.TIFF_IFD_POINTER, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[][] { + {10, 2}, + {1, -3}, + {4, 7} + }; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[][] { + {10, 2}, + {0x100000000L, 3}, + {4, 7} + }; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + // constructor: TIFFField(tag, type, offset, dir) List tags = new ArrayList<>(); tags.add(tag); diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java index 34fd5ed8983..6cd71e27872 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java @@ -159,7 +159,7 @@ public class TIFFImageReadParamTest { ImageReader reader = getTIFFReader(); ImageInputStream s = ImageIO.createImageInputStream(new File(FILENAME)); - reader.setInput(s, false, true); + reader.setInput(s, false, false); int ni = reader.getNumImages(true); check(ni == 1, "invalid number of images: " + ni); diff --git a/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java b/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java index ebc0ab239d6..7301c4faa0b 100644 --- a/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java +++ b/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,20 +103,13 @@ public class EmptyDomainNotificationTest { mbsc.invoke(mbean, "emitNotification", null, null); System.out.println("EmptyDomainNotificationTest-main: waiting notif..."); - final long stopTime = System.currentTimeMillis() + 2000; synchronized(li) { - long toWait = stopTime - System.currentTimeMillis(); - - while (li.received < 1 && toWait > 0) { - li.wait(toWait); - - toWait = stopTime - System.currentTimeMillis(); + while (li.received < 1) { + li.wait(); } } - if (li.received < 1) { - throw new RuntimeException("No notif received!"); - } else if (li.received > 1) { + if (li.received != 1) { throw new RuntimeException("Wait one notif but got: "+li.received); } diff --git a/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java b/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java new file mode 100644 index 00000000000..003780cc474 --- /dev/null +++ b/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + /* + * @test + * @bug 8141591 + * @summary Tests if notifications are received after executor is shutdown + * @author Harsha Wardhana B + * @modules java.management + * @run clean ExecutorShutdownTest + * @run build ExecutorShutdownTest + * @run main ExecutorShutdownTest + */ +import java.util.*; +import java.util.concurrent.*; +import javax.management.*; +import javax.management.remote.*; + +/* + When you create a JMXConnector client, you can supply a + "fetch-notifications Executor", which is a + java.util.concurrent.Executor that will be used each time the + connector client wants to call RMIConnection.fetchNotifications. + If such executor is not supplies, the connector client will fallback + on default LinearExecutor. This test checks if user supplied executor + is shutdown abruptly, LinearExecutor is used to handle notifications. + */ +public class ExecutorShutdownTest { + + private static final String EXECUTOR_PROPERTY + = "jmx.remote.x.fetch.notifications.executor"; + private static final String NOTIF_TYPE = "test.type"; + + public static void main(String[] args) throws Exception { + + // Start JMXConnector Server + JMXServiceURL url = new JMXServiceURL("rmi", null, 0); + MBeanServer mbs = MBeanServerFactory.newMBeanServer(); + ObjectName emitName = new ObjectName("blah:type=Emitter"); + mbs.registerMBean(new Emitter(), emitName); + JMXConnectorServer cs = JMXConnectorServerFactory.newJMXConnectorServer(url, + null, + mbs); + cs.start(); + + // Create executor to provide to JMXConnector client + ExecutorService executor = Executors.newCachedThreadPool(); + Map env = new HashMap<>(); + env.put(EXECUTOR_PROPERTY, executor); + JMXServiceURL addr = cs.getAddress(); + + try (JMXConnector cc = JMXConnectorFactory.connect(addr, env)) { + MBeanServerConnection mbsc = cc.getMBeanServerConnection(); + EmitterMBean emitter = (EmitterMBean) MBeanServerInvocationHandler.newProxyInstance(mbsc, + emitName, + EmitterMBean.class, + false); + SemaphoreListener listener = new SemaphoreListener(); + NotificationFilterSupport filter = new NotificationFilterSupport(); + filter.enableType(NOTIF_TYPE); + mbsc.addNotificationListener(emitName, listener, filter, null); + + final int NOTIF_COUNT = 3; + for (int i = 0; i < NOTIF_COUNT; i++) { + emitter.emit(); + listener.await(); + } + Thread.sleep(1); + listener.checkUnavailable(); + System.out.println("Got notifications with client provided executor"); + + // After shutting down executor, notifications are handled by linear executor + executor.shutdown(); + for (int i = 0; i < NOTIF_COUNT; i++) { + emitter.emit(); + listener.await(); + } + Thread.sleep(1); + listener.checkUnavailable(); + System.out.println("Got notifications with linear executor"); + } + cs.stop(); + System.out.println("TEST PASSED !!!"); + } + + /* Simple MBean that sends a notification every time we ask it to. */ + public static interface EmitterMBean { + + public void emit(); + } + + public static class Emitter + extends NotificationBroadcasterSupport implements EmitterMBean { + + public void emit() { + sendNotification(new Notification(NOTIF_TYPE, this, seq++)); + } + + private long seq = 1; + } + + /* Simple NotificationListener that allows you to wait until a + notification has been received. Since it uses a semaphore, you + can wait either before or after the notification has in fact + been received and it will work in either case. */ + private static class SemaphoreListener implements NotificationListener { + + void await() throws InterruptedException { + semaphore.acquire(); + } + + /* Ensure no extra notifications were received. If we can acquire + the semaphore, that means its release() method was called more + times than its acquire() method, which means there were too + many notifications. */ + void checkUnavailable() throws Exception { + if (semaphore.tryAcquire()) { + throw new Exception("Got extra notifications!"); + } + } + + public void handleNotification(Notification n, Object h) { + semaphore.release(); + } + + private final Semaphore semaphore = new Semaphore(0); + } +} diff --git a/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java b/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java index d457766d5d4..ecd7dcfc4eb 100644 --- a/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java +++ b/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java @@ -34,15 +34,17 @@ public class MyX509ExtendedKeyManager extends X509ExtendedKeyManager { static final String ERROR = "ERROR"; X509ExtendedKeyManager akm; String expectedAP; + boolean doCheck = true; MyX509ExtendedKeyManager(X509ExtendedKeyManager akm) { this.akm = akm; } public MyX509ExtendedKeyManager( - X509ExtendedKeyManager akm, String expectedAP) { + X509ExtendedKeyManager akm, String expectedAP, boolean doCheck) { this.akm = akm; this.expectedAP = expectedAP; + this.doCheck = doCheck; } @@ -104,6 +106,12 @@ public class MyX509ExtendedKeyManager extends X509ExtendedKeyManager { private void checkALPN(String ap) { + if (!doCheck) { + System.out.println("Skipping KeyManager checks " + + "because a callback has been registered"); + return; + } + if (ERROR.equals(expectedAP)) { throw new RuntimeException("Should not reach here"); } diff --git a/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java index de4ea6cc0b6..b17da745841 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java @@ -26,23 +26,53 @@ /* * @test - * @bug 8051498 8145849 + * @bug 8051498 8145849 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLEngineAlpnTest h2 h2 h2 - * @run main/othervm SSLEngineAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLEngineAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLEngineAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLEngineAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLEngineAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLEngineAlpnTest h2 EMPTY NONE - * @run main/othervm SSLEngineAlpnTest H2 h2 ERROR - * @run main/othervm SSLEngineAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLEngineAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLEngineAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLEngineAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLEngineAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLEngineAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLEngineAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLEngineAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLEngineAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 H2 http/1.1 ERROR */ /** * A simple SSLEngine-based client/server that demonstrates the proposed API * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). * + * Usage: + * java SSLEngineAlpnTest + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * * This example is based on our standard SSLEngineTemplate. * * The immediate consumer of ALPN will be HTTP/2 (RFC 7540), aka H2. The H2 IETF @@ -98,6 +128,7 @@ import javax.net.ssl.SSLEngineResult.*; import java.io.*; import java.security.*; import java.nio.*; +import java.util.Arrays; public class SSLEngineAlpnTest { @@ -117,6 +148,9 @@ public class SSLEngineAlpnTest { */ private static final boolean debug = false; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + private final SSLContext sslc; private SSLEngine clientEngine; // client Engine @@ -157,17 +191,21 @@ public class SSLEngineAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } - SSLEngineAlpnTest test = new SSLEngineAlpnTest(args[2]); + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !args[1].equals("UNUSED"); // is callback being used? + + SSLEngineAlpnTest test = new SSLEngineAlpnTest(args[3]); try { - test.runTest(convert(args[0]), convert(args[1]), args[2]); + test.runTest(convert(args[0]), args[1], convert(args[2]), args[3]); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -199,7 +237,8 @@ public class SSLEngineAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(ts); @@ -215,12 +254,15 @@ public class SSLEngineAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings = null; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { @@ -247,12 +289,12 @@ public class SSLEngineAlpnTest { * One could easily separate these phases into separate * sections of code. */ - private void runTest(String[] serverAPs, String[] clientAPs, - String expectedAP) throws Exception { + private void runTest(String[] serverAPs, String callbackAP, + String[] clientAPs, String expectedAP) throws Exception { boolean dataDone = false; - createSSLEngines(serverAPs, clientAPs); + createSSLEngines(serverAPs, callbackAP, clientAPs); createBuffers(); SSLEngineResult clientResult; // results from client's last operation @@ -364,8 +406,8 @@ public class SSLEngineAlpnTest { * Using the SSLContext created during object creation, * create/configure the SSLEngines we'll use for this test. */ - private void createSSLEngines(String[] serverAPs, String[] clientAPs) - throws Exception { + private void createSSLEngines(String[] serverAPs, String callbackAP, + String[] clientAPs) throws Exception { /* * Configure the serverEngine to act as a server in the SSL/TLS * handshake. Also, require SSL client authentication. @@ -385,18 +427,42 @@ public class SSLEngineAlpnTest { */ String[] suites = sslp.getCipherSuites(); sslp.setCipherSuites(suites); - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslp.setUseCipherSuitesOrder(true); // Set server side order serverEngine.setSSLParameters(sslp); + // check that no callback has been registered + if (serverEngine.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + serverEngine.setHandshakeApplicationProtocolSelector( + (sslEngine, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (serverEngine.getHandshakeApplicationProtocolSelector() + == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + + " should return non-null"); + } + } + /* * Similar to above, but using client mode instead. */ clientEngine = sslc.createSSLEngine("client", 80); clientEngine.setUseClientMode(true); sslp = clientEngine.getSSLParameters(); - sslp.setApplicationProtocols(clientAPs); + if (clientAPs != null) { + sslp.setApplicationProtocols(clientAPs); + } clientEngine.setSSLParameters(sslp); if ((clientEngine.getHandshakeApplicationProtocol() != null) || diff --git a/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java index a310cbb0336..a9373ed09f9 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java @@ -26,22 +26,61 @@ /* * @test - * @bug 8051498 8145849 8158978 + * @bug 8051498 8145849 8158978 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLServerSocketAlpnTest h2 h2 h2 - * @run main/othervm SSLServerSocketAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLServerSocketAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLServerSocketAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLServerSocketAlpnTest h2 EMPTY NONE - * @run main/othervm SSLServerSocketAlpnTest H2 h2 ERROR - * @run main/othervm SSLServerSocketAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLServerSocketAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLServerSocketAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 H2 http/1.1 ERROR + * * @author Brad Wetmore */ +/** + * A simple SSLSocket-based client/server that demonstrates the proposed API + * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). + * + * Usage: + * java SSLServerSocketAlpnTest + * + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * + * This example is based on our standard SSLSocketTemplate. + */ import java.io.*; import java.security.KeyStore; +import java.util.Arrays; import javax.net.ssl.*; @@ -73,6 +112,9 @@ public class SSLServerSocketAlpnTest { static String trustFilename = System.getProperty("test.src", ".") + "/" + pathToStores + "/" + trustStoreFile; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + /* * SSLContext */ @@ -89,6 +131,7 @@ public class SSLServerSocketAlpnTest { static boolean debug = false; static String[] serverAPs; + static String callbackAP; static String[] clientAPs; static String expectedAP; @@ -129,7 +172,9 @@ public class SSLServerSocketAlpnTest { sslp.setUseCipherSuitesOrder(true); // Set server side order // Set the ALPN selection. - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslServerSocket.setSSLParameters(sslp); serverPort = sslServerSocket.getLocalPort(); @@ -146,6 +191,25 @@ public class SSLServerSocketAlpnTest { + "return null before the handshake starts"); } + // check that no callback has been registered + if (sslSocket.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + sslSocket.setHandshakeApplicationProtocolSelector( + (serverSocket, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (sslSocket.getHandshakeApplicationProtocolSelector() == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + + " should return non-null"); + } + } + sslSocket.startHandshake(); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -276,14 +340,19 @@ public class SSLServerSocketAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } serverAPs = convert(args[0]); - clientAPs = convert(args[1]); - expectedAP = args[2]; + callbackAP = args[1]; + clientAPs = convert(args[2]); + expectedAP = args[3]; + + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !callbackAP.equals("UNUSED"); // is callback being used? /* * Start the tests. @@ -291,7 +360,7 @@ public class SSLServerSocketAlpnTest { try { new SSLServerSocketAlpnTest(); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -322,7 +391,8 @@ public class SSLServerSocketAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(trustKS); @@ -338,12 +408,15 @@ public class SSLServerSocketAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { diff --git a/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java index fd52f251f9d..ef72474f417 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java @@ -26,22 +26,60 @@ /* * @test - * @bug 8051498 8145849 + * @bug 8051498 8145849 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLSocketAlpnTest h2 h2 h2 - * @run main/othervm SSLSocketAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLSocketAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLSocketAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLSocketAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLSocketAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLSocketAlpnTest h2 EMPTY NONE - * @run main/othervm SSLSocketAlpnTest H2 h2 ERROR - * @run main/othervm SSLSocketAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLSocketAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLSocketAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLSocketAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLSocketAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLSocketAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLSocketAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLSocketAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLSocketAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 H2 http/1.1 ERROR + * * @author Brad Wetmore */ +/** + * A simple SSLSocket-based client/server that demonstrates the proposed API + * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). + * + * Usage: + * java SSLSocketAlpnTest + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * + * This example is based on our standard SSLSocketTemplate. + */ import java.io.*; import java.security.KeyStore; +import java.util.Arrays; import javax.net.ssl.*; @@ -73,6 +111,9 @@ public class SSLSocketAlpnTest { static String trustFilename = System.getProperty("test.src", ".") + "/" + pathToStores + "/" + trustStoreFile; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + /* * SSLContext */ @@ -89,6 +130,7 @@ public class SSLSocketAlpnTest { static boolean debug = false; static String[] serverAPs; + static String callbackAP; static String[] clientAPs; static String expectedAP; @@ -136,7 +178,9 @@ public class SSLSocketAlpnTest { sslp.setUseCipherSuitesOrder(true); // Set server side order // Set the ALPN selection. - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslSocket.setSSLParameters(sslp); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -144,6 +188,24 @@ public class SSLSocketAlpnTest { + "return null before the handshake starts"); } + // check that no callback has been registered + if (sslSocket.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + sslSocket.setHandshakeApplicationProtocolSelector( + (serverSocket, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (sslSocket.getHandshakeApplicationProtocolSelector() == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + " should return non-null"); + } + } + sslSocket.startHandshake(); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -274,14 +336,19 @@ public class SSLSocketAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } serverAPs = convert(args[0]); - clientAPs = convert(args[1]); - expectedAP = args[2]; + callbackAP = args[1]; + clientAPs = convert(args[2]); + expectedAP = args[3]; + + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !callbackAP.equals("UNUSED"); // is callback being used? /* * Start the tests. @@ -289,7 +356,7 @@ public class SSLSocketAlpnTest { try { new SSLSocketAlpnTest(); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -320,7 +387,8 @@ public class SSLSocketAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(trustKS); @@ -336,12 +404,15 @@ public class SSLSocketAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java index e9338cc42eb..052731876c9 100644 --- a/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java +++ b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @bug 4387882 * @summary Need to revisit the javadocs for JSSE, especially the * promoted classes. + * @library /javax/net/ssl/templates * @run main/othervm SSLSessionNulls * * SunJSSE does not support dynamic system properties, no way to re-use @@ -33,109 +34,35 @@ * @author Brad Wetmore */ -import java.io.*; -import java.net.*; -import javax.net.ssl.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; -public class SSLSessionNulls { +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; - /* - * ============================================================= - * Set the various variables needed for the tests, then - * specify what tests to run on each side. - */ +public class SSLSessionNulls extends SSLSocketTemplate { - /* - * Should we run the client or server in a separate thread? - * Both sides can throw exceptions, but do you have a preference - * as to which side should be the main thread. - */ - static boolean separateServerThread = true; - - /* - * Where do we find the keystores? - */ - static String pathToStores = "../etc"; - static String keyStoreFile = "keystore"; - static String trustStoreFile = "truststore"; - static String passwd = "passphrase"; - - /* - * Is the server ready to serve? - */ - volatile static boolean serverReady = false; - - /* - * Turn on SSL debugging? - */ - static boolean debug = false; - - /* - * If the client or server is doing some kind of object creation - * that the other side depends on, and that thread prematurely - * exits, you may experience a hang. The test harness will - * terminate all hung threads after its timeout has expired, - * currently 3 minutes by default, but you might try to be - * smart about it.... - */ - - /* - * Define the server side of the test. - * - * If the server prematurely exits, serverReady will be set to true - * to avoid infinite hangs. - */ - void doServerSide() throws Exception { - SSLServerSocketFactory sslssf = - (SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); - SSLServerSocket sslServerSocket = - (SSLServerSocket) sslssf.createServerSocket(serverPort); - serverPort = sslServerSocket.getLocalPort(); - - /* - * Signal Client, we're ready for his connect. - */ - serverReady = true; - - SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept(); - InputStream sslIS = sslSocket.getInputStream(); - OutputStream sslOS = sslSocket.getOutputStream(); + @Override + protected void runServerApplication(SSLSocket socket) throws Exception { + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); sslIS.read(); sslOS.write(85); sslOS.flush(); - - sslSocket.close(); } - /* - * Define the client side of the test. - * - * If the server prematurely exits, serverReady will be set to true - * to avoid infinite hangs. - */ - void doClientSide() throws Exception { - - /* - * Wait for server to get started. - */ - while (!serverReady) { - Thread.sleep(50); - } - - SSLSocketFactory sslsf = - (SSLSocketFactory) SSLSocketFactory.getDefault(); - SSLSocket sslSocket = (SSLSocket) - sslsf.createSocket("localhost", serverPort); - - InputStream sslIS = sslSocket.getInputStream(); - OutputStream sslOS = sslSocket.getOutputStream(); + @Override + protected void runClientApplication(SSLSocket socket) throws Exception { + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); sslOS.write(280); sslOS.flush(); sslIS.read(); - SSLSession sslSession = sslSocket.getSession(); + SSLSession sslSession = socket.getSession(); try { sslSession.getValue(null); @@ -163,128 +90,9 @@ public class SSLSessionNulls { throw new IOException( "getValueNames didn't return 0-length arrary"); } - - sslSocket.close(); } - /* - * ============================================================= - * The remainder is just support stuff - */ - - // use any free port by default - volatile int serverPort = 0; - - volatile Exception serverException = null; - volatile Exception clientException = null; - public static void main(String[] args) throws Exception { - String keyFilename = - System.getProperty("test.src", "./") + "/" + pathToStores + - "/" + keyStoreFile; - String trustFilename = - System.getProperty("test.src", "./") + "/" + pathToStores + - "/" + trustStoreFile; - - System.setProperty("javax.net.ssl.keyStore", keyFilename); - System.setProperty("javax.net.ssl.keyStorePassword", passwd); - System.setProperty("javax.net.ssl.trustStore", trustFilename); - System.setProperty("javax.net.ssl.trustStorePassword", passwd); - - if (debug) - System.setProperty("javax.net.debug", "all"); - - /* - * Start the tests. - */ - new SSLSessionNulls(); - } - - Thread clientThread = null; - Thread serverThread = null; - - /* - * Primary constructor, used to drive remainder of the test. - * - * Fork off the other side, then do your work. - */ - SSLSessionNulls() throws Exception { - if (separateServerThread) { - startServer(true); - startClient(false); - } else { - startClient(true); - startServer(false); - } - - /* - * Wait for other side to close down. - */ - if (separateServerThread) { - serverThread.join(); - } else { - clientThread.join(); - } - - /* - * When we get here, the test is pretty much over. - * - * If the main thread excepted, that propagates back - * immediately. If the other thread threw an exception, we - * should report back. - */ - if (serverException != null) { - System.out.print("Server Exception:"); - throw serverException; - } - if (clientException != null) { - System.out.print("Client Exception:"); - throw clientException; - } - } - - void startServer(boolean newThread) throws Exception { - if (newThread) { - serverThread = new Thread() { - public void run() { - try { - doServerSide(); - } catch (Exception e) { - /* - * Our server thread just died. - * - * Release the client, if not active already... - */ - System.err.println("Server died..."); - serverReady = true; - serverException = e; - } - } - }; - serverThread.start(); - } else { - doServerSide(); - } - } - - void startClient(boolean newThread) throws Exception { - if (newThread) { - clientThread = new Thread() { - public void run() { - try { - doClientSide(); - } catch (Exception e) { - /* - * Our client thread just died. - */ - System.err.println("Client died..."); - clientException = e; - } - } - }; - clientThread.start(); - } else { - doClientSide(); - } + new SSLSessionNulls().run(); } } diff --git a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java index f8373a6383a..544428566cb 100644 --- a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java +++ b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,30 +29,37 @@ import javax.print.attribute.standard.PrinterName; /* * @test - * @bug 8013810 - * @summary Test that print service returned without filter are of the same class as with name filter + * @bug 8013810 8025439 + * @summary Test that print service returned without filter are of the same class + * as with name filter */ public class GetPrintServices { - public static void main(String[] args) throws Exception { - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { - String serviceName = service.getName(); - PrintService serviceByName = lookupByName(serviceName); - if (!service.equals(serviceByName)) { - throw new RuntimeException("NOK " + serviceName + public static void main(String[] args) throws Exception { + for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { + String serviceName = service.getName(); + PrinterName name = service.getAttribute(PrinterName.class); + String printerName = name.getValue(); + + PrintService serviceByName = lookupByName(printerName); + System.out.println("service " + service); + System.out.println("serviceByName " + serviceByName); + if (!service.equals(serviceByName)) { + throw new RuntimeException("NOK " + serviceName + " expected: " + service.getClass().getName() + " got: " + serviceByName.getClass().getName()); - } + } + } + System.out.println("Test PASSED"); } - System.out.println("Test PASSED"); - } - private static PrintService lookupByName(String name) { - AttributeSet attributes = new HashAttributeSet(); - attributes.add(new PrinterName(name, null)); - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, attributes)) { - return service; + private static PrintService lookupByName(String name) { + AttributeSet attributes = new HashAttributeSet(); + attributes.add(new PrinterName(name, null)); + for (PrintService service : + PrintServiceLookup.lookupPrintServices(null, attributes)) { + return service; + } + return null; } - return null; - } } diff --git a/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java b/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java index c7ea83f3b02..7bf4a440585 100644 --- a/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java +++ b/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java @@ -26,7 +26,7 @@ * @summary Test to check JComboBox does not lose its ability to invoke * registerd ActionListener in case of exception in ActionListener * @run main ActionListenerExceptionTest - */ + */ import java.awt.AWTEvent; import java.awt.AWTException; @@ -44,6 +44,7 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; import javax.swing.SwingUtilities; public class ActionListenerExceptionTest { @@ -133,7 +134,11 @@ public class ActionListenerExceptionTest { SwingUtilities.invokeAndWait(new Runnable() { public void run() { Object comp = combo.getUI().getAccessibleChild(combo, 0); - JComponent scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(0); + int i = 0; + JComponent scrollPane; + do { + scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(i++); + } while (!(scrollPane instanceof JScrollPane)); menuItemHeight = scrollPane.getSize().height / TOTAL_MENU_ITEMS; yPos = scrollPane.getLocationOnScreen().y + menuItemHeight / 2; diff --git a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java index 5c6080c336f..81dfea088a4 100644 --- a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java +++ b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java @@ -24,10 +24,12 @@ /* @test @key headful - @bug 8062946 + @bug 8062946 8159906 @summary Verify Transparency upon iconify/deiconify sequence @run main TransparencyTest */ +import java.awt.GraphicsEnvironment; +import java.awt.GraphicsDevice; import java.awt.Color; import java.awt.Point; import java.awt.Robot; @@ -43,7 +45,7 @@ public class TransparencyTest { private static final int WIDTH = 250; private static final int HEIGHT = 250; private static final float OPACITY = 0.60f; - private static Point dlgPos; + private static volatile Point dlgPos; public static void createAndShowGUI() { frame = new JFrame("JFrame"); @@ -67,6 +69,14 @@ public class TransparencyTest { public static void main(String[] args) throws Exception { + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice gd = ge.getDefaultScreenDevice(); + GraphicsDevice.WindowTranslucency mode = GraphicsDevice.WindowTranslucency.TRANSLUCENT; + boolean translucencyCheck = gd.isWindowTranslucencySupported(mode); + if(!translucencyCheck) { + return; + } + Robot robot = new Robot(); // create a GUI SwingUtilities.invokeAndWait(new Runnable() { diff --git a/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java new file mode 100644 index 00000000000..f02bcc0e0dd --- /dev/null +++ b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8170387 + * @summary JLightweightFrame#syncCopyBuffer() may throw IOOBE + * @modules java.desktop/sun.swing + * @run main JLightweightFrameRoundTest + */ + +import sun.swing.JLightweightFrame; +import sun.swing.LightweightContent; + +import javax.swing.*; + +public class JLightweightFrameRoundTest { + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(() -> { + JLightweightFrame jLightweightFrame = new JLightweightFrame(); + jLightweightFrame.setContent(new XLightweightContent()); + jLightweightFrame.setSize(600, 600); + jLightweightFrame.notifyDisplayChanged(1.0001, 1.0001); + }); + } + + static class XLightweightContent implements LightweightContent { + @Override + public JComponent getComponent() { + return new JPanel(); + } + + @Override + public void paintLock() {} + + @Override + public void paintUnlock() {} + + @Override + public void imageBufferReset(int[] data, int x, int y, int width, + int height, int linestride, + double scaleX, + double scaleY) {} + + @Override + public void imageReshaped(int x, int y, int width, int height) {} + + @Override + public void imageUpdated(int dirtyX, int dirtyY, int dirtyWidth, + int dirtyHeight) {} + + @Override + public void focusGrabbed() {} + + @Override + public void focusUngrabbed() {} + + @Override + public void preferredSizeChanged(int width, int height) {} + + @Override + public void maximumSizeChanged(int width, int height) {} + + @Override + public void minimumSizeChanged(int width, int height) {} + } +} diff --git a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java index 4b95dc92bb3..a9ad28e7504 100644 --- a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java +++ b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java @@ -26,22 +26,31 @@ * @key headful * @library ../../regtesthelpers * @build Util - * @bug 8033699 8154043 + * @bug 8033699 8154043 8167160 * @summary Incorrect radio button behavior when pressing tab key - * @author Vivi An * @run main bug8033699 */ - -import javax.swing.*; -import javax.swing.event.*; -import java.awt.event.*; -import java.awt.*; +import java.awt.KeyboardFocusManager; +import java.awt.Robot; +import java.awt.event.KeyEvent; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; public class bug8033699 { - private static Robot robot; + private static JFrame mainFrame; + private static Robot robot; private static JButton btnStart; - private static ButtonGroup btnGrp; private static JButton btnEnd; private static JButton btnMiddle; private static JRadioButton radioBtn1; @@ -51,7 +60,9 @@ public class bug8033699 { public static void main(String args[]) throws Throwable { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { + changeLAF(); createAndShowGUI(); } }); @@ -84,11 +95,30 @@ public class bug8033699 { // down key circle back to first button in grouped radio button runTest8(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + mainFrame.dispose(); + } + }); + } + + private static void changeLAF() { + String currentLAF = UIManager.getLookAndFeel().toString(); + System.out.println(currentLAF); + currentLAF = currentLAF.toLowerCase(); + if (currentLAF.contains("aqua") || currentLAF.contains("nimbus")) { + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } } private static void createAndShowGUI() { - JFrame mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons"); - + mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons"); btnStart = new JButton("Start"); btnEnd = new JButton("End"); btnMiddle = new JButton("Middle"); @@ -132,12 +162,13 @@ public class bug8033699 { } // Radio button Group as a single component when traversing through tab key - private static void runTest1() throws Exception{ + private static void runTest1() throws Exception { hitKey(robot, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) { System.out.println("Radio Button Group Go To Next Component through Tab Key failed"); @@ -148,9 +179,10 @@ public class bug8033699 { } // Non-Grouped Radio button as a single component when traversing through tab key - private static void runTest2() throws Exception{ + private static void runTest2() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnEnd) { System.out.println("Non Grouped Radio Button Go To Next Component through Tab Key failed"); @@ -161,11 +193,12 @@ public class bug8033699 { } // Non-Grouped Radio button and Group Radio button as a single component when traversing through shift-tab key - private static void runTest3() throws Exception{ + private static void runTest3() throws Exception { hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) { System.out.println("Radio button Group/Non Grouped Radio Button SHIFT-Tab Key Test failed"); @@ -176,10 +209,11 @@ public class bug8033699 { } // Using arrow key to move focus in radio button group - private static void runTest4() throws Exception{ + private static void runTest4() throws Exception { hitKey(robot, KeyEvent.VK_DOWN); hitKey(robot, KeyEvent.VK_RIGHT); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) { System.out.println("Radio button Group UP/LEFT Arrow Key Move Focus Failed"); @@ -189,10 +223,11 @@ public class bug8033699 { }); } - private static void runTest5() throws Exception{ + private static void runTest5() throws Exception { hitKey(robot, KeyEvent.VK_UP); hitKey(robot, KeyEvent.VK_LEFT); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) { System.out.println("Radio button Group Left/Up Arrow Key Move Focus Failed"); @@ -202,10 +237,11 @@ public class bug8033699 { }); } - private static void runTest6() throws Exception{ + private static void runTest6() throws Exception { hitKey(robot, KeyEvent.VK_UP); hitKey(robot, KeyEvent.VK_UP); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn2) { System.out.println("Radio button Group Circle Back To First Button Test"); @@ -215,9 +251,10 @@ public class bug8033699 { }); } - private static void runTest7() throws Exception{ + private static void runTest7() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnMiddle) { System.out.println("Separate Component added in button group layout"); @@ -227,9 +264,10 @@ public class bug8033699 { }); } - private static void runTest8() throws Exception{ + private static void runTest8() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) { System.out.println("Separate Component added in button group layout"); diff --git a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java index 4c773c0f7b1..9ab19f7b245 100644 --- a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java +++ b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java @@ -42,7 +42,6 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextField; import javax.swing.KeyStroke; -import javax.swing.LookAndFeel; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -133,41 +132,19 @@ public class FocusTraversal { } private static void runTestCase() throws Exception { - LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); focusOn(a); - if (isExcludedLookAndFeel(lookAndFeel)) { - robot.keyPress(KeyEvent.VK_ENTER); - robot.keyRelease(KeyEvent.VK_ENTER); - robot.waitForIdle(); - isFocusOwner(b, "forward"); - robot.keyPress(KeyEvent.VK_SHIFT); - robot.keyPress(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_SHIFT); - robot.waitForIdle(); - isFocusOwner(a, "backward"); - } else { + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + robot.waitForIdle(); + isFocusOwner(next, "forward"); + robot.keyPress(KeyEvent.VK_SHIFT); + robot.keyPress(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_SHIFT); + robot.waitForIdle(); + isFocusOwner(a, "backward"); - robot.keyPress(KeyEvent.VK_ENTER); - robot.keyRelease(KeyEvent.VK_ENTER); - robot.waitForIdle(); - isFocusOwner(next, "forward"); - robot.keyPress(KeyEvent.VK_SHIFT); - robot.keyPress(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_SHIFT); - robot.waitForIdle(); - isFocusOwner(d, "backward"); - } - - } - - private static boolean isExcludedLookAndFeel(LookAndFeel lookAndFeel) { - - return lookAndFeel.toString().toLowerCase().contains("aqua") - || lookAndFeel.toString().toLowerCase().contains("nimbus") - || lookAndFeel.toString().toLowerCase().contains("gtk"); } private static void focusOn(Component component) diff --git a/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java b/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java new file mode 100644 index 00000000000..fec08479521 --- /dev/null +++ b/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8160087 + * @summary Change IOOBE to warning in the scenarios when it had not being + * thrown before the JDK-8078514 + * @run main/othervm DefaultRowSorterIOOBEtest + */ + +import javax.swing.*; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; + +public class DefaultRowSorterIOOBEtest extends TableRowSorter { + static List rows = new ArrayList<>(); + + static TableModel tableModel = new AbstractTableModel() { + + @Override + public int getRowCount() { + return rows.size(); + } + + @Override + public int getColumnCount() { + return 1; + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + return rows.get(rowIndex); + } + }; + + public static void main(String[] args) { + DefaultRowSorter sorter = + new DefaultRowSorter<>() { + { + setModelWrapper(new SorterModelWrapper()); + } + }; + + PrintStream err = System.err; + ByteArrayOutputStream bos = new ByteArrayOutputStream(10000) { + @Override + public synchronized void write(byte[] b, int off, int len) { + super.write(b, off, len); + err.print(new String(b, off, len)); + } + }; + System.setErr(new PrintStream(bos)); + + rows.add("New"); + + sorter.convertRowIndexToView(0); + sorter.convertRowIndexToModel(0); + + String out = new String(bos.toByteArray()); + if(out.indexOf("WARNING:") < 0) { + throw new RuntimeException("No warnings found"); + } + } + + static class SorterModelWrapper extends + DefaultRowSorter.ModelWrapper { + + @Override + public TableModel getModel() { + return tableModel; + } + + @Override + public int getColumnCount() { + return tableModel.getColumnCount(); + } + + @Override + public int getRowCount() { + return tableModel.getRowCount(); + } + + @Override + public Object getValueAt(int row, int column) { + return tableModel.getValueAt(row, column); + } + + @Override + public Integer getIdentifier(int row) { + return row; + } + } +} diff --git a/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java b/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java new file mode 100644 index 00000000000..e20f3a81704 --- /dev/null +++ b/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics2D; +import java.awt.GraphicsEnvironment; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Image; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.geom.AffineTransform; +import java.awt.image.BaseMultiResolutionImage; +import java.awt.image.BufferedImage; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.DefaultListCellRenderer; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + +/* + * @test + * @bug 8162350 + * @summary RepaintManager shifts repainted region when the floating point UI scale is used + * @run main/manual/othervm -Dsun.java2d.uiScale=1.5 RepaintManagerFPUIScaleTest + */ +public class RepaintManagerFPUIScaleTest { + + private static volatile boolean testResult = false; + private static volatile CountDownLatch countDownLatch; + private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" + + "Check JScrollPane correctly repaints the view" + + " when UI scale has floating point value:\n" + + "\n" + + "1. Scroll down the JScrollPane\n" + + "2. Select some values\n" + + "If the scrolled selected value is painted without artifacts," + + "press PASS, else press FAIL."; + + public static void main(String args[]) throws Exception { + + countDownLatch = new CountDownLatch(1); + + SwingUtilities.invokeLater(RepaintManagerFPUIScaleTest::createUI); + countDownLatch.await(15, TimeUnit.MINUTES); + + if (!testResult) { + throw new RuntimeException("Test fails!"); + } + } + + private static void createUI() { + + final JFrame mainFrame = new JFrame("Motif L&F icons test"); + GridBagLayout layout = new GridBagLayout(); + JPanel mainControlPanel = new JPanel(layout); + JPanel resultButtonPanel = new JPanel(layout); + + GridBagConstraints gbc = new GridBagConstraints(); + + JComponent testPanel = createComponent(); + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(testPanel, gbc); + + JTextArea instructionTextArea = new JTextArea(); + instructionTextArea.setText(INSTRUCTIONS); + instructionTextArea.setEditable(false); + instructionTextArea.setBackground(Color.white); + + gbc.gridx = 0; + gbc.gridy = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + JButton passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + testResult = true; + mainFrame.dispose(); + countDownLatch.countDown(); + + }); + + JButton failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + mainFrame.dispose(); + countDownLatch.countDown(); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 2; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + mainFrame.pack(); + + mainFrame.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosing(WindowEvent e) { + mainFrame.dispose(); + countDownLatch.countDown(); + } + }); + mainFrame.setVisible(true); + } + + private static JComponent createComponent() { + + int N = 100; + String[] data = new String[N]; + for (int i = 0; i < N; i++) { + data[i] = "Floating point test List Item: " + i; + } + JList list = new JList(data); + list.setCellRenderer(new TestListCellRenderer()); + + JScrollPane scrollPane = new JScrollPane(list); + return scrollPane; + } + + private static Color[] COLORS = { + Color.RED, Color.ORANGE, Color.GREEN, Color.BLUE, Color.GRAY + }; + + private static Image createTestImage(int width, int height, int colorindex) { + + Color color = COLORS[colorindex % COLORS.length]; + + AffineTransform tx = GraphicsEnvironment + .getLocalGraphicsEnvironment() + .getDefaultScreenDevice() + .getDefaultConfiguration() + .getDefaultTransform(); + + Image baseImage = createTestImage(width, height, 1, 1, color); + Image rvImage = createTestImage(width, height, tx.getScaleX(), tx.getScaleY(), color); + + return new BaseMultiResolutionImage(baseImage, rvImage); + } + + private static Image createTestImage(int w, int h, + double scaleX, double scaleY, Color color) { + + int width = (int) Math.ceil(scaleX * w); + int height = (int) Math.ceil(scaleY * h); + BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + + Graphics2D g = img.createGraphics(); + g.setColor(Color.WHITE); + g.fillRect(0, 0, width, height); + g.scale(scaleX, scaleY); + g.setColor(color); + int d = 1; + int d2 = 2 * d; + g.drawLine(d, h / 2, w - d2, h / 2); + g.drawLine(w / 2, d, w / 2, h - d2); + g.drawRect(d, d, w - d2, h - d2); + g.dispose(); + + return img; + } + + static class TestListCellRenderer extends DefaultListCellRenderer { + + public Component getListCellRendererComponent( + JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + Component retValue = super.getListCellRendererComponent( + list, value, index, isSelected, cellHasFocus + ); + setIcon(new ImageIcon(createTestImage(20, 10, index))); + return retValue; + } + } +} diff --git a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java b/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java index fc53de9dee2..4504475d554 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java +++ b/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java @@ -44,20 +44,20 @@ import javax.swing.SwingUtilities; * @key headful * @summary [macos 10.12] Trackpad scrolling of text on OS X 10.12 Sierra * is very fast (Trackpad, Retina only) + * @requires (os.family == "windows" | os.family == "mac") * @run main/manual/othervm TooMuchWheelRotationEventsTest */ public class TooMuchWheelRotationEventsTest { private static volatile boolean testResult = false; private static volatile CountDownLatch countDownLatch; - private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" - + "Try to check the issue on Mac OS X 10.12 Sierra with trackpad" - + " on Retina display.\n" + private static final String INSTRUCTIONS = " INSTRUCTIONS:\n" + + " Try to check the issue with trackpad\n" + "\n" - + "If the trackpad is not supported, press PASS\n" + + " If the trackpad is not supported, press PASS\n" + "\n" - + "Use the trackpad to slightly scroll the JTextArea horizontally and vertically.\n" - + "If the text area is scrolled too fast press FAIL, else press PASS."; + + " Use the trackpad to slightly scroll the JTextArea horizontally and vertically.\n" + + " If the text area is scrolled too fast press FAIL, else press PASS."; public static void main(String args[]) throws Exception { countDownLatch = new CountDownLatch(1); @@ -138,6 +138,7 @@ public class TooMuchWheelRotationEventsTest { countDownLatch.countDown(); } }); + mainFrame.setLocationRelativeTo(null); mainFrame.setVisible(true); } diff --git a/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java b/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java index f6f571aa05e..25066dafe42 100644 --- a/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java +++ b/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java @@ -23,7 +23,7 @@ */ /* @test - @bug 6427244 8144240 8166003 + @bug 6427244 8144240 8166003 8169879 @summary Test that pressing HOME correctly moves caret in I18N document. @author Sergey Groznyh @library ../../../regtesthelpers @@ -69,10 +69,12 @@ public class bug6427244 { bug6427244 t = new bug6427244(); for (String space: SPACES) { t.init(space); - t.runAllTests(); + t.testCaretPosition(); } System.out.println("OK"); + // Dispose the test interface upon completion + t.destroyTestInterface(); } void init(final String space) { @@ -113,29 +115,65 @@ public class bug6427244 { } } - void blockTillDisplayed(JComponent comp) { - if(comp != null) { - while (!comp.isVisible()) { - try { + void destroyTestInterface() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + // Dispose the frame + jf.dispose(); + } + }); + } catch (Exception ex) { + // No-op + } + } + + void blockTillDisplayed(JComponent comp) throws Exception { + while (comp != null && isCompVisible == false) { + try { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + isCompVisible = comp.isVisible(); + } + }); + + if (isCompVisible == false) { + // A short wait for component to be visible Thread.sleep(1000); - } catch (InterruptedException ie) { - /* No-op */ } + } catch (InterruptedException ex) { + // No-op. Thread resumed from sleep + } catch (Exception ex) { + throw new RuntimeException(ex); } } } public void testCaretPosition() { - Point p = tp.getLocationOnScreen(); - // the right-top corner position - p.x += (dim.width - 5); - p.y += 5; - ROBOT.mouseMove(p.x, p.y); + final Point p[] = new Point[1]; + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + p[0] = tp.getLocationOnScreen(); + + // the right-top corner position + p[0].x += (dim.width - 5); + p[0].y += 5; + } + }); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + ROBOT.mouseMove(p[0].x, p[0].y); ROBOT.clickMouse(); ROBOT.hitKey(KeyEvent.VK_HOME); ROBOT.waitForIdle(); // this will fail if caret moves out of the 1st line. if (getCaretOrdinate() != 0) { + // Dispose the test interface upon completion + destroyTestInterface(); throw new RuntimeException("Test Failed."); } } @@ -162,7 +200,8 @@ public class bug6427244 { return y[0]; } - JFrame jf; - JTextPane tp; - Dimension dim; + private JFrame jf; + private JTextPane tp; + private Dimension dim; + private volatile boolean isCompVisible = false; } diff --git a/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java new file mode 100644 index 00000000000..10fe6e867bc --- /dev/null +++ b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +/* @test + @bug 4936917 7190578 + @summary Tests if background is correctly painted when has css margins + @author Denis Sharypov + @library ../../../regtesthelpers + @run main bug4936917 +*/ + + + +import java.awt.Color; +import java.awt.Point; +import java.awt.Robot; +import java.util.Timer; +import javax.swing.JComponent; +import javax.swing.JEditorPane; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + + +public class bug4936917 { + + private boolean passed = false; + private Timer timer; + private JEditorPane editorPane; + private static JFrame f; + private volatile Point p = null; + + private String text = + "" + + " some text "; + + public void init() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + editorPane = new JEditorPane("text/html", ""); + editorPane.setEditable(false); + editorPane.setMargin(new java.awt.Insets(0, 0, 0, 0)); + editorPane.setText(text); + + f = new JFrame(); + f.getContentPane().add(editorPane); + f.setSize(600, 400); + f.setVisible(true); + } + }); + blockTillDisplayed(editorPane); + Robot robot = new Robot(); + robot.waitForIdle(); + + int x0 = p.x + 15 ; + int y = p.y + 15; + int match = 0; + int nonmatch = 0; + + passed = true; + for (int x = x0; x < x0 + 10; x++) { + System.out.println("color ("+x+"," + y +")=" + robot.getPixelColor(x,y)); + if (!robot.getPixelColor(x, y).equals(new Color(0xcc, 0xcc, 0xcc))) { + nonmatch++; + } else match++; + } + if (nonmatch > match) { + passed = false; + } + } + + void blockTillDisplayed(JComponent comp) throws Exception { + while (p == null) { + try { + SwingUtilities.invokeAndWait(() -> { + p = comp.getLocationOnScreen(); + }); + } catch (IllegalStateException e) { + try { + Thread.sleep(1000); + } catch (InterruptedException ie) { + } + } + } + } + + public void destroy() throws Exception { + SwingUtilities.invokeAndWait(()->f.dispose()); + if(!passed) { + throw new RuntimeException("Test failed."); + } + } + + + public static void main(String args[]) throws Exception { + bug4936917 test = new bug4936917(); + test.init(); + test.destroy(); + } +} diff --git a/jdk/test/jdk/internal/misc/VM/RuntimeArguments.java b/jdk/test/jdk/internal/misc/VM/RuntimeArguments.java index 754b2ada4ee..f45d9f7dd01 100644 --- a/jdk/test/jdk/internal/misc/VM/RuntimeArguments.java +++ b/jdk/test/jdk/internal/misc/VM/RuntimeArguments.java @@ -26,7 +26,6 @@ * @summary Basic test of VM::getRuntimeArguments * @library /lib/testlibrary * @modules java.base/jdk.internal.misc - * java.compact3 * jdk.zipfs * @run testng RuntimeArguments */ @@ -64,11 +63,11 @@ public class RuntimeArguments { "--add-modules", "jdk.zipfs", "--limit-modules", - "java.compact3"), + "java.logging,java.xml,jdk.charsets,jdk.zipfs"), // expected runtime arguments List.of("--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED", "--add-modules=jdk.zipfs", - "--limit-modules=java.compact3"), + "--limit-modules=java.logging,java.xml,jdk.charsets,jdk.zipfs"), }, }; }; diff --git a/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java b/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java index cd25a49c31c..72e337066cb 100644 --- a/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java +++ b/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java @@ -24,9 +24,7 @@ /** * @test * @summary Verify the defining class loader of each module never delegates - * to its child class loader. Also sanity check java.compact2 - * requires. - * @modules java.compact2 + * to its child class loader. * @run testng/othervm --add-modules=ALL-SYSTEM VerifyModuleDelegation */ @@ -46,21 +44,10 @@ import static org.testng.Assert.*; public class VerifyModuleDelegation { private static final String JAVA_BASE = "java.base"; - private static final String JAVA_COMPACT1 = "java.compact1"; - private static final String JAVA_COMPACT2 = "java.compact2"; private static final ModuleDescriptor BASE = ModuleDescriptor.module(JAVA_BASE).build(); - private static final ModuleDescriptor COMPACT2 - = ModuleDescriptor.module(JAVA_COMPACT2) - .requires(Set.of(MANDATED), JAVA_BASE) - .requires(Set.of(TRANSITIVE), JAVA_COMPACT1) - .requires(Set.of(TRANSITIVE), "java.rmi") - .requires(Set.of(TRANSITIVE), "java.sql") - .requires(Set.of(TRANSITIVE), "java.xml") - .build(); - private static final Set MREFS = Layer.boot().modules().stream().map(Module::getDescriptor) .collect(toSet()); @@ -79,14 +66,6 @@ public class VerifyModuleDelegation { check(md, BASE); } - @Test - public void checkCompact2() { - ModuleDescriptor md = - MREFS.stream() - .filter(d -> d.name().equals(JAVA_COMPACT2)) - .findFirst().orElseThrow(Error::new); - check(md, COMPACT2); - } @Test public void checkLoaderDelegation() { diff --git a/jdk/test/jdk/modules/incubator/DefaultImage.java b/jdk/test/jdk/modules/incubator/DefaultImage.java new file mode 100644 index 00000000000..ff6f5261f14 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/DefaultImage.java @@ -0,0 +1,158 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8170859 + * @summary Ensure no incubator modules are resolved by default in the image + * @library /lib/testlibrary + * @modules jdk.compiler + * @build CompilerUtils + * @run testng DefaultImage + */ + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.function.Consumer; +import java.util.stream.Stream; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static jdk.testlibrary.ProcessTools.executeCommand; +import static org.testng.Assert.*; + +public class DefaultImage { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final Path TEST_SRC = Paths.get(System.getProperty("test.src")); + private static final Path CP_DIR = Paths.get("cp"); + + @BeforeTest + private void setup() throws Throwable { + Path src = TEST_SRC.resolve("src").resolve("cp").resolve("listmods"); + assertTrue(CompilerUtils.compile(src, CP_DIR)); + } + + public void test() throws Throwable { + if (isExplodedBuild()) { + System.out.println("Test cannot run on exploded build"); + return; + } + + java("-cp", CP_DIR.toString(), + "listmods.ListModules") + .assertSuccess() + .resultChecker(r -> r.assertOutputContains("java.base")) + .resultChecker(r -> r.assertOutputDoesNotContain("jdk.incubator")); + } + + @DataProvider(name = "tokens") + public Object[][] singleModuleValues() throws IOException { + return new Object[][]{ { "ALL-DEFAULT" }, { "ALL-SYSTEM"} }; + } + + @Test(dataProvider = "tokens") + public void testAddMods(String addModsToken) throws Throwable { + if (isExplodedBuild()) { + System.out.println("Test cannot run on exploded build"); + return; + } + + java("--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "listmods.ListModules") + .assertSuccess() + .resultChecker(r -> r.assertOutputContains("java.base")) + .resultChecker(r -> r.assertOutputDoesNotContain("jdk.incubator")); + } + + static ToolResult java(String... opts) throws Throwable { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + String[] options = Stream.concat(Stream.of(getJava()), Stream.of(opts)) + .toArray(String[]::new); + + ProcessBuilder pb = new ProcessBuilder(options); + int exitValue = executeCommand(pb).outputTo(ps) + .errorTo(ps) + .getExitValue(); + + return new ToolResult(exitValue, new String(baos.toByteArray(), UTF_8)); + } + + static class ToolResult { + final int exitCode; + final String output; + + ToolResult(int exitValue, String output) { + this.exitCode = exitValue; + this.output = output; + } + + ToolResult assertSuccess() { + assertEquals(exitCode, 0, + "Expected exit code 0, got " + exitCode + + ", with output[" + output + "]"); + return this; + } + + ToolResult resultChecker(Consumer r) { + r.accept(this); + return this; + } + + ToolResult assertOutputContains(String subString) { + assertTrue(output.contains(subString), + "Expected to find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + + ToolResult assertOutputDoesNotContain(String subString) { + assertFalse(output.contains(subString), + "Expected to NOT find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + } + + static String getJava() { + Path image = Paths.get(JAVA_HOME); + boolean isWindows = System.getProperty("os.name").startsWith("Windows"); + Path java = image.resolve("bin").resolve(isWindows ? "java.exe" : "java"); + if (Files.notExists(java)) + throw new RuntimeException(java + " not found"); + return java.toAbsolutePath().toString(); + } + + static boolean isExplodedBuild() { + Path modulesPath = Paths.get(JAVA_HOME).resolve("lib").resolve("modules"); + return Files.notExists(modulesPath); + } +} diff --git a/jdk/test/jdk/modules/incubator/ImageModules.java b/jdk/test/jdk/modules/incubator/ImageModules.java new file mode 100644 index 00000000000..347b1d4e221 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/ImageModules.java @@ -0,0 +1,382 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8170859 + * @summary Basic test for incubator modules in jmods and images + * @library /lib/testlibrary + * @modules jdk.compiler jdk.jartool jdk.jlink + * @build CompilerUtils + * @run testng/othervm ImageModules + */ + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.spi.ToolProvider; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jdk.testlibrary.FileUtils; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static jdk.testlibrary.ProcessTools.executeCommand; +import static org.testng.Assert.*; + +public class ImageModules { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final Path JDK_JMODS = Paths.get(JAVA_HOME, "jmods"); + + private static final Path TEST_SRC = Paths.get(System.getProperty("test.src")); + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path CP_DIR = Paths.get("cp"); + private static final Path JARS_DIR = Paths.get("jars"); + private static final Path JMODS_DIR = Paths.get("jmods"); + private static final Path IMAGE = Paths.get("image"); + + private static final String JAVA_BASE = "java.base"; + private final String[] modules = new String[] { "message.writer", + "message.converter" }; + + @BeforeTest + private void setup() throws Throwable { + Path src = TEST_SRC.resolve("src"); + for (String name : modules) { + assertTrue(CompilerUtils.compile(src.resolve(name), + MODS_DIR, + "--module-source-path", src.toString())); + } + + assertTrue(CompilerUtils.compile(src.resolve("cp"), + CP_DIR, + "--module-path", MODS_DIR.toString(), + "--add-modules", "message.writer")); + } + + @DataProvider(name = "singleModule") + public Object[][] singleModuleValues() throws IOException { + Object[][] values = new Object[][]{ + // { Extra args to the build the message.converter jmod + // Tokens to pass to the run time --add-modules option + // SUCCESS or FAILURE expected + // Messages expected in the run time output + // Messages that must not appear in the run time output }, + { "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base"), + List.of("WARNING") }, + { "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.base", "java.lang.ClassNotFoundException: converter.MessageConverter"), + List.of("WARNING", "message.converter") }, + { "--warn-if-resolved=incubating", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base", + "WARNING: Using incubator modules: message.converter"), + List.of() }, + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.base", "java.lang.ClassNotFoundException: converter.MessageConverter"), + List.of("WARNING", "message.converter") }, + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("message.converter"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base", "WARNING"), + List.of() } + }; + return values; + } + + @Test(dataProvider = "singleModule") + public void singleModule(String extraJmodArg, + List addModsTokens, + Consumer assertExitCode, + List expectedOutput, + List unexpectedOutput) + throws Throwable + { + if (Files.notExists(JDK_JMODS)) { + System.out.println("JDK jmods not found test cannot run."); + return; + } + + FileUtils.deleteFileTreeUnchecked(JMODS_DIR); + FileUtils.deleteFileTreeUnchecked(IMAGE); + Files.createDirectories(JMODS_DIR); + Path converterJmod = JMODS_DIR.resolve("converter.jmod"); + + jmod("create", + "--class-path", MODS_DIR.resolve("message.converter").toString(), + extraJmodArg, + converterJmod.toString()) + .assertSuccess(); + + String mpath = JDK_JMODS.toString() + File.pathSeparator + JMODS_DIR.toString(); + jlink("--module-path", mpath, + "--add-modules", JAVA_BASE + ",message.converter", + "--output", IMAGE.toString()) + .assertSuccess(); + + for (String addModsToken : addModsTokens) { + String[] props = new String[] {"", "-Djdk.system.module.finder.disabledFastPath"}; + for (String systemProp : props) + java(IMAGE, + systemProp, + "--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "test.ConvertToLowerCase", "HEllo WoRlD") + .resultChecker(assertExitCode) + .resultChecker(r -> { + expectedOutput.forEach(e -> r.assertContains(e)); + unexpectedOutput.forEach(e -> r.assertDoesNotContains(e)); + }); + } + } + + @Test + public void singleModularJar() throws Throwable { + FileUtils.deleteFileTreeUnchecked(JARS_DIR); + Files.createDirectories(JARS_DIR); + Path converterJar = JARS_DIR.resolve("converter.jar"); + + jar("--create", + "--file", converterJar.toString(), + "--warn-if-resolved=incubating", + "-C", MODS_DIR.resolve("message.converter").toString() , ".") + .assertSuccess(); + + + java(Paths.get(JAVA_HOME), + "--module-path", JARS_DIR.toString(), + "--add-modules", "message.converter", + "-cp", CP_DIR.toString(), + "test.ConvertToLowerCase", "HEllo WoRlD") + .assertSuccess() + .resultChecker(r -> { + r.assertContains("WARNING: Using incubator modules: message.converter"); + }); + } + + @DataProvider(name = "twoModules") + public Object[][] twoModulesValues() throws IOException { + Object[][] values = new Object[][]{ + // { Extra args to the build the message.writer jmod + // Extra args to the build the message.converter jmod + // Tokens to pass to the run time --add-modules option + // SUCCESS or FAILURE expected + // Messages expected in the run time output + // Messages that must not appear in the run time output }, + { "", + "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base"), + List.of() }, + { "", + "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base"), + List.of() }, + { "--do-not-resolve-by-default", + "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.lang.ClassNotFoundException: writer.MessageWriter", "java.base"), + List.of("message.writer") }, + { "--do-not-resolve-by-default", + "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.lang.ClassNotFoundException: writer.MessageWriter", "java.base"), + List.of("message.converter", "message.writer") }, + // now add in warnings + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + "", + List.of("message.writer"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base", + "WARNING: Using incubator modules: message.writer"), + List.of() }, + { "", + "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("message.writer"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base", + "WARNING: Using incubator modules: message.converter"), + List.of() } }; + return values; + } + + @Test(dataProvider = "twoModules") + public void doNotResolveByDefaultTwoModules(String extraFirstJmodArg, + String extraSecondJmodArg, + List addModsTokens, + Consumer assertExitCode, + List expectedOutput, + List unexpectedOutput) + throws Throwable + { + if (Files.notExists(JDK_JMODS)) { + System.out.println("JDK jmods not found test cannot run."); + return; + } + + FileUtils.deleteFileTreeUnchecked(JMODS_DIR); + FileUtils.deleteFileTreeUnchecked(IMAGE); + Files.createDirectories(JMODS_DIR); + Path writerJmod = JMODS_DIR.resolve("writer.jmod"); + Path converterJmod = JMODS_DIR.resolve("converter.jmod"); + + jmod("create", + extraFirstJmodArg, + "--class-path", MODS_DIR.resolve("message.writer").toString(), + writerJmod.toString()); + + jmod("create", + "--class-path", MODS_DIR.resolve("message.converter").toString(), + extraSecondJmodArg, + converterJmod.toString()) + .assertSuccess(); + + String mpath = JDK_JMODS.toString() + File.pathSeparator + JMODS_DIR.toString(); + jlink("--module-path", mpath, + "--add-modules", JAVA_BASE + ",message.writer,message.converter", + "--output", IMAGE.toString()) + .assertSuccess(); + + for (String addModsToken : addModsTokens) { + String[] props = new String[] {"", "-Djdk.system.module.finder.disabledFastPath"}; + for (String systemProp : props) + java(IMAGE, + systemProp, + "--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "test.WriteUpperCase", "hello chegar !!!") + .resultChecker(assertExitCode) + .resultChecker(r -> { + expectedOutput.forEach(e -> r.assertContains(e)); + unexpectedOutput.forEach(e -> r.assertDoesNotContains(e)); + }); + } + } + + static final ToolProvider JMOD_TOOL = ToolProvider.findFirst("jmod") + .orElseThrow(() -> new RuntimeException("jmod tool not found")); + static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar") + .orElseThrow(() -> new RuntimeException("jar tool not found")); + static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink") + .orElseThrow(() -> new RuntimeException("jlink tool not found")); + + static ToolResult jmod(String... args) { return execTool(JMOD_TOOL, args); } + + static ToolResult jar(String... args) { return execTool(JAR_TOOL, args); } + + static ToolResult jlink(String... args) { return execTool(JLINK_TOOL, args); } + + static ToolResult java(Path image, String... opts) throws Throwable { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + String[] options = Stream.concat(Stream.of(getJava(image)), + Stream.of(opts).filter(s -> !s.equals(""))) + .toArray(String[]::new); + + ProcessBuilder pb = new ProcessBuilder(options); + int exitValue = executeCommand(pb).outputTo(ps) + .errorTo(ps) + .getExitValue(); + + return new ToolResult(exitValue, new String(baos.toByteArray(), UTF_8)); + } + + static ToolResult execTool(ToolProvider tool, String... args) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + List filteredArgs = Stream.of(args) + .map(s -> s.split(" ")).flatMap(Stream::of) + .filter(s -> !s.equals("")) + .collect(Collectors.toList()); + System.out.println(tool + " " + filteredArgs); + int ec = tool.run(ps, ps, filteredArgs.toArray(new String[] {})); + return new ToolResult(ec, new String(baos.toByteArray(), UTF_8)); + } + + static class ToolResult { + final int exitCode; + final String output; + + ToolResult(int exitValue, String output) { + this.exitCode = exitValue; + this.output = output; + } + + static Consumer ASSERT_SUCCESS = r -> + assertEquals(r.exitCode, 0, + "Expected exit code 0, got " + r.exitCode + + ", with output[" + r.output + "]"); + static Consumer ASSERT_FAILURE = r -> + assertNotEquals(r.exitCode, 0, + "Expected exit code != 0, got " + r.exitCode + + ", with output[" + r.output + "]"); + + ToolResult assertSuccess() { ASSERT_SUCCESS.accept(this); return this; } + ToolResult assertFailure() { ASSERT_FAILURE.accept(this); return this; } + ToolResult resultChecker(Consumer r) { r.accept(this); return this; } + + ToolResult assertContains(String subString) { + assertTrue(output.contains(subString), + "Expected to find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + ToolResult assertDoesNotContains(String subString) { + assertFalse(output.contains(subString), + "Expected to NOT find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + } + + static String getJava(Path image) { + boolean isWindows = System.getProperty("os.name").startsWith("Windows"); + Path java = image.resolve("bin").resolve(isWindows ? "java.exe" : "java"); + if (Files.notExists(java)) + throw new RuntimeException(java + " not found"); + return java.toAbsolutePath().toString(); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java b/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java new file mode 100644 index 00000000000..2d80d198ee0 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package listmods; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class ListModules { + public static void main(String[] args) throws Exception { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java b/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java new file mode 100644 index 00000000000..cf0d1c7cba9 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package test; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class ConvertToLowerCase { + public static void main(String[] args) { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + System.out.println(converter.MessageConverter.toLowerCase(args[0])); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java b/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java new file mode 100644 index 00000000000..844fccb2fcf --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package test; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class WriteUpperCase { + public static void main(String[] args) { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + writer.MessageWriter.writeOn(args[0], System.out); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java b/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java new file mode 100644 index 00000000000..d9604df2ec0 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package converter; + +public class MessageConverter { + public static String toUpperCase(String message) { + return message.toUpperCase(java.util.Locale.ROOT); + } + + public static String toLowerCase(String message) { + return message.toLowerCase(java.util.Locale.ROOT); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java b/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java new file mode 100644 index 00000000000..6fbfa700a7b --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +module message.converter { + exports converter; +} diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java b/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java new file mode 100644 index 00000000000..09370cc283a --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +module message.writer { + requires message.converter; + exports writer; +} diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java b/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java new file mode 100644 index 00000000000..0c6ba17cf26 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package writer; + +import java.io.PrintStream; +import java.util.Locale; + +public class MessageWriter { + public static void writeOn(String message, PrintStream out) { + String newMesssage = converter.MessageConverter.toUpperCase(message); + if (!newMesssage.equals(message.toUpperCase(Locale.ROOT))) + throw new RuntimeException("Expected " + message.toUpperCase(Locale.ROOT) + + ", got " + newMesssage ); + + out.println(newMesssage); + } +} diff --git a/jdk/test/lib/testlibrary/ModuleSourceBuilder.java b/jdk/test/lib/testlibrary/ModuleSourceBuilder.java new file mode 100644 index 00000000000..3d116495c6e --- /dev/null +++ b/jdk/test/lib/testlibrary/ModuleSourceBuilder.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; + +import static org.testng.Assert.assertTrue; + +/** + * Utility class for creating test modules. + */ +public class ModuleSourceBuilder { + private static String MODULE_INFO_JAVA = "module-info.java"; + private static Pattern MODULE_PATTERN = + Pattern.compile("module\\s+((?:\\w+\\.)*)"); + private static Pattern PACKAGE_PATTERN = + Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))"); + private static Pattern CLASS_PATTERN = + Pattern.compile("(?:public\\s+)?(?:class|enum|interface)\\s+(\\w+)"); + + private final Path dir; + public ModuleSourceBuilder(Path dir) { + this.dir = dir; + } + + /** + * Create java source files of the given module + */ + public void writeJavaFiles(String module, String moduleInfoJava, String... contents) + throws IOException + { + Path msrc = dir.resolve(module); + new JavaSource(moduleInfoJava).write(msrc); + for (String c : contents) { + new JavaSource(c).write(msrc); + } + } + + /** + * Compile the module to the given destination. + */ + public void compile(String module, Path dest, String... options) + throws IOException + { + Path msrc = dir.resolve(module); + Stream args = + Stream.concat(Arrays.stream(options), + Stream.of("--module-source-path", + dir.toString())); + assertTrue(CompilerUtils.compile(msrc, dest, args.toArray(String[]::new)), + "Fail to compile " + module); + } + + static class JavaSource { + final String source; + JavaSource(String source) { + this.source = source; + } + + /** + * Writes the source code to a file in a specified directory. + * @param dir the directory + * @throws IOException if there is a problem writing the file + */ + public void write(Path dir) throws IOException { + Path file = dir.resolve(getJavaFileNameFromSource(source)); + Files.createDirectories(file.getParent()); + try (BufferedWriter out = Files.newBufferedWriter(file)) { + out.write(source.replace("\n", System.lineSeparator())); + } + } + + /** + * Extracts the Java file name from the class declaration. + * This method is intended for simple files and uses regular expressions, + * so comments matching the pattern can make the method fail. + */ + static String getJavaFileNameFromSource(String source) { + String packageName = null; + + Matcher matcher = MODULE_PATTERN.matcher(source); + if (matcher.find()) + return MODULE_INFO_JAVA; + + matcher = PACKAGE_PATTERN.matcher(source); + if (matcher.find()) + packageName = matcher.group(1).replace(".", "/"); + + matcher = CLASS_PATTERN.matcher(source); + if (matcher.find()) { + String className = matcher.group(1) + ".java"; + return (packageName == null) ? className : packageName + "/" + className; + } else if (packageName != null) { + return packageName + "/package-info.java"; + } else { + throw new Error("Could not extract the java class " + + "name from the provided source"); + } + } + } +} diff --git a/jdk/test/lib/testlibrary/ModuleUtils.java b/jdk/test/lib/testlibrary/ModuleUtils.java index c227464da1a..b3c9d5e49c8 100644 --- a/jdk/test/lib/testlibrary/ModuleUtils.java +++ b/jdk/test/lib/testlibrary/ModuleUtils.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.function.Supplier; /** @@ -58,12 +57,13 @@ public final class ModuleUtils { URI uri = URI.create("module:/" + name); - Supplier supplier = () -> { - throw new UnsupportedOperationException(); + ModuleReference mref = new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } }; - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); - namesToReference.put(name, mref); } diff --git a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java index 482e93e9128..0a27bf70482 100644 --- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java +++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java @@ -56,8 +56,6 @@ public class CustomLauncherTest { private static final String TEST_SRC = System.getProperty("test.src"); private static final String OSNAME = System.getProperty("os.name"); private static final String ARCH; - private static final String LIBARCH; - static { // magic with os.arch String osarch = System.getProperty("os.arch"); @@ -84,7 +82,6 @@ public class CustomLauncherTest { ARCH = osarch; } } - LIBARCH = ARCH.equals("i586") ? "i386" : ARCH; } public static void main(String[] args) throws Exception { @@ -184,15 +181,12 @@ public class CustomLauncherTest { } private static Path findLibjvm(FileSystem FS) { - Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "jre", "lib", LIBARCH)); - if (libjvmPath == null) { - libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib", LIBARCH)); - } + Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib")); return libjvmPath; } private static Path findLibjvm(Path libPath) { - // ARCH/libjvm.so -> ARCH/server/libjvm.so -> ARCH/client/libjvm.so + // libjvm.so -> server/libjvm.so -> client/libjvm.so Path libjvmPath = libPath.resolve("libjvm.so"); if (isFileOk(libjvmPath)) { return libjvmPath; diff --git a/jdk/test/sun/misc/InvokeCleaner.java b/jdk/test/sun/misc/InvokeCleaner.java new file mode 100644 index 00000000000..3367d1574c6 --- /dev/null +++ b/jdk/test/sun/misc/InvokeCleaner.java @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 8171377 + * @summary Basic test for Unsafe::invokeCleaner + * @modules jdk.unsupported + * @run testng/othervm InvokeCleaner + */ + +import java.io.Closeable; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import sun.misc.Unsafe; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; +import org.testng.annotations.DataProvider; + +public class InvokeCleaner { + + static Unsafe UNSAFE; + static Path bob = Paths.get("bob"); + static List closeables = new ArrayList<>(); + + @BeforeClass + static void init() throws Exception { + UNSAFE = getUnsafe(); + + byte[] srcData = new byte[20]; + for (int i=0; i<20; i++) + srcData[i] = (byte)i; + Files.write(bob, srcData); + } + + @DataProvider(name = "badBuffers") + static Object[][] createBadBuffers() throws Exception { + FileChannel fc = FileChannel.open(bob); + closeables.add(fc); + MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10); + + return new Object[][] { + { ByteBuffer.allocate(0) }, + { ByteBuffer.allocate(10) }, + { ByteBuffer.allocate(10).duplicate() }, + { ByteBuffer.allocate(10).slice() }, + { ByteBuffer.allocateDirect(10).duplicate() }, + { ByteBuffer.allocateDirect(10).slice() }, + { ByteBuffer.allocateDirect(0).duplicate() }, + { ByteBuffer.allocateDirect(0).slice() }, + { mbb.duplicate() }, + { mbb.slice() } + }; + } + + @Test(dataProvider="badBuffers", + expectedExceptions = IllegalArgumentException.class) + public void badBuffers(ByteBuffer buffer) throws Exception { + UNSAFE.invokeCleaner(buffer); + } + + @DataProvider(name = "goodBuffers") + static Object[][] createGoodBuffers() throws Exception { + FileChannel fc = FileChannel.open(bob); + closeables.add(fc); + MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10); + mbb.load(); + + return new Object[][] { + { ByteBuffer.allocateDirect(0) }, + { ByteBuffer.allocateDirect(10) }, + { mbb }, + { fc.map(FileChannel.MapMode.READ_ONLY, 1, 11) } + }; + } + + @Test(dataProvider="goodBuffers") + public void goodBuffers(ByteBuffer buffer) throws Exception { + UNSAFE.invokeCleaner(buffer); + } + + @Test(expectedExceptions = NullPointerException.class) + public void npe() throws Exception { + UNSAFE.invokeCleaner(null); + } + + static Unsafe getUnsafe() throws ReflectiveOperationException { + Field f = Unsafe.class.getDeclaredField("theUnsafe"); + f.setAccessible(true); + return (Unsafe)f.get(null); + } + + @AfterClass + public void cleanup() throws Exception { + for(Closeable fc : closeables) + fc.close(); + } +} diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java index 6e5a9bcf138..4672fb6ad67 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java @@ -43,6 +43,7 @@ import java.io.BufferedWriter; import java.io.OutputStreamWriter; import java.net.HttpURLConnection; import java.net.URL; + import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; @@ -70,6 +71,8 @@ public final class ServerIdentityTest extends SSLSocketTemplate { @Override protected void runServerApplication(SSLSocket socket) throws Exception { + InputStream sslIS = socket.getInputStream(); + sslIS.read(); BufferedWriter bw = new BufferedWriter( new OutputStreamWriter(socket.getOutputStream())); bw.write("HTTP/1.1 200 OK\r\n\r\n\r\n"); diff --git a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java b/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java index ee34213340d..ca31273f809 100644 --- a/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java +++ b/jdk/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -253,7 +253,7 @@ public class AppleUserImpl int port = -1; // create new registry and bind new AppleUserImpl in registry try { - Registry registry = TestLibrary.createRegistryOnUnusedPort(); + Registry registry = TestLibrary.createRegistryOnEphemeralPort(); port = TestLibrary.getRegistryPort(registry); Naming.rebind("rmi://localhost:" + port + "/AppleUser",user); } catch (RemoteException e) { diff --git a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java index dc23b4894eb..2b3d2d5b808 100644 --- a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java +++ b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,7 +103,7 @@ public class CheckLogging { private static Registry registry; static { try { - registry = TestLibrary.createRegistryOnUnusedPort(); + registry = TestLibrary.createRegistryOnEphemeralPort(); REGISTRY_PORT = TestLibrary.getRegistryPort(registry); LOCATION = "rmi://localhost:" + REGISTRY_PORT + "/"; } catch (Exception e) { diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java index c82e1fdac48..93ad04e6618 100644 --- a/jdk/test/sun/security/ec/TestEC.java +++ b/jdk/test/sun/security/ec/TestEC.java @@ -34,8 +34,8 @@ * @library ../pkcs11/ec * @library ../pkcs11/sslecc * @library ../../../java/security/testlibrary - * @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper - * @compile --add-modules jdk.crypto.pkcs11 TestEC.java + * @modules jdk.crypto.token/sun.security.pkcs11.wrapper + * @compile --add-modules jdk.crypto.token TestEC.java * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC */ diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java index 2ef37651374..55f2d1a4d15 100644 --- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java +++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java @@ -23,17 +23,12 @@ /* * @test - * @bug 6578647 6829283 - * @modules java.base/sun.security.util - * java.security.jgss/sun.security.jgss - * java.security.jgss/sun.security.krb5 - * java.security.jgss/sun.security.krb5.internal - * java.security.jgss/sun.security.krb5.internal.ccache - * java.security.jgss/sun.security.krb5.internal.crypto - * java.security.jgss/sun.security.krb5.internal.ktab + * @bug 6578647 6829283 8171340 * @run main/othervm HttpNegotiateServer - * @summary Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - * @summary HTTP/Negotiate: Authenticator triggered again when user cancels the first one + * @summary Undefined requesting URL in java.net.Authenticator + * .getPasswordAuthentication() + * @summary HTTP/Negotiate: Authenticator triggered again when + * user cancels the first one */ import com.sun.net.httpserver.Headers; @@ -247,16 +242,15 @@ public class HttpNegotiateServer { java.net.Authenticator.setDefault(new KnowAllAuthenticator()); reader = new BufferedReader(new InputStreamReader( - webUrl.openConnection().getInputStream())); + webUrl.openConnection(Proxy.NO_PROXY).getInputStream())); if (!reader.readLine().equals(CONTENT)) { throw new RuntimeException("Bad content"); } reader = new BufferedReader(new InputStreamReader( - proxyUrl.openConnection( - new Proxy(Proxy.Type.HTTP, - new InetSocketAddress(PROXY_HOST, proxyPort))) - .getInputStream())); + proxyUrl.openConnection(new Proxy(Proxy.Type.HTTP, + new InetSocketAddress(PROXY_HOST, proxyPort))) + .getInputStream())); if (!reader.readLine().equals(CONTENT)) { throw new RuntimeException("Bad content"); } @@ -267,7 +261,7 @@ public class HttpNegotiateServer { java.net.Authenticator.setDefault(new KnowNothingAuthenticator()); try { new BufferedReader(new InputStreamReader( - webUrl.openConnection().getInputStream())); + webUrl.openConnection(Proxy.NO_PROXY).getInputStream())); } catch (IOException ioe) { // Will fail since no username and password is provided. } @@ -281,7 +275,7 @@ public class HttpNegotiateServer { try { URL url = webUrl; - URLConnection conn = url.openConnection(); + URLConnection conn = url.openConnection(Proxy.NO_PROXY); conn.connect(); inputStream = conn.getInputStream(); byte[] b = new byte[inputStream.available()]; @@ -292,7 +286,7 @@ public class HttpNegotiateServer { System.out.println("Length: " + s.length()); System.out.println(s); } catch (Exception ex) { - throw new RuntimeException(ex); + throw new RuntimeException(ex); } finally { if (inputStream != null) { try { @@ -314,7 +308,8 @@ public class HttpNegotiateServer { CallbackHandler callback = new CallbackHandler() { @Override - public void handle(Callback[] pCallbacks) throws IOException, UnsupportedCallbackException { + public void handle(Callback[] pCallbacks) + throws IOException, UnsupportedCallbackException { for (Callback cb : pCallbacks) { if (cb instanceof NameCallback) { NameCallback ncb = (NameCallback)cb; @@ -330,7 +325,8 @@ public class HttpNegotiateServer { }; final String jaasConfigName = "oracle.test.kerberos.login"; - final String krb5LoginModule = "com.sun.security.auth.module.Krb5LoginModule"; + final String krb5LoginModule + = "com.sun.security.auth.module.Krb5LoginModule"; Configuration loginConfig = new Configuration() { @Override @@ -354,7 +350,8 @@ public class HttpNegotiateServer { // oracle context/subject/login LoginContext context = null; try { - context = new LoginContext("oracle.test.kerberos.login", null, callback, loginConfig); + context = new LoginContext( + "oracle.test.kerberos.login", null, callback, loginConfig); context.login(); } catch (LoginException ex) { @@ -365,29 +362,35 @@ public class HttpNegotiateServer { Subject subject = context.getSubject(); - final PrivilegedExceptionAction test_action = new PrivilegedExceptionAction() { + final PrivilegedExceptionAction test_action + = new PrivilegedExceptionAction() { public Object run() throws Exception { testConnect(); return null; } }; - System.err.println("\n\nExpecting to succeed when executing with the the logged in subject."); + System.err.println("\n\nExpecting to succeed when executing " + + "with the the logged in subject."); try { Subject.doAs(subject, test_action); - System.err.println("\n\nConnection succeed when executing with the the logged in subject."); + System.err.println("\n\nConnection succeed when executing " + + "with the the logged in subject."); } catch (PrivilegedActionException e) { - System.err.println("\n\nFailure unexpected when executing with the the logged in subject."); + System.err.println("\n\nFailure unexpected when executing " + + "with the the logged in subject."); e.printStackTrace(); throw new RuntimeException("Failed to login as subject"); } try { - System.err.println("\n\nExpecting to fail when running with the current user's login."); + System.err.println("\n\nExpecting to fail when running " + + "with the current user's login."); testConnect(); } catch (Exception ex) { - System.err.println("\nConnect failed when running with the current user's login:\n" + ex.getMessage()); + System.err.println("\nConnect failed when running " + + "with the current user's login:\n" + ex.getMessage()); } } @@ -457,8 +460,9 @@ public class HttpNegotiateServer { return m.createCredential( null, GSSCredential.INDEFINITE_LIFETIME, - MyServerAuthenticator.this.scheme.equalsIgnoreCase("Negotiate")? - GSSUtil.GSS_SPNEGO_MECH_OID: + MyServerAuthenticator.this.scheme + .equalsIgnoreCase("Negotiate") ? + GSSUtil.GSS_SPNEGO_MECH_OID : GSSUtil.GSS_KRB5_MECH_OID, GSSCredential.ACCEPT_ONLY); } @@ -472,7 +476,8 @@ public class HttpNegotiateServer { GSSContext c = null; String auth = exch.getRequestHeaders().getFirst(respHdr); try { - c = (GSSContext)exch.getHttpContext().getAttributes().get("GSSContext"); + c = (GSSContext)exch.getHttpContext() + .getAttributes().get("GSSContext"); if (auth == null) { // First request Headers map = exch.getResponseHeaders(); map.set (reqHdr, scheme); // Challenge! @@ -485,7 +490,8 @@ public class HttpNegotiateServer { exch.getHttpContext().getAttributes().put("GSSContext", c); return new com.sun.net.httpserver.Authenticator.Retry(err); } else { // Later requests - byte[] token = Base64.getMimeDecoder().decode(auth.split(" ")[1]); + byte[] token = Base64.getMimeDecoder() + .decode(auth.split(" ")[1]); token = c.acceptSecContext(token, 0, token.length); Headers map = exch.getResponseHeaders(); map.set (reqHdr, scheme + " " + Base64.getMimeEncoder() diff --git a/jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java b/jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java index 72dbb728687..643134bf76d 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java +++ b/jdk/test/sun/security/pkcs11/Cipher/ReinitCipher.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ReinitCipher * @run main/othervm ReinitCipher sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java b/jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java index 49880d3706e..7804116aea4 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java @@ -27,7 +27,7 @@ * @summary Test internal PKCS5Padding impl with various error conditions. * @author Valerie Peng * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestPKCS5PaddingError * @run main/othervm TestPKCS5PaddingError sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java b/jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java index 160ce1cb5a1..abf5818ef77 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestRSACipher.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestRSACipher * @run main/othervm TestRSACipher sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java b/jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java index 4e4fb600852..d1c5485954c 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java @@ -27,7 +27,7 @@ * @summary basic test for RSA cipher key wrapping functionality * @author Valerie Peng * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestRSACipherWrap * @run main/othervm TestRSACipherWrap sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java b/jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java index ed85f315a75..7444c7684bf 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java @@ -28,7 +28,7 @@ * @author Valerie Peng * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestRawRSACipher * @run main/othervm TestRawRSACipher sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java b/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java index e94c61d2938..3ba5dabdcbc 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java @@ -28,7 +28,7 @@ * @author Valerie Peng * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestSymmCiphers * @run main/othervm TestSymmCiphers sm */ diff --git a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java b/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java index 4fc7d7b9553..f96c4a08e3f 100644 --- a/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java +++ b/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java @@ -28,7 +28,7 @@ * @author Valerie Peng * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestSymmCiphersNoPad * @run main/othervm TestSymmCiphersNoPad sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java b/jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java index 52b69892dae..7e3ceae5384 100644 --- a/jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java +++ b/jdk/test/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java @@ -26,7 +26,7 @@ * @bug 8072452 * @summary Support DHE sizes up to 8192-bits and DSA sizes up to 3072-bits * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm SupportedDHKeys * @run main/othervm SupportedDHKeys sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java b/jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java index c43dc081878..18a526dbe97 100644 --- a/jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java +++ b/jdk/test/sun/security/pkcs11/KeyAgreement/TestDH.java @@ -27,7 +27,7 @@ * @summary Verify that DH works properly * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestDH * @run main/othervm TestDH sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java b/jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java index 4834b761f89..d231efd95bd 100644 --- a/jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java +++ b/jdk/test/sun/security/pkcs11/KeyAgreement/TestInterop.java @@ -26,7 +26,7 @@ * @bug 7146728 * @summary Interop test for DH with secret that has a leading 0x00 byte * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestInterop * @run main/othervm TestInterop sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java b/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java index f082fee09ac..687daff0147 100644 --- a/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java +++ b/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java @@ -27,7 +27,7 @@ * @summary KAT test for DH (normal and with secret that has leading a 0x00 byte) * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestShort * @run main/othervm TestShort sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java b/jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java index cdfa887de0a..df0853ce04c 100644 --- a/jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java +++ b/jdk/test/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java @@ -26,7 +26,7 @@ * @bug 8072452 * @summary Support DHE sizes up to 8192-bits and DSA sizes up to 3072-bits * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm UnsupportedDHKeys * @run main/othervm UnsupportedDHKeys sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java b/jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java index 9e2b6da7b43..3b5d831fcf7 100644 --- a/jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java +++ b/jdk/test/sun/security/pkcs11/KeyGenerator/DESParity.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm DESParity * @run main/othervm DESParity sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java index f5297390348..ee2ccaa47d1 100644 --- a/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java +++ b/jdk/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java @@ -27,7 +27,7 @@ * @summary test the KeyGenerator * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestKeyGenerator * @run main/othervm TestKeyGenerator sm */ diff --git a/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java b/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java index f5a0a105fe8..4c04226e3ee 100644 --- a/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java +++ b/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java @@ -27,7 +27,7 @@ * @summary Ensure that DH key pairs can be generated for 512 - 8192 bits * @author Valerie Peng * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestDH2048 * @run main/othervm TestDH2048 sm */ diff --git a/jdk/test/sun/security/pkcs11/Mac/MacKAT.java b/jdk/test/sun/security/pkcs11/Mac/MacKAT.java index c068ac0e3c1..0894ea96efe 100644 --- a/jdk/test/sun/security/pkcs11/Mac/MacKAT.java +++ b/jdk/test/sun/security/pkcs11/Mac/MacKAT.java @@ -27,7 +27,7 @@ * @summary Basic known-answer-test for Hmac algorithms * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm MacKAT * @run main/othervm MacKAT sm */ diff --git a/jdk/test/sun/security/pkcs11/Mac/MacSameTest.java b/jdk/test/sun/security/pkcs11/Mac/MacSameTest.java index c1ee2ec4a67..818f1737af2 100644 --- a/jdk/test/sun/security/pkcs11/Mac/MacSameTest.java +++ b/jdk/test/sun/security/pkcs11/Mac/MacSameTest.java @@ -27,7 +27,7 @@ * @summary Check if doFinal and update operation result in same Mac * @author Yu-Ching Valerie Peng, Bill Situ, Alexander Fomin * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm MacSameTest * @run main/othervm MacSameTest sm * @key randomness diff --git a/jdk/test/sun/security/pkcs11/Mac/ReinitMac.java b/jdk/test/sun/security/pkcs11/Mac/ReinitMac.java index 97dcb7305b4..9973f46230a 100644 --- a/jdk/test/sun/security/pkcs11/Mac/ReinitMac.java +++ b/jdk/test/sun/security/pkcs11/Mac/ReinitMac.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ReinitMac * @run main/othervm ReinitMac sm */ diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java b/jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java index 64d7ff5ba65..3226442c71c 100644 --- a/jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java +++ b/jdk/test/sun/security/pkcs11/MessageDigest/ByteBuffers.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ByteBuffers * @run main/othervm ByteBuffers sm */ diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java b/jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java index 4a3b71f7deb..42aa231a05f 100644 --- a/jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java +++ b/jdk/test/sun/security/pkcs11/MessageDigest/DigestKAT.java @@ -27,7 +27,7 @@ * @summary Basic known-answer-test for all our MessageDigest algorithms * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm DigestKAT * @run main/othervm DigestKAT sm */ diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java index 3414a579754..04e43bb3fce 100644 --- a/jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java +++ b/jdk/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ReinitDigest * @run main/othervm ReinitDigest sm */ diff --git a/jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java b/jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java index 4bac0794227..2374e9bda79 100644 --- a/jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java +++ b/jdk/test/sun/security/pkcs11/MessageDigest/TestCloning.java @@ -28,7 +28,7 @@ * @author Valerie Peng * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestCloning * @run main/othervm TestCloning sm */ diff --git a/jdk/test/sun/security/pkcs11/Provider/Absolute.java b/jdk/test/sun/security/pkcs11/Provider/Absolute.java index 7906ac129c5..05d0e7860aa 100644 --- a/jdk/test/sun/security/pkcs11/Provider/Absolute.java +++ b/jdk/test/sun/security/pkcs11/Provider/Absolute.java @@ -24,7 +24,7 @@ * @test * @bug 7003952 7191662 * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @summary load DLLs and launch executables using fully qualified path */ diff --git a/jdk/test/sun/security/pkcs11/SampleTest.java b/jdk/test/sun/security/pkcs11/SampleTest.java index 5d5c68414f0..f3ee5bdaab6 100644 --- a/jdk/test/sun/security/pkcs11/SampleTest.java +++ b/jdk/test/sun/security/pkcs11/SampleTest.java @@ -27,7 +27,7 @@ * @summary XXX todo * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token */ import java.security.Provider; diff --git a/jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java b/jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java index 82fc4ab5f74..b6875a78c1c 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java +++ b/jdk/test/sun/security/pkcs11/Secmod/AddPrivateKey.java @@ -27,7 +27,7 @@ * @summary Test that the PKCS#11 KeyStore handles RSA, DSA, and EC keys * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm AddPrivateKey * @run main/othervm AddPrivateKey sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java b/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java index 1e085c33a24..c03cb861497 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java +++ b/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java @@ -27,7 +27,7 @@ * @summary make sure we can add a trusted cert to the NSS KeyStore module * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm AddTrustedCert * @run main/othervm AddTrustedCert sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/Crypto.java b/jdk/test/sun/security/pkcs11/Secmod/Crypto.java index b1b4372a49b..da57418e32b 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/Crypto.java +++ b/jdk/test/sun/security/pkcs11/Secmod/Crypto.java @@ -27,7 +27,7 @@ * @summary verify that NSS no-db mode works correctly * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm Crypto * @run main/othervm Crypto sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java b/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java index 9dd1fe0aaba..39db0a3f81f 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java +++ b/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java @@ -28,7 +28,7 @@ * and use a private key * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm GetPrivateKey * @run main/othervm GetPrivateKey sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java b/jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java index 360e5d1e684..c02a98aea8e 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java +++ b/jdk/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java @@ -27,7 +27,7 @@ * @summary store a NSS PKCS11 PrivateKeyEntry to JKS KeyStore throws confusing NPE * @author Wang Weijun * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm JksSetPrivateKey * @run main/othervm JksSetPrivateKey sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java b/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java index 2e1d85ce58f..e4218834924 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java +++ b/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java @@ -26,7 +26,7 @@ * @bug 8048622 8134232 * @summary Checks that PKCS#11 keystore can't be loaded with wrong password * @library ../ - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm LoadKeystore * @run main/othervm LoadKeystore sm policy */ diff --git a/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java b/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java index a26a5862d59..8735bc6fcb2 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java +++ b/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java @@ -27,7 +27,7 @@ * @summary make sure we can access the NSS trust anchor module * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TrustAnchors * @run main/othervm TrustAnchors sm policy */ diff --git a/jdk/test/sun/security/pkcs11/SecureRandom/Basic.java b/jdk/test/sun/security/pkcs11/SecureRandom/Basic.java index 3145431b867..19949777584 100644 --- a/jdk/test/sun/security/pkcs11/SecureRandom/Basic.java +++ b/jdk/test/sun/security/pkcs11/SecureRandom/Basic.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm Basic * @run main/othervm Basic sm */ diff --git a/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java b/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java index 37985dd96e7..27a3575df3e 100644 --- a/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java +++ b/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java @@ -26,7 +26,7 @@ * @bug 6837847 * @summary Ensure a deserialized PKCS#11 SecureRandom is functional. * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java b/jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java index a3deb72c974..b22465f0425 100644 --- a/jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java +++ b/jdk/test/sun/security/pkcs11/Serialize/SerializeProvider.java @@ -27,7 +27,7 @@ * @summary Test that the SunPKCS11 provider can be serialized * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java b/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java index 3d1afa3bcb0..854da848f28 100644 --- a/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java +++ b/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ByteBuffers * @run main/othervm ByteBuffers sm */ diff --git a/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java b/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java index 30f1d7f4f17..9a072269f99 100644 --- a/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java +++ b/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main ReinitSignature * @run main ReinitSignature * @run main ReinitSignature diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSA.java b/jdk/test/sun/security/pkcs11/Signature/TestDSA.java index b707d98ee20..11bfbfde324 100644 --- a/jdk/test/sun/security/pkcs11/Signature/TestDSA.java +++ b/jdk/test/sun/security/pkcs11/Signature/TestDSA.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestDSA * @run main/othervm TestDSA sm */ diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java index c1a0dc1bc57..673098e4d21 100644 --- a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java +++ b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java @@ -28,7 +28,7 @@ * with unsupported key sizes * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestDSAKeyLength * @run main/othervm TestDSAKeyLength sm */ diff --git a/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java index 7618851bc2a..8e70e224bf1 100644 --- a/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java +++ b/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java @@ -27,7 +27,7 @@ * @summary Make sure initSign/initVerify() check RSA key lengths * @author Yu-Ching Valerie Peng * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestRSAKeyLength * @run main/othervm TestRSAKeyLength sm */ diff --git a/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java b/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java index 3117c983402..46d44f446e2 100644 --- a/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java +++ b/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java @@ -29,7 +29,7 @@ * @author Andreas Sterbenz * @library .. * @library ../../../../java/security/testlibrary - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ReadCertificates * @run main/othervm ReadCertificates sm policy */ diff --git a/jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java b/jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java index 57af80441f8..8efbb0a9aea 100644 --- a/jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java +++ b/jdk/test/sun/security/pkcs11/ec/ReadPKCS12.java @@ -29,7 +29,7 @@ * @library .. * @library ../../../../java/security/testlibrary * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm ReadPKCS12 * @run main/othervm ReadPKCS12 sm policy */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestCurves.java b/jdk/test/sun/security/pkcs11/ec/TestCurves.java index 41e57619643..b07900153ec 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestCurves.java +++ b/jdk/test/sun/security/pkcs11/ec/TestCurves.java @@ -27,8 +27,8 @@ * @summary Basic consistency test for all curves using ECDSA and ECDH * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper - * @compile --add-modules jdk.crypto.pkcs11 TestCurves.java + * @modules jdk.crypto.token/sun.security.pkcs11.wrapper + * @compile --add-modules jdk.crypto.token TestCurves.java * @run main/othervm TestCurves * @run main/othervm TestCurves sm * @key randomness diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH.java b/jdk/test/sun/security/pkcs11/ec/TestECDH.java index d5432b03968..a967f8e2eff 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDH.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDH.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @library ../../../../java/security/testlibrary - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestECDH * @run main/othervm TestECDH sm policy */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java index d064e5263c3..2da9fbc333b 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java @@ -29,7 +29,7 @@ * @library .. * @library ../../../../java/security/testlibrary * @modules java.base/sun.security.util - * jdk.crypto.pkcs11 + * jdk.crypto.token * @compile -XDignore.symbol.file TestECDH2.java * @run main/othervm TestECDH2 * @run main/othervm TestECDH2 sm diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java index fd5de680064..8b516cc6f27 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java @@ -29,7 +29,7 @@ * @library .. * @library ../../../../java/security/testlibrary * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestECDSA * @run main/othervm TestECDSA sm policy */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java index fa0c5fc26b8..0a9b9c66b31 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java @@ -29,7 +29,7 @@ * @library .. * @library ../../../../java/security/testlibrary * @modules java.base/sun.security.util - * jdk.crypto.pkcs11 + * jdk.crypto.token * @compile -XDignore.symbol.file TestECDSA2.java * @run main/othervm TestECDSA2 * @run main/othervm TestECDSA2 sm diff --git a/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java b/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java index 4ce105030da..9d50c9522e1 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java @@ -27,7 +27,7 @@ * @summary Verify that we can use ECGenParameterSpec * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestECGenSpec * @run main/othervm TestECGenSpec sm */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java b/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java index 827af91ed9e..524c0485a91 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java +++ b/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java @@ -27,7 +27,7 @@ * @summary Test the P11ECKeyFactory * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestKeyFactory * @run main/othervm TestKeyFactory sm */ diff --git a/jdk/test/sun/security/pkcs11/rsa/KeyWrap.java b/jdk/test/sun/security/pkcs11/rsa/KeyWrap.java index 311a9b7f5aa..00c7199b7e3 100644 --- a/jdk/test/sun/security/pkcs11/rsa/KeyWrap.java +++ b/jdk/test/sun/security/pkcs11/rsa/KeyWrap.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm KeyWrap * @run main/othervm KeyWrap sm */ diff --git a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java b/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java index a79330b8fcb..012142e2776 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @library ../../../../java/security/testlibrary - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestCACerts * @run main/othervm TestCACerts sm TestCACerts.policy */ diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java b/jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java index d8292bcbad3..f999afae4e6 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestKeyFactory.java @@ -27,7 +27,7 @@ * @summary Test KeyFactory of the new RSA provider * @author Andreas Sterbenz * @library .. - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestKeyFactory * @run main/othervm TestKeyFactory sm rsakeys.ks.policy */ diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java index 84bbb60ab53..6671509b1e1 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java @@ -29,7 +29,7 @@ * @library .. * @library /lib/testlibrary * @build jdk.testlibrary.* - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator * sm TestKeyPairGenerator.policy diff --git a/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java b/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java index 84283b81ef8..e0c61d80901 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @key randomness - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestSignatures * @run main/othervm TestSignatures sm rsakeys.ks.policy */ diff --git a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java index 11fcaacaf79..a1689656057 100644 --- a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java +++ b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java @@ -33,7 +33,7 @@ * @author Andreas Sterbenz * @library .. * @library ../../../../java/security/testlibrary - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" * ClientJSSEServerJSSE * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" diff --git a/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java b/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java index 81a8b4571ba..c0b58d03d0d 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java +++ b/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @modules java.base/sun.security.internal.spec - * jdk.crypto.pkcs11 + * jdk.crypto.token * @run main/othervm TestKeyMaterial * @run main/othervm TestKeyMaterial sm policy */ diff --git a/jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java b/jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java index 2d9dc2890aa..e455cce5377 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java +++ b/jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java @@ -27,7 +27,7 @@ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement * @library .. * @author Pasi Eronen - * @modules jdk.crypto.pkcs11 + * @modules jdk.crypto.token * @run main/othervm TestLeadingZeroesP11 * @run main/othervm TestLeadingZeroesP11 sm */ diff --git a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java b/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java index de6863608d5..abaceb35268 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java +++ b/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java @@ -29,7 +29,7 @@ * @library .. * @modules java.base/sun.security.internal.interfaces * java.base/sun.security.internal.spec - * jdk.crypto.pkcs11 + * jdk.crypto.token * @run main/othervm TestMasterSecret * @run main/othervm TestMasterSecret sm TestMasterSecret.policy */ diff --git a/jdk/test/sun/security/pkcs11/tls/TestPRF.java b/jdk/test/sun/security/pkcs11/tls/TestPRF.java index 47b49e9a634..9efdb0063b3 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestPRF.java +++ b/jdk/test/sun/security/pkcs11/tls/TestPRF.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @modules java.base/sun.security.internal.spec - * jdk.crypto.pkcs11 + * jdk.crypto.token * @run main/othervm TestPRF * @run main/othervm TestPRF sm policy */ diff --git a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java b/jdk/test/sun/security/pkcs11/tls/TestPremaster.java index 67191a7df28..6bdace21519 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java +++ b/jdk/test/sun/security/pkcs11/tls/TestPremaster.java @@ -28,7 +28,7 @@ * @author Andreas Sterbenz * @library .. * @modules java.base/sun.security.internal.spec - * jdk.crypto.pkcs11 + * jdk.crypto.token * @run main/othervm TestPremaster * @run main/othervm TestPremaster sm policy */ diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java b/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java new file mode 100644 index 00000000000..6afeb274a28 --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java @@ -0,0 +1,228 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8047305 8075618 + * @summary Tests jarsigner tool and JarSigner API work with multi-release JAR files. + * @library /test/lib + * @library /lib/testlibrary + * @run main MVJarSigningTest + */ + +import jdk.security.jarsigner.JarSigner; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.KeyStore; +import java.security.PrivateKey; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.jar.JarFile; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.JDKToolLauncher; +import jdk.test.lib.Utils; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + + +public class MVJarSigningTest { + + private static final String TEST_SRC = System.getProperty("test.src", "."); + private static final String USR_DIR = System.getProperty("user.dir", "."); + private static final String JAR_NAME = "MV.jar"; + private static final String KEYSTORE = "keystore.jks"; + private static final String ALIAS = "JavaTest"; + private static final String STOREPASS = "changeit"; + private static final String KEYPASS = "changeit"; + private static final String SIGNED_JAR = "Signed.jar"; + private static final String POLICY_FILE = "SignedJar.policy"; + private static final String VERSION_MESSAGE = "I am running on version 9"; + + public static void main(String[] args) throws Throwable { + // compile java files in jarContent directory + compile("jarContent"); + + // create multi-release jar + Path classes = Paths.get("classes"); + jar("cf", JAR_NAME, "-C", classes.resolve("base").toString(), ".", + "--release", "9", "-C", classes.resolve("v9").toString(), ".", + "--release", "10", "-C", classes.resolve("v10").toString(), ".") + .shouldHaveExitValue(0); + + genKey(); + signJar(JAR_NAME) + .shouldHaveExitValue(0) + .shouldMatch("signing.*META-INF/versions/9/version/Version.class") + .shouldMatch("signing.*META-INF/versions/10/version/Version.class") + .shouldMatch("signing.*version/Main.class") + .shouldMatch("signing.*version/Version.class"); + verify(SIGNED_JAR); + + // test with JarSigner API + Files.deleteIfExists(Paths.get(SIGNED_JAR)); + signWithJarSignerAPI(JAR_NAME); + verify(SIGNED_JAR); + + // test Permission granted + File keypass = new File("keypass"); + try (FileOutputStream fos = new FileOutputStream(keypass)) { + fos.write(KEYPASS.getBytes()); + } + String[] cmd = { + "-classpath", SIGNED_JAR, + "-Djava.security.manager", + "-Djava.security.policy=" + + TEST_SRC + File.separator + POLICY_FILE, + "version.Main"}; + ProcessTools.executeTestJvm(cmd) + .shouldHaveExitValue(0) + .shouldContain(VERSION_MESSAGE); + } + + private static void compile (String jarContent_path) throws Throwable { + Path classes = Paths.get(USR_DIR, "classes", "base"); + Path source = Paths.get(TEST_SRC, jarContent_path, "base", "version"); + CompilerUtils.compile(source, classes); + + classes = Paths.get(USR_DIR, "classes", "v9"); + source = Paths.get(TEST_SRC, jarContent_path , "v9", "version"); + CompilerUtils.compile(source, classes); + + classes = Paths.get(USR_DIR, "classes", "v10"); + source = Paths.get(TEST_SRC, jarContent_path, "v10", "version"); + CompilerUtils.compile(source, classes); + } + + private static OutputAnalyzer jar(String...args) throws Throwable { + JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jar"); + Stream.of(args).forEach(launcher::addToolArg); + return ProcessTools.executeCommand(launcher.getCommand()); + } + + private static void genKey() throws Throwable { + String keytool = JDKToolFinder.getJDKTool("keytool"); + Files.deleteIfExists(Paths.get(KEYSTORE)); + ProcessTools.executeCommand(keytool, + "-J-Duser.language=en", + "-J-Duser.country=US", + "-genkey", + "-alias", ALIAS, + "-keystore", KEYSTORE, + "-keypass", KEYPASS, + "-dname", "cn=sample", + "-storepass", STOREPASS + ).shouldHaveExitValue(0); + } + + private static OutputAnalyzer signJar(String jarName) throws Throwable { + List args = new ArrayList<>(); + args.add("-verbose"); + args.add("-signedjar"); + args.add(SIGNED_JAR); + args.add(jarName); + args.add(ALIAS); + + return jarsigner(args); + } + + private static void verify(String signedJarName) throws Throwable { + verifyJar(signedJarName) + .shouldHaveExitValue(0) + .shouldContain("jar verified") + .shouldMatch("smk.*META-INF/versions/9/version/Version.class") + .shouldMatch("smk.*META-INF/versions/10/version/Version.class") + .shouldMatch("smk.*version/Main.class") + .shouldMatch("smk.*version/Version.class"); + } + + private static OutputAnalyzer verifyJar(String signedJarName) throws Throwable { + List args = new ArrayList<>(); + args.add("-verbose"); + args.add("-verify"); + args.add(signedJarName); + + return jarsigner(args); + } + + private static OutputAnalyzer jarsigner(List extra) + throws Throwable { + JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jarsigner") + .addVMArg("-Duser.language=en") + .addVMArg("-Duser.country=US") + .addToolArg("-keystore") + .addToolArg(KEYSTORE) + .addToolArg("-storepass") + .addToolArg(STOREPASS) + .addToolArg("-keypass") + .addToolArg(KEYPASS); + for (String s : extra) { + if (s.startsWith("-J")) { + launcher.addVMArg(s.substring(2)); + } else { + launcher.addToolArg(s); + } + } + return ProcessTools.executeCommand(launcher.getCommand()); + } + + private static void signWithJarSignerAPI(String jarName) + throws Throwable { + // Get JarSigner + try (FileInputStream fis = new FileInputStream(KEYSTORE)) { + KeyStore ks = KeyStore.getInstance("JKS"); + ks.load(fis, STOREPASS.toCharArray()); + PrivateKey pk = (PrivateKey)ks.getKey(ALIAS, KEYPASS.toCharArray()); + Certificate cert = ks.getCertificate(ALIAS); + JarSigner signer = new JarSigner.Builder(pk, + CertificateFactory.getInstance("X.509").generateCertPath( + Collections.singletonList(cert))) + .build(); + // Sign jar + try (ZipFile src = new JarFile(jarName); + FileOutputStream out = new FileOutputStream(SIGNED_JAR)) { + signer.sign(src,out); + } + } + } + +} + + diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/SignedJar.policy b/jdk/test/sun/security/tools/jarsigner/multiRelease/SignedJar.policy new file mode 100644 index 00000000000..f39efb57dee --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/SignedJar.policy @@ -0,0 +1,10 @@ +keystore "file:keystore.jks"; +keystorePasswordURL "file:keypass"; + +grant signedBy "JavaTest" { + permission java.lang.RuntimePermission "setIO"; +}; + +grant signedBy "other" { + permission java.lang.RuntimePermission "setFactory"; +}; diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java new file mode 100644 index 00000000000..482b1475850 --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Main.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package version; + +import java.security.Permission; + +public class Main { + + public static void main(String[] args) { + Version v = new Version(); + System.out.println("I am running on version " + v.getVersion()); + } +} diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java new file mode 100644 index 00000000000..3ad444066d3 --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/base/version/Version.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package version; + +public class Version { + + public int getVersion() { + return 8; + } +} diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java new file mode 100644 index 00000000000..0a816cbbdcf --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v10/version/Version.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package version; + +public class Version { + + public int getVersion() { + return 10; + } +} + diff --git a/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java new file mode 100644 index 00000000000..39b09f094d6 --- /dev/null +++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/jarContent/v9/version/Version.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package version; + +import java.security.AccessControlException; +import java.security.AccessController; +import java.security.Permission; +import java.security.PrivilegedAction; + +public class Version { + private static final Permission PERM1 = new RuntimePermission("setIO"); + private static final Permission PERM2 = new RuntimePermission("setFactory"); + + public int getVersion() { + checkPermission(PERM1, false); + checkPermission(PERM2, true); + return 9; + } + + private void checkPermission(Permission perm, boolean expectException) { + boolean getException = (Boolean) AccessController + .doPrivileged((PrivilegedAction) () -> { + try { + AccessController.checkPermission(perm); + return (Boolean) false; + } catch (AccessControlException ex) { + return (Boolean) true; + } + }); + + if (expectException ^ getException) { + String message = "Check Permission :" + perm + "\n ExpectException = " + + expectException + "\n getException = " + getException; + throw new RuntimeException(message); + } + } +} diff --git a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java index 998e1b2eed2..9285044b358 100644 --- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java +++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java @@ -44,7 +44,7 @@ import jdk.testlibrary.Utils; import jdk.testlibrary.OutputAnalyzer; import jdk.testlibrary.ProcessTools; import jdk.test.lib.apps.LingeredApp; -import jdk.testlibrary.Platform; +import jdk.test.lib.Platform; public class BasicLauncherTest { @@ -230,8 +230,7 @@ public class BasicLauncherTest { Arrays.asList(toolArgs)); } - public static void main(String[] args) - throws IOException { + public static void main(String[] args) throws Exception { if (!Platform.shouldSAAttach()) { // Silently skip the test if we don't have enough permissions to attach diff --git a/jdk/test/sun/tools/jhsdb/HeapDumpTest.java b/jdk/test/sun/tools/jhsdb/HeapDumpTest.java index 59772a3c421..bc1d6553885 100644 --- a/jdk/test/sun/tools/jhsdb/HeapDumpTest.java +++ b/jdk/test/sun/tools/jhsdb/HeapDumpTest.java @@ -41,7 +41,7 @@ import jdk.testlibrary.JDKToolLauncher; import jdk.testlibrary.OutputAnalyzer; import jdk.testlibrary.ProcessTools; import jdk.test.lib.apps.LingeredApp; -import jdk.testlibrary.Platform; +import jdk.test.lib.Platform; public class HeapDumpTest { @@ -109,8 +109,7 @@ public class HeapDumpTest { dump.delete(); } - public static void main(String[] args) - throws IOException { + public static void main(String[] args) throws Exception { if (!Platform.shouldSAAttach()) { // Silently skip the test if we don't have enough permissions to attach diff --git a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java index 1f88fd325b1..75437fa4ed3 100644 --- a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java +++ b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java @@ -30,7 +30,7 @@ import java.util.Map; import jdk.test.lib.apps.LingeredApp; import jdk.testlibrary.Utils; -import jdk.testlibrary.Platform; +import jdk.test.lib.Platform; /* * @test diff --git a/jdk/test/tools/jar/compat/CLICompatibility.java b/jdk/test/tools/jar/compat/CLICompatibility.java index 9355f18a66b..c31762eedc3 100644 --- a/jdk/test/tools/jar/compat/CLICompatibility.java +++ b/jdk/test/tools/jar/compat/CLICompatibility.java @@ -43,6 +43,7 @@ import org.testng.annotations.Test; import static java.lang.String.format; import static java.lang.System.out; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; /* @@ -428,10 +429,12 @@ public class CLICompatibility { jar("--help") .assertSuccess() - .resultChecker(r -> + .resultChecker(r -> { assertTrue(r.output.startsWith("Usage: jar [OPTION...] [ [--release VERSION] [-C dir] files]"), - "Failed, got [" + r.output + "]") - ); + "Failed, got [" + r.output + "]"); + assertFalse(r.output.contains("--do-not-resolve-by-default")); + assertFalse(r.output.contains("--warn-if-resolved")); + }); jar("--help:compat") .assertSuccess() @@ -439,6 +442,15 @@ public class CLICompatibility { assertTrue(r.output.startsWith("Compatibility Interface:"), "Failed, got [" + r.output + "]") ); + + jar("--help-extra") + .assertSuccess() + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jar [OPTION...] [ [--release VERSION] [-C dir] files]"), + "Failed, got [" + r.output + "]"); + assertTrue(r.output.contains("--do-not-resolve-by-default")); + assertTrue(r.output.contains("--warn-if-resolved")); + }); } // -- Infrastructure diff --git a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java b/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java index 92329265533..2d1d844c818 100644 --- a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java +++ b/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java @@ -25,16 +25,18 @@ package jdk.test.bar; import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Exports; -import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Provides; +import java.lang.module.ModuleReference; +import java.lang.module.ResolvedModule; +import java.lang.reflect.Module; import java.util.Optional; import java.util.StringJoiner; import java.util.HashSet; import java.util.Set; - import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.JavaLangModuleAccess; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; import jdk.test.bar.internal.Message; public class Bar { @@ -71,9 +73,14 @@ public class Bar { if (!sj.toString().equals("")) System.out.println("contains:" + sj.toString()); - ModuleDescriptor foo = jdk.test.foo.Foo.class.getModule().getDescriptor(); - JavaLangModuleAccess jlma = SharedSecrets.getJavaLangModuleAccess(); - Optional oHashes = jlma.hashes(foo); - System.out.println("hashes:" + oHashes.get().hashFor("bar")); + + Module foo = jdk.test.foo.Foo.class.getModule(); + Optional om = foo.getLayer().configuration().findModule(foo.getName()); + assert om.isPresent(); + ModuleReference mref = om.get().reference(); + assert mref instanceof ModuleReferenceImpl; + ModuleHashes hashes = ((ModuleReferenceImpl) mref).recordedHashes(); + assert hashes != null; + System.out.println("hashes:" + hashes.hashFor("bar")); } } diff --git a/jdk/test/tools/jimage/VerifyJimage.java b/jdk/test/tools/jimage/VerifyJimage.java index 30628ad9921..d5415af35b0 100644 --- a/jdk/test/tools/jimage/VerifyJimage.java +++ b/jdk/test/tools/jimage/VerifyJimage.java @@ -49,7 +49,7 @@ import jdk.internal.jimage.ImageLocation; * @test * @summary Verify jimage * @modules java.base/jdk.internal.jimage - * @run main/othervm --add-modules=ALL-SYSTEM VerifyJimage + * @run main/othervm --add-modules=ALL-SYSTEM,jdk.incubator.httpclient VerifyJimage */ /** diff --git a/jdk/test/tools/jlink/CustomPluginTest.java b/jdk/test/tools/jlink/CustomPluginTest.java index 2464735a216..9fad705de53 100644 --- a/jdk/test/tools/jlink/CustomPluginTest.java +++ b/jdk/test/tools/jlink/CustomPluginTest.java @@ -156,7 +156,7 @@ public class CustomPluginTest { .option("--rogue-filter") .option("/foo/") .call() - .assertFailure("java.lang.module.ResolutionException"); + .assertFailure("foo not found"); } { diff --git a/jdk/test/tools/jlink/IntegrationTest.java b/jdk/test/tools/jlink/IntegrationTest.java index 8d6bb303bdc..e9666676b25 100644 --- a/jdk/test/tools/jlink/IntegrationTest.java +++ b/jdk/test/tools/jlink/IntegrationTest.java @@ -186,7 +186,7 @@ public class IntegrationTest { lst.add(new MyPostProcessor()); } // Image builder - DefaultImageBuilder builder = new DefaultImageBuilder(output); + DefaultImageBuilder builder = new DefaultImageBuilder(output, Collections.emptyMap()); PluginsConfiguration plugins = new Jlink.PluginsConfiguration(lst, builder, null); diff --git a/jdk/test/tools/jlink/JLinkTest.java b/jdk/test/tools/jlink/JLinkTest.java index 4d12ddcb3bc..874c9dfef32 100644 --- a/jdk/test/tools/jlink/JLinkTest.java +++ b/jdk/test/tools/jlink/JLinkTest.java @@ -190,17 +190,6 @@ public class JLinkTest { } } - { - // License files - String copied = "LICENSE"; - String[] arr = copied.split(","); - String[] copyFiles = new String[2]; - copyFiles[0] = "--copy-files"; - copyFiles[1] = copied; - Path imageDir = helper.generateDefaultImage(copyFiles, "composite2").assertSuccess(); - helper.checkImage(imageDir, "composite2", null, null, arr); - } - { // List plugins StringWriter writer = new StringWriter(); diff --git a/jdk/test/tools/jlink/ModuleNamesOrderTest.java b/jdk/test/tools/jlink/ModuleNamesOrderTest.java index 09a4dfd9f79..20b642d1ef3 100644 --- a/jdk/test/tools/jlink/ModuleNamesOrderTest.java +++ b/jdk/test/tools/jlink/ModuleNamesOrderTest.java @@ -38,6 +38,12 @@ import tests.JImageGenerator; * @bug 8168925 * @summary MODULES property should be topologically ordered and space-separated list * @library ../lib + * @modules java.base/jdk.internal.jimage + * jdk.jdeps/com.sun.tools.classfile + * jdk.jlink/jdk.tools.jlink.internal + * jdk.jlink/jdk.tools.jmod + * jdk.jlink/jdk.tools.jimage + * jdk.compiler * @build tests.* * @run main ModuleNamesOrderTest */ diff --git a/jdk/test/tools/jlink/ReleaseImplementorTest.java b/jdk/test/tools/jlink/ReleaseImplementorTest.java new file mode 100644 index 00000000000..7f935ea5a1c --- /dev/null +++ b/jdk/test/tools/jlink/ReleaseImplementorTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Properties; + +/* + * @test + * @bug 8171316 + * @summary Add IMPLEMENTOR property to the release file + * @run main ReleaseImplementorTest + */ +public class ReleaseImplementorTest { + public static void main(String[] args) throws Exception { + Properties props = new Properties(); + Path release = Paths.get(System.getProperty("test.jdk"), "release"); + try (InputStream in = Files.newInputStream(release)) { + props.load(in); + } + + if (!props.containsKey("IMPLEMENTOR")) { + throw new RuntimeException("IMPLEMENTOR key is missing"); + } + + String implementor = props.getProperty("IMPLEMENTOR"); + if (implementor.length() < 3) { + throw new RuntimeException("IMPLEMENTOR value is not expected length"); + } + + if (implementor.charAt(0) != '"' || + implementor.charAt(implementor.length() - 1) != '"') { + throw new RuntimeException("IMPLEMENTOR value not quoted property"); + } + + System.out.println("IMPLEMENTOR is " + implementor); + } +} diff --git a/jdk/test/tools/jlink/basic/BasicTest.java b/jdk/test/tools/jlink/basic/BasicTest.java index 87b2b0ef69d..ae49a01820c 100644 --- a/jdk/test/tools/jlink/basic/BasicTest.java +++ b/jdk/test/tools/jlink/basic/BasicTest.java @@ -87,20 +87,29 @@ public class BasicTest { JarUtils.createJarFile(jarfile, classes); Path image = Paths.get("mysmallimage"); - runJmod(jarfile.toString(), TEST_MODULE); - runJlink(image, TEST_MODULE, "--compress", "2"); - execute(image, TEST_MODULE); + runJmod(jarfile.toString(), TEST_MODULE, true); + runJlink(image, TEST_MODULE, "--compress", "2", "--launcher", "foo=" + TEST_MODULE); + execute(image, "foo"); Files.delete(jmods.resolve(TEST_MODULE + ".jmod")); image = Paths.get("myimage"); - runJmod(classes.toString(), TEST_MODULE); - runJlink(image, TEST_MODULE); - execute(image, TEST_MODULE); + runJmod(classes.toString(), TEST_MODULE, true); + runJlink(image, TEST_MODULE, "--launcher", "bar=" + TEST_MODULE); + execute(image, "bar"); + + Files.delete(jmods.resolve(TEST_MODULE + ".jmod")); + + image = Paths.get("myimage2"); + runJmod(classes.toString(), TEST_MODULE, false /* no ModuleMainClass! */); + // specify main class in --launcher command line + runJlink(image, TEST_MODULE, "--launcher", "bar2=" + TEST_MODULE + "/jdk.test.Test"); + execute(image, "bar2"); + } - private void execute(Path image, String moduleName) throws Throwable { - String cmd = image.resolve("bin").resolve(moduleName).toString(); + private void execute(Path image, String scriptName) throws Throwable { + String cmd = image.resolve("bin").resolve(scriptName).toString(); OutputAnalyzer analyzer; if (System.getProperty("os.name").startsWith("Windows")) { analyzer = ProcessTools.executeProcess("sh.exe", cmd, "1", "2", "3"); @@ -127,14 +136,25 @@ public class BasicTest { } } - private void runJmod(String cp, String modName) { - int rc = JMOD_TOOL.run(System.out, System.out, new String[] { + private void runJmod(String cp, String modName, boolean main) { + int rc; + if (main) { + rc = JMOD_TOOL.run(System.out, System.out, new String[] { "create", "--class-path", cp, "--module-version", "1.0", "--main-class", "jdk.test.Test", + jmods.resolve(modName + ".jmod").toString() + }); + } else { + rc = JMOD_TOOL.run(System.out, System.out, new String[] { + "create", + "--class-path", cp, + "--module-version", "1.0", jmods.resolve(modName + ".jmod").toString(), - }); + }); + } + if (rc != 0) { throw new AssertionError("Jmod failed: rc = " + rc); } diff --git a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java b/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java deleted file mode 100644 index 9137ed30e1e..00000000000 --- a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @summary Test files copy plugin - * @author Jean-Francois Denise - * @modules jdk.jlink/jdk.tools.jlink.internal - * jdk.jlink/jdk.tools.jlink.builder - * jdk.jlink/jdk.tools.jlink.internal.plugins - * @run main FileCopierPluginTest - */ - -import java.io.File; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import jdk.tools.jlink.internal.ResourcePoolManager; -import jdk.tools.jlink.builder.DefaultImageBuilder; - -import jdk.tools.jlink.internal.plugins.FileCopierPlugin; -import jdk.tools.jlink.plugin.PluginException; -import jdk.tools.jlink.plugin.ResourcePoolEntry; -import jdk.tools.jlink.plugin.ResourcePool; - -public class FileCopierPluginTest { - - public static void main(String[] args) throws Exception { - new FileCopierPluginTest().test(); - } - - /** - * 3 cases - Absolute, no target ==> copy in image root dir - Absolute and - * target ==> copy in image root dir/target - Relative ==> copy from JDK - * home dir. - * - * @throws Exception - */ - public void test() throws Exception { - FileCopierPlugin plug = new FileCopierPlugin(); - String content = "You \n should \n be \bthere.\n"; - String name = "sample.txt"; - File src = new File("src"); - src.mkdir(); - // Need a fake bin - File bin = new File("bin"); - bin.mkdir(); - - File txt = new File(src, name); - txt.createNewFile(); - - String target = "target" + File.separator + name; - Files.write(txt.toPath(), content.getBytes()); - File lic = new File(System.getProperty("java.home"), "LICENSE.txt"); - StringBuilder builder = new StringBuilder(); - int expected = lic.exists() ? 4 : 3; - if (lic.exists()) { - builder.append("LICENSE.txt,"); - } - builder.append(txt.getAbsolutePath()+","); - builder.append(txt.getAbsolutePath() + "=" + target+","); - builder.append(src.getAbsolutePath() + "=src2"); - - Map conf = new HashMap<>(); - conf.put(FileCopierPlugin.NAME, builder.toString()); - plug.configure(conf); - ResourcePoolManager poolMgr = new ResourcePoolManager(); - // java.base/module-info.class is used to add "release" file - // We read it from jrt-fs and add a ResourcePoolEntry - poolMgr.add( - ResourcePoolEntry.create("/java.base/module-info.class", - ResourcePoolEntry.Type.CLASS_OR_RESOURCE, getJavaBaseModuleInfo())); - expected++; - ResourcePool pool = plug.transform( - new ResourcePoolManager().resourcePool(), - poolMgr.resourcePoolBuilder()); - if (pool.entryCount() != expected) { - throw new AssertionError("Wrong number of added files"); - } - pool.entries().forEach(f -> { - if (!f.type().equals(ResourcePoolEntry.Type.OTHER) && - !f.type().equals(ResourcePoolEntry.Type.CLASS_OR_RESOURCE)) { - throw new AssertionError("Invalid type " + f.type() - + " for file " + f.path()); - } - if (f.content() == null) { - throw new AssertionError("Null stream for file " + f.path()); - } - }); - Path root = new File(".").toPath(); - DefaultImageBuilder imgbuilder = new DefaultImageBuilder(root); - imgbuilder.storeFiles(pool); - - if (lic.exists()) { - File license = new File(root.toFile(), "LICENSE.txt"); - if (!license.exists() || license.length() == 0) { - throw new AssertionError("Invalid license file " - + license.getAbsoluteFile()); - } - } - - File sample1 = new File(root.toFile(), txt.getName()); - if (!sample1.exists() || sample1.length() == 0) { - throw new AssertionError("Invalide sample1 file " - + sample1.getAbsoluteFile()); - } - if (!new String(Files.readAllBytes(sample1.toPath())).equals(content)) { - throw new AssertionError("Invalid Content in sample1"); - } - - File sample2 = new File(root.toFile(), target); - if (!sample2.exists() || sample2.length() == 0) { - throw new AssertionError("Invalide sample2 file " - + sample2.getAbsoluteFile()); - } - if (!new String(Files.readAllBytes(sample2.toPath())).equals(content)) { - throw new AssertionError("Invalid Content in sample2"); - } - - File src2 = new File(root.toFile(), "src2"); - if (!src2.exists() || src2.list().length != 1) { - throw new AssertionError("Invalide src2 dir " - + src2.getAbsoluteFile()); - } - File f = src2.listFiles()[0]; - if (!f.getName().equals(txt.getName())) { - throw new AssertionError("Invalide file name in src2 dir " - + f.getAbsoluteFile()); - } - if (!new String(Files.readAllBytes(f.toPath())).equals(content)) { - throw new AssertionError("Invalid Content in src2 dir"); - } - } - - // read java.base/module-info.class from jrt-fs - private static Path getJavaBaseModuleInfo() { - return Paths.get(URI.create("jrt:/modules/java.base/module-info.class")); - } -} diff --git a/jdk/test/tools/jlink/plugins/LegalFilePluginTest.java b/jdk/test/tools/jlink/plugins/LegalFilePluginTest.java new file mode 100644 index 00000000000..d5b3dfde4b4 --- /dev/null +++ b/jdk/test/tools/jlink/plugins/LegalFilePluginTest.java @@ -0,0 +1,387 @@ +/** + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8169925 + * @summary Validate the license files deduplicated in the image + * @library /lib/testlibrary + * @modules jdk.compiler + * jdk.jlink + * @build CompilerUtils + * @run testng LegalFilePluginTest + */ + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UncheckedIOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.spi.ToolProvider; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static org.testng.Assert.*; + +public class LegalFilePluginTest { + static final ToolProvider JMOD_TOOL = ToolProvider.findFirst("jmod") + .orElseThrow(() -> + new RuntimeException("jmod tool not found") + ); + + static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink") + .orElseThrow(() -> + new RuntimeException("jlink tool not found") + ); + + static final Path MODULE_PATH = Paths.get(System.getProperty("java.home"), "jmods"); + static final Path SRC_DIR = Paths.get("src"); + static final Path MODS_DIR = Paths.get("mods"); + static final Path JMODS_DIR = Paths.get("jmods"); + static final Path LEGAL_DIR = Paths.get("legal"); + static final Path IMAGES_DIR = Paths.get("images"); + + static final Map, Map> LICENSES = Map.of( + // Key is module name and requires + // Value is a map of filename to the file content + List.of("m1"), Map.of("LICENSE", "m1 LICENSE", + "m1-license.txt", "m1 license", + "test-license", "test license v1"), + List.of("m2", "m1"), Map.of("m2-license", "m2 license", + "test-license", "test license v1"), + List.of("m3"), Map.of("m3-license.md", "m3 license", + "test-license", "test license v3"), + List.of("m4"), Map.of("test-license", "test license v4") + ); + + @BeforeTest + private void setup() throws Exception { + List builders = new ArrayList<>(); + for (Map.Entry, Map> e : LICENSES.entrySet()) { + List names = e.getKey(); + String mn = names.get(0); + JmodFileBuilder builder = new JmodFileBuilder(mn); + builders.add(builder); + + if (names.size() > 1) { + names.subList(1, names.size()) + .stream() + .forEach(builder::requires); + } + e.getValue().entrySet() + .stream() + .forEach(f -> builder.licenseFile(f.getKey(), f.getValue())); + // generate source + builder.writeModuleInfo(); + } + + // create jmod file + for (JmodFileBuilder builder: builders) { + builder.build(); + } + + } + + private String imageDir(String dir) { + return IMAGES_DIR.resolve(dir).toString(); + } + + + @DataProvider(name = "modules") + public Object[][] jlinkoptions() { + String m2TestLicenseContent = + symlinkContent(Paths.get("legal", "m2", "test-license"), + Paths.get("legal", "m1", "test-license"), + "test license v1"); + // options and expected header files & man pages + return new Object[][] { + { new String [] { + "test1", + "--add-modules=m1", + }, + Map.of( "m1/LICENSE", "m1 LICENSE", + "m1/m1-license.txt", "m1 license", + "m1/test-license", "test license v1") + }, + { new String [] { + "test2", + "--add-modules=m1,m2", + }, + Map.of( "m1/LICENSE", "m1 LICENSE", + "m1/m1-license.txt", "m1 license", + "m1/test-license", "test license v1", + "m2/m2-license", "m2 license", + "m2/test-license", m2TestLicenseContent), + }, + { new String [] { + "test3", + "--add-modules=m2,m3", + }, + Map.of( "m1/LICENSE", "m1 LICENSE", + "m1/m1-license.txt", "m1 license", + "m1/test-license", "test license v1", + "m2/m2-license", "m2 license", + "m2/test-license", m2TestLicenseContent, + "m3/m3-license.md", "m3 license", + "m3/test-license", "test license v3"), + }, + }; + } + + private static String symlinkContent(Path source, Path target, String content) { + String osName = System.getProperty("os.name"); + if (!osName.startsWith("Windows") && MODULE_PATH.getFileSystem() + .supportedFileAttributeViews() + .contains("posix")) { + // symlink created + return content; + } else { + // tiny file is created + Path symlink = source.getParent().relativize(target); + return String.format("Please see %s", symlink.toString()); + } + } + + @Test(dataProvider = "modules") + public void test(String[] opts, Map expectedFiles) throws Exception { + if (Files.notExists(MODULE_PATH)) { + // exploded image + return; + } + + String dir = opts[0]; + List options = new ArrayList<>(); + for (int i = 1; i < opts.length; i++) { + options.add(opts[i]); + } + + String mpath = MODULE_PATH.toString() + File.pathSeparator + + JMODS_DIR.toString(); + Stream.of("--module-path", mpath, + "--output", imageDir(dir)) + .forEach(options::add); + + Path image = createImage(dir, options); + + Files.walk(image.resolve("legal"), Integer.MAX_VALUE) + .filter(p -> Files.isRegularFile(p)) + .filter(p -> p.getParent().endsWith("m1") || + p.getParent().endsWith("m2") || + p.getParent().endsWith("m3") || + p.getParent().endsWith("m4")) + .forEach(p -> { + String fn = image.resolve("legal").relativize(p) + .toString() + .replace(File.separatorChar, '/'); + System.out.println(fn); + if (!expectedFiles.containsKey(fn)) { + throw new RuntimeException(fn + " should not be in the image"); + } + compareFileContent(p, expectedFiles.get(fn)); + }); + } + + @Test + public void errorIfNotSameContent() { + if (Files.notExists(MODULE_PATH)) { + // exploded image + return; + } + + String dir = "test"; + + String mpath = MODULE_PATH.toString() + File.pathSeparator + + JMODS_DIR.toString(); + List options = Stream.of("--dedup-legal-notices", + "error-if-not-same-content", + "--module-path", mpath, + "--add-modules=m3,m4", + "--output", imageDir(dir)) + .collect(Collectors.toList()); + + StringWriter writer = new StringWriter(); + PrintWriter pw = new PrintWriter(writer); + System.out.println("jlink " + options.stream().collect(Collectors.joining(" "))); + int rc = JLINK_TOOL.run(pw, pw, + options.toArray(new String[0])); + assertTrue(rc != 0); + assertTrue(writer.toString().trim() + .matches("Error:.*/m4/legal/m4/test-license .*contain different content")); + } + + private void compareFileContent(Path file, String content) { + try { + byte[] bytes = Files.readAllBytes(file); + byte[] expected = String.format("%s%n", content).getBytes(); + assertEquals(bytes, expected, String.format("%s not matched:%nfile: %s%nexpected:%s%n", + file.toString(), new String(bytes), new String(expected))); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + private Path createImage(String outputDir, List options) { + System.out.println("jlink " + options.stream().collect(Collectors.joining(" "))); + int rc = JLINK_TOOL.run(System.out, System.out, + options.toArray(new String[0])); + assertTrue(rc == 0); + + return IMAGES_DIR.resolve(outputDir); + } + + private void deleteDirectory(Path dir) throws IOException { + Files.walkFileTree(dir, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException + { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) + throws IOException + { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } + }); + } + + /** + * Builder to create JMOD file + */ + class JmodFileBuilder { + + final String name; + final Set requires = new HashSet<>(); + final Map licenses = new HashMap<>(); + + JmodFileBuilder(String name) throws IOException { + this.name = name; + + Path msrc = SRC_DIR.resolve(name); + if (Files.exists(msrc)) { + deleteDirectory(msrc); + } + } + + JmodFileBuilder writeModuleInfo()throws IOException { + Path msrc = SRC_DIR.resolve(name); + Files.createDirectories(msrc); + Path minfo = msrc.resolve("module-info.java"); + try (BufferedWriter bw = Files.newBufferedWriter(minfo); + PrintWriter writer = new PrintWriter(bw)) { + writer.format("module %s {%n", name); + for (String req : requires) { + writer.format(" requires %s;%n", req); + } + writer.format("}%n"); + } + return this; + } + + JmodFileBuilder licenseFile(String filename, String content) { + licenses.put(filename, content); + return this; + } + + JmodFileBuilder requires(String name) { + requires.add(name); + return this; + } + + Path build() throws IOException { + compileModule(); + + Path mdir = LEGAL_DIR.resolve(name); + for (Map.Entry e : licenses.entrySet()) { + Files.createDirectories(mdir); + String filename = e.getKey(); + String content = e.getValue(); + Path file = mdir.resolve(filename); + try (BufferedWriter writer = Files.newBufferedWriter(file); + PrintWriter pw = new PrintWriter(writer)) { + pw.println(content); + } + } + + return createJmodFile(); + } + + + void compileModule() throws IOException { + Path msrc = SRC_DIR.resolve(name); + assertTrue(CompilerUtils.compile(msrc, MODS_DIR, + "--module-source-path", + SRC_DIR.toString())); + } + + Path createJmodFile() throws IOException { + Path mclasses = MODS_DIR.resolve(name); + Files.createDirectories(JMODS_DIR); + Path outfile = JMODS_DIR.resolve(name + ".jmod"); + List args = new ArrayList<>(); + args.add("create"); + // add classes + args.add("--class-path"); + args.add(mclasses.toString()); + if (licenses.size() > 0) { + args.add("--legal-notices"); + args.add(LEGAL_DIR.resolve(name).toString()); + } + args.add(outfile.toString()); + + if (Files.exists(outfile)) + Files.delete(outfile); + + System.out.println("jmod " + + args.stream().collect(Collectors.joining(" "))); + + int rc = JMOD_TOOL.run(System.out, System.out, + args.toArray(new String[args.size()])); + if (rc != 0) { + throw new AssertionError("jmod failed: rc = " + rc); + } + return outfile; + } + } +} diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java new file mode 100644 index 00000000000..fb7f5569e06 --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jdk.testlibrary.FileUtils; +import static jdk.testlibrary.ProcessTools.*; + + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +/** + * @test + * @library /lib/testlibrary + * @modules jdk.compiler jdk.jlink + * @build CompiledVersionTest CompilerUtils jdk.testlibrary.FileUtils jdk.testlibrary.ProcessTools + * @run testng CompiledVersionTest + */ + +public class CompiledVersionTest { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final String TEST_SRC = System.getProperty("test.src"); + + private static final Path SRC_DIR = Paths.get(TEST_SRC, "src"); + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path IMAGE = Paths.get("image"); + private static final Path JMODS = Paths.get(JAVA_HOME, "jmods"); + private static final String MAIN_MID = "test/jdk.test.Main"; + + // the names of the modules in this test + private static String[] modules = new String[] { "m1", "m2", "test"}; + private static String[] versions = new String[] { "1.0", "2-ea", "3-internal"}; + + + private static boolean hasJmods() { + if (!Files.exists(JMODS)) { + System.err.println("Test skipped. NO jmods directory"); + return false; + } + return true; + } + + /* + * Compiles all modules used by the test + */ + @BeforeTest + public void compileAll() throws Throwable { + if (!hasJmods()) return; + + for (int i=0; i < modules.length; i++) { + String mn = modules[i]; + String version = versions[i]; + Path msrc = SRC_DIR.resolve(mn); + if (version.equals("0")) { + assertTrue(CompilerUtils.compile(msrc, MODS_DIR, + "--module-source-path", SRC_DIR.toString())); + } else { + assertTrue(CompilerUtils.compile(msrc, MODS_DIR, + "--module-source-path", SRC_DIR.toString(), + "--module-version", version)); + } + } + + if (Files.exists(IMAGE)) { + FileUtils.deleteFileTreeUnchecked(IMAGE); + } + + createImage(IMAGE, modules); + } + + private void createImage(Path outputDir, String... modules) throws Throwable { + Path jlink = Paths.get(JAVA_HOME, "bin", "jlink"); + String mp = JMODS.toString() + File.pathSeparator + MODS_DIR.toString(); + assertTrue(executeProcess(jlink.toString(), "--output", outputDir.toString(), + "--add-modules", Arrays.stream(modules).collect(Collectors.joining(",")), + "--module-path", mp) + .outputTo(System.out) + .errorTo(System.out) + .getExitValue() == 0); + } + + /* + * Test the image created when linking with a module with + * no Packages attribute + */ + @Test + public void testCompiledVersions() throws Throwable { + if (!hasJmods()) return; + + Path java = IMAGE.resolve("bin").resolve("java"); + Stream options = Stream.concat( + Stream.of(java.toString(), "-m", MAIN_MID, String.valueOf(modules.length)), + Stream.concat(Arrays.stream(modules), Arrays.stream(versions)) + ); + + assertTrue(executeProcess(options.toArray(String[]::new)) + .outputTo(System.out) + .errorTo(System.out) + .getExitValue() == 0); + } +} diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java index d74b6b84152..83559fb30b7 100644 --- a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java @@ -59,7 +59,7 @@ public class SystemModulesTest { private void testModuleDescriptor(ModuleDescriptor md) { assertUnmodifiable(md.packages(), "package"); assertUnmodifiable(md.requires(), - jlma.newRequires(Set.of(Requires.Modifier.TRANSITIVE), "require")); + jlma.newRequires(Set.of(Requires.Modifier.TRANSITIVE), "require", null)); for (Requires req : md.requires()) { assertUnmodifiable(req.modifiers(), Requires.Modifier.TRANSITIVE); } diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java index 0875db2585c..35d1eec67dc 100644 --- a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java @@ -39,7 +39,7 @@ import static org.testng.Assert.*; /** * @test * @library /lib/testlibrary - * @modules jdk.compiler + * @modules jdk.compiler jdk.jlink * @build UserModuleTest CompilerUtils jdk.testlibrary.FileUtils jdk.testlibrary.ProcessTools * @run testng UserModuleTest */ diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java new file mode 100644 index 00000000000..e5c6fe8e6ca --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.test; + +import java.lang.module.ModuleDescriptor; +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import java.net.URI; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + + +/* + * Main class to verify if ModuleDescriptor carries the correct version + */ +public class Main { + static final Map nameToVersion = new HashMap<>(); + + // jdk.test.Main $count $module-name... $version... + public static void main(String... args) throws Exception { + int count = args.length > 0 ? Integer.valueOf(args[0]) : 0; + if (count < 1 || args.length != count*2+1) { + throw new IllegalArgumentException(Arrays.toString(args)); + } + + List modules = List.of(Arrays.copyOfRange(args, 1, 1+count)); + List versions = List.of(Arrays.copyOfRange(args, 1+count, args.length)); + for (int i=0; i < modules.size(); i++) { + System.out.format("module %s expects %s version%n", + modules.get(i), versions.get(i)); + nameToVersion.put(modules.get(i), versions.get(i)); + } + + FileSystem fs = FileSystems.newFileSystem(URI.create("jrt:/"), + Collections.emptyMap()); + // check the module descriptor of a system module + for (int i=0; i < modules.size(); i++) { + String mn = modules.get(i); + Module module = Layer.boot().findModule(mn).orElseThrow( + () -> new RuntimeException(mn + " not found") + ); + + // check ModuleDescriptor from the run-time + validate(module.getDescriptor()); + + // check module-info.class in the image + Path path = fs.getPath("/", "modules", modules.get(i), "module-info.class"); + validate(ModuleDescriptor.read(Files.newInputStream(path))); + } + } + + static void validate(ModuleDescriptor descriptor) { + checkVersion(descriptor.name(), descriptor.version()); + descriptor.requires() + .stream() + .filter(r -> !r.name().equals("java.base")) + .forEach(r -> checkVersion(r.name(), r.compiledVersion())); + } + + static void checkVersion(String mn, Optional version) { + boolean matched; + String v = nameToVersion.get(mn); + if (version.isPresent()) { + matched = version.get().toString().equals(v); + } else { + // 0 indicate no version + matched = v.equals("0"); + } + + if (!matched) { + throw new RuntimeException(mn + " mismatched version " + version + + " expected: " + v); + } + } +} diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java new file mode 100644 index 00000000000..83e15da97bf --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +module test { + requires m1; + requires m2; + exports jdk.test; +} diff --git a/jdk/test/tools/jmod/JmodTest.java b/jdk/test/tools/jmod/JmodTest.java index 9e19eef37e1..970320ad9a5 100644 --- a/jdk/test/tools/jmod/JmodTest.java +++ b/jdk/test/tools/jmod/JmodTest.java @@ -470,9 +470,22 @@ public class JmodTest { public void testHelp() { jmod("--help") .assertSuccess() - .resultChecker(r -> - assertTrue(r.output.startsWith("Usage: jmod"), "Help not printed") - ); + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jmod"), "Help not printed"); + assertFalse(r.output.contains("--do-not-resolve-by-default")); + assertFalse(r.output.contains("--warn-if-resolved")); + }); + } + + @Test + public void testHelpExtra() { + jmod("--help-extra") + .assertSuccess() + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jmod"), "Extra help not printed"); + assertContains(r.output, "--do-not-resolve-by-default"); + assertContains(r.output, "--warn-if-resolved"); + }); } @Test diff --git a/jdk/test/tools/jmod/hashes/HashesTest.java b/jdk/test/tools/jmod/hashes/HashesTest.java index 22752e759f1..8d4b2f68300 100644 --- a/jdk/test/tools/jmod/hashes/HashesTest.java +++ b/jdk/test/tools/jmod/hashes/HashesTest.java @@ -50,14 +50,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.spi.ToolProvider; import java.util.stream.Collectors; -import jdk.internal.misc.SharedSecrets; -import jdk.internal.misc.JavaLangModuleAccess; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModulePath; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -103,54 +102,53 @@ public class HashesTest { @Test public void test() throws Exception { for (String mn : modules) { - assertFalse(hashes(mn).isPresent()); + assertTrue(hashes(mn) == null); } // hash m1 in m2 jmod("m2", "--module-path", jmods.toString(), "--hash-modules", "m1"); - checkHashes(hashes("m2").get(), "m1"); + checkHashes(hashes("m2"), "m1"); // hash m1 in m2 jmod("m2", "--module-path", jmods.toString(), "--hash-modules", ".*"); - checkHashes(hashes("m2").get(), "m1"); + checkHashes(hashes("m2"), "m1"); // create m2.jmod with no hash jmod("m2"); // run jmod hash command to hash m1 in m2 and m3 runJmod(Arrays.asList("hash", "--module-path", jmods.toString(), "--hash-modules", ".*")); - checkHashes(hashes("m2").get(), "m1"); - checkHashes(hashes("m3").get(), "m1"); + checkHashes(hashes("m2"), "m1"); + checkHashes(hashes("m3"), "m1"); jmod("org.bar"); jmod("org.foo"); jmod("org.bar", "--module-path", jmods.toString(), "--hash-modules", "org.*"); - checkHashes(hashes("org.bar").get(), "org.foo"); + checkHashes(hashes("org.bar"), "org.foo"); jmod("m3", "--module-path", jmods.toString(), "--hash-modules", ".*"); - checkHashes(hashes("m3").get(), "org.foo", "org.bar", "m1"); + checkHashes(hashes("m3"), "org.foo", "org.bar", "m1"); } private void checkHashes(ModuleHashes hashes, String... hashModules) { assertTrue(hashes.names().equals(Set.of(hashModules))); } - private Optional hashes(String name) throws Exception { - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, jmods.resolve(name + ".jmod")); + private ModuleHashes hashes(String name) throws Exception { + ModuleFinder finder = new ModulePath(Runtime.version(), + true, + jmods.resolve(name + ".jmod")); ModuleReference mref = finder.find(name).orElseThrow(RuntimeException::new); ModuleReader reader = mref.open(); try (InputStream in = reader.open("module-info.class").get()) { - ModuleDescriptor md = ModuleDescriptor.read(in); - JavaLangModuleAccess jmla = SharedSecrets.getJavaLangModuleAccess(); - Optional hashes = jmla.hashes(md); + ModuleHashes hashes = ModuleInfo.read(in, null).recordedHashes(); System.out.format("hashes in module %s %s%n", name, - hashes.isPresent() ? "present" : "absent"); - if (hashes.isPresent()) { - hashes.get().names().stream() + (hashes != null) ? "present" : "absent"); + if (hashes != null) { + hashes.names().stream() .sorted() - .forEach(n -> System.out.format(" %s %s%n", n, hashes.get().hashFor(n))); + .forEach(n -> System.out.format(" %s %s%n", n, hashes.hashFor(n))); } return hashes; } finally { diff --git a/jdk/test/tools/launcher/MiscTests.java b/jdk/test/tools/launcher/MiscTests.java index 344730afe28..dbd6255bc3a 100644 --- a/jdk/test/tools/launcher/MiscTests.java +++ b/jdk/test/tools/launcher/MiscTests.java @@ -80,8 +80,8 @@ public class MiscTests extends TestHelper { createFile(new File(mainClass + ".java"), scratch); compile(mainClass + ".java", - "--add-modules=jdk.crypto.pkcs11", - "--add-exports=jdk.crypto.pkcs11/sun.security.pkcs11=ALL-UNNAMED"); + "--add-modules=jdk.crypto.token", + "--add-exports=jdk.crypto.token/sun.security.pkcs11=ALL-UNNAMED"); File testJar = new File("Foo.jar"); testJar.delete(); diff --git a/jdk/test/tools/launcher/RunpathTest.java b/jdk/test/tools/launcher/RunpathTest.java index 00e757343c3..2730f5da464 100644 --- a/jdk/test/tools/launcher/RunpathTest.java +++ b/jdk/test/tools/launcher/RunpathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ public class RunpathTest extends TestHelper { } void testRpath() { - String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*"; + String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib.*"; elfCheck(javaCmd, expectedRpath); } diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java index afbde0782a3..aa507b6da43 100644 --- a/jdk/test/tools/launcher/VersionCheck.java +++ b/jdk/test/tools/launcher/VersionCheck.java @@ -51,6 +51,7 @@ public class VersionCheck extends TestHelper { "jaccessinspector-32", "jaccesswalker", "jaccesswalker-32", + "jaotc", "javaw", "javaws", "jcontrol", @@ -72,6 +73,7 @@ public class VersionCheck extends TestHelper { "jaccessinspector-32", "jaccesswalker", "jaccesswalker-32", + "jaotc", "jar", "jarsigner", "java-rmi", diff --git a/jdk/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java b/jdk/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java new file mode 100644 index 00000000000..5df7f0d50aa --- /dev/null +++ b/jdk/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8168836 + * @summary Basic argument validation for --add-exports + * @library /lib/testlibrary + * @modules jdk.compiler + * @build AddExportsTestWarningError CompilerUtils ModuleSourceBuilder + * @build jdk.testlibrary.* + * @run testng AddExportsTestWarningError + */ + +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.stream.Stream; + +import jdk.testlibrary.OutputAnalyzer; +import static jdk.testlibrary.ProcessTools.*; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + + +@Test +public class AddExportsTestWarningError { + + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path SRC_DIR = Paths.get("src"); + private static final String M1_MAIN = "m1/p1.C1"; + private static final String M3_MAIN = "m3/p3.C3"; + + @BeforeTest + public void setup() throws Exception { + ModuleSourceBuilder builder = new ModuleSourceBuilder(SRC_DIR); + builder.writeJavaFiles("m1", + "module m1 { }", + "package p1; public class C1 { " + + " public static void main(String... args) {}" + + "}"); + + builder.writeJavaFiles("m2", + "module m2 { requires m1; exports p2; }", + "package p2; public class C2 { private p1.C1 c1; }"); + + builder.writeJavaFiles("m3", + "module m3 { requires m2; }", + "package p3; class C3 { " + + " p1.C1 c; " + + " public static void main(String... args) { new p2.C2(); }" + + "}"); + + builder.compile("m1", MODS_DIR); + builder.compile("m2", MODS_DIR, "--add-exports", "m1/p1=m2"); + builder.compile("m3", MODS_DIR, "--add-exports", "m1/p1=m3"); + } + + + @DataProvider(name = "goodcases") + public Object[][] goodCases() { + return new Object[][]{ + + // empty items + { "m1/p1=,m2,m3", null }, + { "m1/p1=m2,,m3", null }, + { "m1/p1=m2,m3,", null }, + + // duplicates + { "m1/p1=m2,m2,m3,,", null }, + + }; + } + + + @Test(dataProvider = "goodcases") + public void test(String value, String ignore) throws Exception { + testNoWarning(value); + } + + + @DataProvider(name = "illFormedAddExports") + public Object[][] illFormedAddExports() { + return new Object[][]{ + { "m1", "Unable to parse --add-exports =: m1"}, + + // missing source part + { "=m2", "Unable to parse --add-exports =: =m2"}, + { "/=m2", "Unable to parse --add-exports /: /" }, + { "m1=m2", "Unable to parse --add-exports /: m1" }, + { "/p1=m2", "Unable to parse --add-exports /: /p1" }, + { "m1p1=m2", "Unable to parse --add-exports /: m1p1" }, + + // empty list, missing target + { "m1/p1=", "Unable to parse --add-exports =: m1/p1=" }, + { "m1/p1=,,", "Target must be specified: --add-exports m1/p1=,," }, + }; + } + + @Test(dataProvider = "illFormedAddExports") + public void testIllFormedAddExports(String value, String msg) throws Exception { + testError(value, msg); + } + + + @DataProvider(name = "unknownNames") + public Object[][] unknownNames() { + return new Object[][]{ + + // source not found + {"DoesNotExist/p=m1", "WARNING: Unknown module: DoesNotExist specified in --add-exports"}, + {"m1/DoesNotExist=m2", "WARNING: package DoesNotExist not in m1"}, + + // target not found + {"m1/p1=DoesNotExist", "WARNING: Unknown module: DoesNotExist specified in --add-exports"}, + + // bad names + {"m*/p1=m2", "WARNING: Unknown module: m* specified in --add-exports"}, + {"m1/p!=m2", "WARNING: package p! not in m1"}, + {"m1/p1=m!", "WARNING: Unknown module: m! specified in --add-exports"}, + + }; + } + + + @Test(dataProvider = "unknownNames") + public void testUnknownNames(String value, String msg) throws Exception { + testWarning(value, msg); + } + + + @DataProvider(name = "missingArguments") + public Object[][] missingArguments() { + return new Object[][]{ + { new String[] { "--add-exports" }, + "Error: --add-exports requires modules to be specified"}, + + { new String[] { "--add-exports=" }, + "Error: --add-exports= requires modules to be specified" }, + + { new String[] { "--add-exports", "" }, + "Error: --add-exports requires modules to be specified"} + + }; + } + + + @Test(dataProvider = "missingArguments") + public void testMissingArguments(String[] options, String msg) throws Exception { + String[] args = Stream.concat(Arrays.stream(options), + Stream.of("-version")) + .toArray(String[]::new); + int exitValue = executeTestJava(args) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue != 0); + } + + private void testWarning(String value, String msg) throws Exception { + int exitValue = + executeTestJava("--add-exports", value, + "--module-path", MODS_DIR.toString(), + "-m", M1_MAIN) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue == 0); + } + + private void testError(String value, String msg) throws Exception { + int exitValue = + executeTestJava("--add-exports", value, + "--module-path", MODS_DIR.toString(), + "-m", M1_MAIN) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue != 0); + } + + private void testNoWarning(String value) throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(new BufferedOutputStream(baos)); + OutputAnalyzer outputAnalyzer = + executeTestJava("--add-exports", value, + "--module-path", MODS_DIR.toString(), + "-m", M3_MAIN) + .outputTo(ps) + .errorTo(ps); + + assertTrue(outputAnalyzer.getExitValue() == 0); + + System.out.println(baos.toString()); + String[] output = baos.toString().split("\\R"); + assertFalse(Arrays.stream(output) + .filter(s -> !s.matches("WARNING: Module name .* may soon be illegal")) + .filter(s -> s.startsWith("WARNING:")) + .findAny().isPresent()); + + } +} diff --git a/jdk/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java b/jdk/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java new file mode 100644 index 00000000000..325ca322522 --- /dev/null +++ b/jdk/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java @@ -0,0 +1,224 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8168836 + * @summary Basic argument validation for --add-reads + * @library /lib/testlibrary + * @modules jdk.compiler + * @build AddReadsTestWarningError CompilerUtils ModuleSourceBuilder + * @build jdk.testlibrary.* + * @run testng AddReadsTestWarningError + */ + +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.stream.Stream; + +import jdk.testlibrary.OutputAnalyzer; +import static jdk.testlibrary.ProcessTools.*; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + + +@Test +public class AddReadsTestWarningError { + + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path SRC_DIR = Paths.get("src"); + private static final String M1_MAIN = "m1/p1.C1"; + private static final String M4_MAIN = "m4/p4.C4"; + + @BeforeTest + public void setup() throws Exception { + ModuleSourceBuilder builder = new ModuleSourceBuilder(SRC_DIR); + builder.writeJavaFiles("m1", + "module m1 { requires m4; }", + "package p1; public class C1 { " + + " public static void main(String... args) {" + + " p2.C2 c2 = new p2.C2();" + + " p3.C3 c3 = new p3.C3();" + + " }" + + "}" + ); + + builder.writeJavaFiles("m2", + "module m2 { exports p2; }", + "package p2; public class C2 { }" + ); + + builder.writeJavaFiles("m3", + "module m3 { exports p3; }", + "package p3; public class C3 { }" + ); + + builder.writeJavaFiles("m4", + "module m4 { requires m2; requires m3; }", + "package p4; public class C4 { " + + " public static void main(String... args) {}" + + "}" + ); + + builder.compile("m2", MODS_DIR); + builder.compile("m3", MODS_DIR); + builder.compile("m4", MODS_DIR); + builder.compile("m1", MODS_DIR, "--add-reads", "m1=m2,m3"); + } + + + @DataProvider(name = "goodcases") + public Object[][] goodCases() { + return new Object[][]{ + // empty items + { "m1=,m2,m3", null }, + { "m1=m2,,m3", null }, + { "m1=m2,m3,", null }, + + // duplicates + { "m1=m2,m2,m3,,", null }, + + }; + } + + + @Test(dataProvider = "goodcases") + public void test(String value, String ignore) throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(new BufferedOutputStream(baos)); + OutputAnalyzer outputAnalyzer = + executeTestJava("--add-reads", value, + "--module-path", MODS_DIR.toString(), + "-m", M1_MAIN) + .outputTo(ps) + .errorTo(ps); + + assertTrue(outputAnalyzer.getExitValue() == 0); + + System.out.println(baos.toString()); + String[] output = baos.toString().split("\\R"); + assertFalse(Arrays.stream(output) + .filter(s -> !s.matches("WARNING: Module name .* may soon be illegal")) + .filter(s -> s.startsWith("WARNING:")) + .findAny().isPresent()); + } + + + @DataProvider(name = "illFormedAddReads") + public Object[][] illFormedAddReads() { + return new Object[][]{ + { "m1", "Unable to parse --add-reads =: m1" }, + + // missing source part + { "=m2", "Unable to parse --add-reads =: =m2" }, + + // empty list, missing target + { "m1=", "Unable to parse --add-reads =: m1=" }, + + // empty list + { "m1=,,", "Target must be specified: --add-reads m1=,," }, + }; + } + + + @Test(dataProvider = "illFormedAddReads") + public void testIllFormedAddReads(String value, String msg) throws Exception { + int exitValue = + executeTestJava("--add-reads", value, + "--module-path", MODS_DIR.toString(), + "-m", M4_MAIN) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue != 0); + } + + + @DataProvider(name = "unknownNames") + public Object[][] unknownNames() { + return new Object[][]{ + + // source not found + {"DoesNotExist=m2", "WARNING: Unknown module: DoesNotExist specified in --add-reads"}, + + // target not found + {"m2=DoesNotExist", "WARNING: Unknown module: DoesNotExist specified in --add-reads"}, + + // bad names + {"m*=m2", "WARNING: Unknown module: m* specified in --add-reads"}, + {"m2=m!", "WARNING: Unknown module: m! specified in --add-reads"}, + + }; + } + + @Test(dataProvider = "unknownNames") + public void testUnknownNames(String value, String msg) throws Exception { + int exitValue = + executeTestJava("--add-reads", value, + "--module-path", MODS_DIR.toString(), + "-m", M4_MAIN) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue == 0); + } + + + @DataProvider(name = "missingArguments") + public Object[][] missingArguments() { + return new Object[][]{ + { new String[] {"--add-reads" }, + "Error: --add-reads requires modules to be specified"}, + + { new String[] { "--add-reads=" }, + "Error: --add-reads= requires modules to be specified"}, + + { new String[] { "--add-reads", "" }, + "Error: --add-reads requires modules to be specified"}, + }; + } + + @Test(dataProvider = "missingArguments") + public void testEmptyArgument(String[] options, String msg) throws Exception { + String[] args = Stream.concat(Arrays.stream(options), Stream.of("-version")) + .toArray(String[]::new); + int exitValue = executeTestJava(args) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue != 0); + } +} diff --git a/jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java b/jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java index 2618fbab45b..208e36f9fa2 100644 --- a/jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java +++ b/jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java @@ -24,7 +24,7 @@ /** * @test * @library /lib/testlibrary - * @modules java.desktop java.compact1 jdk.compiler + * @modules java.desktop java.logging jdk.compiler * @build LimitModsTest CompilerUtils jdk.testlibrary.* * @run testng LimitModsTest * @summary Basic tests for java --limit-modules @@ -83,13 +83,12 @@ public class LimitModsTest { assertTrue(exitValue == 0); - // java --limit-modules java.compact1 --list-modules - exitValue = executeTestJava("--limit-modules", "java.compact1", "--list-modules") + // java --limit-modules java.logging --list-modules + exitValue = executeTestJava("--limit-modules", "java.logging", "--list-modules") .outputTo(System.out) .errorTo(System.out) .shouldContain("java.base") .shouldContain("java.logging") - .shouldContain("java.compact1") .shouldNotContain("java.xml") .getExitValue(); diff --git a/jdk/test/tools/launcher/modules/listmods/ListModsTest.java b/jdk/test/tools/launcher/modules/listmods/ListModsTest.java index eb21d2d5333..b386f402c47 100644 --- a/jdk/test/tools/launcher/modules/listmods/ListModsTest.java +++ b/jdk/test/tools/launcher/modules/listmods/ListModsTest.java @@ -147,12 +147,12 @@ public class ListModsTest { @Test public void testListWithLimitMods1() throws Exception { OutputAnalyzer output - = executeTestJava("--limit-modules", "java.compact1", "--list-modules") + = executeTestJava("--limit-modules", "java.management", "--list-modules") .outputTo(System.out) .errorTo(System.out); - output.shouldContain("java.compact1"); + output.shouldContain("java.rmi"); output.shouldContain("java.base"); - output.shouldNotContain("java.xml"); + output.shouldNotContain("java.scripting"); assertTrue(output.getExitValue() == 0); } @@ -161,7 +161,7 @@ public class ListModsTest { public void testListWithLimitMods2() throws Exception { OutputAnalyzer output = executeTestJava("--module-path", MODS_DIR.toString(), - "--limit-modules", "java.compact1", + "--limit-modules", "java.management", "--list-modules") .outputTo(System.out) .errorTo(System.out); diff --git a/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java b/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java new file mode 100644 index 00000000000..711bedf8e3a --- /dev/null +++ b/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8168836 + * @summary Basic argument validation for --patch-module + * @library /lib/testlibrary + * @modules jdk.compiler + * @build PatchTestWarningError CompilerUtils JarUtils jdk.testlibrary.* + * @run testng PatchTestWarningError + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static jdk.testlibrary.ProcessTools.*; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + + +/** + * This test + * See PatchTestWarningError for test description. + */ + +@Test +public class PatchTestWarningError { + + // top-level source directory + private static final String TEST_SRC = System.getProperty("test.src"); + + // source/destination tree for the test module + private static final Path SRC_DIR = Paths.get(TEST_SRC, "src"); + private static final Path MODS_DIR = Paths.get("mods"); + + // source/destination tree for patch tree 1 + private static final Path SRC1_DIR = Paths.get(TEST_SRC, "src1"); + private static final Path PATCHES1_DIR = Paths.get("patches1"); + + // source/destination tree for patch tree 2 + private static final Path SRC2_DIR = Paths.get(TEST_SRC, "src2"); + private static final Path PATCHES2_DIR = Paths.get("patches2"); + + // patch path for java.base + private static final String PATCHES_PATH = + PATCHES1_DIR.resolve("java.base") + File.pathSeparator + + PATCHES2_DIR.resolve("java.base"); + + // the classes overridden or added with --patch-module + private static final String[] CLASSES = { + + // java.base = boot loader + "java.base/java.text.Annotation", // override class + "java.base/java.text.AnnotationBuddy", // add class to package + "java.base/java.lang2.Object", // new package + + }; + + + @BeforeTest + public void setup() throws Exception { + + // javac -d mods/test src/test/** + boolean compiled= CompilerUtils.compile(SRC_DIR.resolve("test"), + MODS_DIR.resolve("test")); + assertTrue(compiled, "classes did not compile"); + + // javac -Xmodule:$MODULE -d patches1/$MODULE patches1/$MODULE/** + Path src = SRC1_DIR.resolve("java.base"); + Path output = PATCHES1_DIR.resolve(src.getFileName()); + Files.createDirectories(output); + String mn = src.getFileName().toString(); + compiled = CompilerUtils.compile(src, output, "-Xmodule:" + mn); + assertTrue(compiled, "classes did not compile"); + + // javac -Xmodule:$MODULE -d patches2/$MODULE patches2/$MODULE/** + src = SRC2_DIR.resolve("java.base"); + output = PATCHES2_DIR.resolve(src.getFileName()); + Files.createDirectories(output); + mn = src.getFileName().toString(); + compiled = CompilerUtils.compile(src, output, "-Xmodule:" + mn); + assertTrue(compiled, "classes did not compile"); + + } + + /** + * Test with --patch-module options patching the same module + */ + public void testDuplicateModule() throws Exception { + int exitValue = + executeTestJava("--patch-module", "java.base=" + PATCHES1_DIR.resolve("java.base"), + "--patch-module", "java.base=" + PATCHES2_DIR.resolve("java.base"), + "--module-path", MODS_DIR.toString(), + "-m", "test/jdk.test.Main") + .outputTo(System.out) + .errorTo(System.out) + // error output by VM + .shouldContain("Cannot specify java.base more than once to --patch-module") + .getExitValue(); + + assertTrue(exitValue != 0); + } + + @DataProvider(name = "emptyItem") + public Object[][] emptyItems() { + String patch1 = PATCHES1_DIR.resolve("java.base").toString(); + String patch2 = PATCHES2_DIR.resolve("java.base").toString(); + String pathSep = File.pathSeparator; + return new Object[][]{ + + { "java.base="+ pathSep + patch1 + pathSep + patch2, null }, + { "java.base="+ patch1 + pathSep + pathSep + patch2, null }, + { "java.base="+ patch1 + pathSep + patch2 + pathSep + pathSep, null }, + }; + } + + /** + * Empty item in a non-empty path list + */ + @Test(dataProvider = "emptyItem") + public void testEmptyItem(String value, String msg) throws Exception { + // the argument to the test is the list of classes overridden or added + String arg = Stream.of(CLASSES).collect(Collectors.joining(",")); + + int exitValue = + executeTestJava("--patch-module", value, + "--add-exports", "java.base/java.lang2=test", + "--module-path", MODS_DIR.toString(), + "-m", "test/jdk.test.Main", arg) + .outputTo(System.out) + .errorTo(System.out) + .getExitValue(); + + assertTrue(exitValue == 0); + } + + /** + * Test bad module name that should emit a warning + */ + public void testBadName() throws Exception { + // the argument to the test is the list of classes overridden or added + String arg = Stream.of(CLASSES).collect(Collectors.joining(",")); + + int exitValue = + executeTestJava("--patch-module", "DoesNotExist=tmp", + "--patch-module", "java.base=" + PATCHES_PATH, + "--add-exports", "java.base/java.lang2=test", + "--module-path", MODS_DIR.toString(), + "-m", "test/jdk.test.Main", arg) + .outputTo(System.out) + .errorTo(System.out) + .shouldContain("WARNING: Unknown module: DoesNotExist specified in --patch-module") + .getExitValue(); + + assertTrue(exitValue == 0); + } + + @DataProvider(name = "badArguments") + public Object[][] badArguments() { + return new Object[][]{ + + // source not found + { "=tmp", "Unable to parse --patch-module =: =tmp" }, + + // target not found: check by VM + { "java.base", "Missing '=' in --patch-module specification" }, + { "foo", "Missing '=' in --patch-module specification" }, + + // target not found + { "java.base=", "Unable to parse --patch-module =: java.base=" }, + { "java.base=" + File.pathSeparator, + "Target must be specified: --patch-module java.base=" + File.pathSeparator } + }; + } + + /** + * Test ill-formed argument to --patch-module + */ + @Test(dataProvider = "badArguments") + public void testBadArgument(String value, String msg) throws Exception { + int exitValue = + executeTestJava("--patch-module", value, + "--module-path", MODS_DIR.toString(), + "-m", "test/jdk.test.Main") + .outputTo(System.out) + .errorTo(System.out) + .shouldContain(msg) + .getExitValue(); + + assertTrue(exitValue != 0); + } +} diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java index a56c8dda67c..a774fc7427f 100644 --- a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java +++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java @@ -29,4 +29,8 @@ package jdk.internal.module; */ public final class SystemModules { public static final String[] MODULE_NAMES = new String[0]; + + public static boolean hasSplitPackages() { + return true; + } } diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java b/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java index 144405e5ddf..97e5f767b6e 100644 --- a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java +++ b/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java @@ -41,6 +41,8 @@ import com.sun.tools.classfile.Code_attribute; import com.sun.tools.classfile.CompilationID_attribute; import com.sun.tools.classfile.ConstantPool; import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Module_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Package_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Float_info; @@ -80,9 +82,9 @@ import com.sun.tools.classfile.Module_attribute.RequiresEntry; import com.sun.tools.classfile.ModuleHashes_attribute; import com.sun.tools.classfile.ModuleHashes_attribute.Entry; import com.sun.tools.classfile.ModuleMainClass_attribute; +import com.sun.tools.classfile.ModuleResolution_attribute; import com.sun.tools.classfile.ModuleTarget_attribute; import com.sun.tools.classfile.ModulePackages_attribute; -import com.sun.tools.classfile.ModuleVersion_attribute; import com.sun.tools.classfile.Opcode; import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute; @@ -669,6 +671,40 @@ class ConstantPoolVisitor implements ConstantPool.Visitor { return value; } + @Override + public String visitModule(CONSTANT_Module_info info, Integer p) { + String value = slist.get(p); + if (value == null) { + try { + value = visit(cfpool.get(info.name_index), info.name_index); + slist.set(p, value); + xpool.add(new Element("CONSTANT_Module", + new String[]{"id", p.toString()}, + value)); + } catch (ConstantPoolException ex) { + ex.printStackTrace(); + } + } + return value; + } + + @Override + public String visitPackage(CONSTANT_Package_info info, Integer p) { + String value = slist.get(p); + if (value == null) { + try { + value = visit(cfpool.get(info.name_index), info.name_index); + slist.set(p, value); + xpool.add(new Element("CONSTANT_Package", + new String[]{"id", p.toString()}, + value)); + } catch (ConstantPoolException ex) { + ex.printStackTrace(); + } + } + return value; + } + @Override public String visitDouble(CONSTANT_Double_info c, Integer p) { String value = slist.get(p); @@ -1495,20 +1531,20 @@ class AttributeVisitor implements Attribute.Visitor { } @Override - public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) { - Element e = new Element(x.getCpString(attr.attribute_name_index)); - e.add(x.getCpString(attr.os_name_index)); - e.add(x.getCpString(attr.os_arch_index)); - e.add(x.getCpString(attr.os_version_index)); + public Element visitModuleResolution(ModuleResolution_attribute attr, Element p) { + Element e = new Element("ModuleResolution"); + e.setAttr("flags", Integer.toString(attr.resolution_flags)); e.trimToSize(); p.add(e); return null; } @Override - public Element visitModuleVersion(ModuleVersion_attribute attr, Element p) { + public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) { Element e = new Element(x.getCpString(attr.attribute_name_index)); - e.add(x.getCpString(attr.version_index)); + e.add(x.getCpString(attr.os_name_index)); + e.add(x.getCpString(attr.os_arch_index)); + e.add(x.getCpString(attr.os_version_index)); e.trimToSize(); p.add(e); return null; diff --git a/langtools/.hgtags b/langtools/.hgtags index a0121a3cc1a..fe50e8a4d7e 100644 --- a/langtools/.hgtags +++ b/langtools/.hgtags @@ -391,3 +391,4 @@ cb9e896265ef45295fdd09986dee76624e4d41e4 jdk-9+145 26f972dc2d174a75bc32131c29661c78568586b0 jdk-9+146 76389430a13e82a9321cdc085216f6bff526e316 jdk-9+147 586c93260d3b2f91a055b96118b141c05841694f jdk-9+148 +4d4cd7cd731c1952d7330ea5bcfda8bd26820fa5 jdk-9+149 diff --git a/langtools/THIRD_PARTY_README b/langtools/THIRD_PARTY_README deleted file mode 100644 index a93b35b994c..00000000000 --- a/langtools/THIRD_PARTY_README +++ /dev/null @@ -1,3605 +0,0 @@ -DO NOT TRANSLATE OR LOCALIZE. ------------------------------ - -%% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and -OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2000-2011 France Télécom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to BSDiff v4.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright 2003-2005 Colin Percival -All rights reserved - -Redistribution and use in source and binary forms, with or without -modification, are permitted providing 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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CodeViewer 1.0, which may be -included with JDK 8. - ---- begin of LICENSE --- - -Copyright 1999 by CoolServlets.com. - -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. 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. - -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. - -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." - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Cryptix AES 3.2.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to CUP Parser Generator for -Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -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 -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Document Object Model (DOM) Level 2 -& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 -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 -site-policy@w3.org. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Dynalink v0.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2009-2013, Attila Szegedi - -All rights reserved.Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met:* 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 Attila -Szegedi nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Elliptic Curve Cryptography, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - -You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 8 and OpenJDK 8 source distributions, and as object code in -the JRE 8 & JDK 8 runtimes. - -In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do -NOT apply to the Elliptic Curve Cryptography library; it is licensed under the -following license, separately from Oracle's JDK & JRE. If you do not wish to -install the Elliptic Curve Cryptography library, 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. - - - Copyright (C) - - 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. - - , 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 ECMAScript Language -Specification ECMA-262 Edition 5.1 which may be included with -JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright notice -Copyright © 2011 Ecma International -Ecma International -Rue du Rhone 114 -CH-1204 Geneva -Tel: +41 22 849 6000 -Fax: +41 22 849 6001 -Web: http://www.ecma-international.org - -This document and possible translations of it may be copied and furnished to -others, and derivative works that comment on or otherwise explain it or assist -in its implementation may be prepared, copied, published, and distributed, in -whole or in part, without restriction of any kind, provided that the above -copyright notice and this section are included on all such copies and derivative -works. However, this document itself may not be modified in any way, including -by removing the copyright notice or references to Ecma International, except as -needed for the purpose of developing any document or deliverable produced by -Ecma International (in which case the rules applied to copyrights must be -followed) or as required to translate it into languages other than English. The -limited permissions granted above are perpetual and will not be revoked by Ecma -International or its successors or assigns. This document and the information -contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL -DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY -WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP -RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE." Software License - -All Software contained in this document ("Software)" is protected by copyright -and is being made available under the "BSD License", included below. This -Software may be subject to third party rights (rights from parties other than -Ecma International), including patent rights, and no licenses under such third -party rights are granted under this license even if the third party concerned is -a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS -AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR -INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO -IMPLEMENT ECMA INTERNATIONAL STANDARDS*. 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 authors nor Ecma International may be used to endorse -or promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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 Dynalink library which is included -with the Nashorn technology. - ---- begin of LICENSE --- -Copyright (c) 2009-2013, Attila Szegedi - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -* 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 the copyright holder nor the names of - 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 COPYRIGHT HOLDER -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 Joni library which is included -with the Nashorn technology. - ---- begin of 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: - -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 FontConfig 2.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on -Linux and Solaris. - ---- begin of LICENSE --- - -Copyright © 2001,2003 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IAIK PKCS#11 Wrapper, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -IAIK PKCS#11 Wrapper 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: - -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 IAIK of Graz University of - Technology." - - Alternately, this acknowledgment may appear in the software itself, if and - wherever such third-party acknowledgments normally appear. - -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. - -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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which -may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) 1995-2010 International Business Machines Corporation and others - -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, 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. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to IJG JPEG 6b, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -This software is copyright (C) 1991-1998, Thomas G. Lane. -All Rights Reserved except as specified below. - -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. - -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". - -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. - ---- end of LICENSE --- - --------------------------------------------------------------------------------- - -%% This notice is provided with respect to Joni v1.1.9, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of 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: - -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 JOpt-Simple v3.0, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - 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. - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Kronos OpenGL headers, which may be -included with JDK 8 and OpenJDK 8 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.5.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 following -this sentence. - -This code is released under the libpng license. - -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 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 - - Cosmin Truta - -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. - -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: - - 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: - - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner - -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: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -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 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. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -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, 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: - - 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 a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -July 7, 2011 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to libungif 4.1.3, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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 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 Little CMS 2.4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Little CMS -Copyright (c) 1998-2010 Marti Maria Saguer - -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 --- - -------------------------------------------------------------------------------- - -%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the -U.S. and other countries. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mesa 3D Graphics Library v4.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. - ---- begin of LICENSE --- - - 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 of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Mozilla Network Security -Services (NSS), which is supplied with the JDK test suite in the OpenJDK -source code repository. It is licensed under Mozilla Public License (MPL), -version 2.0. - -The NSS libraries are supplied in executable form, built from unmodified -NSS source code labeled with the "NSS_3.13.1_RTM" release tag. - -The NSS source code is available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/src - -The NSS libraries are available in the OpenJDK source code repository at: - jdk/test/sun/security/pkcs11/nss/lib - ---- begin of LICENSE --- - -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - 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. License Grants and Conditions --------------------------------- - -2.1. Grants - -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 such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -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 Software 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 placed in a text file included with all distributions of the Covered -Software under this License. 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. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software 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 Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any 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 Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, 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. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the 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. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, -which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. - ---- begin of LICENSE --- - -Copyright (c) 1999-2004 David Corcoran -Copyright (c) 1999-2004 Ludovic Rousseau -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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran - 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. - -Changes to this license can be made only by the copyright author with -explicit written consent. - -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. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to PorterStemmer v4, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -See: http://tartarus.org/~martin/PorterStemmer - -The software is completely free for any purpose, unless notes at the head of -the program text indicates otherwise (which is rare). In any case, the notes -about licensing are never more restrictive than the BSD License. - -In every case where the software is not written by me (Martin Porter), this -licensing arrangement has been endorsed by the contributor, and it is -therefore unnecessary to ask the contributor again to confirm it. - -I have not asked any contributors (or their employers, if they have them) for -proofs that they have the right to distribute their software in this way. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Relax NG Object/Parser v.20050510, -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - -Copyright (c) Kohsuke Kawaguchi - -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 RelaxNGCC v1.12, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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: - -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 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. - -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. - -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. - -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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SAX 2.0.1, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- 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. - - 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. - - David Megginson, sax@megginson.com - 1998-05-11 - - SAX 2.0 - - 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@megginson.com - 2000-05-05 - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to SoftFloat version 2b, which may be -included with JRE 8, JDK 8, and OpenJDK 8 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 --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Sparkle 1.5, -which may be included with JRE 8 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -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 --- - -------------------------------------------------------------------------------- - -%% Portions licensed from Taligent, Inc. - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to Thai Dictionary, which may be -included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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.2.0 & CLDR 21.0.1 -which may be included with JRE 8, JDK 8, and OpenJDK 8. - ---- 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-2013 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-2012 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 may be included -with JRE 8 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 - - -PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN -TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION. - - -ABSTRACT -======== - - UPX and UCL are copyrighted software distributed under the terms - of the GNU General Public License (hereinafter the "GPL"). - - 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. - - As a special exception we grant the free usage of UPX for all - executables, including commercial programs. - See below for details and restrictions. - - -COPYRIGHT -========= - - 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@jk.uni-linz.ac.at ml1050@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 may be included with JRE 8, JDK 8, and OpenJDK 8 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 may be -included with JRE 8, JDK 8, and OpenJDK 8 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. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following -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: - -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) 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 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. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2. The Open Group - -Copyright 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. - -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. 3.2. -Berkeley-based copyrights: - -o -3.2.1. General - -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 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 - -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 - -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@urwpp.de or design@bigelowandholmes.com - - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to zlib v1.2.5, which may be included -with JRE 8, JDK 8, and OpenJDK 8. - ---- begin of LICENSE --- - - version 1.2.5, 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@gzip.org madler@alumni.caltech.edu - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - -%% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: - - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 - Apache Xerces Java 2.10.0 - Apache XML Resolver 1.1 - Dynalink 0.5 - - ---- 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 --- - -------------------------------------------------------------------------------- - diff --git a/langtools/make/tools/anttasks/SelectToolTask.java b/langtools/make/tools/anttasks/SelectToolTask.java index bf3305198a4..82e4931380e 100644 --- a/langtools/make/tools/anttasks/SelectToolTask.java +++ b/langtools/make/tools/anttasks/SelectToolTask.java @@ -203,14 +203,11 @@ public class SelectToolTask extends Task { if (toolName != null) { toolChoice.setSelectedItem(tool); } - toolChoice.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - ToolChoices tool = (ToolChoices)e.getItem(); - argsField.setText(getDefaultArgsForTool(props, tool)); - if (toolProperty != null) - okButton.setEnabled(tool != ToolChoices.NONE); - } + toolChoice.addItemListener(e -> { + ToolChoices tool1 = (ToolChoices)e.getItem(); + argsField.setText(getDefaultArgsForTool(props, tool1)); + if (toolProperty != null) + okButton.setEnabled(tool1 != ToolChoices.NONE); }); fc.anchor = GridBagConstraints.EAST; @@ -248,12 +245,9 @@ public class SelectToolTask extends Task { final JOptionPane p = new JOptionPane(body); okButton = new JButton("OK"); okButton.setEnabled(toolProperty == null || (toolName != null && !toolName.equals(""))); - okButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JDialog d = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, p); - d.setVisible(false); - } + okButton.addActionListener(e -> { + JDialog d = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, p); + d.setVisible(false); }); p.setOptions(new Object[] { okButton }); diff --git a/langtools/make/tools/crules/MutableFieldsAnalyzer.java b/langtools/make/tools/crules/MutableFieldsAnalyzer.java index bae6b4d6836..1e14e39e1a7 100644 --- a/langtools/make/tools/crules/MutableFieldsAnalyzer.java +++ b/langtools/make/tools/crules/MutableFieldsAnalyzer.java @@ -107,6 +107,8 @@ public class MutableFieldsAnalyzer extends AbstractCodingRulesAnalyzer { "layerClass", "bootMethod", "defineModulesWithOneLoaderMethod", "configurationMethod"); ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$Module", "addExportsMethod", "addUsesMethod", "getModuleMethod", "getUnnamedModuleMethod"); + ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$ModuleDescriptor$Version", + "versionClass", "parseMethod"); ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$ServiceLoaderHelper", "loadMethod"); ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$VMHelper", diff --git a/langtools/make/tools/propertiesparser/PropertiesParser.java b/langtools/make/tools/propertiesparser/PropertiesParser.java index 120dac6f4ba..2cb4689a0df 100644 --- a/langtools/make/tools/propertiesparser/PropertiesParser.java +++ b/langtools/make/tools/propertiesparser/PropertiesParser.java @@ -57,7 +57,7 @@ public class PropertiesParser { } public static boolean run(String[] args, PrintStream out) { - PropertiesParser pp = new PropertiesParser(msg -> out.println(msg)); + PropertiesParser pp = new PropertiesParser(out::println); return pp.run(args); } @@ -76,7 +76,7 @@ public class PropertiesParser { return false; } try { - optionsMap.forEach((propfile, outfile) -> compilePropertyFile(propfile, outfile)); + optionsMap.forEach(this::compilePropertyFile); return true; } catch (RuntimeException ex) { ex.printStackTrace(); diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java index 682ed018baa..97979b932c2 100644 --- a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java +++ b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Filer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,8 @@ import java.io.IOException; * allow the originating elements to be provided as hints to * the tool infrastructure to better manage dependencies. The * originating elements are the types or packages (representing {@code - * package-info} files) which caused an annotation processor to + * package-info} files) or modules (representing {@code + * module-info} files) which caused an annotation processor to * attempt to create a new file. For example, if an annotation * processor tries to create a source file, {@code * GeneratedFromUserSource}, in response to processing @@ -111,10 +112,10 @@ import java.io.IOException; * to overwrite existing files that were not generated. * *

    Processors can indicate a source or class file is generated by - * including an {@link javax.annotation.Generated @Generated} - * annotation. + * including a {@code javax.annotation.Generated} annotation if the + * environment is configured so that that type is accessible. * - *

    Note that some of the effect of overwriting a file can be + * @apiNote Some of the effect of overwriting a file can be * achieved by using a decorator-style pattern. Instead of * modifying a class directly, the class is designed so that either * its superclass is generated by annotation processing or subclasses @@ -131,18 +132,35 @@ import java.io.IOException; public interface Filer { /** * Creates a new source file and returns an object to allow - * writing to it. The file's name and path (relative to the - * {@linkplain StandardLocation#SOURCE_OUTPUT root output location - * for source files}) are based on the type to be declared in that - * file. If more than one type is being declared, the name of the - * principal top-level type (the public one, for example) should - * be used. A source file can also be created to hold information - * about a package, including package annotations. To create a - * source file for a named package, have {@code name} be the + * writing to it. A source file for a type, or a package can + * be created. + * + * The file's name and path (relative to the {@linkplain + * StandardLocation#SOURCE_OUTPUT root output location for source + * files}) are based on the name of the item to be declared in + * that file as well as the specified module for the item (if + * any). + * + * If more than one type is being declared in a single file (that + * is, a single compilation unit), the name of the file should + * correspond to the name of the principal top-level type (the + * public one, for example). + * + *

    A source file can also be created to hold information about + * a package, including package annotations. To create a source + * file for a named package, have the {@code name} argument be the * package's name followed by {@code ".package-info"}; to create a * source file for an unnamed package, use {@code "package-info"}. * - *

    Note that to use a particular {@linkplain + *

    The optional module name is prefixed to the type name or + * package name and separated using a "{@code /}" character. For + * example, to create a source file for type {@code a.B} in module + * {@code foo}, use a {@code name} argument of {@code "foo/a.B"}. + * + *

    Creating a source file in or for an unnamed package in a named + * module is not supported. + * + * @apiNote To use a particular {@linkplain * java.nio.charset.Charset charset} to encode the contents of the * file, an {@code OutputStreamWriter} with the chosen charset can * be created from the {@code OutputStream} from the returned @@ -161,37 +179,51 @@ public interface Filer { * @param name canonical (fully qualified) name of the principal type * being declared in this file or a package name followed by * {@code ".package-info"} for a package information file - * @param originatingElements type or package elements causally + * @param originatingElements type or package or module elements causally * associated with the creation of this file, may be elided or * {@code null} * @return a {@code JavaFileObject} to write the new source file * @throws FilerException if the same pathname has already been * created, the same type has already been created, or the name is - * not valid for a type + * otherwise not valid for the entity requested to being created * @throws IOException if the file cannot be created + * @jls 7.3 Compilation Units */ JavaFileObject createSourceFile(CharSequence name, Element... originatingElements) throws IOException; /** * Creates a new class file, and returns an object to allow - * writing to it. The file's name and path (relative to the - * {@linkplain StandardLocation#CLASS_OUTPUT root output location - * for class files}) are based on the name of the type being - * written. A class file can also be created to hold information - * about a package, including package annotations. To create a - * class file for a named package, have {@code name} be the + * writing to it. A class file for a type, or a package can + * be created. + * + * The file's name and path (relative to the {@linkplain + * StandardLocation#CLASS_OUTPUT root output location for class + * files}) are based on the name of the item to be declared as + * well as the specified module for the item (if any). + * + *

    A class file can also be created to hold information about a + * package, including package annotations. To create a class file + * for a named package, have the {@code name} argument be the * package's name followed by {@code ".package-info"}; creating a * class file for an unnamed package is not supported. * - *

    To avoid subsequent errors, the contents of the class file - * should be compatible with the {@linkplain - * ProcessingEnvironment#getSourceVersion source version} being used - * for this run. + *

    The optional module name is prefixed to the type name or + * package name and separated using a "{@code /}" character. For + * example, to create a class file for type {@code a.B} in module + * {@code foo}, use a {@code name} argument of {@code "foo/a.B"}. + * + *

    Creating a class file in or for an unnamed package in a named + * module is not supported. + * + * @apiNote To avoid subsequent errors, the contents of the class + * file should be compatible with the {@linkplain + * ProcessingEnvironment#getSourceVersion source version} being + * used for this run. * * @param name binary name of the type being written or a package name followed by * {@code ".package-info"} for a package information file - * @param originatingElements type or package elements causally + * @param originatingElements type or package or module elements causally * associated with the creation of this file, may be elided or * {@code null} * @return a {@code JavaFileObject} to write the new class file @@ -210,20 +242,27 @@ public interface Filer { * other supported location. The locations {@link * StandardLocation#CLASS_OUTPUT CLASS_OUTPUT} and {@link * StandardLocation#SOURCE_OUTPUT SOURCE_OUTPUT} must be - * supported. The resource may be named relative to some package - * (as are source and class files), and from there by a relative - * pathname. In a loose sense, the full pathname of the new file - * will be the concatenation of {@code location}, {@code pkg}, and - * {@code relativeName}. + * supported. The resource may be named relative to some module + * and/or package (as are source and class files), and from there + * by a relative pathname. In a loose sense, the full pathname of + * the new file will be the concatenation of {@code location}, + * {@code moduleAndPkg}, and {@code relativeName}. * - *

    Files created via this method are not registered for + * If {@code moduleAndPkg} contains a "{@code /}" character, the + * prefix before the "{@code /}" character is the module name and + * the suffix after the "{@code /}" character is the package + * name. The package suffix may be empty. If {@code moduleAndPkg} + * does not contain a "{@code /}" character, the entire argument + * is interpreted as a package name. + * + *

    Files created via this method are not registered for * annotation processing, even if the full pathname of the file * would correspond to the full pathname of a new source file * or new class file. * * @param location location of the new file - * @param pkg package relative to which the file should be named, - * or the empty string if none + * @param moduleAndPkg module and/or package relative to which the file + * should be named, or the empty string if none * @param relativeName final pathname components of the file * @param originatingElements type or package elements causally * associated with the creation of this file, may be elided or @@ -233,10 +272,11 @@ public interface Filer { * @throws FilerException if the same pathname has already been * created * @throws IllegalArgumentException for an unsupported location + * @throws IllegalArgumentException if {@code moduleAndPkg} is ill-formed * @throws IllegalArgumentException if {@code relativeName} is not relative */ FileObject createResource(JavaFileManager.Location location, - CharSequence pkg, + CharSequence moduleAndPkg, CharSequence relativeName, Element... originatingElements) throws IOException; @@ -246,18 +286,27 @@ public interface Filer { * and {@link StandardLocation#SOURCE_OUTPUT SOURCE_OUTPUT} must * be supported. * + *

    If {@code moduleAndPkg} contains a "{@code /}" character, the + * prefix before the "{@code /}" character is the module name and + * the suffix after the "{@code /}" character is the package + * name. The package suffix may be empty; however, if a module + * name is present, it must be nonempty. If {@code moduleAndPkg} + * does not contain a "{@code /}" character, the entire argument + * is interpreted as a package name. + * * @param location location of the file - * @param pkg package relative to which the file should be searched, - * or the empty string if none + * @param moduleAndPkg module and/or package relative to which the file + * should be searched for, or the empty string if none * @param relativeName final pathname components of the file * @return an object to read the file * @throws FilerException if the same pathname has already been * opened for writing * @throws IOException if the file cannot be opened * @throws IllegalArgumentException for an unsupported location + * @throws IllegalArgumentException if {@code moduleAndPkg} is ill-formed * @throws IllegalArgumentException if {@code relativeName} is not relative */ FileObject getResource(JavaFileManager.Location location, - CharSequence pkg, + CharSequence moduleAndPkg, CharSequence relativeName) throws IOException; } diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java index 637c5a9c73c..f6afca8d0ea 100644 --- a/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java +++ b/langtools/src/java.compiler/share/classes/javax/annotation/processing/Processor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -115,7 +115,17 @@ import javax.lang.model.SourceVersion; * the root elements of a round. For this purpose, a type parameter is * considered to be enclosed by its {@linkplain * TypeParameterElement#getGenericElement generic - * element}. Annotations on {@linkplain + * element}. + + * For this purpose, a package element is not considered to + * enclose the top-level types within that package. (A root element + * representing a package is created when a {@code package-info} file + * is processed.) Likewise, for this purpose, a module element is + * not considered to enclose the packages within that + * module. (A root element representing a module is created when a + * {@code module-info} file is processed.) + * + * Annotations on {@linkplain * java.lang.annotation.ElementType#TYPE_USE type uses}, as opposed to * annotations on elements, are ignored when computing whether or not * an annotation type is present. @@ -235,12 +245,20 @@ public interface Processor { * (fully qualified) name of a supported annotation type. * Alternately it may be of the form "name.*" * representing the set of all annotation types with canonical - * names beginning with "name.". Finally, {@code - * "*"} by itself represents the set of all annotation types, - * including the empty set. Note that a processor should not - * claim {@code "*"} unless it is actually processing all files; - * claiming unnecessary annotations may cause a performance - * slowdown in some environments. + * names beginning with "name.". + * + * In either of those cases, the name of the annotation type can + * be optionally preceded by a module name followed by a {@code + * "/"} character. For example, if a processor supports {@code + * "a.B"}, this can include multiple annotation types named {@code + * a.B} which reside in different modules. To only support {@code + * a.B} in the {@code Foo} module, instead use {@code "Foo/a.B"}. + * + * Finally, {@code "*"} by itself represents the set of all + * annotation types, including the empty set. Note that a + * processor should not claim {@code "*"} unless it is actually + * processing all files; claiming unnecessary annotations may + * cause a performance slowdown in some environments. * *

    Each string returned in the set must be accepted by the * following grammar: @@ -248,9 +266,12 @@ public interface Processor { *

    *
    *
    SupportedAnnotationTypeString: - *
    TypeName DotStaropt + *
    ModulePrefixopt TypeName DotStaropt *
    * * + *
    ModulePrefix: + *
    TypeName / + * *
    DotStar: *
    . * *
    diff --git a/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java b/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java index e3f65e57c57..f2a94f0b19f 100644 --- a/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java +++ b/langtools/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java @@ -76,14 +76,17 @@ public interface RoundEnvironment { /** * Returns the elements annotated with the given annotation type. * The annotation may appear directly or be inherited. Only - * package elements and type elements included in this + * package elements, module elements, and type elements included in this * round of annotation processing, or declarations of members, * constructors, parameters, or type parameters declared within * those, are returned. Included type elements are {@linkplain * #getRootElements root types} and any member types nested within - * them. Elements in a package are not considered included simply + * them. Elements of a package are not considered included simply * because a {@code package-info} file for that package was * created. + * Likewise, elements of a module are not considered included + * simply because a {@code module-info} file for that module was + * created * * @param a annotation type being requested * @return the elements annotated with the given annotation type, @@ -128,7 +131,7 @@ public interface RoundEnvironment { /** * Returns the elements annotated with the given annotation type. * The annotation may appear directly or be inherited. Only - * package elements and type elements included in this + * package elements, module elements, and type elements included in this * round of annotation processing, or declarations of members, * constructors, parameters, or type parameters declared within * those, are returned. Included type elements are {@linkplain @@ -136,6 +139,9 @@ public interface RoundEnvironment { * them. Elements in a package are not considered included simply * because a {@code package-info} file for that package was * created. + * Likewise, elements of a module are not considered included + * simply because a {@code module-info} file for that module was + * created * * @param a annotation type being requested * @return the elements annotated with the given annotation type, diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java index daabe3e0e25..967bde79cdb 100644 --- a/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java +++ b/langtools/src/java.compiler/share/classes/javax/lang/model/element/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,7 +53,9 @@ * Names of parameters may not be recoverable from class files. * * The {@linkplain javax.lang.model.element.Modifier modifiers} on an - * element may differ in some cases including: + * element created from a class file may differ in some cases from an + * element for the same declaration created from a source file + * including: * *
      *
    • {@code strictfp} on a class or interface @@ -61,10 +63,19 @@ *
    • {@code protected}, {@code private}, and {@code static} on classes and interfaces *
    * - * Additionally, synthetic constructs in a class file, such as - * accessor methods used in implementing nested classes and bridge - * methods used in implementing covariant returns, are translation - * artifacts outside of this model. + * Some elements which are {@linkplain + * javax.lang.model.util.Elements.Origin#MANDATED mandated} may not be + * marked as such when created from class files. + * + * Additionally, {@linkplain + * javax.lang.model.util.Elements.Origin#SYNTHETIC synthetic} + * constructs in a class file, such as accessor methods used in + * implementing nested classes and {@linkplain + * javax.lang.model.util.Elements.Origin#isBridge(ExecutableElement) + * bridge methods} used in implementing covariant returns, are + * translation artifacts strictly outside of this model. However, when + * operating on class files, it is helpful be able to operate on such + * elements, screening them out when appropriate. * *

    During annotation processing, operating on incomplete or * erroneous programs is necessary; however, there are fewer diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java index e5dbf49b5b9..893a124c031 100644 --- a/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java +++ b/langtools/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,6 +36,7 @@ import javax.lang.model.element.*; import javax.lang.model.element.ModuleElement.Directive; import javax.lang.model.element.ModuleElement.DirectiveKind; import javax.lang.model.element.ModuleElement.ExportsDirective; +import javax.lang.model.element.ModuleElement.OpensDirective; import javax.lang.model.element.ModuleElement.ProvidesDirective; import javax.lang.model.element.ModuleElement.RequiresDirective; import javax.lang.model.element.ModuleElement.UsesDirective; @@ -239,11 +240,9 @@ public class ElementFilter { return set; } - - /** - * Returns a list of export directives in {@code directives}. - * @return a list of export directives in {@code directives} + * Returns a list of {@code exports} directives in {@code directives}. + * @return a list of {@code exports} directives in {@code directives} * @param directives the directives to filter * @since 9 */ @@ -253,8 +252,19 @@ public class ElementFilter { } /** - * Returns a list of provides directives in {@code directives}. - * @return a list of provides directives in {@code directives} + * Returns a list of {@code opens} directives in {@code directives}. + * @return a list of {@code opens} directives in {@code directives} + * @param directives the directives to filter + * @since 9 + */ + public static List + opensIn(Iterable directives) { + return listFilter(directives, DirectiveKind.OPENS, OpensDirective.class); + } + + /** + * Returns a list of {@code provides} directives in {@code directives}. + * @return a list of {@code provides} directives in {@code directives} * @param directives the directives to filter * @since 9 */ @@ -264,8 +274,8 @@ public class ElementFilter { } /** - * Returns a list of requires directives in {@code directives}. - * @return a list of requires directives in {@code directives} + * Returns a list of {@code requires} directives in {@code directives}. + * @return a list of {@code requires} directives in {@code directives} * @param directives the directives to filter * @since 9 */ @@ -275,8 +285,8 @@ public class ElementFilter { } /** - * Returns a list of uses directives in {@code directives}. - * @return a list of uses directives in {@code directives} + * Returns a list of {@code uses} directives in {@code directives}. + * @return a list of {@code uses} directives in {@code directives} * @param directives the directives to filter * @since 9 */ diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java index 076e34caa74..201c09f2b15 100644 --- a/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java +++ b/langtools/src/java.compiler/share/classes/javax/lang/model/util/Elements.java @@ -29,6 +29,7 @@ package javax.lang.model.util; import java.util.List; import java.util.Map; +import javax.lang.model.AnnotatedConstruct; import javax.lang.model.element.*; @@ -47,10 +48,11 @@ import javax.lang.model.element.*; public interface Elements { /** - * Returns a package given its fully qualified name. + * Returns a package given its fully qualified name if the package is unique in the environment. + * If running with modules, all modules in the modules graph are searched for matching packages. * * @param name fully qualified package name, or an empty string for an unnamed package - * @return the named package, or {@code null} if it cannot be found + * @return the named package, or {@code null} if it cannot be uniquely found */ PackageElement getPackageElement(CharSequence name); @@ -65,10 +67,12 @@ public interface Elements { PackageElement getPackageElement(ModuleElement module, CharSequence name); /** - * Returns a type element given its canonical name. + * Returns a type element given its canonical name if the type element is unique in the environment. + * If running with modules, all modules in the modules graph are searched for matching + * type elements. * * @param name the canonical name - * @return the named type element, or {@code null} if it cannot be found + * @return the named type element, or {@code null} if it cannot be uniquely found */ TypeElement getTypeElement(CharSequence name); @@ -84,6 +88,10 @@ public interface Elements { /** * Returns a module element given its fully qualified name. + * If the named module cannot be found, null is returned. One situation where a module + * cannot be found is if the environment does not include modules, such as + * an annotation processing environment configured for + * a {@linkplain ProcessingEnvironment#getSourceVersion source version} without modules. * * * @param name the name * @return the named module element, or {@code null} if it cannot be found @@ -135,6 +143,167 @@ public interface Elements { */ boolean isDeprecated(Element e); + /** + * Returns the origin of the given element. + * + *

    Note that if this method returns {@link Origin#EXPLICIT + * EXPLICIT} and the element was created from a class file, then + * the element may not, in fact, correspond to an explicitly + * declared construct in source code. This is due to limitations + * of the fidelity of the class file format in preserving + * information from source code. For example, at least some + * versions of the class file format do not preserve whether a + * constructor was explicitly declared by the programmer or was + * implicitly declared as the default constructor. + * + * @implSpec The default implementation of this method returns + * {@link Origin#EXPLICIT EXPLICIT}. + * + * @param e the element being examined + * @return the origin of the given element + * @since 9 + */ + default Origin getOrigin(Element e) { + return Origin.EXPLICIT; + } + + /** + * Returns the origin of the given annotation mirror. + * + * An annotation mirror is {@linkplain Origin#MANDATED mandated} + * if it is an implicitly declared container annotation + * used to hold repeated annotations of a repeatable annotation + * type. + * + *

    Note that if this method returns {@link Origin#EXPLICIT + * EXPLICIT} and the annotation mirror was created from a class + * file, then the element may not, in fact, correspond to an + * explicitly declared construct in source code. This is due to + * limitations of the fidelity of the class file format in + * preserving information from source code. For example, at least + * some versions of the class file format do not preserve whether + * an annotation was explicitly declared by the programmer or was + * implicitly declared as a container annotation. + * + * @implSpec The default implementation of this method returns + * {@link Origin#EXPLICIT EXPLICIT}. + * + * @param c the construct the annotation mirror modifies + * @param a the annotation mirror being examined + * @return the origin of the given annotation mirror + * @jls 9.6.3 Repeatable Annotation Types + * @jls 9.7.5 Multiple Annotations of the Same Type + * @since 9 + */ + default Origin getOrigin(AnnotatedConstruct c, + AnnotationMirror a) { + return Origin.EXPLICIT; + } + + /** + * Returns the origin of the given module directive. + * + *

    Note that if this method returns {@link Origin#EXPLICIT + * EXPLICIT} and the module directive was created from a class + * file, then the module directive may not, in fact, correspond to + * an explicitly declared construct in source code. This is due to + * limitations of the fidelity of the class file format in + * preserving information from source code. For example, at least + * some versions of the class file format do not preserve whether + * a {@code uses} directive was explicitly declared by the + * programmer or was added as a synthetic construct. + * + *

    Note that an implementation may not be able to reliably + * determine the origin status of the directive if the directive + * is created from a class file due to limitations of the fidelity + * of the class file format in preserving information from source + * code. + * + * @implSpec The default implementation of this method returns + * {@link Origin#EXPLICIT EXPLICIT}. + * + * @param m the module of the directive + * @param directive the module directive being examined + * @return the origin of the given directive + * @since 9 + */ + default Origin getOrigin(ModuleElement m, + ModuleElement.Directive directive) { + return Origin.EXPLICIT; + } + + /** + * The origin of an element or other language model + * item. The origin of an element or item models how a construct + * in a program is declared in the source code, explicitly, + * implicitly, etc. + * + *

    Note that it is possible additional kinds of origin values + * will be added in future versions of the platform. + * + * @jls 13.1 The Form of a Binary + * @since 9 + */ + public enum Origin { + /** + * Describes a construct explicitly declared in source code. + */ + EXPLICIT, + + /** + * A mandated construct is one that is not explicitly declared + * in the source code, but whose presence is mandated by the + * specification. Such a construct is said to be implicitly + * declared. + * + * One example of a mandated element is a default + * constructor in a class that contains no explicit + * constructor declarations. + * + * Another example of a mandated construct is an implicitly + * declared container annotation used to hold + * multiple annotations of a repeatable annotation type. + * + * @jls 8.8.9 Default Constructor + * @jls 9.6.3 Repeatable Annotation Types + * @jls 9.7.5 Multiple Annotations of the Same Type + */ + MANDATED, + + /** + * A synthetic construct is one that is neither implicitly nor + * explicitly declared in the source code. Such a construct is + * typically a translation artifact created by a compiler. + */ + SYNTHETIC; + + /** + * Returns {@code true} for values corresponding to constructs + * that are implicitly or explicitly declared, {@code false} + * otherwise. + * @return {@code true} for {@link EXPLICIT} and {@link + * MANDATED}, {@code false} otherwise. + */ + public boolean isDeclared() { + return this != SYNTHETIC; + } + } + + /** + * Returns {@code true} if the executable element is a bridge + * method, {@code false} otherwise. + * + * @implSpec The default implementation of this method returns {@code false}. + * + * @param e the executable being examined + * @return {@code true} if the executable element is a bridge + * method, {@code false} otherwise + * @since 9 + */ + default boolean isBridge(ExecutableElement e) { + return false; + } + /** * Returns the binary name of a type element. * @@ -159,6 +328,10 @@ public interface Elements { /** * Returns the module of an element. The module of a module is * itself. + * If there is no module for the element, null is returned. One situation where there is + * no module for an element is if the environment does not include modules, such as + * an annotation processing environment configured for + * a {@linkplain ProcessingEnvironment#getSourceVersion source version} without modules. * * * @param type the element being examined * @return the module of an element diff --git a/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java index 1564061f31e..3f1122aff38 100644 --- a/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java +++ b/langtools/src/java.compiler/share/classes/javax/tools/JavaFileManager.java @@ -479,8 +479,10 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker { /** * Gets a location for the module containing a specific file representing a Java - * source or class, to be found in a module-oriented location. - * The result will be a package-oriented location. + * source or class, to be found within a location, which may be either + * a module-oriented location or an output location. + * The result will be an output location if the given location is + * an output location, or it will be a package-oriented location. * * @apiNote the package name is used to identify the position of the file object * within the module/package/class hierarchy identified by by the location. @@ -494,7 +496,8 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker { * * @throws IOException if an I/O error occurred * @throws UnsupportedOperationException if this operation if not supported by this file manager - * @throws IllegalArgumentException if the location is not a module-oriented location + * @throws IllegalArgumentException if the location is neither an output location nor a + * module-oriented location * @since 9 */ default Location getLocationForModule(Location location, JavaFileObject fo, String pkgName) throws IOException { @@ -543,8 +546,9 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker { } /** - * Lists the locations for all the modules in a module-oriented location. - * The locations that are returned will be package-oriented locations. + * Lists the locations for all the modules in a module-oriented location or an output location. + * The locations that are returned will be output locations if the given location is an output, + * or it will be a package-oriented locations. * * @implSpec This implementation throws {@code UnsupportedOperationException}. * diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java index 0a33818c285..039047f3dcb 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java @@ -149,6 +149,12 @@ public interface DocTree { */ PARAM("param"), + /** + * Used for instances of {@link ProvidesTree} + * representing an @provides tag. + */ + PROVIDES("provides"), + /** * Used for instances of {@link ReferenceTree} * representing a reference to a element in the @@ -222,6 +228,12 @@ public interface DocTree { */ UNKNOWN_INLINE_TAG, + /** + * Used for instances of {@link UsesTree} + * representing an @uses tag. + */ + USES("uses"), + /** * Used for instances of {@link ValueTree} * representing an @value tag. diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java index 9aabbf75b97..80c131fe893 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java @@ -184,6 +184,14 @@ public interface DocTreeVisitor { */ R visitParam(ParamTree node, P p); + /** + * Visits a ProvidesTree node. + * @param node the node being visited + * @param p a parameter value + * @return a result value + */ + R visitProvides(ProvidesTree node, P p); + /** * Visits a ReferenceTree node. * @param node the node being visited @@ -280,6 +288,14 @@ public interface DocTreeVisitor { */ R visitUnknownInlineTag(UnknownInlineTagTree node, P p); + /** + * Visits a UsesTree node. + * @param node the node being visited + * @param p a parameter value + * @return a result value + */ + R visitUses(UsesTree node, P p); + /** * Visits a ValueTree node. * @param node the node being visited diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java similarity index 68% rename from langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java rename to langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java index fea478d2104..f13262371d4 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ProvidesTree.java @@ -23,19 +23,29 @@ * questions. */ +package com.sun.source.doctree; + +import java.util.List; + /** - * This is a test description for the module2 module. Search word {@index search_word} with no description. - * - * @deprecated This module is deprecated using just the javadoc tag. - */ -@testpkgmdl2.AnnotationType(optional="Module Annotation", required=2016) -@testpkgmdl2.AnnotationTypeUndocumented(optional="Module Annotation", required=2016) -module module2 { - exports testpkgmdl2; + * + * A tree node for a @provides block tag. + * + *

    + * @provides service-type description + * + * @since 9 + */ +public interface ProvidesTree extends BlockTagTree { + /** + * Returns the name of the service type being documented. + * @return the name of the service type + */ + ReferenceTree getServiceType(); - exports testpkg2mdl2 to module1; - - uses testpkgmdl2.TestClassInModule2; - - provides testpkg2mdl2.TestInterfaceInModule2 with testpkgmdl2.TestClassInModule2; + /** + * Returns a description of the service type being provided by the module. + * @return the description + */ + List getDescription(); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java index 0fcb0863cc2..3c4957847a1 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ThrowsTree.java @@ -40,13 +40,13 @@ import java.util.List; */ public interface ThrowsTree extends BlockTagTree { /** - * Returns a name of the exception being documented. + * Returns the name of the exception being documented. * @return the name of the exception */ ReferenceTree getExceptionName(); /** - * Returns the description of the reasons why the + * Returns a description of the reasons why the * exception may be thrown. * @return the description */ diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java new file mode 100644 index 00000000000..9efff438293 --- /dev/null +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UsesTree.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.source.doctree; + +import java.util.List; + +/** + * + * A tree node for an @uses block tag. + * + *

    + * @uses service-type description + * + * @since 9 + */ +public interface UsesTree extends BlockTagTree { + /** + * Returns the name of the service type being documented. + * @return the name of the service type + */ + ReferenceTree getServiceType(); + + /** + * Returns a description of the use of service type within the module. + * @return the description + */ + List getDescription(); +} diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java index c7259d4ffef..791c964fe0b 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java @@ -49,6 +49,7 @@ import com.sun.source.doctree.InheritDocTree; import com.sun.source.doctree.LinkTree; import com.sun.source.doctree.LiteralTree; import com.sun.source.doctree.ParamTree; +import com.sun.source.doctree.ProvidesTree; import com.sun.source.doctree.ReferenceTree; import com.sun.source.doctree.ReturnTree; import com.sun.source.doctree.SeeTree; @@ -61,6 +62,7 @@ import com.sun.source.doctree.TextTree; import com.sun.source.doctree.ThrowsTree; import com.sun.source.doctree.UnknownBlockTagTree; import com.sun.source.doctree.UnknownInlineTagTree; +import com.sun.source.doctree.UsesTree; import com.sun.source.doctree.ValueTree; import com.sun.source.doctree.VersionTree; @@ -216,6 +218,14 @@ public interface DocTreeFactory { */ ParamTree newParamTree(boolean isTypeParameter, IdentifierTree name, List description); + /** + * Create a new {@code ProvidesTree} object, to represent a {@code @provides } tag. + * @param name the name of the service type + * @param description a description of the service being provided + * @return a {@code ProvidesTree} object + */ + ProvidesTree newProvidesTree(ReferenceTree name, List description); + /** * Create a new {@code ReferenceTree} object, to represent a reference to an API element. * @@ -308,6 +318,14 @@ public interface DocTreeFactory { */ UnknownInlineTagTree newUnknownInlineTagTree(Name name, List content); + /** + * Create a new {@code UsesTree} object, to represent a {@code @uses } tag. + * @param name the name of the service type + * @param description a description of how the service will be used + * @return a {@code UsesTree} object + */ + UsesTree newUsesTree(ReferenceTree name, List description); + /** * Create a new {@code ValueTree} object, to represent a {@code {@value } } tag. * @param ref a reference to the value diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java index f5ab321717f..d32ce2e65cb 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java @@ -26,7 +26,6 @@ package com.sun.source.util; import com.sun.source.doctree.*; -import com.sun.tools.javac.tree.DCTree.DCIndex; /** @@ -325,6 +324,20 @@ public class DocTreeScanner implements DocTreeVisitor { return r; } + /** + * {@inheritDoc} This implementation scans the children in left to right order. + * + * @param node {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of scanning + */ + @Override + public R visitProvides(ProvidesTree node, P p) { + R r = scan(node.getServiceType(), p); + r = scanAndReduce(node.getDescription(), p, r); + return r; + } + /** * {@inheritDoc} This implementation returns {@code null}. * @@ -474,6 +487,20 @@ public class DocTreeScanner implements DocTreeVisitor { return scan(node.getContent(), p); } + /** + * {@inheritDoc} This implementation scans the children in left to right order. + * + * @param node {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of scanning + */ + @Override + public R visitUses(UsesTree node, P p) { + R r = scan(node.getServiceType(), p); + r = scanAndReduce(node.getDescription(), p, r); + return r; + } + /** * {@inheritDoc} This implementation scans the children in left to right order. * diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java index 0dd30123e6f..945ab4dba03 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java @@ -210,6 +210,7 @@ public class SimpleDocTreeVisitor implements DocTreeVisitor { * @param p {@inheritDoc} * @return the result of {@code defaultAction} */ + @Override public R visitHidden(HiddenTree node, P p) { return defaultAction(node, p); } @@ -286,6 +287,18 @@ public class SimpleDocTreeVisitor implements DocTreeVisitor { return defaultAction(node, p); } + /** + * {@inheritDoc} This implementation calls {@code defaultAction}. + * + * @param node {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of {@code defaultAction} + */ + @Override + public R visitProvides(ProvidesTree node, P p) { + return defaultAction(node, p); + } + /** * {@inheritDoc} This implementation calls {@code defaultAction}. * @@ -430,6 +443,18 @@ public class SimpleDocTreeVisitor implements DocTreeVisitor { return defaultAction(node, p); } + /** + * {@inheritDoc} This implementation calls {@code defaultAction}. + * + * @param node {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of {@code defaultAction} + */ + @Override + public R visitUses(UsesTree node, P p) { + return defaultAction(node, p); + } + /** * {@inheritDoc} This implementation calls {@code defaultAction}. * diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java index 3727ddcd9e9..811f710ab9f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java @@ -63,6 +63,7 @@ import com.sun.source.doctree.InheritDocTree; import com.sun.source.doctree.LinkTree; import com.sun.source.doctree.LiteralTree; import com.sun.source.doctree.ParamTree; +import com.sun.source.doctree.ProvidesTree; import com.sun.source.doctree.ReferenceTree; import com.sun.source.doctree.ReturnTree; import com.sun.source.doctree.SerialDataTree; @@ -73,6 +74,7 @@ import com.sun.source.doctree.TextTree; import com.sun.source.doctree.ThrowsTree; import com.sun.source.doctree.UnknownBlockTagTree; import com.sun.source.doctree.UnknownInlineTagTree; +import com.sun.source.doctree.UsesTree; import com.sun.source.doctree.ValueTree; import com.sun.source.doctree.VersionTree; import com.sun.source.tree.Tree; @@ -85,6 +87,7 @@ import com.sun.tools.javac.util.Assert; import com.sun.tools.javac.util.DefinedBy; import com.sun.tools.javac.util.DefinedBy.Api; import com.sun.tools.javac.util.StringUtils; + import static com.sun.tools.doclint.Messages.Group.*; @@ -131,7 +134,7 @@ public class Checker extends DocTreePathScanner { } } - private Deque tagStack; // TODO: maybe want to record starting tree as well + private final Deque tagStack; // TODO: maybe want to record starting tree as well private HtmlTag currHeaderTag; private final int implicitHeaderLevel; @@ -823,6 +826,20 @@ public class Checker extends DocTreePathScanner { } } + @Override @DefinedBy(Api.COMPILER_TREE) + public Void visitProvides(ProvidesTree tree, Void ignore) { + Element e = env.trees.getElement(env.currPath); + if (e.getKind() != ElementKind.MODULE) { + env.messages.error(REFERENCE, tree, "dc.invalid.provides"); + } + ReferenceTree serviceType = tree.getServiceType(); + Element se = env.trees.getElement(new DocTreePath(getCurrentPath(), serviceType)); + if (se == null) { + env.messages.error(REFERENCE, tree, "dc.service.not.found"); + } + return super.visitProvides(tree, ignore); + } + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitReference(ReferenceTree tree, Void ignore) { String sig = tree.getSignature(); @@ -937,6 +954,20 @@ public class Checker extends DocTreePathScanner { env.messages.error(SYNTAX, tree, "dc.tag.unknown", tagName); } + @Override @DefinedBy(Api.COMPILER_TREE) + public Void visitUses(UsesTree tree, Void ignore) { + Element e = env.trees.getElement(env.currPath); + if (e.getKind() != ElementKind.MODULE) { + env.messages.error(REFERENCE, tree, "dc.invalid.uses"); + } + ReferenceTree serviceType = tree.getServiceType(); + Element se = env.trees.getElement(new DocTreePath(getCurrentPath(), serviceType)); + if (se == null) { + env.messages.error(REFERENCE, tree, "dc.service.not.found"); + } + return super.visitUses(tree, ignore); + } + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitValue(ValueTree tree, Void ignore) { ReferenceTree ref = tree.getReference(); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java index 4177a5ea1fd..653ae5c9f7d 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java @@ -556,11 +556,11 @@ public enum HtmlTag { private final Map attrs; HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) { - this(HtmlVersion.ALL, blockType, endKind, Collections.emptySet(), attrMaps); + this(HtmlVersion.ALL, blockType, endKind, Collections.emptySet(), attrMaps); } HtmlTag(HtmlVersion allowedVersion, BlockType blockType, EndKind endKind, AttrMap... attrMaps) { - this(allowedVersion, blockType, endKind, Collections.emptySet(), attrMaps); + this(allowedVersion, blockType, endKind, Collections.emptySet(), attrMaps); } HtmlTag(BlockType blockType, EndKind endKind, Set flags, AttrMap... attrMaps) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java index 70383b5109c..6a5e92c8f0f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/Messages.java @@ -315,12 +315,7 @@ public class Messages { */ private static class Table { - private static final Comparator DECREASING = new Comparator() { - - public int compare(Integer o1, Integer o2) { - return o2.compareTo(o1); - } - }; + private static final Comparator DECREASING = (o1, o2) -> o2.compareTo(o1); private final TreeMap> map = new TreeMap<>(DECREASING); void put(String label, int n) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties index 03adb82aeaa..a470502aa24 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -41,8 +41,10 @@ dc.entity.invalid = invalid entity &{0}; dc.exception.not.thrown = exception not thrown: {0} dc.invalid.anchor = invalid name for anchor: "{0}" dc.invalid.param = invalid use of @param +dc.invalid.provides = invalid use of @provides dc.invalid.return = invalid use of @return dc.invalid.throws = invalid use of @throws +dc.invalid.uses = invalid use of @uses dc.invalid.uri = invalid uri: "{0}" dc.missing.comment = no comment dc.missing.param = no @param for {0} @@ -52,6 +54,7 @@ dc.no.alt.attr.for.image = no "alt" attribute for image dc.no.summary.or.caption.for.table=no summary or caption for table dc.param.name.not.found = @param name not found dc.ref.not.found = reference not found +dc.service.not.found = service-type not found dc.tag.code.within.code = '{@code'} within dc.tag.empty = empty <{0}> tag dc.tag.end.not.permitted = invalid end tag: diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java index f9c4adadc5d..ecf2bec0cfa 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java @@ -97,15 +97,12 @@ public class JavacTaskImpl extends BasicJavacTask { /* Internal version of call exposing Main.Result. */ public Main.Result doCall() { try { - return handleExceptions(new Callable() { - @Override - public Main.Result call() throws Exception { - prepareCompiler(false); - if (compiler.errorCount() > 0) - return Main.Result.ERROR; - compiler.compile(args.getFileObjects(), args.getClassNames(), processors); - return (compiler.errorCount() > 0) ? Main.Result.ERROR : Main.Result.OK; // FIXME? - } + return handleExceptions(() -> { + prepareCompiler(false); + if (compiler.errorCount() > 0) + return Main.Result.ERROR; + compiler.compile(args.getFileObjects(), args.getClassNames(), processors); + return (compiler.errorCount() > 0) ? Main.Result.ERROR : Main.Result.OK; // FIXME? }, Main.Result.SYSERR, Main.Result.ABNORMAL); } finally { try { @@ -228,12 +225,7 @@ public class JavacTaskImpl extends BasicJavacTask { @Override @DefinedBy(Api.COMPILER_TREE) public Iterable parse() { - return handleExceptions(new Callable>() { - @Override - public Iterable call() { - return parseInternal(); - } - }, List.nil(), List.nil()); + return handleExceptions(this::parseInternal, List.nil(), List.nil()); } private Iterable parseInternal() { @@ -360,12 +352,7 @@ public class JavacTaskImpl extends BasicJavacTask { @Override @DefinedBy(Api.COMPILER_TREE) public Iterable analyze() { - return handleExceptions(new Callable>() { - @Override - public Iterable call() { - return analyze(null); - } - }, List.nil(), List.nil()); + return handleExceptions(() -> analyze(null), List.nil(), List.nil()); } /** @@ -427,12 +414,7 @@ public class JavacTaskImpl extends BasicJavacTask { @Override @DefinedBy(Api.COMPILER_TREE) public Iterable generate() { - return handleExceptions(new Callable>() { - @Override - public Iterable call() { - return generate(null); - } - }, List.nil(), List.nil()); + return handleExceptions(() -> generate(null), List.nil(), List.nil()); } /** diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java index fd3813600c6..2edfcb1b3b8 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java @@ -437,7 +437,7 @@ public class JavacTrees extends DocTrees { Type t = attr.attribType(ref.qualifierExpression, env); if (t.isErroneous()) { JCCompilationUnit toplevel = - treeMaker.TopLevel(List.nil()); + treeMaker.TopLevel(List.nil()); final ModuleSymbol msym = modules.getDefaultModule(); toplevel.modle = msym; toplevel.packge = msym.unnamedPackage; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java index 53351871981..c9c152318e1 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java @@ -163,12 +163,7 @@ public class ClassFinder { /** * Completer that delegates to the complete-method of this class. */ - private final Completer thisCompleter = new Completer() { - @Override - public void complete(Symbol sym) throws CompletionFailure { - ClassFinder.this.complete(sym); - } - }; + private final Completer thisCompleter = this::complete; public Completer getCompleter() { return thisCompleter; @@ -516,7 +511,7 @@ public class ClassFinder { ModuleSymbol msym = p.modle; - Assert.checkNonNull(msym, () -> p.toString()); + Assert.checkNonNull(msym, p::toString); msym.complete(); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java index 80ff1d24e9e..e124d3ff37f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java @@ -118,6 +118,7 @@ public class Lint if (source.compareTo(Source.JDK1_9) >= 0) { values.add(LintCategory.DEP_ANN); } + values.add(LintCategory.MODULE); values.add(LintCategory.REMOVAL); } @@ -204,6 +205,11 @@ public class Lint */ FINALLY("finally"), + /** + * Warn about module system related issues. + */ + MODULE("module"), + /** * Warn about issues relating to use of command line options */ diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java index dc93c65d55b..43df27fd9e3 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java @@ -143,12 +143,7 @@ public abstract class Scope { /** Returns true iff the given Symbol is in this scope, optionally checking outward scopes. */ public boolean includes(final Symbol sym, LookupKind lookupKind) { - return getSymbolsByName(sym.name, new Filter() { - @Override - public boolean accepts(Symbol t) { - return t == sym; - } - }, lookupKind).iterator().hasNext(); + return getSymbolsByName(sym.name, t -> t == sym, lookupKind).iterator().hasNext(); } /** Returns true iff this scope does not contain any Symbol. Does not inspect outward scopes. @@ -574,64 +569,56 @@ public abstract class Scope { public Iterable getSymbols(final Filter sf, final LookupKind lookupKind) { - return new Iterable() { - public Iterator iterator() { - return new Iterator() { - private ScopeImpl currScope = ScopeImpl.this; - private Scope.Entry currEntry = elems; - private int seenRemoveCount = currScope.removeCount; - { - update(); - } + return () -> new Iterator() { + private ScopeImpl currScope = ScopeImpl.this; + private Entry currEntry = elems; + private int seenRemoveCount = currScope.removeCount; + { + update(); + } - public boolean hasNext() { - if (seenRemoveCount != currScope.removeCount && - currEntry != null && - !currEntry.scope.includes(currEntry.sym)) { - doNext(); //skip entry that is no longer in the Scope - seenRemoveCount = currScope.removeCount; - } - return currEntry != null; - } + public boolean hasNext() { + if (seenRemoveCount != currScope.removeCount && + currEntry != null && + !currEntry.scope.includes(currEntry.sym)) { + doNext(); //skip entry that is no longer in the Scope + seenRemoveCount = currScope.removeCount; + } + return currEntry != null; + } - public Symbol next() { - if (!hasNext()) { - throw new NoSuchElementException(); - } + public Symbol next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } - return doNext(); - } - private Symbol doNext() { - Symbol sym = (currEntry == null ? null : currEntry.sym); - if (currEntry != null) { - currEntry = currEntry.sibling; - } - update(); - return sym; - } + return doNext(); + } + private Symbol doNext() { + Symbol sym = (currEntry == null ? null : currEntry.sym); + if (currEntry != null) { + currEntry = currEntry.sibling; + } + update(); + return sym; + } - public void remove() { - throw new UnsupportedOperationException(); - } - - private void update() { + private void update() { + skipToNextMatchingEntry(); + if (lookupKind == RECURSIVE) { + while (currEntry == null && currScope.next != null) { + currScope = currScope.next; + currEntry = currScope.elems; + seenRemoveCount = currScope.removeCount; skipToNextMatchingEntry(); - if (lookupKind == RECURSIVE) { - while (currEntry == null && currScope.next != null) { - currScope = currScope.next; - currEntry = currScope.elems; - seenRemoveCount = currScope.removeCount; - skipToNextMatchingEntry(); - } - } } + } + } - void skipToNextMatchingEntry() { - while (currEntry != null && sf != null && !sf.accepts(currEntry.sym)) { - currEntry = currEntry.sibling; - } - } - }; + void skipToNextMatchingEntry() { + while (currEntry != null && sf != null && !sf.accepts(currEntry.sym)) { + currEntry = currEntry.sibling; + } } }; } @@ -639,40 +626,36 @@ public abstract class Scope { public Iterable getSymbolsByName(final Name name, final Filter sf, final LookupKind lookupKind) { - return new Iterable() { - public Iterator iterator() { - return new Iterator() { - Scope.Entry currentEntry = lookup(name, sf); - int seenRemoveCount = currentEntry.scope != null ? - currentEntry.scope.removeCount : -1; + return () -> new Iterator() { + Entry currentEntry = lookup(name, sf); + int seenRemoveCount = currentEntry.scope != null ? + currentEntry.scope.removeCount : -1; - public boolean hasNext() { - if (currentEntry.scope != null && - seenRemoveCount != currentEntry.scope.removeCount && - !currentEntry.scope.includes(currentEntry.sym)) { - doNext(); //skip entry that is no longer in the Scope - } - return currentEntry.scope != null && - (lookupKind == RECURSIVE || - currentEntry.scope == ScopeImpl.this); - } - public Symbol next() { - if (!hasNext()) { - throw new NoSuchElementException(); - } - return doNext(); - } - private Symbol doNext() { - Scope.Entry prevEntry = currentEntry; - currentEntry = currentEntry.next(sf); - return prevEntry.sym; - } - public void remove() { - throw new UnsupportedOperationException(); - } - }; - } - }; + public boolean hasNext() { + if (currentEntry.scope != null && + seenRemoveCount != currentEntry.scope.removeCount && + !currentEntry.scope.includes(currentEntry.sym)) { + doNext(); //skip entry that is no longer in the Scope + } + return currentEntry.scope != null && + (lookupKind == RECURSIVE || + currentEntry.scope == ScopeImpl.this); + } + public Symbol next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } + return doNext(); + } + private Symbol doNext() { + Entry prevEntry = currentEntry; + currentEntry = currentEntry.next(sf); + return prevEntry.sym; + } + public void remove() { + throw new UnsupportedOperationException(); + } + }; } public Scope getOrigin(Symbol s) { @@ -826,7 +809,7 @@ public abstract class Scope { @Override public Iterable getSymbols(Filter sf, LookupKind lookupKind) { - return sf == null || sf.accepts(sym) ? content : Collections.emptyList(); + return sf == null || sf.accepts(sym) ? content : Collections.emptyList(); } @Override @@ -834,7 +817,7 @@ public abstract class Scope { Filter sf, LookupKind lookupKind) { return sym.name == name && - (sf == null || sf.accepts(sym)) ? content : Collections.emptyList(); + (sf == null || sf.accepts(sym)) ? content : Collections.emptyList(); } @Override diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java index aac3e769a18..91a4bdabec7 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java @@ -209,6 +209,9 @@ public enum Source { public boolean allowPostApplicabilityVarargsAccessCheck() { return compareTo(JDK1_8) >= 0; } + public boolean mapCapturesToBounds() { + return compareTo(JDK1_8) < 0; + } public boolean allowPrivateSafeVarargs() { return compareTo(JDK1_9) >= 0; } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java index 1e713f05c6a..a1a9c8f8f6e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java @@ -140,7 +140,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { */ public List getRawAttributes() { return (metadata == null) - ? List.nil() + ? List.nil() : metadata.getDeclarationAttributes(); } @@ -150,7 +150,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { */ public List getRawTypeAttributes() { return (metadata == null) - ? List.nil() + ? List.nil() : metadata.getTypeAttributes(); } @@ -192,13 +192,13 @@ public abstract class Symbol extends AnnoConstruct implements Element { public List getClassInitTypeAttributes() { return (metadata == null) - ? List.nil() + ? List.nil() : metadata.getClassInitTypeAttributes(); } public List getInitTypeAttributes() { return (metadata == null) - ? List.nil() + ? List.nil() : metadata.getInitTypeAttributes(); } @@ -212,7 +212,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { public List getDeclarationAttributes() { return (metadata == null) - ? List.nil() + ? List.nil() : metadata.getDeclarationAttributes(); } @@ -925,6 +925,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { public Completer usesProvidesCompleter = Completer.NULL_COMPLETER; public final Set flags = EnumSet.noneOf(ModuleFlags.class); + public final Set resolutionFlags = EnumSet.noneOf(ModuleResolutionFlags.class); /** * Create a ModuleSymbol with an associated module-info ClassSymbol. @@ -1037,7 +1038,26 @@ public abstract class Symbol extends AnnoConstruct implements Element { } public final int value; + } + public enum ModuleResolutionFlags { + DO_NOT_RESOLVE_BY_DEFAULT(0x0001), + WARN_DEPRECATED(0x0002), + WARN_DEPRECATED_REMOVAL(0x0004), + WARN_INCUBATOR(0x0008); + + public static int value(Set s) { + int v = 0; + for (ModuleResolutionFlags f: s) + v |= f.value; + return v; + } + + private ModuleResolutionFlags(int value) { + this.value = value; + } + + public final int value; } /** A class for package symbols @@ -1228,7 +1248,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { public Type erasure(Types types) { if (erasure_field == null) erasure_field = new ClassType(types.erasure(type.getEnclosingType()), - List.nil(), this, + List.nil(), this, type.getMetadata()); return erasure_field; } @@ -1529,11 +1549,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { final Attr attr, final JCVariableDecl variable) { - setData(new Callable() { - public Object call() { - return attr.attribLazyConstantValue(env, variable, type); - } - }); + setData((Callable)() -> attr.attribLazyConstantValue(env, variable, type)); } /** @@ -1836,12 +1852,8 @@ public abstract class Symbol extends AnnoConstruct implements Element { return implementation(origin, types, checkResult, implementation_filter); } // where - public static final Filter implementation_filter = new Filter() { - public boolean accepts(Symbol s) { - return s.kind == MTH && - (s.flags() & SYNTHETIC) == 0; - } - }; + public static final Filter implementation_filter = s -> + s.kind == MTH && (s.flags() & SYNTHETIC) == 0; public MethodSymbol implementation(TypeSymbol origin, Types types, boolean checkResult, Filter implFilter) { MethodSymbol res = types.implementation(this, origin, checkResult, implFilter); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java index e0ae12f4f63..d666074b1ed 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java @@ -72,19 +72,19 @@ public class SymbolMetadata { * Type attributes for this symbol. * This field should never be null. */ - private List type_attributes = List.nil(); + private List type_attributes = List.nil(); /* * Type attributes of initializers in this class. * Unused if the current symbol is not a ClassSymbol. */ - private List init_type_attributes = List.nil(); + private List init_type_attributes = List.nil(); /* * Type attributes of class initializers in this class. * Unused if the current symbol is not a ClassSymbol. */ - private List clinit_type_attributes = List.nil(); + private List clinit_type_attributes = List.nil(); /* * The Symbol this SymbolMetadata instance belongs to @@ -248,7 +248,7 @@ public class SymbolMetadata { private List filterDeclSentinels(List a) { return (a == DECL_IN_PROGRESS || a == DECL_NOT_STARTED) - ? List.nil() + ? List.nil() : a; } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java index 202ca4e5dfe..f76205b8c95 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java @@ -309,14 +309,14 @@ public class Symtab { MethodSymbol boxMethod = new MethodSymbol(PUBLIC | STATIC, names.valueOf, new MethodType(List.of(type), sym.type, - List.nil(), methodClass), + List.nil(), methodClass), sym); sym.members().enter(boxMethod); MethodSymbol unboxMethod = new MethodSymbol(PUBLIC, type.tsym.name.append(names.Value), // x.intValue() - new MethodType(List.nil(), type, - List.nil(), methodClass), + new MethodType(List.nil(), type, + List.nil(), methodClass), sym); sym.members().enter(unboxMethod); } @@ -514,8 +514,8 @@ public class Symtab { enumFinalFinalize = new MethodSymbol(PROTECTED|FINAL|HYPOTHETICAL, names.finalize, - new MethodType(List.nil(), voidType, - List.nil(), methodClass), + new MethodType(List.nil(), voidType, + List.nil(), methodClass), enumSym); listType = enterClass("java.util.List"); collectionsType = enterClass("java.util.Collections"); @@ -538,7 +538,7 @@ public class Symtab { autoCloseableType = enterClass("java.lang.AutoCloseable"); autoCloseableClose = new MethodSymbol(PUBLIC, names.close, - new MethodType(List.nil(), voidType, + new MethodType(List.nil(), voidType, List.of(exceptionType), methodClass), autoCloseableType.tsym); trustMeType = enterClass("java.lang.SafeVarargs"); @@ -584,13 +584,13 @@ public class Symtab { arrayCloneMethod = new MethodSymbol( PUBLIC, names.clone, - new MethodType(List.nil(), objectType, - List.nil(), methodClass), + new MethodType(List.nil(), objectType, + List.nil(), methodClass), arrayClass); arrayClass.members().enter(arrayCloneMethod); if (java_base != noModule) - java_base.completer = sym -> moduleCompleter.complete(sym); //bootstrap issues + java_base.completer = moduleCompleter::complete; //bootstrap issues } @@ -624,7 +624,7 @@ public class Symtab { } public ClassSymbol getClass(ModuleSymbol msym, Name flatName) { - Assert.checkNonNull(msym, () -> flatName.toString()); + Assert.checkNonNull(msym, flatName::toString); return classes.getOrDefault(flatName, Collections.emptyMap()).get(msym); } @@ -757,7 +757,8 @@ public class Symtab { } }; unnamedPackage.modle = module; - unnamedPackage.completer = sym -> initialCompleter.complete(sym); + //we cannot use a method reference below, as initialCompleter might be null now + unnamedPackage.completer = s -> initialCompleter.complete(s); module.unnamedPackage = unnamedPackage; } @@ -770,7 +771,7 @@ public class Symtab { if (msym == null) { msym = ModuleSymbol.create(name, names.module_info); addRootPackageFor(msym); - msym.completer = sym -> moduleCompleter.complete(sym); //bootstrap issues + msym.completer = s -> moduleCompleter.complete(s); //bootstrap issues modules.put(name, msym); } return msym; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java index 1cbeadb07e5..e3704c5ce18 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java @@ -1164,7 +1164,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { public static class ErasedClassType extends ClassType { public ErasedClassType(Type outer, TypeSymbol tsym, TypeMetadata metadata) { - super(outer, List.nil(), tsym, metadata); + super(outer, List.nil(), tsym, metadata); } @Override @@ -1235,7 +1235,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { public IntersectionClassType(List bounds, ClassSymbol csym, boolean allInterfaces) { // Presently no way to refer to this type directly, so we // cannot put annotations directly on it. - super(Type.noType, List.nil(), csym); + super(Type.noType, List.nil(), csym); this.allInterfaces = allInterfaces; Assert.check((csym.flags() & COMPOUND) != 0); supertype_field = bounds.head; @@ -2082,6 +2082,21 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { /** add a bound of a given kind - this might trigger listener notification */ public final void addBound(InferenceBound ib, Type bound, Types types) { + // Per JDK-8075793: in pre-8 sources, follow legacy javac behavior + // when capture variables are inferred as bounds: for lower bounds, + // map to the capture variable's upper bound; for upper bounds, + // if the capture variable has a lower bound, map to that type + if (types.mapCapturesToBounds) { + switch (ib) { + case LOWER: + bound = types.cvarUpperBound(bound); + break; + case UPPER: + Type altBound = types.cvarLowerBound(bound); + if (!altBound.hasTag(TypeTag.BOT)) bound = altBound; + break; + } + } addBound(ib, bound, types, false); } @@ -2123,11 +2138,9 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { UndetVarListener prevListener = listener; try { //setup new listener for keeping track of changed bounds - listener = new UndetVarListener() { - public void varBoundChanged(UndetVar uv, InferenceBound ib, Type t, boolean _ignored) { - Assert.check(uv == UndetVar.this); - boundsChanged.add(new Pair<>(ib, t)); - } + listener = (uv, ib, t, _ignored) -> { + Assert.check(uv == UndetVar.this); + boundsChanged.add(new Pair<>(ib, t)); }; for (Map.Entry> _entry : bounds.entrySet()) { InferenceBound ib = _entry.getKey(); @@ -2303,14 +2316,14 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { } public ErrorType(Type originalType, TypeSymbol tsym) { - super(noType, List.nil(), null); + super(noType, List.nil(), null); this.tsym = tsym; this.originalType = (originalType == null ? noType : originalType); } private ErrorType(Type originalType, TypeSymbol tsym, TypeMetadata metadata) { - super(noType, List.nil(), null, metadata); + super(noType, List.nil(), null, metadata); this.tsym = tsym; this.originalType = (originalType == null ? noType : originalType); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java index 120a57eb7db..f9e1174fb43 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java @@ -88,6 +88,7 @@ public class Types { final Names names; final boolean allowObjectToPrimitiveCast; final boolean allowDefaultMethods; + final boolean mapCapturesToBounds; final Check chk; final Enter enter; JCDiagnostic.Factory diags; @@ -112,6 +113,7 @@ public class Types { Source source = Source.instance(context); allowObjectToPrimitiveCast = source.allowObjectToPrimitiveCast(); allowDefaultMethods = source.allowDefaultMethods(); + mapCapturesToBounds = source.mapCapturesToBounds(); chk = Check.instance(context); enter = Enter.instance(context); capturedName = names.fromString(""); @@ -586,7 +588,7 @@ public class Types { csym.members_field = WriteableScope.create(csym); MethodSymbol instDescSym = new MethodSymbol(descSym.flags(), descSym.name, descType, csym); csym.members_field.enter(instDescSym); - Type.ClassType ctype = new Type.ClassType(Type.noType, List.nil(), csym); + Type.ClassType ctype = new Type.ClassType(Type.noType, List.nil(), csym); ctype.supertype_field = syms.objectType; ctype.interfaces_field = targets; csym.type = ctype; @@ -3160,7 +3162,7 @@ public class Types { t.getMetadata()); // the new bound should use the new type variable in place // of the old - tv.bound = subst(bound1, List.of(t), List.of(tv)); + tv.bound = subst(bound1, List.of(t), List.of(tv)); return tv; } } @@ -3760,7 +3762,7 @@ public class Types { List lci = List.of(asSuper(ts[startIdx], erasedSupertype.tsym)); for (int i = startIdx + 1 ; i < ts.length ; i++) { Type superType = asSuper(ts[i], erasedSupertype.tsym); - lci = intersect(lci, superType != null ? List.of(superType) : List.nil()); + lci = intersect(lci, superType != null ? List.of(superType) : List.nil()); } candidates = candidates.appendList(lci); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java index da01293dbf1..93c5884633f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java @@ -484,7 +484,7 @@ public class Annotate { JCIdent left = (JCIdent)assign.lhs; Symbol method = resolve.resolveQualifiedMethod(elidedValue ? assign.rhs.pos() : left.pos(), env, thisAnnotationType, - left.name, List.nil(), null); + left.name, List.nil(), null); left.sym = method; left.type = method.type; if (method.owner != thisAnnotationType.tsym && !badAnnotation) @@ -626,7 +626,7 @@ public class Annotate { // Special case, implicit array if (!tree.hasTag(NEWARRAY)) { tree = make.at(tree.pos). - NewArray(null, List.nil(), List.of(tree)); + NewArray(null, List.nil(), List.of(tree)); } JCNewArray na = (JCNewArray)tree; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java index 43757ed9ed4..9d3344c5b97 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java @@ -1052,8 +1052,8 @@ public class Attr extends JCTree.Visitor { !TreeInfo.isSelfCall(body.stats.head)) { body.stats = body.stats. prepend(typeEnter.SuperCall(make.at(body.pos), - List.nil(), - List.nil(), + List.nil(), + List.nil(), false)); } else if ((env.enclClass.sym.flags() & ENUM) != 0 && (tree.mods.flags & GENERATEDCONSTR) == 0 && @@ -1453,8 +1453,8 @@ public class Attr extends JCTree.Visitor { env, types.skipTypeVars(resource, false), names.close, - List.nil(), - List.nil()); + List.nil(), + List.nil()); } finally { log.popDiagnosticHandler(discardHandler); @@ -1915,7 +1915,7 @@ public class Attr extends JCTree.Visitor { argtypes.isEmpty()) { // as a special case, x.getClass() has type Class return new ClassType(restype.getEnclosingType(), - List.of(new WildcardType(types.erasure(qualifierType), + List.of(new WildcardType(types.erasure(qualifierType), BoundKind.EXTENDS, syms.boundClass)), restype.tsym, @@ -1953,7 +1953,7 @@ public class Attr extends JCTree.Visitor { /** Obtain a method type with given argument types. */ Type newMethodTemplate(Type restype, List argtypes, List typeargtypes) { - MethodType mt = new MethodType(argtypes, restype, List.nil(), syms.methodClass); + MethodType mt = new MethodType(argtypes, restype, List.nil(), syms.methodClass); return (typeargtypes == null) ? mt : (Type)new ForAll(typeargtypes, mt); } @@ -2635,7 +2635,7 @@ public class Attr extends JCTree.Visitor { return new MethodType(argtypes, Type.recoveryType, List.of(syms.throwableType), syms.methodClass); case REFERENCE: - return new MethodType(List.nil(), Type.recoveryType, + return new MethodType(List.nil(), Type.recoveryType, List.of(syms.throwableType), syms.methodClass); default: Assert.error("Cannot get here!"); @@ -2651,12 +2651,8 @@ public class Attr extends JCTree.Visitor { private void checkAccessibleTypes(final DiagnosticPosition pos, final Env env, final InferenceContext inferenceContext, final List ts) { if (inferenceContext.free(ts)) { - inferenceContext.addFreeTypeListener(ts, new FreeTypeListener() { - @Override - public void typesInferred(InferenceContext inferenceContext) { - checkAccessibleTypes(pos, env, inferenceContext, inferenceContext.asInstTypes(ts)); - } - }); + inferenceContext.addFreeTypeListener(ts, + solvedContext -> checkAccessibleTypes(pos, env, solvedContext, solvedContext.asInstTypes(ts))); } else { for (Type t : ts) { rs.checkAccessibleType(env, t); @@ -2801,11 +2797,11 @@ public class Attr extends JCTree.Visitor { */ MethodSymbol clinit = clinits.get(enclClass); if (clinit == null) { - Type clinitType = new MethodType(List.nil(), - syms.voidType, List.nil(), syms.methodClass); + Type clinitType = new MethodType(List.nil(), + syms.voidType, List.nil(), syms.methodClass); clinit = new MethodSymbol(STATIC | SYNTHETIC | PRIVATE, names.clinit, clinitType, enclClass); - clinit.params = List.nil(); + clinit.params = List.nil(); clinits.put(enclClass, clinit); } newScopeOwner = clinit; @@ -3094,12 +3090,9 @@ public class Attr extends JCTree.Visitor { private void setFunctionalInfo(final Env env, final JCFunctionalExpression fExpr, final Type pt, final Type descriptorType, final Type primaryTarget, final CheckContext checkContext) { if (checkContext.inferenceContext().free(descriptorType)) { - checkContext.inferenceContext().addFreeTypeListener(List.of(pt, descriptorType), new FreeTypeListener() { - public void typesInferred(InferenceContext inferenceContext) { - setFunctionalInfo(env, fExpr, pt, inferenceContext.asInstType(descriptorType), - inferenceContext.asInstType(primaryTarget), checkContext); - } - }); + checkContext.inferenceContext().addFreeTypeListener(List.of(pt, descriptorType), + inferenceContext -> setFunctionalInfo(env, fExpr, pt, inferenceContext.asInstType(descriptorType), + inferenceContext.asInstType(primaryTarget), checkContext)); } else { ListBuffer targets = new ListBuffer<>(); if (pt.hasTag(CLASS)) { @@ -3723,7 +3716,7 @@ public class Attr extends JCTree.Visitor { normOuter = types.erasure(ownOuter); if (normOuter != ownOuter) owntype = new ClassType( - normOuter, List.nil(), owntype.tsym, + normOuter, List.nil(), owntype.tsym, owntype.getMetadata()); } } @@ -4224,8 +4217,8 @@ public class Attr extends JCTree.Visitor { } JCClassDecl cd = make.at(tree).ClassDef( make.Modifiers(PUBLIC | ABSTRACT), - names.empty, List.nil(), - extending, implementing, List.nil()); + names.empty, List.nil(), + extending, implementing, List.nil()); ClassSymbol c = (ClassSymbol)owntype.tsym; Assert.check((c.flags() & COMPOUND) != 0); @@ -4444,7 +4437,7 @@ public class Attr extends JCTree.Visitor { ModuleSymbol msym = tree.sym; Lint lint = env.outer.info.lint = env.outer.info.lint.augment(msym); Lint prevLint = chk.setLint(lint); - + chk.checkModuleName(tree); chk.checkDeprecatedAnnotation(tree, msym); try { @@ -4574,13 +4567,8 @@ public class Attr extends JCTree.Visitor { } } - public static final Filter anyNonAbstractOrDefaultMethod = new Filter() { - @Override - public boolean accepts(Symbol s) { - return s.kind == MTH && - (s.flags() & (DEFAULT | ABSTRACT)) != ABSTRACT; - } - }; + public static final Filter anyNonAbstractOrDefaultMethod = s -> + s.kind == MTH && (s.flags() & (DEFAULT | ABSTRACT)) != ABSTRACT; /** get a diagnostic position for an attribute of Type t, or null if attribute missing */ private DiagnosticPosition getDiagnosticPosition(JCClassDecl tree, Type t) { @@ -4907,8 +4895,8 @@ public class Attr extends JCTree.Visitor { if (prim.typetag == VOID) restype = syms.voidType; } - return new MethodType(List.nil(), restype, - List.nil(), syms.methodClass); + return new MethodType(List.nil(), restype, + List.nil(), syms.methodClass); } private Type dummyMethodType() { return dummyMethodType(null); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java index 8150c6fccb8..bf195d7b70a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java @@ -565,12 +565,8 @@ public class Check { Type checkType(final DiagnosticPosition pos, final Type found, final Type req, final CheckContext checkContext) { final InferenceContext inferenceContext = checkContext.inferenceContext(); if (inferenceContext.free(req) || inferenceContext.free(found)) { - inferenceContext.addFreeTypeListener(List.of(req, found), new FreeTypeListener() { - @Override - public void typesInferred(InferenceContext inferenceContext) { - checkType(pos, inferenceContext.asInstType(found), inferenceContext.asInstType(req), checkContext); - } - }); + inferenceContext.addFreeTypeListener(List.of(req, found), + solvedContext -> checkType(pos, solvedContext.asInstType(found), solvedContext.asInstType(req), checkContext)); } if (req.hasTag(ERROR)) return req; @@ -614,13 +610,10 @@ public class Check { && types.isSameType(tree.expr.type, tree.clazz.type) && !(ignoreAnnotatedCasts && TreeInfo.containsTypeAnnotation(tree.clazz)) && !is292targetTypeCast(tree)) { - deferredLintHandler.report(new DeferredLintHandler.LintLogger() { - @Override - public void report() { - if (lint.isEnabled(Lint.LintCategory.CAST)) - log.warning(Lint.LintCategory.CAST, - tree.pos(), "redundant.cast", tree.clazz.type); - } + deferredLintHandler.report(() -> { + if (lint.isEnabled(LintCategory.CAST)) + log.warning(LintCategory.CAST, + tree.pos(), "redundant.cast", tree.clazz.type); }); } } @@ -953,11 +946,8 @@ public class Check { // System.out.println("method : " + owntype); // System.out.println("actuals: " + argtypes); if (inferenceContext.free(mtype)) { - inferenceContext.addFreeTypeListener(List.of(mtype), new FreeTypeListener() { - public void typesInferred(InferenceContext inferenceContext) { - checkMethod(inferenceContext.asInstType(mtype), sym, env, argtrees, argtypes, useVarargs, inferenceContext); - } - }); + inferenceContext.addFreeTypeListener(List.of(mtype), + solvedContext -> checkMethod(solvedContext.asInstType(mtype), sym, env, argtrees, argtypes, useVarargs, solvedContext)); return mtype; } Type owntype = mtype; @@ -2070,13 +2060,8 @@ public class Check { } } - private Filter equalsHasCodeFilter = new Filter() { - public boolean accepts(Symbol s) { - return MethodSymbol.implementation_filter.accepts(s) && - (s.flags() & BAD_OVERRIDE) == 0; - - } - }; + private Filter equalsHasCodeFilter = s -> MethodSymbol.implementation_filter.accepts(s) && + (s.flags() & BAD_OVERRIDE) == 0; public void checkClassOverrideEqualsAndHashIfNeeded(DiagnosticPosition pos, ClassSymbol someClass) { @@ -2116,6 +2101,18 @@ public class Check { } } + public void checkModuleName (JCModuleDecl tree) { + Name moduleName = tree.sym.name; + Assert.checkNonNull(moduleName); + if (lint.isEnabled(LintCategory.MODULE)) { + String moduleNameString = moduleName.toString(); + int nameLength = moduleNameString.length(); + if (nameLength > 0 && Character.isDigit(moduleNameString.charAt(nameLength - 1))) { + log.warning(Lint.LintCategory.MODULE, tree.qualId.pos(), Warnings.PoorChoiceForModuleName(moduleName)); + } + } + } + private boolean checkNameClash(ClassSymbol origin, Symbol s1, Symbol s2) { ClashFilter cf = new ClashFilter(origin.type); return (cf.accepts(s1) && @@ -2166,7 +2163,7 @@ public class Check { log.useSource(prevSource.getFile()); } } else if (sym.kind == TYP) { - checkClass(pos, sym, List.nil()); + checkClass(pos, sym, List.nil()); } } else { //not completed yet @@ -2258,7 +2255,7 @@ public class Check { void checkNonCyclic(DiagnosticPosition pos, TypeVar t) { - checkNonCyclic1(pos, t, List.nil()); + checkNonCyclic1(pos, t, List.nil()); } private void checkNonCyclic1(DiagnosticPosition pos, Type t, List seen) { @@ -3254,12 +3251,7 @@ public class Check { if ( (s.isDeprecatedForRemoval() || s.isDeprecated() && !other.isDeprecated()) && (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)) { - deferredLintHandler.report(new DeferredLintHandler.LintLogger() { - @Override - public void report() { - warnDeprecated(pos, s); - } - }); + deferredLintHandler.report(() -> warnDeprecated(pos, s)); } } @@ -3398,12 +3390,7 @@ public class Check { int opc = ((OperatorSymbol)operator).opcode; if (opc == ByteCodes.idiv || opc == ByteCodes.imod || opc == ByteCodes.ldiv || opc == ByteCodes.lmod) { - deferredLintHandler.report(new DeferredLintHandler.LintLogger() { - @Override - public void report() { - warnDivZero(pos); - } - }); + deferredLintHandler.report(() -> warnDivZero(pos)); } } } @@ -3877,4 +3864,14 @@ public class Check { log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleNotRequiredTransitive(kindName(what), what, what.packge().modle)); } } + + void checkModuleExists(final DiagnosticPosition pos, ModuleSymbol msym) { + if (msym.kind != MDL) { + deferredLintHandler.report(() -> { + if (lint.isEnabled(LintCategory.MODULE)) + log.warning(LintCategory.MODULE, pos, Warnings.ModuleNotFound(msym)); + }); + } + } + } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java index fa861b07c9a..3dcb047d2b3 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java @@ -507,12 +507,10 @@ public class DeferredAttr extends JCTree.Visitor { } DeferredAttrDiagHandler(Log log, JCTree newTree) { - super(log, new Filter() { - public boolean accepts(JCDiagnostic d) { - PosScanner posScanner = new PosScanner(d.getDiagnosticPosition()); - posScanner.scan(newTree); - return posScanner.found; - } + super(log, d -> { + PosScanner posScanner = new PosScanner(d.getDiagnosticPosition()); + posScanner.scan(newTree); + return posScanner.found; }); } } @@ -1008,11 +1006,7 @@ public class DeferredAttr extends JCTree.Visitor { final Filter treeFilter; FilterScanner(final Set validTags) { - this.treeFilter = new Filter() { - public boolean accepts(JCTree t) { - return validTags.contains(t.getTag()); - } - }; + this.treeFilter = t -> validTags.contains(t.getTag()); } @Override diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java index 775556709d7..63e84b91e4d 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java @@ -130,10 +130,10 @@ public class Enter extends JCTree.Visitor { predefClassDef = make.ClassDef( make.Modifiers(PUBLIC), syms.predefClass.name, - List.nil(), + List.nil(), null, - List.nil(), - List.nil()); + List.nil(), + List.nil()); predefClassDef.sym = syms.predefClass; todo = Todo.instance(context); fileManager = context.get(JavaFileManager.class); @@ -415,7 +415,7 @@ public class Enter extends JCTree.Visitor { if (c.owner != owner) { //anonymous class loaded from a classfile may be recreated from source (see below) //if this class is a member of such an anonymous class, fix the owner: - Assert.check(owner.owner.kind != TYP, () -> owner.toString()); + Assert.check(owner.owner.kind != TYP, owner::toString); Assert.check(c.owner.kind == TYP, () -> c.owner.toString()); ClassSymbol cowner = (ClassSymbol) c.owner; if (cowner.members_field != null) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java index 2044b29477a..e60894ffffa 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java @@ -1092,8 +1092,8 @@ public class Flow { attrEnv, types.skipTypeVars(sup, false), names.close, - List.nil(), - List.nil()); + List.nil(), + List.nil()); Type mt = types.memberType(resource.type, closeMethod); if (closeMethod.kind == MTH) { for (Type t : mt.getThrownTypes()) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java index 289aa4caeed..184e43863aa 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java @@ -120,7 +120,7 @@ public class Infer { dependenciesFolder = options.get("debug.dumpInferenceGraphsTo"); pendingGraphs = List.nil(); - emptyContext = new InferenceContext(this, List.nil()); + emptyContext = new InferenceContext(this, List.nil()); } /** A value for prototypes that admit any type, including polymorphic ones. */ diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java index 36371aeffa8..c73a4213254 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java @@ -123,11 +123,7 @@ public class InferenceContext { * inference context */ List restvars() { - return filterVars(new Filter() { - public boolean accepts(UndetVar uv) { - return uv.getInst() == null; - } - }); + return filterVars(uv -> uv.getInst() == null); } /** @@ -135,11 +131,7 @@ public class InferenceContext { * inference context */ List instvars() { - return filterVars(new Filter() { - public boolean accepts(UndetVar uv) { - return uv.getInst() != null; - } - }); + return filterVars(uv -> uv.getInst() != null); } /** @@ -147,13 +139,9 @@ public class InferenceContext { * declared bounds). */ final List boundedVars() { - return filterVars(new Filter() { - public boolean accepts(UndetVar uv) { - return uv.getBounds(InferenceBound.UPPER) - .diff(uv.getDeclaredBounds()) - .appendList(uv.getBounds(InferenceBound.EQ, InferenceBound.LOWER)).nonEmpty(); - } - }); + return filterVars(uv -> uv.getBounds(InferenceBound.UPPER) + .diff(uv.getDeclaredBounds()) + .appendList(uv.getBounds(InferenceBound.EQ, InferenceBound.LOWER)).nonEmpty()); } /* Returns the corresponding inference variables. @@ -341,11 +329,7 @@ public class InferenceContext { //set up listeners to notify original inference contexts as //propagated vars are inferred in new context for (Type t : inferencevars) { - that.freeTypeListeners.put(new FreeTypeListener() { - public void typesInferred(InferenceContext inferenceContext) { - InferenceContext.this.notifyChange(); - } - }, List.of(t)); + that.freeTypeListeners.put(inferenceContext -> InferenceContext.this.notifyChange(), List.of(t)); } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java index b491f69019a..b4ef9d2a770 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java @@ -179,7 +179,7 @@ public class LambdaToMethod extends TreeTranslator { appendedMethodList = new ListBuffer<>(); deserializeCases = new HashMap<>(); MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType, - List.nil(), syms.methodClass); + List.nil(), syms.methodClass); deserMethodSym = makePrivateSyntheticMethod(STATIC, names.deserializeLambda, type, clazz.sym); deserParamSym = new VarSymbol(FINAL, names.fromString("lambda"), syms.serializedLambdaType, deserMethodSym); @@ -310,10 +310,10 @@ public class LambdaToMethod extends TreeTranslator { JCMethodDecl lambdaDecl = make.MethodDef(make.Modifiers(sym.flags_field), sym.name, make.QualIdent(lambdaType.getReturnType().tsym), - List.nil(), + List.nil(), localContext.syntheticParams, lambdaType.getThrownTypes() == null ? - List.nil() : + List.nil() : make.Types(lambdaType.getThrownTypes()), null, null); @@ -447,7 +447,7 @@ public class LambdaToMethod extends TreeTranslator { throw new InternalError("Should not have an invalid kind"); } - List indy_args = init==null? List.nil() : translate(List.of(init), localContext.prev); + List indy_args = init==null? List.nil() : translate(List.of(init), localContext.prev); //build a sam instance using an indy call to the meta-factory @@ -556,7 +556,7 @@ public class LambdaToMethod extends TreeTranslator { //target is void: // BODY; JCStatement stat = make.at(expr).Exec(expr); - return make.Block(0, List.of(stat)); + return make.Block(0, List.of(stat)); } else if (isLambda_void && isTarget_Void) { //void to Void conversion: // BODY; return null; @@ -568,7 +568,7 @@ public class LambdaToMethod extends TreeTranslator { //non-void to non-void conversion: // return (TYPE)BODY; JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype); - return make.at(retExpr).Block(0, List.of(make.Return(retExpr))); + return make.at(retExpr).Block(0, List.of(make.Return(retExpr))); } } finally { make.at(prevPos); @@ -602,7 +602,7 @@ public class LambdaToMethod extends TreeTranslator { // { TYPE $loc = RET-EXPR; return; } VarSymbol loc = makeSyntheticVar(0, names.fromString("$loc"), tree.expr.type, lambdaMethodDecl.sym); JCVariableDecl varDef = make.VarDef(loc, tree.expr); - result = make.Block(0, List.of(varDef, make.Return(null))); + result = make.Block(0, List.of(varDef, make.Return(null))); } else if (!isTarget_void || !isLambda_void) { //non-void to non-void conversion: // return (TYPE)RET-EXPR; @@ -637,17 +637,17 @@ public class LambdaToMethod extends TreeTranslator { for (JCBreak br : breaks) { br.target = sw; } - JCBlock body = make.Block(0L, List.of( + JCBlock body = make.Block(0L, List.of( sw, make.Throw(makeNewClass( syms.illegalArgumentExceptionType, - List.of(make.Literal("Invalid lambda deserialization")))))); + List.of(make.Literal("Invalid lambda deserialization")))))); JCMethodDecl deser = make.MethodDef(make.Modifiers(kInfo.deserMethodSym.flags()), names.deserializeLambda, make.QualIdent(kInfo.deserMethodSym.getReturnType().tsym), - List.nil(), + List.nil(), List.of(make.VarDef(kInfo.deserParamSym, null)), - List.nil(), + List.nil(), body, null); deser.sym = kInfo.deserMethodSym; @@ -675,7 +675,7 @@ public class LambdaToMethod extends TreeTranslator { */ JCNewClass makeNewClass(Type ctype, List args) { return makeNewClass(ctype, args, - rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.nil())); + rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.nil())); } private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym, @@ -736,12 +736,12 @@ public class LambdaToMethod extends TreeTranslator { } private JCExpression deserTest(JCExpression prev, String func, String lit) { - MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.nil(), syms.methodClass); - Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.nil()); + MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.nil(), syms.methodClass); + Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.nil()); JCMethodInvocation eqtest = make.Apply( - List.nil(), + List.nil(), make.Select(deserGetter(func, syms.stringType), eqsym).setType(eqmt), - List.of(make.Literal(lit))); + List.of(make.Literal(lit))); eqtest.setType(syms.booleanType); JCBinary compound = make.Binary(JCTree.Tag.AND, prev, eqtest); compound.operator = operators.resolveBinary(compound, JCTree.Tag.AND, syms.booleanType, syms.booleanType); @@ -750,14 +750,14 @@ public class LambdaToMethod extends TreeTranslator { } private JCExpression deserGetter(String func, Type type) { - return deserGetter(func, type, List.nil(), List.nil()); + return deserGetter(func, type, List.nil(), List.nil()); } private JCExpression deserGetter(String func, Type type, List argTypes, List args) { - MethodType getmt = new MethodType(argTypes, type, List.nil(), syms.methodClass); - Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.nil()); + MethodType getmt = new MethodType(argTypes, type, List.nil(), syms.methodClass); + Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.nil()); return make.Apply( - List.nil(), + List.nil(), make.Select(make.Ident(kInfo.deserParamSym).setType(syms.serializedLambdaType), getsym).setType(getmt), args).setType(type); } @@ -961,7 +961,7 @@ public class LambdaToMethod extends TreeTranslator { select.type = tree.sym.erasure(types); //create the method call expression - JCExpression apply = make.Apply(List.nil(), select, + JCExpression apply = make.Apply(List.nil(), select, convertArgs(tree.sym, args.toList(), tree.varargsElement)). setType(tree.sym.erasure(types).getReturnType()); @@ -989,7 +989,7 @@ public class LambdaToMethod extends TreeTranslator { //note that method reference syntax does not allow an explicit //enclosing class (so the enclosing class is null) JCNewClass newClass = make.NewClass(null, - List.nil(), + List.nil(), make.Type(tree.getQualifierExpression().type), convertArgs(tree.sym, args.toList(), tree.varargsElement), null); @@ -1028,7 +1028,7 @@ public class LambdaToMethod extends TreeTranslator { JCFunctionalExpression tree = context.tree; //determine the static bsm args MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym); - List staticArgs = List.of( + List staticArgs = List.of( typeToMethodType(samSym.type), new Pool.MethodHandle(refKind, refSym, types), typeToMethodType(tree.getDescriptorType(types))); @@ -1042,7 +1042,7 @@ public class LambdaToMethod extends TreeTranslator { //finally, compute the type of the indy call MethodType indyType = new MethodType(indy_args_types.toList(), tree.type, - List.nil(), + List.nil(), syms.methodClass); Name metafactoryName = context.needsAltMetafactory() ? @@ -1108,7 +1108,7 @@ public class LambdaToMethod extends TreeTranslator { syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs)); Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site, - bsmName, bsm_staticArgs, List.nil()); + bsmName, bsm_staticArgs, List.nil()); DynamicMethodSymbol dynSym = new DynamicMethodSymbol(methName, @@ -1124,7 +1124,7 @@ public class LambdaToMethod extends TreeTranslator { qualifier.sym = dynSym; qualifier.type = indyType.getReturnType(); - JCMethodInvocation proxyCall = make.Apply(List.nil(), qualifier, indyArgs); + JCMethodInvocation proxyCall = make.Apply(List.nil(), qualifier, indyArgs); proxyCall.type = indyType.getReturnType(); return proxyCall; } finally { @@ -1622,8 +1622,8 @@ public class LambdaToMethod extends TreeTranslator { */ clinit = makePrivateSyntheticMethod(STATIC, names.clinit, - new MethodType(List.nil(), syms.voidType, - List.nil(), syms.methodClass), + new MethodType(List.nil(), syms.voidType, + List.nil(), syms.methodClass), csym); clinits.put(csym, clinit); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index 1b44ea8f839..180423d2123 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -495,7 +495,7 @@ public class Lower extends TreeTranslator { MethodSymbol valuesMethod = lookupMethod(pos, names.values, forEnum.type, - List.nil()); + List.nil()); JCExpression size = make // Color.values().length .Select(make.App(make.QualIdent(valuesMethod)), syms.lengthVar); @@ -508,13 +508,13 @@ public class Lower extends TreeTranslator { Symbol ordinalMethod = lookupMethod(pos, names.ordinal, forEnum.type, - List.nil()); + List.nil()); List catcher = List.nil() .prepend(make.Catch(make.VarDef(new VarSymbol(PARAMETER, names.ex, syms.noSuchFieldErrorType, syms.noSymbol), null), - make.Block(0, List.nil()))); + make.Block(0, List.nil()))); for (Map.Entry e : values.entrySet()) { VarSymbol enumerator = e.getKey(); Integer mappedValue = e.getValue(); @@ -572,7 +572,7 @@ public class Lower extends TreeTranslator { JCNewClass tree = make.NewClass(null, null, make.QualIdent(ctype.tsym), args, null); tree.constructor = rs.resolveConstructor( - make_pos, attrEnv, ctype, TreeInfo.types(args), List.nil()); + make_pos, attrEnv, ctype, TreeInfo.types(args), List.nil()); tree.type = ctype; return tree; } @@ -663,8 +663,8 @@ public class Lower extends TreeTranslator { // Create class definition tree. JCClassDecl cdef = make.ClassDef( make.Modifiers(flags), names.empty, - List.nil(), - null, List.nil(), List.nil()); + List.nil(), + null, List.nil(), List.nil()); cdef.sym = c; cdef.type = c.type; @@ -757,7 +757,7 @@ public class Lower extends TreeTranslator { /** Look up a method in a given scope. */ private MethodSymbol lookupMethod(DiagnosticPosition pos, Name name, Type qual, List args) { - return rs.resolveInternalMethod(pos, attrEnv, qual, name, args, List.nil()); + return rs.resolveInternalMethod(pos, attrEnv, qual, name, args, List.nil()); } /** Look up a constructor. @@ -1358,7 +1358,7 @@ public class Lower extends TreeTranslator { callee.sym = constr; callee.type = constr.type; md.body = - make.Block(0, List.of( + make.Block(0, List.of( make.Call( make.App( callee, @@ -1613,7 +1613,7 @@ public class Lower extends TreeTranslator { JCVariableDecl paramTree = make.VarDef(param, null); JCStatement assign = make.Assignment(primaryException, make.Ident(param)); JCStatement rethrowStat = make.Throw(make.Ident(param)); - JCBlock catchBlock = make.Block(0L, List.of(assign, rethrowStat)); + JCBlock catchBlock = make.Block(0L, List.of(assign, rethrowStat)); JCCatch catchClause = make.Catch(paramTree, catchBlock); int oldPos = make.pos; @@ -1622,7 +1622,7 @@ public class Lower extends TreeTranslator { make.at(oldPos); JCTry outerTry = make.Try(makeTwrBlock(resources.tail, block, finallyCanCompleteNormally, depth + 1), - List.of(catchClause), + List.of(catchClause), finallyClause); outerTry.finallyCanCompleteNormally = finallyCanCompleteNormally; stats.add(outerTry); @@ -1649,14 +1649,14 @@ public class Lower extends TreeTranslator { new MethodType( List.of(syms.throwableType, syms.autoCloseableType), syms.voidType, - List.nil(), + List.nil(), syms.methodClass), currentClass); enterSynthetic(resource.pos(), closeResource, currentClass.members()); JCMethodDecl md = make.MethodDef(closeResource, null); List params = md.getParameters(); - md.body = make.Block(0, List.of(makeTwrCloseStatement(params.get(0).sym, + md.body = make.Block(0, List.of(makeTwrCloseStatement(params.get(0).sym, make.Ident(params.get(1))))); JCClassDecl currentClassDecl = classDef(currentClass); @@ -1667,7 +1667,7 @@ public class Lower extends TreeTranslator { if (closeResource != null) { //$closeResource(#primaryException, #resource) - closeStatement = make.Exec(make.Apply(List.nil(), + closeStatement = make.Exec(make.Apply(List.nil(), make.Ident(closeResource), List.of(make.Ident(primaryException), resource) @@ -1688,7 +1688,7 @@ public class Lower extends TreeTranslator { } return make.Block(0L, - List.of(finallyStatement)); + List.of(finallyStatement)); } //where: private boolean shouldUseCloseResourceMethod() { @@ -1728,14 +1728,14 @@ public class Lower extends TreeTranslator { JCStatement addSuppressionStatement = make.Exec(makeCall(make.Ident(primaryException), names.addSuppressed, - List.of(make.Ident(catchException)))); + List.of(make.Ident(catchException)))); // try { resource.close(); } catch (e) { primaryException.addSuppressed(e); } JCBlock tryBlock = - make.Block(0L, List.of(makeResourceCloseInvocation(resource))); + make.Block(0L, List.of(makeResourceCloseInvocation(resource))); JCVariableDecl catchExceptionDecl = make.VarDef(catchException, null); - JCBlock catchBlock = make.Block(0L, List.of(addSuppressionStatement)); - List catchClauses = List.of(make.Catch(catchExceptionDecl, catchBlock)); + JCBlock catchBlock = make.Block(0L, List.of(addSuppressionStatement)); + List catchClauses = List.of(make.Catch(catchExceptionDecl, catchBlock)); JCTry tryTree = make.Try(tryBlock, catchClauses, null); tryTree.finallyCanCompleteNormally = true; @@ -1756,7 +1756,7 @@ public class Lower extends TreeTranslator { // create resource.close() method invocation JCExpression resourceClose = makeCall(resource, names.close, - List.nil()); + List.nil()); return make.Exec(resourceClose); } @@ -1931,7 +1931,7 @@ public class Lower extends TreeTranslator { new MethodType( List.of(syms.stringType), types.erasure(syms.classType), - List.nil(), + List.nil(), syms.methodClass), outerCacheClass); enterSynthetic(pos, classDollarSym, outerCacheClass.members()); @@ -1940,7 +1940,7 @@ public class Lower extends TreeTranslator { try { md.body = classDollarSymBody(pos, md); } catch (CompletionFailure ex) { - md.body = make.Block(0, List.nil()); + md.body = make.Block(0, List.nil()); chk.completionError(pos, ex); } JCClassDecl outerCacheClassDef = classDef(outerCacheClass); @@ -1971,7 +1971,7 @@ public class Lower extends TreeTranslator { // newcache := "new cache$1[0]" JCNewArray newcache = make.NewArray(make.Type(outerCacheClass.type), - List.of(make.Literal(INT, 0).setType(syms.intType)), + List.of(make.Literal(INT, 0).setType(syms.intType)), null); newcache.type = new ArrayType(types.erasure(outerCacheClass.type), syms.arrayClass); @@ -1992,18 +1992,18 @@ public class Lower extends TreeTranslator { makeCall( makeCall(makeCall(newcache, names.getClass, - List.nil()), + List.nil()), names.getComponentType, - List.nil()), + List.nil()), names.getClassLoader, - List.nil())).setType(syms.classLoaderType), + List.nil())).setType(syms.classLoaderType), make.Ident(clsym)).setType(syms.classLoaderType); // returnResult := "{ return Class.forName(param1, false, cl$); }" List args = List.of(make.Ident(md.params.head.sym), makeLit(syms.booleanType, 0), clvalue); - returnResult = make.Block(0, List.of(make.Call(make.App(make.Ident(forNameSym), args)))); + returnResult = make.Block(0, List.of(make.Call(make.App(make.Ident(forNameSym), args)))); // catchParam := ClassNotFoundException e1 VarSymbol catchParam = @@ -2015,9 +2015,9 @@ public class Lower extends TreeTranslator { // rethrow = "throw new NoClassDefFoundError().initCause(e); JCExpression throwExpr = makeCall(makeNewClass(syms.noClassDefFoundErrorType, - List.nil()), + List.nil()), names.initCause, - List.of(make.Ident(catchParam))); + List.of(make.Ident(catchParam))); rethrow = make.Throw(throwExpr); // rethrowStmt := "( $rethrow )" @@ -2158,7 +2158,7 @@ public class Lower extends TreeTranslator { Symbol desiredAssertionStatusSym = lookupMethod(pos, names.desiredAssertionStatus, types.erasure(syms.classType), - List.nil()); + List.nil()); JCClassDecl containerDef = classDef(container); make_at(containerDef.pos()); JCExpression notStatus = makeUnary(NOT, make.App(make.Select( @@ -2175,7 +2175,7 @@ public class Lower extends TreeTranslator { JCClassDecl currentClassDef = classDef(currentClass); make_at(currentClassDef.pos()); JCStatement dummy = make.If(make.QualIdent(assertDisabledSym), make.Skip(), null); - JCBlock clinit = make.Block(STATIC, List.of(dummy)); + JCBlock clinit = make.Block(STATIC, List.of(dummy)); currentClassDef.defs = currentClassDef.defs.prepend(clinit); } } @@ -2254,25 +2254,15 @@ public class Lower extends TreeTranslator { final JCFieldAccess s = (JCFieldAccess)lval; Symbol lid = TreeInfo.symbol(s.selected); if (lid != null && lid.kind == TYP) return builder.build(lval); - return abstractRval(s.selected, new TreeBuilder() { - public JCExpression build(final JCExpression selected) { - return builder.build(make.Select(selected, s.sym)); - } - }); + return abstractRval(s.selected, selected -> builder.build(make.Select(selected, s.sym))); } case INDEXED: { final JCArrayAccess i = (JCArrayAccess)lval; - return abstractRval(i.indexed, new TreeBuilder() { - public JCExpression build(final JCExpression indexed) { - return abstractRval(i.index, syms.intType, new TreeBuilder() { - public JCExpression build(final JCExpression index) { - JCExpression newLval = make.Indexed(indexed, index); - newLval.setType(i.type); - return builder.build(newLval); - } - }); - } - }); + return abstractRval(i.indexed, indexed -> abstractRval(i.index, syms.intType, index -> { + JCExpression newLval = make.Indexed(indexed, index); + newLval.setType(i.type); + return builder.build(newLval); + })); } case TYPECAST: { return abstractLval(((JCTypeCast)lval).expr, builder); @@ -2283,11 +2273,7 @@ public class Lower extends TreeTranslator { // evaluate and discard the first expression, then evaluate the second. JCExpression makeComma(final JCExpression expr1, final JCExpression expr2) { - return abstractRval(expr1, new TreeBuilder() { - public JCExpression build(final JCExpression discarded) { - return expr2; - } - }); + return abstractRval(expr1, discarded -> expr2); } /************************************************************************** @@ -2389,15 +2375,15 @@ public class Lower extends TreeTranslator { ClassSymbol c = msym.module_info; c.setAttributes(msym); c.flags_field |= Flags.MODULE; - createInfoClass(List.nil(), tree.sym.module_info); + createInfoClass(List.nil(), tree.sym.module_info); } private void createInfoClass(List annots, ClassSymbol c) { long flags = Flags.ABSTRACT | Flags.INTERFACE; JCClassDecl infoClass = make.ClassDef(make.Modifiers(flags, annots), - c.name, List.nil(), - null, List.nil(), List.nil()); + c.name, List.nil(), + null, List.nil(), List.nil()); infoClass.sym = c; translated.append(infoClass); } @@ -2489,7 +2475,7 @@ public class Lower extends TreeTranslator { currentMethodSym = currentMethodSymPrev; // Return empty block {} as a placeholder for an inner class. - result = make_at(tree.pos()).Block(SYNTHETIC, List.nil()); + result = make_at(tree.pos()).Block(SYNTHETIC, List.nil()); } /** Translate an enum class. */ @@ -2532,14 +2518,14 @@ public class Lower extends TreeTranslator { arrayType, tree.type.tsym); JCNewArray newArray = make.NewArray(make.Type(types.erasure(tree.type)), - List.nil(), + List.nil(), values.toList()); newArray.type = arrayType; enumDefs.append(make.VarDef(valuesVar, newArray)); tree.sym.members().enter(valuesVar); Symbol valuesSym = lookupMethod(tree.pos(), names.values, - tree.type, List.nil()); + tree.type, List.nil()); List valuesBody; if (useClone()) { // return (T[]) $VALUES.clone(); @@ -2547,7 +2533,7 @@ public class Lower extends TreeTranslator { make.TypeCast(valuesSym.type.getReturnType(), make.App(make.Select(make.Ident(valuesVar), syms.arrayCloneMethod))); - valuesBody = List.of(make.Return(valuesResult)); + valuesBody = List.of(make.Return(valuesResult)); } else { // template: T[] $result = new T[$values.length]; Name resultName = names.fromString(target.syntheticNameChar() + "result"); @@ -2568,13 +2554,13 @@ public class Lower extends TreeTranslator { systemArraycopyMethod = new MethodSymbol(PUBLIC | STATIC, names.fromString("arraycopy"), - new MethodType(List.of(syms.objectType, + new MethodType(List.of(syms.objectType, syms.intType, syms.objectType, syms.intType, syms.intType), syms.voidType, - List.nil(), + List.nil(), syms.methodClass), syms.systemType.tsym); } @@ -2587,7 +2573,7 @@ public class Lower extends TreeTranslator { // template: return $result; JCStatement ret = make.Return(make.Ident(resultVar)); - valuesBody = List.of(decl, copy, ret); + valuesBody = List.of(decl, copy, ret); } JCMethodDecl valuesDef = @@ -2968,7 +2954,7 @@ public class Lower extends TreeTranslator { if (!tree.cond.type.isTrue()) { JCExpression cond = assertFlagTest(tree.pos()); List exnArgs = (tree.detail == null) ? - List.nil() : List.of(translate(tree.detail)); + List.nil() : List.of(translate(tree.detail)); if (!tree.cond.type.isFalse()) { cond = makeBinary (AND, @@ -3081,7 +3067,7 @@ public class Lower extends TreeTranslator { args = args.tail; } JCNewArray boxedArgs = make.NewArray(make.Type(varargsElement), - List.nil(), + List.nil(), elems.toList()); boxedArgs.type = new ArrayType(varargsElement, syms.arrayClass); result.append(boxedArgs); @@ -3150,7 +3136,7 @@ public class Lower extends TreeTranslator { Symbol valueSym = lookupMethod(tree.pos(), unboxedType.tsym.name.append(names.Value), // x.intValue() tree.type, - List.nil()); + List.nil()); return make.App(make.Select(tree, valueSym)); } @@ -3195,33 +3181,31 @@ public class Lower extends TreeTranslator { // boxing required; need to rewrite as x = (unbox typeof x)(x op y); // or if x == (typeof x)z then z = (unbox typeof x)((typeof x)z op y) // (but without recomputing x) - JCTree newTree = abstractLval(tree.lhs, new TreeBuilder() { - public JCExpression build(final JCExpression lhs) { - JCTree.Tag newTag = tree.getTag().noAssignOp(); - // Erasure (TransTypes) can change the type of - // tree.lhs. However, we can still get the - // unerased type of tree.lhs as it is stored - // in tree.type in Attr. - OperatorSymbol newOperator = operators.resolveBinary(tree, - newTag, - tree.type, - tree.rhs.type); - //Need to use the "lhs" at two places, once on the future left hand side - //and once in the future binary operator. But further processing may change - //the components of the tree in place (see visitSelect for e.g. .super.), - //so cloning the tree to avoid interference between the uses: - JCExpression expr = (JCExpression) lhs.clone(); - if (expr.type != tree.type) - expr = make.TypeCast(tree.type, expr); - JCBinary opResult = make.Binary(newTag, expr, tree.rhs); - opResult.operator = newOperator; - opResult.type = newOperator.type.getReturnType(); - JCExpression newRhs = boxingReq ? - make.TypeCast(types.unboxedType(tree.type), opResult) : - opResult; - return make.Assign(lhs, newRhs).setType(tree.type); - } - }); + JCTree newTree = abstractLval(tree.lhs, lhs -> { + Tag newTag = tree.getTag().noAssignOp(); + // Erasure (TransTypes) can change the type of + // tree.lhs. However, we can still get the + // unerased type of tree.lhs as it is stored + // in tree.type in Attr. + OperatorSymbol newOperator = operators.resolveBinary(tree, + newTag, + tree.type, + tree.rhs.type); + //Need to use the "lhs" at two places, once on the future left hand side + //and once in the future binary operator. But further processing may change + //the components of the tree in place (see visitSelect for e.g. .super.), + //so cloning the tree to avoid interference between the uses: + JCExpression expr = (JCExpression) lhs.clone(); + if (expr.type != tree.type) + expr = make.TypeCast(tree.type, expr); + JCBinary opResult = make.Binary(newTag, expr, tree.rhs); + opResult.operator = newOperator; + opResult.type = newOperator.type.getReturnType(); + JCExpression newRhs = boxingReq ? + make.TypeCast(types.unboxedType(tree.type), opResult) : + opResult; + return make.Assign(lhs, newRhs).setType(tree.type); + }); result = translate(newTree); return; } @@ -3287,28 +3271,22 @@ public class Lower extends TreeTranslator { // translate to tmp1=lval(e); tmp2=tmp1; (typeof tree)tmp1 OP 1; tmp2 // where OP is += or -= final boolean cast = TreeInfo.skipParens(tree.arg).hasTag(TYPECAST); - return abstractLval(tree.arg, new TreeBuilder() { - public JCExpression build(final JCExpression tmp1) { - return abstractRval(tmp1, tree.arg.type, new TreeBuilder() { - public JCExpression build(final JCExpression tmp2) { - JCTree.Tag opcode = (tree.hasTag(POSTINC)) - ? PLUS_ASG : MINUS_ASG; - //"tmp1" and "tmp2" may refer to the same instance - //(for e.g. .super.). But further processing may - //change the components of the tree in place (see visitSelect), - //so cloning the tree to avoid interference between the two uses: - JCExpression lhs = (JCExpression)tmp1.clone(); - lhs = cast - ? make.TypeCast(tree.arg.type, lhs) - : lhs; - JCExpression update = makeAssignop(opcode, - lhs, - make.Literal(1)); - return makeComma(update, tmp2); - } - }); - } - }); + return abstractLval(tree.arg, tmp1 -> abstractRval(tmp1, tree.arg.type, tmp2 -> { + Tag opcode = (tree.hasTag(POSTINC)) + ? PLUS_ASG : MINUS_ASG; + //"tmp1" and "tmp2" may refer to the same instance + //(for e.g. .super.). But further processing may + //change the components of the tree in place (see visitSelect), + //so cloning the tree to avoid interference between the two uses: + JCExpression lhs = (JCExpression)tmp1.clone(); + lhs = cast + ? make.TypeCast(tree.arg.type, lhs) + : lhs; + JCExpression update = makeAssignop(opcode, + lhs, + make.Literal(1)); + return makeComma(update, tmp2); + })); } public void visitUnary(JCUnary tree) { @@ -3507,7 +3485,7 @@ public class Lower extends TreeTranslator { Symbol iterator = lookupMethod(tree.expr.pos(), names.iterator, eType, - List.nil()); + List.nil()); VarSymbol itvar = new VarSymbol(SYNTHETIC, names.fromString("i" + target.syntheticNameChar()), types.erasure(types.asSuper(iterator.type.getReturnType(), syms.iteratorType.tsym)), currentMethodSym); @@ -3519,12 +3497,12 @@ public class Lower extends TreeTranslator { Symbol hasNext = lookupMethod(tree.expr.pos(), names.hasNext, itvar.type, - List.nil()); + List.nil()); JCMethodInvocation cond = make.App(make.Select(make.Ident(itvar), hasNext)); Symbol next = lookupMethod(tree.expr.pos(), names.next, itvar.type, - List.nil()); + List.nil()); JCExpression vardefinit = make.App(make.Select(make.Ident(itvar), next)); if (tree.var.type.isPrimitive()) vardefinit = make.TypeCast(types.cvarUpperBound(iteratorTarget), vardefinit); @@ -3540,7 +3518,7 @@ public class Lower extends TreeTranslator { result = translate(make. ForLoop(List.of(init), cond, - List.nil(), + List.nil(), body)); patchTargets(body, tree, result); } @@ -3629,7 +3607,7 @@ public class Lower extends TreeTranslator { Symbol ordinalMethod = lookupMethod(tree.pos(), names.ordinal, tree.selector.type, - List.nil()); + List.nil()); JCArrayAccess selector = make.Indexed(map.mapVar, make.App(make.Select(tree.selector, ordinalMethod))); @@ -3768,7 +3746,7 @@ public class Lower extends TreeTranslator { // hashCode will trigger nullcheck on original switch expression JCMethodInvocation hashCodeCall = makeCall(make.Ident(dollar_s), names.hashCode, - List.nil()).setType(syms.intType); + List.nil()).setType(syms.intType); JCSwitch switch1 = make.Switch(hashCodeCall, caseBuffer.toList()); for(Map.Entry> entry : hashToString.entrySet()) { @@ -3780,7 +3758,7 @@ public class Lower extends TreeTranslator { for(String caseLabel : stringsWithHashCode ) { JCMethodInvocation stringEqualsCall = makeCall(make.Ident(dollar_s), names.equals, - List.of(make.Literal(caseLabel))); + List.of(make.Literal(caseLabel))); elsepart = make.If(stringEqualsCall, make.Exec(make.Assign(make.Ident(dollar_tmp), make.Literal(caseLabelToPosition.get(caseLabel))). diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java index dd32f93ff20..f5a30ebaa5d 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java @@ -62,7 +62,6 @@ import com.sun.tools.javac.code.Directive.RequiresDirective; import com.sun.tools.javac.code.Directive.RequiresFlag; import com.sun.tools.javac.code.Directive.UsesDirective; import com.sun.tools.javac.code.Flags; -import com.sun.tools.javac.code.Kinds; import com.sun.tools.javac.code.Lint.LintCategory; import com.sun.tools.javac.code.ModuleFinder; import com.sun.tools.javac.code.Source; @@ -112,6 +111,7 @@ import static com.sun.tools.javac.code.Flags.ABSTRACT; import static com.sun.tools.javac.code.Flags.ENUM; import static com.sun.tools.javac.code.Flags.PUBLIC; import static com.sun.tools.javac.code.Flags.UNATTRIBUTED; +import static com.sun.tools.javac.code.Kinds.Kind.ERR; import static com.sun.tools.javac.code.Kinds.Kind.MDL; import static com.sun.tools.javac.code.Kinds.Kind.MTH; import static com.sun.tools.javac.code.TypeTag.CLASS; @@ -158,6 +158,7 @@ public class Modules extends JCTree.Visitor { private final Set extraAddMods = new HashSet<>(); private final String limitModsOpt; private final Set extraLimitMods = new HashSet<>(); + private final String moduleVersionOpt; private final boolean lintOptions; @@ -203,6 +204,7 @@ public class Modules extends JCTree.Visitor { addReadsOpt = options.get(Option.ADD_READS); addModsOpt = options.get(Option.ADD_MODULES); limitModsOpt = options.get(Option.LIMIT_MODULES); + moduleVersionOpt = options.get(Option.MODULE_VERSION); } int depth = -1; @@ -260,7 +262,7 @@ public class Modules extends JCTree.Visitor { // scan trees for module defs Set roots = enterModules(trees, c); - setCompilationUnitModules(trees, roots); + setCompilationUnitModules(trees, roots, c); init.accept(roots); @@ -349,7 +351,7 @@ public class Modules extends JCTree.Visitor { } } - private void setCompilationUnitModules(List trees, Set rootModules) { + private void setCompilationUnitModules(List trees, Set rootModules, ClassSymbol c) { // update the module for each compilation unit if (multiModuleMode) { checkNoAllModulePath(); @@ -383,6 +385,8 @@ public class Modules extends JCTree.Visitor { } tree.modle = msym; rootModules.add(msym); + } else if (c != null && c.packge().modle == syms.unnamedModule) { + tree.modle = syms.unnamedModule; } else { log.error(tree.pos(), Errors.UnnamedPkgNotAllowedNamedModules); tree.modle = syms.errModule; @@ -420,12 +424,7 @@ public class Modules extends JCTree.Visitor { checkNoAllModulePath(); defaultModule.complete(); // Question: why not do completeModule here? - defaultModule.completer = new Completer() { - @Override - public void complete(Symbol sym) throws CompletionFailure { - completeModule((ModuleSymbol) sym); - } - }; + defaultModule.completer = sym -> completeModule((ModuleSymbol) sym); } rootModules.add(defaultModule); break; @@ -449,9 +448,6 @@ public class Modules extends JCTree.Visitor { if (defaultModule != syms.unnamedModule) { syms.unnamedModule.completer = getUnnamedModuleCompleter(); - if (moduleOverride == null) { - syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH; - } syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH; } @@ -476,8 +472,18 @@ public class Modules extends JCTree.Visitor { private Location getModuleLocation(JavaFileObject fo, Name pkgName) throws IOException { // For now, just check module source path. // We may want to check source path as well. - return fileManager.getLocationForModule(StandardLocation.MODULE_SOURCE_PATH, - fo, (pkgName == null) ? null : pkgName.toString()); + Location loc = + fileManager.getLocationForModule(StandardLocation.MODULE_SOURCE_PATH, + fo, (pkgName == null) ? null : pkgName.toString()); + if (loc == null) { + Location sourceOutput = fileManager.hasLocation(StandardLocation.SOURCE_OUTPUT) ? + StandardLocation.SOURCE_OUTPUT : StandardLocation.CLASS_OUTPUT; + loc = + fileManager.getLocationForModule(sourceOutput, + fo, (pkgName == null) ? null : pkgName.toString()); + } + + return loc; } private void checkSpecifiedModule(List trees, JCDiagnostic.Error error) { @@ -502,7 +508,7 @@ public class Modules extends JCTree.Visitor { public void complete(Symbol sym) throws CompletionFailure { ModuleSymbol msym = moduleFinder.findModule((ModuleSymbol) sym); - if (msym.kind == Kinds.Kind.ERR) { + if (msym.kind == ERR) { log.error(Errors.ModuleNotFound(msym)); //make sure the module is initialized: msym.directives = List.nil(); @@ -595,13 +601,16 @@ public class Modules extends JCTree.Visitor { msym.flags_field |= UNATTRIBUTED; ModuleVisitor v = new ModuleVisitor(); JavaFileObject prev = log.useSource(tree.sourcefile); + JCModuleDecl moduleDecl = tree.getModuleDecl(); + DiagnosticPosition prevLintPos = deferredLintHandler.setPos(moduleDecl.pos()); + try { - JCModuleDecl moduleDecl = tree.getModuleDecl(); moduleDecl.accept(v); completeModule(msym); checkCyclicDependencies(moduleDecl); } finally { log.useSource(prev); + deferredLintHandler.setPos(prevLintPos); msym.flags_field &= ~UNATTRIBUTED; } } @@ -614,6 +623,11 @@ public class Modules extends JCTree.Visitor { }; } + public boolean isRootModule(ModuleSymbol module) { + Assert.checkNonNull(rootModules); + return rootModules.contains(module); + } + class ModuleVisitor extends JCTree.Visitor { private ModuleSymbol sym; private final Set allRequires = new HashSet<>(); @@ -678,15 +692,12 @@ public class Modules extends JCTree.Visitor { Set to = new LinkedHashSet<>(); for (JCExpression n: tree.moduleNames) { ModuleSymbol msym = lookupModule(n); - if (msym.kind != MDL) { - log.error(n.pos(), Errors.ModuleNotFound(msym)); - } else { - for (ExportsDirective d : exportsForPackage) { - checkDuplicateExportsToModule(n, msym, d); - } - if (!to.add(msym)) { - reportExportsConflictToModule(n, msym); - } + chk.checkModuleExists(n.pos(), msym); + for (ExportsDirective d : exportsForPackage) { + checkDuplicateExportsToModule(n, msym, d); + } + if (!to.add(msym)) { + reportExportsConflictToModule(n, msym); } } toModules = List.from(to); @@ -740,15 +751,12 @@ public class Modules extends JCTree.Visitor { Set to = new LinkedHashSet<>(); for (JCExpression n: tree.moduleNames) { ModuleSymbol msym = lookupModule(n); - if (msym.kind != MDL) { - log.error(n.pos(), Errors.ModuleNotFound(msym)); - } else { - for (OpensDirective d : opensForPackage) { - checkDuplicateOpensToModule(n, msym, d); - } - if (!to.add(msym)) { - reportOpensConflictToModule(n, msym); - } + chk.checkModuleExists(n.pos(), msym); + for (OpensDirective d : opensForPackage) { + checkDuplicateOpensToModule(n, msym, d); + } + if (!to.add(msym)) { + reportOpensConflictToModule(n, msym); } } toModules = List.from(to); @@ -1065,7 +1073,8 @@ public class Modules extends JCTree.Visitor { } } - Predicate observablePred = sym -> observable == null || observable.contains(sym); + Predicate observablePred = sym -> + (observable == null) ? (moduleFinder.findModule(sym).kind != ERR) : observable.contains(sym); Predicate systemModulePred = sym -> (sym.flags() & Flags.SYSTEM_MODULE) != 0; Set enabledRoot = new LinkedHashSet<>(); @@ -1133,6 +1142,12 @@ public class Modules extends JCTree.Visitor { result.add(syms.unnamedModule); allModules = result; + + //add module versions from options, if any: + if (moduleVersionOpt != null) { + Name version = names.fromString(moduleVersionOpt); + rootModules.forEach(m -> m.version = version); + } } public boolean isInModuleGraph(ModuleSymbol msym) { @@ -1503,7 +1518,7 @@ public class Modules extends JCTree.Visitor { current.complete(); if ((current.flags() & Flags.ACYCLIC) != 0) continue; - Assert.checkNonNull(current.requires, () -> current.toString()); + Assert.checkNonNull(current.requires, current::toString); for (RequiresDirective dep : current.requires) { if (!dep.flags.contains(RequiresFlag.EXTRA)) queue = queue.prepend(dep.module); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java index a4ccf16124b..e97b5d1cdcc 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java @@ -296,7 +296,7 @@ public class Operators { */ private OperatorSymbol[] initOperators() { OperatorSymbol[] operators = operatorSuppliers.stream() - .map(op -> op.get()) + .map(Supplier::get) .toArray(OperatorSymbol[]::new); alternatives = Optional.of(operators); operatorSuppliers = null; //let GC do its work diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java index 1c55157c683..ae01e8f180a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -881,12 +881,8 @@ public class Resolve { */ private void varargsAccessible(final Env env, final Type t, final InferenceContext inferenceContext) { if (inferenceContext.free(t)) { - inferenceContext.addFreeTypeListener(List.of(t), new FreeTypeListener() { - @Override - public void typesInferred(InferenceContext inferenceContext) { - varargsAccessible(env, inferenceContext.asInstType(t), inferenceContext); - } - }); + inferenceContext.addFreeTypeListener(List.of(t), + solvedContext -> varargsAccessible(env, solvedContext.asInstType(t), solvedContext)); } else { if (!isAccessible(env, types.erasure(t))) { Symbol location = env.enclClass.sym; @@ -1851,47 +1847,43 @@ public class Resolve { * errors if some of the not-needed supertypes are missing/ill-formed). */ Iterable superclasses(final Type intype) { - return new Iterable() { - public Iterator iterator() { - return new Iterator() { + return () -> new Iterator() { - List seen = List.nil(); - TypeSymbol currentSym = symbolFor(intype); - TypeSymbol prevSym = null; + List seen = List.nil(); + TypeSymbol currentSym = symbolFor(intype); + TypeSymbol prevSym = null; - public boolean hasNext() { - if (currentSym == syms.noSymbol) { - currentSym = symbolFor(types.supertype(prevSym.type)); - } - return currentSym != null; - } + public boolean hasNext() { + if (currentSym == syms.noSymbol) { + currentSym = symbolFor(types.supertype(prevSym.type)); + } + return currentSym != null; + } - public TypeSymbol next() { - prevSym = currentSym; - currentSym = syms.noSymbol; - Assert.check(prevSym != null || prevSym != syms.noSymbol); - return prevSym; - } + public TypeSymbol next() { + prevSym = currentSym; + currentSym = syms.noSymbol; + Assert.check(prevSym != null || prevSym != syms.noSymbol); + return prevSym; + } - public void remove() { - throw new UnsupportedOperationException(); - } + public void remove() { + throw new UnsupportedOperationException(); + } - TypeSymbol symbolFor(Type t) { - if (!t.hasTag(CLASS) && - !t.hasTag(TYPEVAR)) { - return null; - } - t = types.skipTypeVars(t, false); - if (seen.contains(t.tsym)) { - //degenerate case in which we have a circular - //class hierarchy - because of ill-formed classfiles - return null; - } - seen = seen.prepend(t.tsym); - return t.tsym; - } - }; + TypeSymbol symbolFor(Type t) { + if (!t.hasTag(CLASS) && + !t.hasTag(TYPEVAR)) { + return null; + } + t = types.skipTypeVars(t, false); + if (seen.contains(t.tsym)) { + //degenerate case in which we have a circular + //class hierarchy - because of ill-formed classfiles + return null; + } + seen = seen.prepend(t.tsym); + return t.tsym; } }; } @@ -1983,22 +1975,42 @@ public class Resolve { } catch (ClassFinder.BadClassFile err) { throw err; } catch (CompletionFailure ex) { - //even if a class cannot be found in the current module and packages in modules it depends on that - //are exported for any or this module, the class may exist internally in some of these modules, - //or may exist in a module on which this module does not depend. Provide better diagnostic in - //such cases by looking for the class in any module: - for (ModuleSymbol ms : syms.getAllModules()) { - //do not load currently unloaded classes, to avoid too eager completion of random things in other modules: - ClassSymbol clazz = syms.getClass(ms, name); + Symbol candidate = recoveryLoadClass.loadClass(env, name); - if (clazz != null) { - return new AccessError(clazz); - } + if (candidate != null) { + return candidate; } + return typeNotFound; } } + public static interface RecoveryLoadClass { + Symbol loadClass(Env env, Name name); + } + + private RecoveryLoadClass recoveryLoadClass = (env, name) -> { + //even if a class cannot be found in the current module and packages in modules it depends on that + //are exported for any or this module, the class may exist internally in some of these modules, + //or may exist in a module on which this module does not depend. Provide better diagnostic in + //such cases by looking for the class in any module: + for (ModuleSymbol ms : syms.getAllModules()) { + //do not load currently unloaded classes, to avoid too eager completion of random things in other modules: + ClassSymbol clazz = syms.getClass(ms, name); + + if (clazz != null) { + return new AccessError(clazz); + } + } + return null; + }; + + public RecoveryLoadClass setRecoveryLoadClass(RecoveryLoadClass recovery) { + RecoveryLoadClass prev = recoveryLoadClass; + recoveryLoadClass = recovery; + return prev; + } + /** * Find a type declared in a scope (not inherited). Return null * if none is found. @@ -2335,7 +2347,7 @@ public class Resolve { Type site, Name name, boolean qualified) { - return accessInternal(sym, pos, location, site, name, qualified, List.nil(), null, basicLogResolveHelper); + return accessInternal(sym, pos, location, site, name, qualified, List.nil(), null, basicLogResolveHelper); } /** Same as original accessBase(), but without location. @@ -2681,7 +2693,7 @@ public class Resolve { (sym.flags_field & SYNTHETIC) == 0) { List oldParams = sym.type.hasTag(FORALL) ? ((ForAll)sym.type).tvars : - List.nil(); + List.nil(); Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams), types.createMethodTypeWithReturn(sym.type.asMethodType(), site)); MethodSymbol newConstr = new MethodSymbol(sym.flags(), names.init, constrType, site.tsym) { @@ -2709,7 +2721,7 @@ public class Resolve { site = types.capture(site); ReferenceLookupHelper lookupHelper = makeReferenceLookupHelper( - referenceTree, site, name, List.nil(), null, VARARITY); + referenceTree, site, name, List.nil(), null, VARARITY); Env newEnv = env.dup(env.tree, env.info.dup()); Symbol sym = lookupMethod(newEnv, env.tree.pos(), site.tsym, @@ -3263,7 +3275,7 @@ public class Resolve { protected Symbol lookup(Env env, MethodResolutionPhase phase) { WriteableScope sc = WriteableScope.create(syms.arrayClass); MethodSymbol arrayConstr = new MethodSymbol(PUBLIC, name, null, site.tsym); - arrayConstr.type = new MethodType(List.of(syms.intType), site, List.nil(), syms.methodClass); + arrayConstr.type = new MethodType(List.of(syms.intType), site, List.nil(), syms.methodClass); sc.enter(arrayConstr); return findMethodInScope(env, site, name, argtypes, typeargtypes, sc, methodNotFound, phase.isBoxingRequired(), phase.isVarargsRequired(), false); } @@ -3650,8 +3662,8 @@ public class Resolve { Name name, List argtypes, List typeargtypes) { - argtypes = argtypes == null ? List.nil() : argtypes; - typeargtypes = typeargtypes == null ? List.nil() : typeargtypes; + argtypes = argtypes == null ? List.nil() : argtypes; + typeargtypes = typeargtypes == null ? List.nil() : typeargtypes; if (name == names.error) return null; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java index ff6bd7174ab..53ba2984b7e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java @@ -529,7 +529,7 @@ public class TypeEnter implements Completer { protected JCExpression enumBase(int pos, ClassSymbol c) { JCExpression result = make.at(pos). TypeApply(make.QualIdent(syms.enumSym), - List.of(make.Type(c.type))); + List.of(make.Type(c.type))); return result; } @@ -960,9 +960,9 @@ public class TypeEnter implements Completer { MethodDef(make.Modifiers(Flags.PUBLIC|Flags.STATIC), names.values, valuesType, - List.nil(), - List.nil(), - List.nil(), // thrown + List.nil(), + List.nil(), + List.nil(), // thrown null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))), null); memberEnter.memberEnter(values, env); @@ -972,12 +972,12 @@ public class TypeEnter implements Completer { MethodDef(make.Modifiers(Flags.PUBLIC|Flags.STATIC), names.valueOf, make.Type(tree.sym.type), - List.nil(), + List.nil(), List.of(make.VarDef(make.Modifiers(Flags.PARAMETER | Flags.MANDATED), names.fromString("name"), make.Type(syms.stringType), null)), - List.nil(), // thrown + List.nil(), // thrown null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))), null); memberEnter.memberEnter(valueOf, env); @@ -1069,7 +1069,7 @@ public class TypeEnter implements Completer { } if (baseInit != null && baseInit.params != null && baseInit.params.nonEmpty() && argTypesList.nonEmpty()) { - initParams = (initParams == null) ? List.nil() : initParams; + initParams = (initParams == null) ? List.nil() : initParams; List baseInitParams = baseInit.params; while (baseInitParams.nonEmpty() && argTypesList.nonEmpty()) { VarSymbol param = new VarSymbol(baseInitParams.head.flags() | PARAMETER, diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java index 504ce28a353..1e2854c8803 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Context.Factory; /** * Caching implementation of FSInfo. @@ -47,13 +48,11 @@ public class CacheFSInfo extends FSInfo { * Register a Context.Factory to create a CacheFSInfo. */ public static void preRegister(Context context) { - context.put(FSInfo.class, new Context.Factory() { - public FSInfo make(Context c) { + context.put(FSInfo.class, (Factory)c -> { FSInfo instance = new CacheFSInfo(); c.put(FSInfo.class, instance); return instance; - } - }); + }); } public void clearCache() { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java index 8c370b221fd..9fe9611bbbe 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java @@ -71,6 +71,7 @@ import com.sun.tools.javac.file.RelativePath.RelativeDirectory; import com.sun.tools.javac.file.RelativePath.RelativeFile; import com.sun.tools.javac.util.Assert; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Context.Factory; import com.sun.tools.javac.util.DefinedBy; import com.sun.tools.javac.util.DefinedBy.Api; import com.sun.tools.javac.util.List; @@ -134,12 +135,8 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil * Register a Context.Factory to create a JavacFileManager. */ public static void preRegister(Context context) { - context.put(JavaFileManager.class, new Context.Factory() { - @Override - public JavaFileManager make(Context c) { - return new JavacFileManager(c, true, null); - } - }); + context.put(JavaFileManager.class, + (Factory)c -> new JavacFileManager(c, true, null)); } /** @@ -950,12 +947,10 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil @Override @DefinedBy(Api.COMPILER) public Location getLocationForModule(Location location, String moduleName) throws IOException { - Objects.requireNonNull(location); - if (!location.isOutputLocation() && !location.isModuleOrientedLocation()) - throw new IllegalArgumentException( - "location is not an output location or a module-oriented location: " - + location.getName()); + checkModuleOrientedOrOutputLocation(location); nullCheck(moduleName); + if (location == SOURCE_OUTPUT && getSourceOutDir() == null) + location = CLASS_OUTPUT; return locations.getLocationForModule(location, moduleName); } @@ -978,7 +973,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil @Override @DefinedBy(Api.COMPILER) public Location getLocationForModule(Location location, JavaFileObject fo, String pkgName) throws IOException { - checkModuleOrientedLocation(location); + checkModuleOrientedOrOutputLocation(location); if (!(fo instanceof PathFileObject)) throw new IllegalArgumentException(fo.getName()); int depth = 1; // allow 1 for filename @@ -1012,7 +1007,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil @Override @DefinedBy(Api.COMPILER) public Iterable> listLocationsForModules(Location location) throws IOException { - checkModuleOrientedLocation(location); + checkModuleOrientedOrOutputLocation(location); return locations.listLocationsForModules(location); } @@ -1098,10 +1093,12 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil throw new IllegalArgumentException("location is not an output location: " + location.getName()); } - private void checkModuleOrientedLocation(Location location) { + private void checkModuleOrientedOrOutputLocation(Location location) { Objects.requireNonNull(location); - if (!location.isModuleOrientedLocation()) - throw new IllegalArgumentException("location is not module-oriented: " + location.getName()); + if (!location.isModuleOrientedLocation() && !location.isOutputLocation()) + throw new IllegalArgumentException( + "location is not an output location or a module-oriented location: " + + location.getName()); } private void checkNotModuleOrientedLocation(Location location) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java index 5d87a3a2dd4..d6df913de38 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java @@ -73,6 +73,7 @@ import javax.tools.StandardJavaFileManager.PathFactory; import javax.tools.StandardLocation; import com.sun.tools.javac.code.Lint; +import com.sun.tools.javac.code.Lint.LintCategory; import com.sun.tools.javac.main.Option; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Warnings; @@ -207,7 +208,13 @@ public class Locations { entries.add(emptyPathDefault); } } else { - entries.add(getPath(s)); + try { + entries.add(getPath(s)); + } catch (IllegalArgumentException e) { + if (warn) { + log.warning(LintCategory.PATH, "invalid.path", s); + } + } } } return entries; @@ -272,7 +279,7 @@ public class Locations { } try (Stream s = Files.list(dir)) { - s.filter(dirEntry -> isArchive(dirEntry)) + s.filter(Locations.this::isArchive) .forEach(dirEntry -> addFile(dirEntry, warn)); } catch (IOException ignore) { } @@ -476,6 +483,7 @@ public class Locations { private Path outputDir; private Map moduleLocations; + private Map pathLocations; OutputLocationHandler(Location location, Option... options) { super(location, options); @@ -521,22 +529,51 @@ public class Locations { outputDir = dir; } moduleLocations = null; + pathLocations = null; } @Override Location getLocationForModule(String name) { - if (moduleLocations == null) + if (moduleLocations == null) { moduleLocations = new HashMap<>(); + pathLocations = new HashMap<>(); + } Location l = moduleLocations.get(name); if (l == null) { + Path out = outputDir.resolve(name); l = new ModuleLocationHandler(location.getName() + "[" + name + "]", name, - Collections.singleton(outputDir.resolve(name)), + Collections.singleton(out), true, false); moduleLocations.put(name, l); - } + pathLocations.put(out.toAbsolutePath(), l); + } return l; } + + @Override + Location getLocationForModule(Path dir) { + return pathLocations.get(dir); + } + + private boolean listed; + + @Override + Iterable> listLocationsForModules() throws IOException { + if (!listed && outputDir != null) { + try (DirectoryStream stream = Files.newDirectoryStream(outputDir)) { + for (Path p : stream) { + getLocationForModule(p.getFileName().toString()); + } + } + listed = true; + } + if (moduleLocations == null) + return Collections.emptySet(); + Set locns = new LinkedHashSet<>(); + moduleLocations.forEach((k, v) -> locns.add(v)); + return Collections.singleton(locns); + } } /** @@ -916,7 +953,7 @@ public class Locations { if (searchPath == null) return Collections.emptyList(); - return () -> new ModulePathIterator(); + return ModulePathIterator::new; } @Override diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java index b6d05804828..6429cf8f16f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java @@ -85,6 +85,8 @@ public class ClassFile { public final static int CONSTANT_MethodHandle = 15; public final static int CONSTANT_MethodType = 16; public final static int CONSTANT_InvokeDynamic = 18; + public final static int CONSTANT_Module = 19; + public final static int CONSTANT_Package = 20; public final static int REF_getField = 1; public final static int REF_getStatic = 2; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java index 3b60fbc41ab..105ed20c485 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java @@ -161,9 +161,6 @@ public class ClassReader { */ protected ModuleSymbol currentModule = null; - // FIXME: temporary compatibility code - private boolean readNewModuleAttribute; - /** The buffer containing the currently read class file. */ byte[] buf = new byte[INITIAL_BUFFER_SIZE]; @@ -392,6 +389,8 @@ public class ClassReader { case CONSTANT_Class: case CONSTANT_String: case CONSTANT_MethodType: + case CONSTANT_Module: + case CONSTANT_Package: bp = bp + 2; break; case CONSTANT_MethodHandle: @@ -481,6 +480,11 @@ public class ClassReader { case CONSTANT_InvokeDynamic: skipBytes(5); break; + case CONSTANT_Module: + case CONSTANT_Package: + // this is temporary for now: treat as a simple reference to the underlying Utf8. + poolObj[i] = readName(getChar(index + 1)); + break; default: throw badClassFile("bad.const.pool.tag", Byte.toString(tag)); } @@ -567,40 +571,12 @@ public class ClassReader { return (NameAndType)obj; } - /** Read the class name of a module-info.class file. - * The name is stored in a CONSTANT_Class entry, where the - * class name is of the form module-name.module-info. - */ - Name readModuleInfoName(int i) { - if (majorVersion < Version.V53.major) { - throw badClassFile("anachronistic.module.info", - Integer.toString(majorVersion), - Integer.toString(minorVersion)); - } - int classIndex = poolIdx[i]; - if (buf[classIndex] == CONSTANT_Class) { - int utf8Index = poolIdx[getChar(classIndex + 1)]; - if (buf[utf8Index] == CONSTANT_Utf8) { - int len = getChar(utf8Index + 1); - int start = utf8Index + 3; - return names.fromUtf(internalize(buf, start, len)); - } - } - throw badClassFile("bad.module-info.name"); - } - /** Read the name of a module. - * The name is stored in a CONSTANT_Utf8 entry, in - * JVMS 4.2 internal form (with '/' instead of '.') + * The name is stored in a CONSTANT_Module entry, in + * JVMS 4.2 binary form (using ".", not "/") */ Name readModuleName(int i) { - Name name = readName(i); - // FIXME: temporary compatibility code - if (readNewModuleAttribute) { - return names.fromUtf(internalize(name)); - } else { - return name; - } + return readName(i); } /** Read module_flags. @@ -614,6 +590,17 @@ public class ClassReader { return set; } + /** Read resolution_flags. + */ + Set readModuleResolutionFlags(int flags) { + Set set = EnumSet.noneOf(ModuleResolutionFlags.class); + for (ModuleResolutionFlags f : ModuleResolutionFlags.values()) { + if ((flags & f.value) != 0) + set.add(f); + } + return set; + } + /** Read exports_flags. */ Set readExportsFlags(int flags) { @@ -792,7 +779,7 @@ public class ClassReader { try { return (outer == Type.noType) ? t.erasure(types) : - new ClassType(outer, List.nil(), t); + new ClassType(outer, List.nil(), t); } finally { sbp = startSbp; } @@ -865,7 +852,7 @@ public class ClassReader { t = enterClass(names.fromUtf(signatureBuffer, startSbp, sbp - startSbp)); - outer = new ClassType(outer, List.nil(), t); + outer = new ClassType(outer, List.nil(), t); } signatureBuffer[sbp++] = (byte)'$'; continue; @@ -1282,21 +1269,20 @@ public class ClassReader { ModuleSymbol msym = (ModuleSymbol) sym.owner; ListBuffer directives = new ListBuffer<>(); - // FIXME: temporary compatibility code - if (readNewModuleAttribute) { - Name moduleName = readModuleName(nextChar()); - if (currentModule.name != moduleName) { - throw badClassFile("module.name.mismatch", moduleName, currentModule.name); - } + Name moduleName = readModuleName(nextChar()); + if (currentModule.name != moduleName) { + throw badClassFile("module.name.mismatch", moduleName, currentModule.name); } msym.flags.addAll(readModuleFlags(nextChar())); + msym.version = readName(nextChar()); ListBuffer requires = new ListBuffer<>(); int nrequires = nextChar(); for (int i = 0; i < nrequires; i++) { ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar())); Set flags = readRequiresFlags(nextChar()); + nextChar(); // skip compiled version requires.add(new RequiresDirective(rsym, flags)); } msym.requires = requires.toList(); @@ -1372,7 +1358,7 @@ public class ClassReader { } }, - new AttributeReader(names.ModuleVersion, V53, CLASS_ATTRIBUTE) { + new AttributeReader(names.ModuleResolution, V53, CLASS_ATTRIBUTE) { @Override protected boolean accepts(AttributeKind kind) { return super.accepts(kind) && allowModules; @@ -1380,7 +1366,7 @@ public class ClassReader { protected void read(Symbol sym, int attrLen) { if (sym.kind == TYP && sym.owner.kind == MDL) { ModuleSymbol msym = (ModuleSymbol) sym.owner; - msym.version = readName(nextChar()); + msym.resolutionFlags.addAll(readModuleResolutionFlags(nextChar())); } } }, @@ -2071,9 +2057,9 @@ public class ClassReader { // type (typeof null) as return type because this type is // a subtype of all reference types and can be converted // to primitive types by unboxing. - MethodType mt = new MethodType(List.nil(), + MethodType mt = new MethodType(List.nil(), syms.botType, - List.nil(), + List.nil(), syms.methodClass); return new MethodSymbol(PUBLIC | ABSTRACT, name, mt, container.tsym); } @@ -2277,7 +2263,7 @@ public class ClassReader { TypeAnnotationCompleter(Symbol sym, List proxies) { - super(sym, List.nil()); + super(sym, List.nil()); this.proxies = proxies; } @@ -2564,24 +2550,15 @@ public class ClassReader { self.flatname); } } else { + if (majorVersion < Version.V53.major) { + throw badClassFile("anachronistic.module.info", + Integer.toString(majorVersion), + Integer.toString(minorVersion)); + } c.flags_field = flags; currentModule = (ModuleSymbol) c.owner; int this_class = nextChar(); - // FIXME: temporary compatibility code - if (this_class == 0) { - readNewModuleAttribute = true; - } else { - Name modInfoName = readModuleInfoName(this_class); - if (currentModule.name.append('.', names.module_info) != modInfoName) { - //strip trailing .module-info, if exists: - int modInfoStart = modInfoName.length() - names.module_info.length(); - modInfoName = modInfoName.subName(modInfoStart, modInfoName.length()) == names.module_info && - modInfoName.charAt(modInfoStart - 1) == '.' ? - modInfoName.subName(0, modInfoStart - 1) : modInfoName; - throw badClassFile("module.name.mismatch", modInfoName, currentModule.name); - } - readNewModuleAttribute = false; - } + // temp, no check on this_class } // class attributes must be read before class diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java index 88d91307327..f23385c7c21 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java @@ -474,6 +474,14 @@ public class ClassWriter extends ClassFile { poolbuf.appendByte(CONSTANT_MethodHandle); poolbuf.appendByte(ref.refKind); poolbuf.appendChar(pool.put(ref.refSym)); + } else if (value instanceof ModuleSymbol) { + ModuleSymbol m = (ModuleSymbol)value; + poolbuf.appendByte(CONSTANT_Module); + poolbuf.appendChar(pool.put(m.name)); + } else if (value instanceof PackageSymbol) { + PackageSymbol m = (PackageSymbol)value; + poolbuf.appendByte(CONSTANT_Package); + poolbuf.appendChar(pool.put(names.fromUtf(externalize(m.fullname)))); } else { Assert.error("writePool " + value); } @@ -954,8 +962,9 @@ public class ClassWriter extends ClassFile { int alenIdx = writeAttr(names.Module); - databuf.appendChar(pool.put(names.fromUtf(externalize(m.name)))); + databuf.appendChar(pool.put(m)); databuf.appendChar(ModuleFlags.value(m.flags)); // module_flags + databuf.appendChar(m.version != null ? pool.put(m.version) : 0); ListBuffer requires = new ListBuffer<>(); for (RequiresDirective r: m.requires) { @@ -964,21 +973,22 @@ public class ClassWriter extends ClassFile { } databuf.appendChar(requires.size()); for (RequiresDirective r: requires) { - databuf.appendChar(pool.put(names.fromUtf(externalize(r.module.name)))); + databuf.appendChar(pool.put(r.module)); databuf.appendChar(RequiresFlag.value(r.flags)); + databuf.appendChar(r.module.version != null ? pool.put(r.module.version) : 0); } List exports = m.exports; databuf.appendChar(exports.size()); for (ExportsDirective e: exports) { - databuf.appendChar(pool.put(names.fromUtf(externalize(e.packge.flatName())))); + databuf.appendChar(pool.put(e.packge)); databuf.appendChar(ExportsFlag.value(e.flags)); if (e.modules == null) { databuf.appendChar(0); } else { databuf.appendChar(e.modules.size()); for (ModuleSymbol msym: e.modules) { - databuf.appendChar(pool.put(names.fromUtf(externalize(msym.name)))); + databuf.appendChar(pool.put(msym)); } } } @@ -986,14 +996,14 @@ public class ClassWriter extends ClassFile { List opens = m.opens; databuf.appendChar(opens.size()); for (OpensDirective o: opens) { - databuf.appendChar(pool.put(names.fromUtf(externalize(o.packge.flatName())))); + databuf.appendChar(pool.put(o.packge)); databuf.appendChar(OpensFlag.value(o.flags)); if (o.modules == null) { databuf.appendChar(0); } else { databuf.appendChar(o.modules.size()); for (ModuleSymbol msym: o.modules) { - databuf.appendChar(pool.put(names.fromUtf(externalize(msym.name)))); + databuf.appendChar(pool.put(msym)); } } } @@ -1718,7 +1728,8 @@ public class ClassWriter extends ClassFile { databuf.appendChar(flags); if (c.owner.kind == MDL) { - databuf.appendChar(0); + PackageSymbol unnamed = ((ModuleSymbol) c.owner).unnamedPackage; + databuf.appendChar(pool.put(new ClassSymbol(0, names.module_info, unnamed))); } else { databuf.appendChar(pool.put(c)); } @@ -1799,7 +1810,7 @@ public class ClassWriter extends ClassFile { acount += writeEnclosingMethodAttribute(c); if (c.owner.kind == MDL) { acount += writeModuleAttribute(c); - acount += writeFlagAttrs(c.owner.flags()); + acount += writeFlagAttrs(c.owner.flags() & ~DEPRECATED); } acount += writeExtraClassAttributes(c); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java index 216f141873c..7a9ad623d93 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java @@ -476,8 +476,8 @@ public class Gen extends JCTree.Visitor { STATIC | (c.flags() & STRICTFP), names.clinit, new MethodType( - List.nil(), syms.voidType, - List.nil(), syms.methodClass), + List.nil(), syms.voidType, + List.nil(), syms.methodClass), c); c.members().enter(clinit); List clinitStats = clinitCode.toList(); @@ -1037,11 +1037,11 @@ public class Gen extends JCTree.Visitor { } public void visitDoLoop(JCDoWhileLoop tree) { - genLoop(tree, tree.body, tree.cond, List.nil(), false); + genLoop(tree, tree.body, tree.cond, List.nil(), false); } public void visitWhileLoop(JCWhileLoop tree) { - genLoop(tree, tree.body, tree.cond, List.nil(), true); + genLoop(tree, tree.body, tree.cond, List.nil(), true); } public void visitForLoop(JCForLoop tree) { @@ -1321,7 +1321,7 @@ public class Gen extends JCTree.Visitor { } }; syncEnv.info.gaps = new ListBuffer<>(); - genTry(tree.body, List.nil(), syncEnv); + genTry(tree.body, List.nil(), syncEnv); code.endScopes(limit); } @@ -1903,7 +1903,7 @@ public class Gen extends JCTree.Visitor { List.of(syms.objectType), true); } else { callMethod(pos, syms.objectType, names.getClass, - List.nil(), false); + List.nil(), false); } code.emitop0(pop); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java index bdb16206ba9..36da2b3c4a0 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java @@ -100,30 +100,24 @@ public class ModuleNameReader { if (access_flags != 0x8000) throw new BadClassFile("invalid access flags for module: 0x" + Integer.toHexString(access_flags)); - // FIXME: temporary compatibility code int this_class = nextChar(); - if (this_class == 0) { - // new form - checkZero(nextChar(), "super_class"); - checkZero(nextChar(), "interface_count"); - checkZero(nextChar(), "fields_count"); - checkZero(nextChar(), "methods_count"); - int attributes_count = nextChar(); - for (int i = 0; i < attributes_count; i++) { - int attr_name = nextChar(); - int attr_length = nextInt(); - if (getUtf8Value(attr_name, false).equals("Module") && attr_length > 2) { - return getUtf8Value(nextChar(), true); - } else { - // skip over unknown attributes - bp += attr_length; - } + // could, should, check this_class == CONSTANT_Class("mdoule-info") + checkZero(nextChar(), "super_class"); + checkZero(nextChar(), "interface_count"); + checkZero(nextChar(), "fields_count"); + checkZero(nextChar(), "methods_count"); + int attributes_count = nextChar(); + for (int i = 0; i < attributes_count; i++) { + int attr_name = nextChar(); + int attr_length = nextInt(); + if (getUtf8Value(attr_name, false).equals("Module") && attr_length > 2) { + return getModuleName(nextChar()); + } else { + // skip over unknown attributes + bp += attr_length; } - throw new BadClassFile("no Module attribute"); - } else { - // old form - return readModuleInfoName(this_class); } + throw new BadClassFile("no Module attribute"); } void checkZero(int count, String name) throws BadClassFile { @@ -172,6 +166,8 @@ public class ModuleNameReader { case CONSTANT_Class: case CONSTANT_String: case CONSTANT_MethodType: + case CONSTANT_Module: + case CONSTANT_Package: bp = bp + 2; break; case CONSTANT_MethodHandle: @@ -211,33 +207,13 @@ public class ModuleNameReader { throw new BadClassFile("bad name at index " + index); } - /** Read the class name of a module-info.class file. - * The name is stored in a CONSTANT_Class entry, where the - * class name is of the form module-name/module-info. - */ - String readModuleInfoName(int i) throws BadClassFile { - int classIndex = poolIdx[i]; - if (buf[classIndex] == CONSTANT_Class) { - int utf8Index = poolIdx[getChar(classIndex + 1)]; - if (buf[utf8Index] == CONSTANT_Utf8) { - int len = getChar(utf8Index + 1); - int start = utf8Index + 3; - String suffix = "/module-info"; - if (endsWith(buf, start, len, suffix)) - return new String(ClassFile.internalize(buf, start, len - suffix.length())); - } + String getModuleName(int index) throws BadClassFile { + int infoIndex = poolIdx[index]; + if (buf[infoIndex] == CONSTANT_Module) { + return getUtf8Value(getChar(infoIndex + 1), true); + } else { + throw new BadClassFile("bad module name at index " + index); } - throw new BadClassFile("bad module-info name"); - } - - private boolean endsWith(byte[] buf, int start, int len, String suffix) { - if (len <= suffix.length()) - return false; - for (int i = 0; i < suffix.length(); i++) { - if (buf[start + len - suffix.length() + i] != suffix.charAt(i)) - return false; - } - return true; } private static byte[] readInputStream(byte[] buf, InputStream s) throws IOException { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java index 719950e8dbb..39fba539659 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java @@ -365,16 +365,8 @@ public class Pool { Assert.check(!refSym.owner.isInterface() || interfaceOwner); } //where - Filter nonInitFilter = new Filter() { - public boolean accepts(Name n) { - return n != n.table.names.init && n != n.table.names.clinit; - } - }; + Filter nonInitFilter = n -> (n != n.table.names.init && n != n.table.names.clinit); - Filter initFilter = new Filter() { - public boolean accepts(Name n) { - return n == n.table.names.init; - } - }; + Filter initFilter = n -> n == n.table.names.init; } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java index f101e0b9695..90a391f1f1d 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java @@ -224,7 +224,7 @@ public abstract class StringConcat { JCDiagnostic.DiagnosticPosition pos = tree.pos(); gen.getCode().emitop2(new_, gen.makeRef(pos, syms.stringBuilderType)); gen.getCode().emitop0(dup); - gen.callMethod(pos, syms.stringBuilderType, names.init, List.nil(), false); + gen.callMethod(pos, syms.stringBuilderType, names.init, List.nil(), false); return pos; } @@ -245,7 +245,7 @@ public abstract class StringConcat { } private void builderToString(JCDiagnostic.DiagnosticPosition pos) { - gen.callMethod(pos, syms.stringBuilderType, names.toString, List.nil(), false); + gen.callMethod(pos, syms.stringBuilderType, names.toString, List.nil(), false); } } @@ -353,7 +353,7 @@ public abstract class StringConcat { private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, List dynamicArgTypes) { Type.MethodType indyType = new Type.MethodType(dynamicArgTypes, type, - List.nil(), + List.nil(), syms.methodClass); int prevPos = make.pos; @@ -457,7 +457,7 @@ public abstract class StringConcat { private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, String recipe, List staticArgs, List dynamicArgTypes) { Type.MethodType indyType = new Type.MethodType(dynamicArgTypes, type, - List.nil(), + List.nil(), syms.methodClass); int prevPos = make.pos; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java index 328b1fbbedf..cd47fde15aa 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java @@ -582,7 +582,8 @@ public class Arguments { Option.BOOT_CLASS_PATH, Option.XBOOTCLASSPATH_PREPEND, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND, Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS, - Option.EXTDIRS, Option.DJAVA_EXT_DIRS); + Option.EXTDIRS, Option.DJAVA_EXT_DIRS, + Option.PROFILE); checkOptionAllowed(t.compareTo(Target.JDK1_9) >= 0, option -> error("err.option.not.allowed.with.target", option.getPrimaryName(), t.name), diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java index 46744c2d441..ec68764c882 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java @@ -337,12 +337,7 @@ public class JavaCompiler { * SourceCompleter that delegates to the readSourceFile method of this class. */ protected final Symbol.Completer sourceCompleter = - new Symbol.Completer() { - @Override - public void complete(Symbol sym) throws CompletionFailure { - readSourceFile((ClassSymbol) sym); - } - }; + sym -> readSourceFile((ClassSymbol) sym); protected final ModuleFinder.ModuleInfoSourceFileCompleter moduleInfoSourceFileCompleter = fo -> (ModuleSymbol) readSourceFile(parseImplicitFile(fo), null, tl -> { @@ -588,7 +583,7 @@ public class JavaCompiler { } protected final List stopIfError(CompileState cs, List list) { - return shouldStop(cs) ? List.nil() : list; + return shouldStop(cs) ? List.nil() : list; } /** The number of warnings reported so far. @@ -617,7 +612,7 @@ public class JavaCompiler { */ protected JCCompilationUnit parse(JavaFileObject filename, CharSequence content) { long msec = now(); - JCCompilationUnit tree = make.TopLevel(List.nil()); + JCCompilationUnit tree = make.TopLevel(List.nil()); if (content != null) { if (verbose) { log.printVerbose("parsing.started", filename); @@ -730,7 +725,7 @@ public class JavaCompiler { : make.Select(tree, names.fromString(s)); } JCCompilationUnit toplevel = - make.TopLevel(List.nil()); + make.TopLevel(List.nil()); toplevel.modle = msym; toplevel.packge = msym.unnamedPackage; return attr.attribIdent(tree, toplevel); @@ -797,7 +792,7 @@ public class JavaCompiler { return t; } catch (IOException e) { log.error("error.reading.file", filename, JavacFileManager.getMessage(e)); - return make.TopLevel(List.nil()); + return make.TopLevel(List.nil()); } finally { log.useSource(prev); } @@ -891,7 +886,7 @@ public class JavaCompiler { public void compile(List sourceFileObject) throws Throwable { - compile(sourceFileObject, List.nil(), null); + compile(sourceFileObject, List.nil(), null); } /** @@ -1154,7 +1149,7 @@ public class JavaCompiler { // TODO: called by JavacTaskImpl public void processAnnotations(List roots) { - processAnnotations(roots, List.nil()); + processAnnotations(roots, List.nil()); } /** diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java index 9480ca0611a..052bf48de9e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java @@ -35,16 +35,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.EnumSet; -import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Locale; -import java.util.Map; import java.util.ServiceLoader; import java.util.Set; import java.util.TreeSet; -import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -60,7 +56,6 @@ import com.sun.tools.javac.jvm.Profile; import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.platform.PlatformProvider; import com.sun.tools.javac.processing.JavacProcessingEnvironment; -import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.util.Assert; import com.sun.tools.javac.util.JDK9Wrappers; import com.sun.tools.javac.util.Log; @@ -342,7 +337,7 @@ public enum Option { } }, - VERSION("-version", "opt.version", STANDARD, INFO) { + VERSION("--version -version", "opt.version", STANDARD, INFO) { @Override public void process(OptionHelper helper, String option) throws InvalidValueException { Log log = helper.getLog(); @@ -352,7 +347,7 @@ public enum Option { } }, - FULLVERSION("-fullversion", null, HIDDEN, INFO) { + FULLVERSION("--full-version -fullversion", null, HIDDEN, INFO) { @Override public void process(OptionHelper helper, String option) throws InvalidValueException { Log log = helper.getLog(); @@ -402,7 +397,7 @@ public enum Option { } }, - X("-X", "opt.X", STANDARD, INFO) { + X("--help-extra -X", "opt.X", STANDARD, INFO) { @Override public void process(OptionHelper helper, String option) throws InvalidValueException { Log log = helper.getLog(); @@ -634,6 +629,33 @@ public enum Option { } }, + MODULE_VERSION("--module-version", "opt.arg.module.version", "opt.module.version", STANDARD, BASIC) { + @Override + public void process(OptionHelper helper, String option, String arg) throws InvalidValueException { + if (arg.isEmpty()) { + throw helper.newInvalidValueException("err.no.value.for.option", option); + } else { + try { + Class.forName(JDK9Wrappers.ModuleDescriptor.Version.CLASSNAME); + // use official parser if available + try { + JDK9Wrappers.ModuleDescriptor.Version.parse(arg); + } catch (IllegalArgumentException e) { + throw helper.newInvalidValueException("err.bad.value.for.option", option, arg); + } + } catch (ClassNotFoundException ex) { + // fall-back to simplistic rules when running on older platform + if (!(arg.charAt(0) >= '0' && arg.charAt(0) <= '9') || + arg.endsWith("-") || + arg.endsWith("+")) { + throw helper.newInvalidValueException("err.bad.value.for.option", option, arg); + } + } + } + super.process(helper, option, arg); + } + }, + // This option exists only for the purpose of documenting itself. // It's actually implemented by the CommandLine class. AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO, ArgKind.ADJACENT) { @@ -681,7 +703,7 @@ public enum Option { @Override public void process(OptionHelper helper, String option) throws InvalidValueException { try { - Class.forName(JDK9Wrappers.VMHelper.VM_CLASSNAME); + Class.forName(JDK9Wrappers.VMHelper.CLASSNAME); String[] runtimeArgs = JDK9Wrappers.VMHelper.getRuntimeArguments(); for (String arg : runtimeArgs) { // Handle any supported runtime options; ignore all others. @@ -1035,7 +1057,7 @@ public enum Option { * @param helper a helper to provide access to the environment * @param arg the arg string that identified this option * @param rest the remaining strings to be analysed - * @return true if the operation was successful, and false otherwise + * @throws InvalidValueException if the value of the option was invalid * @implNote The return value is the opposite of that used by {@link #process}. */ public void handleOption(OptionHelper helper, String arg, Iterator rest) throws InvalidValueException { @@ -1084,6 +1106,7 @@ public enum Option { * @param option the option to be processed * @param arg the value to associate with the option, or a default value * to be used if the option does not otherwise take an argument. + * @throws InvalidValueException if an error occurred */ public void process(OptionHelper helper, String option, String arg) throws InvalidValueException { if (choices != null) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java index eeb7fe70b37..87047be98bd 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/FilteredMemberList.java @@ -71,11 +71,7 @@ public class FilteredMemberList extends AbstractList { // A more efficient implementation than AbstractList's. public Iterator iterator() { - return scope.getSymbols(new Filter() { - public boolean accepts(Symbol t) { - return !unwanted(t); - } - }, NON_RECURSIVE).iterator(); + return scope.getSymbols(t -> !unwanted(t), NON_RECURSIVE).iterator(); } /** diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java index eb43d8fd5cf..c30ab765f5e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java @@ -25,8 +25,11 @@ package com.sun.tools.javac.model; +import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; +import javax.lang.model.AnnotatedConstruct; import javax.lang.model.SourceVersion; import javax.lang.model.element.*; import javax.lang.model.type.DeclaredType; @@ -37,6 +40,13 @@ import static javax.lang.model.util.ElementFilter.methodsIn; import com.sun.source.util.JavacTask; import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.code.*; +import com.sun.tools.javac.code.Attribute.Compound; +import com.sun.tools.javac.code.Directive.ExportsDirective; +import com.sun.tools.javac.code.Directive.ExportsFlag; +import com.sun.tools.javac.code.Directive.OpensDirective; +import com.sun.tools.javac.code.Directive.OpensFlag; +import com.sun.tools.javac.code.Directive.RequiresDirective; +import com.sun.tools.javac.code.Directive.RequiresFlag; import com.sun.tools.javac.code.Scope.WriteableScope; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.comp.AttrContext; @@ -54,9 +64,9 @@ import com.sun.tools.javac.util.Name; import static com.sun.tools.javac.code.Kinds.Kind.*; import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE; import static com.sun.tools.javac.code.TypeTag.CLASS; -import com.sun.tools.javac.comp.CompileStates; -import com.sun.tools.javac.comp.CompileStates.CompileState; import com.sun.tools.javac.comp.Modules; +import com.sun.tools.javac.comp.Resolve; +import com.sun.tools.javac.comp.Resolve.RecoveryLoadClass; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** @@ -75,8 +85,8 @@ public class JavacElements implements Elements { private final Names names; private final Types types; private final Enter enter; + private final Resolve resolve; private final JavacTaskImpl javacTaskImpl; - private final CompileStates compileStates; public static JavacElements instance(Context context) { JavacElements instance = context.get(JavacElements.class); @@ -93,14 +103,16 @@ public class JavacElements implements Elements { names = Names.instance(context); types = Types.instance(context); enter = Enter.instance(context); + resolve = Resolve.instance(context); JavacTask t = context.get(JavacTask.class); javacTaskImpl = t instanceof JavacTaskImpl ? (JavacTaskImpl) t : null; - compileStates = CompileStates.instance(context); } @Override @DefinedBy(Api.LANGUAGE_MODEL) public ModuleSymbol getModuleElement(CharSequence name) { ensureEntered("getModuleElement"); + if (modules.getDefaultModule() == syms.noModule) + return null; String strName = name.toString(); if (strName.equals("")) return syms.unnamedModule; @@ -109,32 +121,77 @@ public class JavacElements implements Elements { @Override @DefinedBy(Api.LANGUAGE_MODEL) public PackageSymbol getPackageElement(CharSequence name) { - ensureEntered("getPackageElement"); - return getPackageElement(modules.getDefaultModule(), name); + return doGetPackageElement(null, name); } @Override @DefinedBy(Api.LANGUAGE_MODEL) public PackageSymbol getPackageElement(ModuleElement module, CharSequence name) { - String strName = name.toString(); - if (strName.equals("")) + module.getClass(); + return doGetPackageElement(module, name); + } + + private PackageSymbol doGetPackageElement(ModuleElement module, CharSequence name) { + ensureEntered("getPackageElement"); + if (name.length() == 0) return syms.unnamedModule.unnamedPackage; - return SourceVersion.isName(strName) - ? nameToSymbol((ModuleSymbol) module, strName, PackageSymbol.class) - : null; + return doGetElement(module, name, PackageSymbol.class); } @Override @DefinedBy(Api.LANGUAGE_MODEL) public ClassSymbol getTypeElement(CharSequence name) { - ensureEntered("getTypeElement"); - return getTypeElement(modules.getDefaultModule(), name); + return doGetTypeElement(null, name); } @Override @DefinedBy(Api.LANGUAGE_MODEL) public ClassSymbol getTypeElement(ModuleElement module, CharSequence name) { + module.getClass(); + + return doGetTypeElement(module, name); + } + + private ClassSymbol doGetTypeElement(ModuleElement module, CharSequence name) { + ensureEntered("getTypeElement"); + return doGetElement(module, name, ClassSymbol.class); + } + + private S doGetElement(ModuleElement module, CharSequence name, Class clazz) { String strName = name.toString(); - return SourceVersion.isName(strName) - ? nameToSymbol((ModuleSymbol) module, strName, ClassSymbol.class) - : null; + if (!SourceVersion.isName(strName)) { + return null; + } + if (module == null) { + return unboundNameToSymbol(strName, clazz); + } else { + return nameToSymbol((ModuleSymbol) module, strName, clazz); + } + } + + private S unboundNameToSymbol(String nameStr, Class clazz) { + if (modules.getDefaultModule() == syms.noModule) { //not a modular mode: + return nameToSymbol(syms.noModule, nameStr, clazz); + } + + RecoveryLoadClass prevRecoveryLoadClass = resolve.setRecoveryLoadClass((env, name) -> null); + try { + Set found = new LinkedHashSet<>(); + + for (ModuleSymbol msym : modules.allModules()) { + S sym = nameToSymbol(msym, nameStr, clazz); + + if (sym != null) { + found.add(sym); + } + } + + if (found.size() == 1) { + return found.iterator().next(); + } else { + //not found, or more than one element found: + return null; + } + } finally { + resolve.setRecoveryLoadClass(prevRecoveryLoadClass); + } } /** @@ -369,6 +426,8 @@ public class JavacElements implements Elements { @DefinedBy(Api.LANGUAGE_MODEL) public ModuleElement getModuleOf(Element e) { Symbol sym = cast(Symbol.class, e); + if (modules.getDefaultModule() == syms.noModule) + return null; return (sym.kind == MDL) ? ((ModuleElement) e) : sym.packge().modle; } @@ -379,6 +438,52 @@ public class JavacElements implements Elements { return sym.isDeprecated(); } + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public Origin getOrigin(Element e) { + Symbol sym = cast(Symbol.class, e); + if ((sym.flags() & Flags.GENERATEDCONSTR) != 0) + return Origin.MANDATED; + //TypeElement.getEnclosedElements does not return synthetic elements, + //and most synthetic elements are not read from the classfile anyway: + return Origin.EXPLICIT; + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public Origin getOrigin(AnnotatedConstruct c, AnnotationMirror a) { + Compound ac = cast(Compound.class, a); + if (ac.isSynthesized()) + return Origin.MANDATED; + return Origin.EXPLICIT; + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public Origin getOrigin(ModuleElement m, ModuleElement.Directive directive) { + switch (directive.getKind()) { + case REQUIRES: + RequiresDirective rd = cast(RequiresDirective.class, directive); + if (rd.flags.contains(RequiresFlag.MANDATED)) + return Origin.MANDATED; + if (rd.flags.contains(RequiresFlag.SYNTHETIC)) + return Origin.SYNTHETIC; + return Origin.EXPLICIT; + case EXPORTS: + ExportsDirective ed = cast(ExportsDirective.class, directive); + if (ed.flags.contains(ExportsFlag.MANDATED)) + return Origin.MANDATED; + if (ed.flags.contains(ExportsFlag.SYNTHETIC)) + return Origin.SYNTHETIC; + return Origin.EXPLICIT; + case OPENS: + OpensDirective od = cast(OpensDirective.class, directive); + if (od.flags.contains(OpensFlag.MANDATED)) + return Origin.MANDATED; + if (od.flags.contains(OpensFlag.SYNTHETIC)) + return Origin.SYNTHETIC; + return Origin.EXPLICIT; + } + return Origin.EXPLICIT; + } + @DefinedBy(Api.LANGUAGE_MODEL) public Name getBinaryName(TypeElement type) { return cast(TypeSymbol.class, type).flatName(); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java index 8fcf9b75389..9a419f8321f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java @@ -683,7 +683,7 @@ public class DocCommentParser { } } - return List.of(erroneous("dc.unterminated.inline.tag", pos)); + return List.of(erroneous("dc.unterminated.inline.tag", pos)); } protected void entity(ListBuffer list) { @@ -1160,6 +1160,16 @@ public class DocCommentParser { } }, + // @provides service-name description + new TagParser(Kind.BLOCK, DCTree.Kind.PROVIDES) { + public DCTree parse(int pos) throws ParseException { + skipWhitespace(); + DCReference ref = reference(true); + List description = blockContent(); + return m.at(pos).newProvidesTree(ref, description); + } + }, + // @return description new TagParser(Kind.BLOCK, DCTree.Kind.RETURN) { public DCTree parse(int pos) { @@ -1261,6 +1271,16 @@ public class DocCommentParser { } }, + // @uses service-name description + new TagParser(Kind.BLOCK, DCTree.Kind.USES) { + public DCTree parse(int pos) throws ParseException { + skipWhitespace(); + DCReference ref = reference(true); + List description = blockContent(); + return m.at(pos).newUsesTree(ref, description); + } + }, + // {@value package.class#field} new TagParser(Kind.INLINE, DCTree.Kind.VALUE) { public DCTree parse(int pos) throws ParseException { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java index 7e786ce0b76..e8c70d60958 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -418,7 +418,7 @@ public class JavacParser implements Parser { } protected JCErroneous syntaxError(int pos, String key, TokenKind... args) { - return syntaxError(pos, List.nil(), key, args); + return syntaxError(pos, List.nil(), key, args); } protected JCErroneous syntaxError(int pos, List errs, String key, TokenKind... args) { @@ -1718,11 +1718,7 @@ public class JavacParser implements Parser { } /** Accepts all identifier-like tokens */ - protected Filter LAX_IDENTIFIER = new Filter() { - public boolean accepts(TokenKind t) { - return t == IDENTIFIER || t == UNDERSCORE || t == ASSERT || t == ENUM; - } - }; + protected Filter LAX_IDENTIFIER = t -> t == IDENTIFIER || t == UNDERSCORE || t == ASSERT || t == ENUM; enum ParensResult { CAST, @@ -1886,7 +1882,7 @@ public class JavacParser implements Parser { return args.toList(); } } else { - return List.of(syntaxError(token.pos, "expected", LT)); + return List.of(syntaxError(token.pos, "expected", LT)); } } @@ -1971,7 +1967,7 @@ public class JavacParser implements Parser { /** BracketsOpt = [ "[" "]" { [Annotations] "[" "]"} ] */ private JCExpression bracketsOpt(JCExpression t) { - return bracketsOpt(t, List.nil()); + return bracketsOpt(t, List.nil()); } private JCExpression bracketsOptCont(JCExpression t, int pos, @@ -2151,7 +2147,7 @@ public class JavacParser implements Parser { } else { setErrorEndPos(token.pos); reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET); - t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.nil(), null)); + t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.nil(), null)); return toP(F.at(newpos).Erroneous(List.of(t))); } } @@ -2201,8 +2197,8 @@ public class JavacParser implements Parser { } return na; } else { - JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.nil(), null)); - return syntaxError(token.pos, List.of(t), "array.dimension.missing"); + JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.nil(), null)); + return syntaxError(token.pos, List.of(t), "array.dimension.missing"); } } else { ListBuffer dims = new ListBuffer<>(); @@ -2271,7 +2267,7 @@ public class JavacParser implements Parser { } } accept(RBRACE); - return toP(F.at(newpos).NewArray(t, List.nil(), elems.toList())); + return toP(F.at(newpos).NewArray(t, List.nil(), elems.toList())); } /** VariableInitializer = ArrayInitializer | Expression @@ -2424,7 +2420,7 @@ public class JavacParser implements Parser { if (token.kind == COLON && t.hasTag(IDENT)) { nextToken(); JCStatement stat = parseStatementAsBlock(); - return List.of(F.at(pos).Labelled(prevToken.name(), stat)); + return List.of(F.at(pos).Labelled(prevToken.name(), stat)); } else if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) { pos = token.pos; JCModifiers mods = F.at(Position.NOPOS).Modifiers(0); @@ -2440,7 +2436,7 @@ public class JavacParser implements Parser { t = checkExprStat(t); accept(SEMI); JCExpressionStatement expr = toP(F.at(pos).Exec(t)); - return List.of(expr); + return List.of(expr); } } } @@ -2482,7 +2478,7 @@ public class JavacParser implements Parser { case FOR: { nextToken(); accept(LPAREN); - List inits = token.kind == SEMI ? List.nil() : forInit(); + List inits = token.kind == SEMI ? List.nil() : forInit(); if (inits.length() == 1 && inits.head.hasTag(VARDEF) && ((JCVariableDecl) inits.head).init == null && @@ -2497,7 +2493,7 @@ public class JavacParser implements Parser { accept(SEMI); JCExpression cond = token.kind == SEMI ? null : parseExpression(); accept(SEMI); - List steps = token.kind == RPAREN ? List.nil() : forUpdate(); + List steps = token.kind == RPAREN ? List.nil() : forUpdate(); accept(RPAREN); JCStatement body = parseStatementAsBlock(); return F.at(pos).ForLoop(inits, cond, steps, body); @@ -2520,7 +2516,7 @@ public class JavacParser implements Parser { } case TRY: { nextToken(); - List resources = List.nil(); + List resources = List.nil(); if (token.kind == LPAREN) { checkTryWithResources(); nextToken(); @@ -2630,7 +2626,7 @@ public class JavacParser implements Parser { int errPos = S.errPos(); JCTree stm = action.doRecover(this); S.errPos(errPos); - return toP(F.Exec(syntaxError(startPos, List.of(stm), key))); + return toP(F.Exec(syntaxError(startPos, List.of(stm), key))); } /** CatchClause = CATCH "(" FormalParameter ")" Block @@ -2886,7 +2882,7 @@ public class JavacParser implements Parser { } List annotationFieldValuesOpt() { - return (token.kind == LPAREN) ? annotationFieldValues() : List.nil(); + return (token.kind == LPAREN) ? annotationFieldValues() : List.nil(); } /** AnnotationFieldValues = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */ @@ -2949,7 +2945,7 @@ public class JavacParser implements Parser { } } accept(RBRACE); - return toP(F.at(pos).NewArray(null, List.nil(), buf.toList())); + return toP(F.at(pos).NewArray(null, List.nil(), buf.toList())); default: mode = EXPR; return term1(); @@ -3346,10 +3342,10 @@ public class JavacParser implements Parser { int pos = token.pos; List errs; if (LAX_IDENTIFIER.accepts(token.kind)) { - errs = List.of(mods, toP(F.at(pos).Ident(ident()))); + errs = List.of(mods, toP(F.at(pos).Ident(ident()))); setErrorEndPos(token.pos); } else { - errs = List.of(mods); + errs = List.of(mods); } return toP(F.Exec(syntaxError(pos, errs, "expected3", CLASS, INTERFACE, ENUM))); @@ -3427,7 +3423,7 @@ public class JavacParser implements Parser { List defs = enumBody(name); mods.flags |= Flags.ENUM; JCClassDecl result = toP(F.at(pos). - ClassDef(mods, name, List.nil(), + ClassDef(mods, name, List.nil(), null, implementing, defs)); attach(result, dc); return result; @@ -3485,7 +3481,7 @@ public class JavacParser implements Parser { Name name = ident(); int createPos = token.pos; List args = (token.kind == LPAREN) - ? arguments() : List.nil(); + ? arguments() : List.nil(); JCClassDecl body = null; if (token.kind == LBRACE) { JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM); @@ -3571,7 +3567,7 @@ public class JavacParser implements Parser { protected List classOrInterfaceBodyDeclaration(Name className, boolean isInterface) { if (token.kind == SEMI) { nextToken(); - return List.nil(); + return List.nil(); } else { Comment dc = token.comment(CommentStyle.JAVADOC); int pos = token.pos; @@ -3579,14 +3575,14 @@ public class JavacParser implements Parser { if (token.kind == CLASS || token.kind == INTERFACE || token.kind == ENUM) { - return List.of(classOrInterfaceOrEnumDeclaration(mods, dc)); + return List.of(classOrInterfaceOrEnumDeclaration(mods, dc)); } else if (token.kind == LBRACE && (mods.flags & Flags.StandardFlags & ~Flags.STATIC) == 0 && mods.annotations.isEmpty()) { if (isInterface) { error(token.pos, "initializer.not.allowed"); } - return List.of(block(pos, mods.flags)); + return List.of(block(pos, mods.flags)); } else { pos = token.pos; List typarams = typeParametersOpt(); @@ -3641,10 +3637,10 @@ public class JavacParser implements Parser { } else { pos = token.pos; List err = isVoid - ? List.of(toP(F.at(pos).MethodDef(mods, name, type, typarams, - List.nil(), List.nil(), null, null))) + ? List.of(toP(F.at(pos).MethodDef(mods, name, type, typarams, + List.nil(), List.nil(), null, null))) : null; - return List.of(syntaxError(token.pos, err, "expected", LPAREN)); + return List.of(syntaxError(token.pos, err, "expected", LPAREN)); } } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java index 6d38668c014..8a6fc05c600 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java @@ -51,6 +51,9 @@ import static javax.tools.StandardLocation.SOURCE_OUTPUT; import static javax.tools.StandardLocation.CLASS_OUTPUT; import com.sun.tools.javac.code.Lint; +import com.sun.tools.javac.code.Symbol.ModuleSymbol; +import com.sun.tools.javac.code.Symtab; +import com.sun.tools.javac.comp.Modules; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.DefinedBy.Api; @@ -114,10 +117,12 @@ public class JavacFiler implements Filer, Closeable { */ private class FilerOutputFileObject extends ForwardingFileObject { private boolean opened = false; + private ModuleSymbol mod; private String name; - FilerOutputFileObject(String name, FileObject fileObject) { + FilerOutputFileObject(ModuleSymbol mod, String name, FileObject fileObject) { super(fileObject); + this.mod = mod; this.name = name; } @@ -126,7 +131,7 @@ public class JavacFiler implements Filer, Closeable { if (opened) throw new IOException(ALREADY_OPENED); opened = true; - return new FilerOutputStream(name, fileObject); + return new FilerOutputStream(mod, name, fileObject); } @Override @DefinedBy(Api.COMPILER) @@ -134,7 +139,7 @@ public class JavacFiler implements Filer, Closeable { if (opened) throw new IOException(ALREADY_OPENED); opened = true; - return new FilerWriter(name, fileObject); + return new FilerWriter(mod, name, fileObject); } // Three anti-literacy methods @@ -161,8 +166,8 @@ public class JavacFiler implements Filer, Closeable { private class FilerOutputJavaFileObject extends FilerOutputFileObject implements JavaFileObject { private final JavaFileObject javaFileObject; - FilerOutputJavaFileObject(String name, JavaFileObject javaFileObject) { - super(name, javaFileObject); + FilerOutputJavaFileObject(ModuleSymbol mod, String name, JavaFileObject javaFileObject) { + super(mod, name, javaFileObject); this.javaFileObject = javaFileObject; } @@ -248,6 +253,7 @@ public class JavacFiler implements Filer, Closeable { * when they are closed. */ private class FilerOutputStream extends FilterOutputStream { + ModuleSymbol mod; String typeName; FileObject fileObject; boolean closed = false; @@ -256,8 +262,9 @@ public class JavacFiler implements Filer, Closeable { * @param typeName name of class or {@code null} if just a * binary file */ - FilerOutputStream(String typeName, FileObject fileObject) throws IOException { + FilerOutputStream(ModuleSymbol mod, String typeName, FileObject fileObject) throws IOException { super(fileObject.openOutputStream()); + this.mod = mod; this.typeName = typeName; this.fileObject = fileObject; } @@ -270,7 +277,7 @@ public class JavacFiler implements Filer, Closeable { * stream, still try to process the file. */ - closeFileObject(typeName, fileObject); + closeFileObject(mod, typeName, fileObject); out.close(); } } @@ -282,6 +289,7 @@ public class JavacFiler implements Filer, Closeable { * closed. */ private class FilerWriter extends FilterWriter { + ModuleSymbol mod; String typeName; FileObject fileObject; boolean closed = false; @@ -291,8 +299,9 @@ public class JavacFiler implements Filer, Closeable { * @param typeName name of source file or {@code null} if just a * text file */ - FilerWriter(String typeName, FileObject fileObject) throws IOException { + FilerWriter(ModuleSymbol mod, String typeName, FileObject fileObject) throws IOException { super(fileObject.openWriter()); + this.mod = mod; this.typeName = typeName; this.fileObject = fileObject; } @@ -305,7 +314,7 @@ public class JavacFiler implements Filer, Closeable { * Writer, still try to process the file. */ - closeFileObject(typeName, fileObject); + closeFileObject(mod, typeName, fileObject); out.close(); } } @@ -313,6 +322,9 @@ public class JavacFiler implements Filer, Closeable { JavaFileManager fileManager; Log log; + Modules modules; + Names names; + Symtab syms; Context context; boolean lastRound; @@ -340,7 +352,7 @@ public class JavacFiler implements Filer, Closeable { * This set must be synchronized. Its iterators should preserve * insertion order. */ - private final Map generatedClasses; + private final Map> generatedClasses; /** * JavaFileObjects for source files closed in this round. This @@ -353,13 +365,13 @@ public class JavacFiler implements Filer, Closeable { * Names of all created source files. Its iterators should * preserve insertion order. */ - private final Set aggregateGeneratedSourceNames; + private final Set> aggregateGeneratedSourceNames; /** * Names of all created class files. Its iterators should * preserve insertion order. */ - private final Set aggregateGeneratedClassNames; + private final Set> aggregateGeneratedClassNames; JavacFiler(Context context) { @@ -367,12 +379,15 @@ public class JavacFiler implements Filer, Closeable { fileManager = context.get(JavaFileManager.class); log = Log.instance(context); + modules = Modules.instance(context); + names = Names.instance(context); + syms = Symtab.instance(context); fileObjectHistory = synchronizedSet(new LinkedHashSet()); generatedSourceNames = synchronizedSet(new LinkedHashSet()); generatedSourceFileObjects = synchronizedSet(new LinkedHashSet()); - generatedClasses = synchronizedMap(new LinkedHashMap()); + generatedClasses = synchronizedMap(new LinkedHashMap<>()); openTypeNames = synchronizedSet(new LinkedHashSet()); @@ -382,19 +397,51 @@ public class JavacFiler implements Filer, Closeable { lint = (Lint.instance(context)).isEnabled(PROCESSING); } - @DefinedBy(Api.ANNOTATION_PROCESSING) - public JavaFileObject createSourceFile(CharSequence name, + @Override @DefinedBy(Api.ANNOTATION_PROCESSING) + public JavaFileObject createSourceFile(CharSequence nameAndModule, Element... originatingElements) throws IOException { - return createSourceOrClassFile(true, name.toString()); + Pair moduleAndClass = checkOrInferModule(nameAndModule); + return createSourceOrClassFile(moduleAndClass.fst, true, moduleAndClass.snd); } - @DefinedBy(Api.ANNOTATION_PROCESSING) - public JavaFileObject createClassFile(CharSequence name, - Element... originatingElements) throws IOException { - return createSourceOrClassFile(false, name.toString()); + @Override @DefinedBy(Api.ANNOTATION_PROCESSING) + public JavaFileObject createClassFile(CharSequence nameAndModule, + Element... originatingElements) throws IOException { + Pair moduleAndClass = checkOrInferModule(nameAndModule); + return createSourceOrClassFile(moduleAndClass.fst, false, moduleAndClass.snd); } - private JavaFileObject createSourceOrClassFile(boolean isSourceFile, String name) throws IOException { + private Pair checkOrInferModule(CharSequence moduleAndPkg) throws FilerException { + String moduleAndPkgString = moduleAndPkg.toString(); + int slash = moduleAndPkgString.indexOf('/'); + + if (slash != (-1)) { + //module name specified: + String module = moduleAndPkgString.substring(0, slash); + + ModuleSymbol explicitModule = syms.getModule(names.fromString(module)); + + if (explicitModule == null) { + throw new FilerException("Module: " + module + " does not exist."); + } + + if (!modules.isRootModule(explicitModule)) { + throw new FilerException("Cannot write to the given module!"); + } + + return Pair.of(explicitModule, moduleAndPkgString.substring(slash + 1)); + } else { + if (modules.multiModuleMode) { + throw new FilerException("No module to write to specified!"); + } + + return Pair.of(modules.getDefaultModule(), moduleAndPkgString); + } + } + + private JavaFileObject createSourceOrClassFile(ModuleSymbol mod, boolean isSourceFile, String name) throws IOException { + Assert.checkNonNull(mod); + if (lint) { int periodIndex = name.lastIndexOf("."); if (periodIndex != -1) { @@ -404,8 +451,12 @@ public class JavacFiler implements Filer, Closeable { log.warning("proc.suspicious.class.name", name, extn); } } - checkNameAndExistence(name, isSourceFile); + checkNameAndExistence(mod, name, isSourceFile); Location loc = (isSourceFile ? SOURCE_OUTPUT : CLASS_OUTPUT); + + if (modules.multiModuleMode) { + loc = this.fileManager.getLocationForModule(loc, mod.name.toString()); + } JavaFileObject.Kind kind = (isSourceFile ? JavaFileObject.Kind.SOURCE : JavaFileObject.Kind.CLASS); @@ -418,21 +469,30 @@ public class JavacFiler implements Filer, Closeable { log.warning("proc.file.create.last.round", name); if (isSourceFile) - aggregateGeneratedSourceNames.add(name); + aggregateGeneratedSourceNames.add(Pair.of(mod, name)); else - aggregateGeneratedClassNames.add(name); + aggregateGeneratedClassNames.add(Pair.of(mod, name)); openTypeNames.add(name); - return new FilerOutputJavaFileObject(name, fileObject); + return new FilerOutputJavaFileObject(mod, name, fileObject); } - @DefinedBy(Api.ANNOTATION_PROCESSING) + @Override @DefinedBy(Api.ANNOTATION_PROCESSING) public FileObject createResource(JavaFileManager.Location location, - CharSequence pkg, + CharSequence moduleAndPkg, CharSequence relativeName, Element... originatingElements) throws IOException { + Pair moduleAndPackage = checkOrInferModule(moduleAndPkg); + ModuleSymbol msym = moduleAndPackage.fst; + String pkg = moduleAndPackage.snd; + locationCheck(location); + if (modules.multiModuleMode) { + Assert.checkNonNull(msym); + location = this.fileManager.getLocationForModule(location, msym.name.toString()); + } + String strPkg = pkg.toString(); if (strPkg.length() > 0) checkName(strPkg); @@ -443,9 +503,9 @@ public class JavacFiler implements Filer, Closeable { checkFileReopening(fileObject, true); if (fileObject instanceof JavaFileObject) - return new FilerOutputJavaFileObject(null, (JavaFileObject)fileObject); + return new FilerOutputJavaFileObject(msym, null, (JavaFileObject)fileObject); else - return new FilerOutputFileObject(null, fileObject); + return new FilerOutputFileObject(msym, null, fileObject); } private void locationCheck(JavaFileManager.Location location) { @@ -457,13 +517,21 @@ public class JavacFiler implements Filer, Closeable { } } - @DefinedBy(Api.ANNOTATION_PROCESSING) + @Override @DefinedBy(Api.ANNOTATION_PROCESSING) public FileObject getResource(JavaFileManager.Location location, - CharSequence pkg, + CharSequence moduleAndPkg, CharSequence relativeName) throws IOException { - String strPkg = pkg.toString(); - if (strPkg.length() > 0) - checkName(strPkg); + Pair moduleAndPackage = checkOrInferModule(moduleAndPkg); + ModuleSymbol msym = moduleAndPackage.fst; + String pkg = moduleAndPackage.snd; + + if (modules.multiModuleMode) { + Assert.checkNonNull(msym); + location = this.fileManager.getLocationForModule(location, msym.name.toString()); + } + + if (pkg.length() > 0) + checkName(pkg); // TODO: Only support reading resources in selected output // locations? Only allow reading of non-source, non-class @@ -478,12 +546,12 @@ public class JavacFiler implements Filer, Closeable { FileObject fileObject; if (location.isOutputLocation()) { fileObject = fileManager.getFileForOutput(location, - pkg.toString(), + pkg, relativeName.toString(), null); } else { fileObject = fileManager.getFileForInput(location, - pkg.toString(), + pkg, relativeName.toString()); } if (fileObject == null) { @@ -524,16 +592,19 @@ public class JavacFiler implements Filer, Closeable { } } - private void checkNameAndExistence(String typename, boolean allowUnnamedPackageInfo) throws FilerException { + private void checkNameAndExistence(ModuleSymbol mod, String typename, boolean allowUnnamedPackageInfo) throws FilerException { // TODO: Check if type already exists on source or class path? // If so, use warning message key proc.type.already.exists checkName(typename, allowUnnamedPackageInfo); - if (aggregateGeneratedSourceNames.contains(typename) || - aggregateGeneratedClassNames.contains(typename)) { + if (aggregateGeneratedSourceNames.contains(Pair.of(mod, typename)) || + aggregateGeneratedClassNames.contains(Pair.of(mod, typename))) { if (lint) log.warning("proc.type.recreate", typename); throw new FilerException("Attempt to recreate a file for type " + typename); } + if (!mod.isUnnamed() && !typename.contains(".")) { + throw new FilerException("Attempt to create a type in unnamed package of a named module: " + typename); + } } /** @@ -565,7 +636,7 @@ public class JavacFiler implements Filer, Closeable { return generatedSourceFileObjects; } - public Map getGeneratedClasses() { + public Map> getGeneratedClasses() { return generatedClasses; } @@ -621,7 +692,7 @@ public class JavacFiler implements Filer, Closeable { * Upon close, register files opened by create{Source, Class}File * for annotation processing. */ - private void closeFileObject(String typeName, FileObject fileObject) { + private void closeFileObject(ModuleSymbol mod, String typeName, FileObject fileObject) { /* * If typeName is non-null, the file object was opened as a * source or class file by the user. If a file was opened as @@ -640,7 +711,7 @@ public class JavacFiler implements Filer, Closeable { break; case CLASS: - generatedClasses.put(typeName, javaFileObject); + generatedClasses.computeIfAbsent(mod, m -> Collections.synchronizedMap(new LinkedHashMap<>())).put(typeName, javaFileObject); openTypeNames.remove(typeName); break; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java index 26f3a881613..85d5ad1345d 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java @@ -34,6 +34,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; import java.util.*; +import java.util.Map.Entry; import java.util.regex.*; import java.util.stream.Collectors; @@ -323,7 +324,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea if (platformProvider != null) { platformProcessors = platformProvider.getAnnotationProcessors() .stream() - .map(ap -> ap.getPlugin()) + .map(PluginInfo::getPlugin) .collect(Collectors.toList()); } List> iterators = List.of(processorIterator, @@ -827,12 +828,14 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea private void discoverAndRunProcs(Set annotationsPresent, List topLevelClasses, - List packageInfoFiles) { + List packageInfoFiles, + List moduleInfoFiles) { Map unmatchedAnnotations = new HashMap<>(annotationsPresent.size()); for(TypeElement a : annotationsPresent) { - unmatchedAnnotations.put(a.getQualifiedName().toString(), - a); + ModuleElement mod = elementUtils.getModuleOf(a); + unmatchedAnnotations.put((mod != null ? mod.getSimpleName() + "/" : "") + a.getQualifiedName().toString(), + a); } // Give "*" processors a chance to match @@ -849,6 +852,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea Set rootElements = new LinkedHashSet<>(); rootElements.addAll(topLevelClasses); rootElements.addAll(packageInfoFiles); + rootElements.addAll(moduleInfoFiles); rootElements = Collections.unmodifiableSet(rootElements); RoundEnvironment renv = new JavacRoundEnvironment(false, @@ -986,7 +990,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea /** The trees that need to be cleaned - includes roots and implicitly parsed trees. */ Set treesToClean; /** The classes to be compiler that have were generated. */ - Map genClassFiles; + Map> genClassFiles; /** The set of annotations to be processed this round. */ Set annotationsPresent; @@ -994,6 +998,8 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea List topLevelClasses; /** The set of package-info files to be processed this round. */ List packageInfoFiles; + /** The set of module-info files to be processed this round. */ + List moduleInfoFiles; /** Create a round (common code). */ private Round(int number, Set treesToClean, @@ -1011,6 +1017,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea // the following will be populated as needed topLevelClasses = List.nil(); packageInfoFiles = List.nil(); + moduleInfoFiles = List.nil(); this.treesToClean = treesToClean; } @@ -1031,12 +1038,14 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea packageInfoFiles = getPackageInfoFiles(roots); + moduleInfoFiles = getModuleInfoFiles(roots); + findAnnotationsPresent(); } /** Create a new round. */ private Round(Round prev, - Set newSourceFiles, Map newClassFiles) { + Set newSourceFiles, Map> newClassFiles) { this(prev.number+1, prev.treesToClean, null); prev.newRound(); this.genClassFiles = prev.genClassFiles; @@ -1048,9 +1057,13 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea if (unrecoverableError()) return; + roots = compiler.initModules(roots); + enterClassFiles(genClassFiles); List newClasses = enterClassFiles(newClassFiles); - genClassFiles.putAll(newClassFiles); + for (Entry> moduleAndClassFiles : newClassFiles.entrySet()) { + genClassFiles.computeIfAbsent(moduleAndClassFiles.getKey(), m -> new LinkedHashMap<>()).putAll(moduleAndClassFiles.getValue()); + } enterTrees(roots); if (unrecoverableError()) @@ -1064,11 +1077,13 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea getPackageInfoFiles(parsedFiles), getPackageInfoFilesFromClasses(newClasses)); + moduleInfoFiles = List.nil(); //module-info cannot be generated + findAnnotationsPresent(); } /** Create the next round to be used. */ - Round next(Set newSourceFiles, Map newClassFiles) { + Round next(Set newSourceFiles, Map> newClassFiles) { return new Round(this, newSourceFiles, newClassFiles); } @@ -1121,45 +1136,47 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea annotationComputer.scan(classSym, annotationsPresent); for (PackageSymbol pkgSym : packageInfoFiles) annotationComputer.scan(pkgSym, annotationsPresent); + for (ModuleSymbol mdlSym : moduleInfoFiles) + annotationComputer.scan(mdlSym, annotationsPresent); } /** Enter a set of generated class files. */ - private List enterClassFiles(Map classFiles) { + private List enterClassFiles(Map> modulesAndClassFiles) { List list = List.nil(); - for (Map.Entry entry : classFiles.entrySet()) { - Name name = names.fromString(entry.getKey()); - JavaFileObject file = entry.getValue(); - if (file.getKind() != JavaFileObject.Kind.CLASS) - throw new AssertionError(file); - ClassSymbol cs; - // TODO: for now, we assume that generated code is in a default module; - // in time, we need a way to be able to specify the module for generated code - if (isPkgInfo(file, JavaFileObject.Kind.CLASS)) { - Name packageName = Convert.packagePart(name); - PackageSymbol p = symtab.enterPackage(defaultModule, packageName); - if (p.package_info == null) - p.package_info = symtab.enterClass(defaultModule, Convert.shortName(name), p); - cs = p.package_info; - cs.reset(); - if (cs.classfile == null) + for (Entry> moduleAndClassFiles : modulesAndClassFiles.entrySet()) { + for (Map.Entry entry : moduleAndClassFiles.getValue().entrySet()) { + Name name = names.fromString(entry.getKey()); + JavaFileObject file = entry.getValue(); + if (file.getKind() != JavaFileObject.Kind.CLASS) + throw new AssertionError(file); + ClassSymbol cs; + if (isPkgInfo(file, JavaFileObject.Kind.CLASS)) { + Name packageName = Convert.packagePart(name); + PackageSymbol p = symtab.enterPackage(moduleAndClassFiles.getKey(), packageName); + if (p.package_info == null) + p.package_info = symtab.enterClass(moduleAndClassFiles.getKey(), Convert.shortName(name), p); + cs = p.package_info; + cs.reset(); + if (cs.classfile == null) + cs.classfile = file; + cs.completer = initialCompleter; + } else { + cs = symtab.enterClass(moduleAndClassFiles.getKey(), name); + cs.reset(); cs.classfile = file; - cs.completer = initialCompleter; - } else { - cs = symtab.enterClass(defaultModule, name); - cs.reset(); - cs.classfile = file; - cs.completer = initialCompleter; - cs.owner.members().enter(cs); //XXX - OverwriteBetweenCompilations; syms.getClass is not sufficient anymore + cs.completer = initialCompleter; + cs.owner.members().enter(cs); //XXX - OverwriteBetweenCompilations; syms.getClass is not sufficient anymore + } + list = list.prepend(cs); } - list = list.prepend(cs); } return list.reverse(); } /** Enter a set of syntax trees. */ private void enterTrees(List roots) { - compiler.enterTrees(compiler.initModules(roots)); + compiler.enterTrees(roots); } /** Run a processing round. */ @@ -1179,7 +1196,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea JavacProcessingEnvironment.this); discoveredProcs.iterator().runContributingProcs(renv); } else { - discoverAndRunProcs(annotationsPresent, topLevelClasses, packageInfoFiles); + discoverAndRunProcs(annotationsPresent, topLevelClasses, packageInfoFiles, moduleInfoFiles); } } catch (Throwable t) { // we're specifically expecting Abort here, but if any Throwable @@ -1209,8 +1226,8 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea /** Print info about this round. */ private void printRoundInfo(boolean lastRound) { if (printRounds || verbose) { - List tlc = lastRound ? List.nil() : topLevelClasses; - Set ap = lastRound ? Collections.emptySet() : annotationsPresent; + List tlc = lastRound ? List.nil() : topLevelClasses; + Set ap = lastRound ? Collections.emptySet() : annotationsPresent; log.printLines("x.print.rounds", number, "{" + tlc.toString(", ") + "}", @@ -1346,15 +1363,15 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea // Free resources this.close(); - if (!taskListener.isEmpty()) - taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING)); - if (errorStatus && compiler.errorCount() == 0) { compiler.log.nerrors++; } compiler.enterTreesIfNeeded(roots); + if (!taskListener.isEmpty()) + taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING)); + return true; } @@ -1418,6 +1435,18 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea return packages.reverse(); } + private List getModuleInfoFiles(List units) { + List modules = List.nil(); + for (JCCompilationUnit unit : units) { + if (isModuleInfo(unit.sourcefile, JavaFileObject.Kind.SOURCE) && + unit.defs.nonEmpty() && + unit.defs.head.hasTag(Tag.MODULEDEF)) { + modules = modules.prepend(unit.modle); + } + } + return modules.reverse(); + } + // avoid unchecked warning from use of varargs private static List join(List list1, List list2) { return list1.appendList(list2); @@ -1431,6 +1460,10 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea return isPkgInfo(sym.classfile, JavaFileObject.Kind.CLASS) && (sym.packge().package_info == sym); } + private boolean isModuleInfo(JavaFileObject fo, JavaFileObject.Kind kind) { + return fo.isNameCompatible("module-info", kind); + } + /* * Called retroactively to determine if a class loader was required, * after we have failed to create one. @@ -1625,8 +1658,21 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea * import-style string, return a regex that won't match anything. */ private static Pattern importStringToPattern(String s, Processor p, Log log) { - if (MatchingUtils.isValidImportString(s)) { - return MatchingUtils.validImportStringToPattern(s); + String module; + String pkg; + int slash = s.indexOf('/'); + if (slash == (-1)) { + if (s.equals("*")) { + return MatchingUtils.validImportStringToPattern(s); + } + module = ".*/"; + pkg = s; + } else { + module = Pattern.quote(s.substring(0, slash + 1)); + pkg = s.substring(slash + 1); + } + if (MatchingUtils.isValidImportString(pkg)) { + return Pattern.compile(module + MatchingUtils.validImportStringToPatternString(pkg)); } else { log.warning("proc.malformed.supported.string", s, p.getClass().getName()); return noMatches; // won't match any valid identifier diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties index 34bf24d5eda..7daeb354da9 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -1457,6 +1457,10 @@ compiler.warn.dir.path.element.not.directory=\ compiler.warn.finally.cannot.complete=\ finally clause cannot complete normally +# 0: name +compiler.warn.poor.choice.for.module.name=\ + module name {0} should avoid terminal digits + # 0: symbol, 1: symbol compiler.warn.has.been.deprecated=\ {0} in {1} has been deprecated @@ -1693,6 +1697,9 @@ compiler.warn.missing.deprecated.annotation=\ compiler.warn.deprecated.annotation.has.no.effect=\ @Deprecated annotation has no effect on this {0} declaration +compiler.warn.invalid.path=\ + Invalid filename: {0} + compiler.warn.invalid.archive.file=\ Unexpected file on path: {0} @@ -2749,6 +2756,10 @@ compiler.err.expected.module=\ compiler.err.module.not.found=\ module not found: {0} +# 0: symbol +compiler.warn.module.not.found=\ + module not found: {0} + compiler.err.too.many.modules=\ too many module declarations found diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties index 6acb5db137d..2a461a3e600 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties @@ -201,6 +201,9 @@ javac.opt.Xlint.desc.fallthrough=\ javac.opt.Xlint.desc.finally=\ Warn about finally clauses that do not terminate normally. +javac.opt.Xlint.desc.module=\ + Warn about module system related issues. + javac.opt.Xlint.desc.options=\ Warn about issues relating to use of command line options. @@ -263,9 +266,9 @@ javac.opt.Xdoclint.package.desc=\ javac.opt.Xstdout=\ Redirect standard output javac.opt.X=\ - Print a synopsis of nonstandard options + Print help on extra options javac.opt.help=\ - Print a synopsis of standard options + Print this help message javac.opt.print=\ Print out a textual representation of specified types javac.opt.printRounds=\ @@ -308,6 +311,10 @@ javac.opt.limitmods=\ Limit the universe of observable modules javac.opt.arg.limitmods=\ (,)* +javac.opt.module.version=\ + Specify version of modules that are being compiled +javac.opt.arg.module.version=\ + javac.opt.inherit_runtime_environment=\ Inherit module system configuration options from the runtime environment. @@ -375,7 +382,7 @@ javac.msg.usage=\ use --help for a list of possible options javac.msg.usage.nonstandard.footer=\ -These options are non-standard and subject to change without notice. +These extra options are subject to change without notice. javac.msg.bug=\ An exception has occurred in the compiler ({0}). \ diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java index 20b82a675ca..7bfb45bcadb 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java @@ -574,6 +574,36 @@ public abstract class DCTree implements DocTree { } } + public static class DCProvides extends DCBlockTag implements ProvidesTree { + public final DCReference serviceType; + public final List description; + + DCProvides(DCReference serviceType, List description) { + this.serviceType = serviceType; + this.description = description; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public Kind getKind() { + return Kind.PROVIDES; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public R accept(DocTreeVisitor v, D d) { + return v.visitProvides(this, d); + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public ReferenceTree getServiceType() { + return serviceType; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public List getDescription() { + return description; + } + } + public static class DCReference extends DCEndPosTree implements ReferenceTree { public final String signature; @@ -912,6 +942,36 @@ public abstract class DCTree implements DocTree { } } + public static class DCUses extends DCBlockTag implements UsesTree { + public final DCReference serviceType; + public final List description; + + DCUses(DCReference serviceType, List description) { + this.serviceType = serviceType; + this.description = description; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public Kind getKind() { + return Kind.USES; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public R accept(DocTreeVisitor v, D d) { + return v.visitUses(this, d); + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public ReferenceTree getServiceType() { + return serviceType; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public List getDescription() { + return description; + } + } + public static class DCValue extends DCInlineTag implements ValueTree { public final DCReference ref; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java index 56c9c580bbc..5ea0c58e44f 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java @@ -129,8 +129,7 @@ public class DocPretty implements DocTreeVisitor { } } - - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitAttribute(AttributeTree node, Void p) { try { print(node.getName()); @@ -162,7 +161,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitAuthor(AuthorTree node, Void p) { try { printTagName(node); @@ -174,7 +173,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitComment(CommentTree node, Void p) { try { print(node.getBody()); @@ -184,7 +183,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitDeprecated(DeprecatedTree node, Void p) { try { printTagName(node); @@ -198,7 +197,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitDocComment(DocCommentTree node, Void p) { try { List b = node.getFullBody(); @@ -213,7 +212,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitDocRoot(DocRootTree node, Void p) { try { print("{"); @@ -225,7 +224,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitEndElement(EndElementTree node, Void p) { try { print(" { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitEntity(EntityTree node, Void p) { try { print("&"); @@ -249,7 +248,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitErroneous(ErroneousTree node, Void p) { try { print(node.getBody()); @@ -259,7 +258,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitHidden(HiddenTree node, Void p) { try { printTagName(node); @@ -273,7 +272,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitIdentifier(IdentifierTree node, Void p) { try { print(node.getName()); @@ -283,7 +282,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitIndex(IndexTree node, Void p) { try { print("{"); @@ -301,7 +300,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitInheritDoc(InheritDocTree node, Void p) { try { print("{"); @@ -313,7 +312,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitLink(LinkTree node, Void p) { try { print("{"); @@ -331,7 +330,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitLiteral(LiteralTree node, Void p) { try { print("{"); @@ -348,7 +347,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitParam(ParamTree node, Void p) { try { printTagName(node); @@ -366,7 +365,23 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) + public Void visitProvides(ProvidesTree node, Void p) { + try { + printTagName(node); + print(" "); + print(node.getServiceType()); + if (!node.getDescription().isEmpty()) { + print(" "); + print(node.getDescription()); + } + } catch (IOException e) { + throw new UncheckedIOException(e); + } + return null; + } + + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitReference(ReferenceTree node, Void p) { try { print(node.getSignature()); @@ -376,7 +391,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitReturn(ReturnTree node, Void p) { try { printTagName(node); @@ -388,7 +403,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitSee(SeeTree node, Void p) { try { printTagName(node); @@ -406,7 +421,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitSerial(SerialTree node, Void p) { try { printTagName(node); @@ -420,7 +435,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitSerialData(SerialDataTree node, Void p) { try { printTagName(node); @@ -434,7 +449,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitSerialField(SerialFieldTree node, Void p) { try { printTagName(node); @@ -452,7 +467,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitSince(SinceTree node, Void p) { try { printTagName(node); @@ -464,7 +479,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitStartElement(StartElementTree node, Void p) { try { print("<"); @@ -487,7 +502,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitText(TextTree node, Void p) { try { print(node.getBody()); @@ -497,7 +512,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitThrows(ThrowsTree node, Void p) { try { printTagName(node); @@ -513,7 +528,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitUnknownBlockTag(UnknownBlockTagTree node, Void p) { try { print("@"); @@ -526,7 +541,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitUnknownInlineTag(UnknownInlineTagTree node, Void p) { try { print("{"); @@ -541,7 +556,23 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) + public Void visitUses(UsesTree node, Void p) { + try { + printTagName(node); + print(" "); + print(node.getServiceType()); + if (!node.getDescription().isEmpty()) { + print(" "); + print(node.getDescription()); + } + } catch (IOException e) { + throw new UncheckedIOException(e); + } + return null; + } + + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitValue(ValueTree node, Void p) { try { print("{"); @@ -557,7 +588,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitVersion(VersionTree node, Void p) { try { printTagName(node); @@ -569,7 +600,7 @@ public class DocPretty implements DocTreeVisitor { return null; } - @DefinedBy(Api.COMPILER_TREE) + @Override @DefinedBy(Api.COMPILER_TREE) public Void visitOther(DocTree node, Void p) { try { print("(UNKNOWN: " + node + ")"); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java index b7b6c1267b8..b9e03a07945 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java @@ -44,6 +44,8 @@ import com.sun.source.doctree.IdentifierTree; import com.sun.source.doctree.ReferenceTree; import com.sun.source.doctree.StartElementTree; import com.sun.source.doctree.TextTree; +import com.sun.source.doctree.ProvidesTree; +import com.sun.source.doctree.UsesTree; import com.sun.source.util.DocTreeFactory; import com.sun.tools.doclint.HtmlTag; import com.sun.tools.javac.api.JavacTrees; @@ -67,6 +69,7 @@ import com.sun.tools.javac.tree.DCTree.DCInheritDoc; import com.sun.tools.javac.tree.DCTree.DCLink; import com.sun.tools.javac.tree.DCTree.DCLiteral; import com.sun.tools.javac.tree.DCTree.DCParam; +import com.sun.tools.javac.tree.DCTree.DCProvides; import com.sun.tools.javac.tree.DCTree.DCReference; import com.sun.tools.javac.tree.DCTree.DCReturn; import com.sun.tools.javac.tree.DCTree.DCSee; @@ -79,6 +82,7 @@ import com.sun.tools.javac.tree.DCTree.DCText; import com.sun.tools.javac.tree.DCTree.DCThrows; import com.sun.tools.javac.tree.DCTree.DCUnknownBlockTag; import com.sun.tools.javac.tree.DCTree.DCUnknownInlineTag; +import com.sun.tools.javac.tree.DCTree.DCUses; import com.sun.tools.javac.tree.DCTree.DCValue; import com.sun.tools.javac.tree.DCTree.DCVersion; import com.sun.tools.javac.util.Context; @@ -333,6 +337,13 @@ public class DocTreeMaker implements DocTreeFactory { return tree; } + @Override @DefinedBy(Api.COMPILER_TREE) + public DCProvides newProvidesTree(ReferenceTree name, List description) { + DCProvides tree = new DCProvides((DCReference) name, cast(description)); + tree.pos = pos; + return tree; + } + @Override @DefinedBy(Api.COMPILER_TREE) public DCReference newReferenceTree(String signature) { try { @@ -429,6 +440,13 @@ public class DocTreeMaker implements DocTreeFactory { return tree; } + @Override @DefinedBy(Api.COMPILER_TREE) + public DCUses newUsesTree(ReferenceTree name, List description) { + DCUses tree = new DCUses((DCReference) name, cast(description)); + tree.pos = pos; + return tree; + } + @Override @DefinedBy(Api.COMPILER_TREE) public DCValue newValueTree(ReferenceTree ref) { // TODO: verify the reference is to a constant value diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java index 9efc014582a..3cccddc6c66 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -551,7 +551,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { @DefinedBy(Api.COMPILER_TREE) public List getPackageAnnotations() { JCPackageDecl pd = getPackage(); - return pd != null ? pd.getAnnotations() : List.nil(); + return pd != null ? pd.getAnnotations() : List.nil(); } @DefinedBy(Api.COMPILER_TREE) public ExpressionTree getPackageName() { @@ -1619,7 +1619,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { JCExpression meth, List args) { - this.typeargs = (typeargs == null) ? List.nil() + this.typeargs = (typeargs == null) ? List.nil() : typeargs; this.meth = meth; this.args = args; @@ -1673,7 +1673,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { JCClassDecl def) { this.encl = encl; - this.typeargs = (typeargs == null) ? List.nil() + this.typeargs = (typeargs == null) ? List.nil() : typeargs; this.clazz = clazz; this.args = args; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java index 23fdbbeb164..976c7a01b99 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java @@ -462,11 +462,22 @@ public class Pretty extends JCTree.Visitor { @Override public void visitExports(JCExports tree) { try { - if (tree.hasTag(EXPORTS)) { - print("exports "); - } else { - print("opens "); + print("exports "); + printExpr(tree.qualid); + if (tree.moduleNames != null) { + print(" to "); + printExprs(tree.moduleNames); } + print(";"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @Override + public void visitOpens(JCOpens tree) { + try { + print("opens "); printExpr(tree.qualid); if (tree.moduleNames != null) { print(" to "); @@ -1493,7 +1504,7 @@ public class Pretty extends JCTree.Visitor { public void visitTree(JCTree tree) { try { - print("(UNKNOWN: " + tree + ")"); + print("(UNKNOWN: " + tree.getTag() + ")"); println(); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java index 83e3d5fc0de..4a35c665656 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java @@ -285,7 +285,7 @@ public class TreeMaker implements JCTree.Factory { } public JCTry Try(JCBlock body, List catchers, JCBlock finalizer) { - return Try(List.nil(), body, catchers, finalizer); + return Try(List.nil(), body, catchers, finalizer); } public JCTry Try(List resources, @@ -495,7 +495,7 @@ public class TreeMaker implements JCTree.Factory { } public JCTypeParameter TypeParameter(Name name, List bounds) { - return TypeParameter(name, bounds, List.nil()); + return TypeParameter(name, bounds, List.nil()); } public JCTypeParameter TypeParameter(Name name, List bounds, List annos) { @@ -536,7 +536,7 @@ public class TreeMaker implements JCTree.Factory { } public JCModifiers Modifiers(long flags) { - return Modifiers(flags, List.nil()); + return Modifiers(flags, List.nil()); } @Override @@ -589,7 +589,7 @@ public class TreeMaker implements JCTree.Factory { } public JCErroneous Erroneous() { - return Erroneous(List.nil()); + return Erroneous(List.nil()); } public JCErroneous Erroneous(List errs) { @@ -613,9 +613,9 @@ public class TreeMaker implements JCTree.Factory { { return ClassDef(mods, names.empty, - List.nil(), + List.nil(), null, - List.nil(), + List.nil(), defs); } @@ -714,7 +714,7 @@ public class TreeMaker implements JCTree.Factory { * Create a no-arg method invocation from a method tree */ public JCMethodInvocation App(JCExpression meth) { - return Apply(null, meth, List.nil()).setType(meth.type.getReturnType()); + return Apply(null, meth, List.nil()).setType(meth.type.getReturnType()); } /** Create a method invocation from a method tree and a list of argument trees. @@ -903,7 +903,7 @@ public class TreeMaker implements JCTree.Factory { ListBuffer elems = new ListBuffer<>(); for (int i = 0; i < array.values.length; i++) elems.append(translate(array.values[i])); - result = NewArray(null, List.nil(), elems.toList()).setType(array.type); + result = NewArray(null, List.nil(), elems.toList()).setType(array.type); } JCExpression translate(Attribute a) { a.accept(this); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java index fb03e2ae1dd..e3e6491da32 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Context.java @@ -158,7 +158,7 @@ public class Context { * Since we found a key of type Key, the value must * be of type T. */ - return Context.uncheckedCast(o); + return Context.uncheckedCast(o); } public Context() {} diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java index 52dfe84660b..4fbc8ee8e83 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java @@ -73,11 +73,7 @@ public class JCDiagnostic implements Diagnostic { final Options options = Options.instance(context); initOptions(options); - options.addListener(new Runnable() { - public void run() { - initOptions(options); - } - }); + options.addListener(() -> initOptions(options)); } private void initOptions(Options options) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java index a0656ceb4d9..fe28731f9ca 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java @@ -85,6 +85,58 @@ public class JDK9Wrappers { } } + /** + * Wrapper class for java.lang.module.ModuleDescriptor and ModuleDescriptor.Version. + */ + public static class ModuleDescriptor { + public static class Version { + public static final String CLASSNAME = "java.lang.module.ModuleDescriptor$Version"; + private final Object theRealVersion; + + private Version(Object version) { + this.theRealVersion = version; + } + + public static Version parse(String v) { + try { + init(); + Object result = parseMethod.invoke(null, v); + Version version = new Version(result); + return version; + } catch (InvocationTargetException ex) { + if (ex.getCause() instanceof IllegalArgumentException) { + throw (IllegalArgumentException) ex.getCause(); + } else { + throw new Abort(ex); + } + } catch (IllegalAccessException | IllegalArgumentException | SecurityException ex) { + throw new Abort(ex); + } + } + + @Override + public String toString() { + return theRealVersion.toString(); + } + + // ----------------------------------------------------------------------------------------- + + private static Class versionClass = null; + private static Method parseMethod = null; + + private static void init() { + if (versionClass == null) { + try { + versionClass = Class.forName(CLASSNAME, false, null); + parseMethod = versionClass.getDeclaredMethod("parse", String.class); + } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { + throw new Abort(ex); + } + } + } + } + } + /** * Wrapper class for java.lang.module.ModuleFinder. */ @@ -338,7 +390,7 @@ public class JDK9Wrappers { * Helper class for new method in jdk.internal.misc.VM. */ public static final class VMHelper { - public static final String VM_CLASSNAME = "jdk.internal.misc.VM"; + public static final String CLASSNAME = "jdk.internal.misc.VM"; @SuppressWarnings("unchecked") public static String[] getRuntimeArguments() { @@ -360,7 +412,7 @@ public class JDK9Wrappers { private static void init() { if (vmClass == null) { try { - vmClass = Class.forName(VM_CLASSNAME, false, null); + vmClass = Class.forName(CLASSNAME, false, null); getRuntimeArgumentsMethod = vmClass.getDeclaredMethod("getRuntimeArguments"); } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) { throw new Abort(ex); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java index 4235761a061..9c9bfe8ac27 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java @@ -134,7 +134,7 @@ public class List extends AbstractCollection implements java.util.List /** Construct a list consisting of given element. */ public static List of(A x1) { - return new List<>(x1, List.nil()); + return new List<>(x1, List.nil()); } /** Construct a list consisting of given elements. @@ -557,8 +557,8 @@ public class List extends AbstractCollection implements java.util.List */ public static Collector, List> collector() { return Collector.of(ListBuffer::new, - (buf, el)->buf.add(el), + ListBuffer::add, (buf1, buf2)-> { buf1.addAll(buf2); return buf1; }, - buf->buf.toList()); + ListBuffer::toList); } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java index 5f823a0d14f..38ff9683bcb 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ListBuffer.java @@ -103,10 +103,10 @@ public class ListBuffer extends AbstractQueue { if (elems.nonEmpty()) { List orig = elems; - elems = last = List.of(orig.head); + elems = last = List.of(orig.head); while ((orig = orig.tail).nonEmpty()) { - last.tail = List.of(orig.head); + last.tail = List.of(orig.head); last = last.tail; } } @@ -126,7 +126,7 @@ public class ListBuffer extends AbstractQueue { public ListBuffer append(A x) { Assert.checkNonNull(x); if (shared) copy(); - List newLast = List.of(x); + List newLast = List.of(x); if (last != null) { last.tail = newLast; last = newLast; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java index 4bc2403fd93..0f4213e0e50 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java @@ -364,12 +364,7 @@ public class Log extends AbstractLog { final Options options = Options.instance(context); initOptions(options); - options.addListener(new Runnable() { - @Override - public void run() { - initOptions(options); - } - }); + options.addListener(() -> initOptions(options)); } // where private void initOptions(Options options) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java index e8d930dcf24..cc3dceef229 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MatchingUtils.java @@ -36,7 +36,9 @@ import javax.lang.model.SourceVersion; * deletion without notice. */ public class MatchingUtils { - private static final Pattern allMatches = Pattern.compile(".*"); + + private static final String allMatchesString = ".*"; + private static final Pattern allMatches = Pattern.compile(allMatchesString); /** * Return true if the argument string is a valid import-style @@ -72,9 +74,9 @@ public class MatchingUtils { return valid; } - public static Pattern validImportStringToPattern(String s) { + public static String validImportStringToPatternString(String s) { if (s.equals("*")) { - return allMatches; + return allMatchesString; } else { String s_prime = s.replace(".", "\\."); @@ -82,7 +84,17 @@ public class MatchingUtils { s_prime = s_prime.substring(0, s_prime.length() - 1) + ".+"; } - return Pattern.compile(s_prime); + return s_prime; + } + } + + public static Pattern validImportStringToPattern(String s) { + String pattern = validImportStringToPatternString(s); + + if (pattern == allMatchesString) { + return allMatches; + } else { + return Pattern.compile(pattern); } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java index 3ac63d5953e..afd3112693e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java @@ -150,7 +150,7 @@ public class Names { public final Name LocalVariableTypeTable; public final Name MethodParameters; public final Name Module; - public final Name ModuleVersion; + public final Name ModuleResolution; public final Name RuntimeInvisibleAnnotations; public final Name RuntimeInvisibleParameterAnnotations; public final Name RuntimeInvisibleTypeAnnotations; @@ -312,7 +312,7 @@ public class Names { LocalVariableTypeTable = fromString("LocalVariableTypeTable"); MethodParameters = fromString("MethodParameters"); Module = fromString("Module"); - ModuleVersion = fromString("ModuleVersion"); + ModuleResolution = fromString("ModuleResolution"); RuntimeInvisibleAnnotations = fromString("RuntimeInvisibleAnnotations"); RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations"); RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations"); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java index 68eba0a0196..0a0dd4db0f9 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java @@ -556,7 +556,7 @@ public class RichDiagnosticFormatter extends List bounds = (bound != null) && (bound.hasTag(CLASS) || bound.hasTag(TYPEVAR)) ? types.getBounds(t) : - List.nil(); + List.nil(); nameSimplifier.addUsage(t.tsym); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java index 35377be2048..f8c13833fbe 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java @@ -310,15 +310,12 @@ public class JavahTask implements NativeHeaderTool.NativeHeaderTask { private DiagnosticListener getDiagnosticListenerForWriter(Writer w) { final PrintWriter pw = getPrintWriterForWriter(w); - return new DiagnosticListener () { - @DefinedBy(Api.COMPILER) - public void report(Diagnostic diagnostic) { - if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { - pw.print(getMessage("err.prefix")); - pw.print(" "); - } - pw.println(diagnostic.getMessage(null)); + return diagnostic -> { + if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { + pw.print(getMessage("err.prefix")); + pw.print(" "); } + pw.println(diagnostic.getMessage(null)); }; } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java index 18a079dad9d..e565b7e8dc6 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java @@ -222,7 +222,7 @@ public class CompileJavaPackages implements Transformer { CompilationSubResult result = sjavac.compile("n/a", chunkId, args.prepJavacArgs(), - Collections.emptyList(), + Collections.emptyList(), cc.srcs, visibleSources); synchronized (lock) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java index af44dc3950b..0370eb21de7 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java @@ -487,7 +487,7 @@ public class JavacState { Set deps = pkg.typeDependencies() .values() .stream() - .flatMap(s -> s.stream()) + .flatMap(Collection::stream) .collect(Collectors.toSet()); for (String dep : deps) { String depPkg = ":" + dep.substring(0, dep.lastIndexOf('.')); diff --git a/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java b/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java index 81aa169e10e..bb9a5a4b3b7 100644 --- a/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java +++ b/langtools/src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java @@ -53,6 +53,7 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; import javax.lang.model.util.ElementFilter; import javax.tools.JavaCompiler; import javax.tools.JavaFileManager; @@ -240,7 +241,7 @@ public abstract class JavadocHelper implements AutoCloseable { List throwsList = executableElement.getThrownTypes() .stream() - .map(exc -> exc.toString()) + .map(TypeMirror::toString) .collect(Collectors.toList()); Set missingParams = new HashSet<>(parameters); Set missingThrows = new HashSet<>(throwsList); diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java index d520cca4c78..51dcae9bfa7 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java @@ -37,7 +37,7 @@ import com.sun.tools.doclets.internal.toolkit.Content; */ @Deprecated public class ContentBuilder extends Content { - protected List contents = Collections.emptyList(); + protected List contents = Collections.emptyList(); @Override public void addContent(Content content) { diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java index b6aefd9067e..ab60fc73208 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java @@ -45,7 +45,7 @@ import com.sun.tools.doclets.internal.toolkit.util.*; @Deprecated public class HtmlDocument extends Content { - private List docContent = Collections.emptyList(); + private List docContent = Collections.emptyList(); /** * Constructor to construct an HTML document. diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java index 83d680c9822..f2aa755337e 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java @@ -48,8 +48,8 @@ import com.sun.tools.doclets.formats.html.markup.HtmlAttr.Role; public class HtmlTree extends Content { private HtmlTag htmlTag; - private Map attrs = Collections.emptyMap(); - private List content = Collections.emptyList(); + private Map attrs = Collections.emptyMap(); + private List content = Collections.emptyList(); public static final Content EMPTY = new StringContent(""); /** diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java index b776c36b11d..8e513bb4999 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java @@ -31,6 +31,7 @@ import javax.tools.JavaFileObject; import com.sun.tools.javac.code.Symbol.PackageSymbol; import com.sun.tools.javac.code.ClassFinder; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Context.Factory; /** Javadoc uses an extended class finder that records package.html entries * @@ -52,11 +53,7 @@ public class JavadocClassFinder extends ClassFinder { } public static void preRegister(Context context) { - context.put(classFinderKey, new Context.Factory() { - public ClassFinder make(Context c) { - return new JavadocClassFinder(c); - } - }); + context.put(classFinderKey, (Factory)JavadocClassFinder::new); } private DocEnv docenv; diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java index 56940b2973c..1456b981186 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java @@ -58,11 +58,7 @@ public class JavadocEnter extends Enter { } public static void preRegister(Context context) { - context.put(enterKey, new Context.Factory() { - public Enter make(Context c) { - return new JavadocEnter(c); - } - }); + context.put(enterKey, (Context.Factory)JavadocEnter::new); } protected JavadocEnter(Context context) { diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java index 96f647b230b..fa63382c6a8 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java @@ -57,11 +57,7 @@ public class JavadocMemberEnter extends MemberEnter { } public static void preRegister(Context context) { - context.put(memberEnterKey, new Context.Factory() { - public MemberEnter make(Context c) { - return new JavadocMemberEnter(c); - } - }); + context.put(memberEnterKey, (Context.Factory)JavadocMemberEnter::new); } final DocEnv docenv; diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java index 0094ddd9679..31c4a4423c2 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java @@ -27,6 +27,7 @@ package com.sun.tools.javadoc.main; import com.sun.tools.javac.comp.*; import com.sun.tools.javac.util.*; +import com.sun.tools.javac.util.Context.Factory; /** * Javadoc's own todo queue doesn't queue its inputs, as javadoc @@ -42,11 +43,7 @@ import com.sun.tools.javac.util.*; @Deprecated public class JavadocTodo extends Todo { public static void preRegister(Context context) { - context.put(todoKey, new Context.Factory() { - public Todo make(Context c) { - return new JavadocTodo(c); - } - }); + context.put(todoKey, (Factory)JavadocTodo::new); } protected JavadocTodo(Context context) { diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java index f996c3d6e32..dbb57a8b705 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java @@ -31,6 +31,7 @@ import java.util.ResourceBundle; import com.sun.javadoc.*; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Context.Factory; import com.sun.tools.javac.util.JCDiagnostic; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType; import com.sun.tools.javac.util.JavacMessages; @@ -66,27 +67,18 @@ public class Messager extends Log implements DocErrorReporter { public static void preRegister(Context context, final String programName) { - context.put(logKey, new Context.Factory() { - public Log make(Context c) { - return new Messager(c, - programName); - } - }); + context.put(logKey, (Factory)c -> new Messager(c, programName)); } public static void preRegister(Context context, final String programName, final PrintWriter errWriter, final PrintWriter warnWriter, final PrintWriter noticeWriter) { - context.put(logKey, new Context.Factory() { - public Log make(Context c) { - return new Messager(c, - programName, - errWriter, - warnWriter, - noticeWriter); - } - }); + context.put(logKey, (Factory)c -> new Messager(c, + programName, + errWriter, + warnWriter, + noticeWriter)); } public class ExitJavadoc extends Error { diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java index 67229002c03..86bf750fc8e 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java @@ -221,7 +221,7 @@ public class Start extends ToolOption.Helper { * Main program - external wrapper */ public int begin(String... argv) { - boolean ok = begin(null, argv, Collections. emptySet()); + boolean ok = begin(null, argv, Collections.emptySet()); return ok ? 0 : 1; } diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java index 790216a042a..17e878650c6 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java @@ -128,13 +128,13 @@ public class WildcardTypeImpl extends AbstractTypeImpl implements WildcardType { private static List getExtendsBounds(Type.WildcardType wild) { return wild.isSuperBound() - ? List.nil() + ? List.nil() : List.of(wild.type); } private static List getSuperBounds(Type.WildcardType wild) { return wild.isExtendsBound() - ? List.nil() + ? List.nil() : List.of(wild.type); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java index d7cb90d0d5a..42622c35630 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java @@ -59,9 +59,9 @@ public class JavadocTaskImpl implements DocumentationTask { this.context = context; this.docletClass = docletClass; - this.options = (options == null) ? Collections.emptySet() + this.options = (options == null) ? Collections.emptySet() : nullCheck(options); - this.fileObjects = (fileObjects == null) ? Collections.emptySet() + this.fileObjects = (fileObjects == null) ? Collections.emptySet() : nullCheck(fileObjects); setLocale(Locale.getDefault()); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java index 26e6b1f35fb..e9ab04c74d9 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java @@ -360,7 +360,7 @@ public class AbstractIndexWriter extends HtmlDocletWriter { */ protected void addComment(Element element, Content contentTree) { List tags; - Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element)); HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.block); if (utils.isDeprecated(element)) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java index b671ed16c3b..3eefd0c0c48 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java @@ -36,7 +36,6 @@ import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.TypeMirror; import com.sun.source.doctree.DocTree; - import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; @@ -258,7 +257,7 @@ public abstract class AbstractMemberWriter { } } if (!set.isEmpty()) { - String mods = set.stream().map(m -> m.toString()).collect(Collectors.joining(" ")); + String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" ")); htmltree.addContent(mods); htmltree.addContent(Contents.SPACE); } @@ -404,46 +403,6 @@ public abstract class AbstractMemberWriter { ped.getEnclosingElement().equals(ped.getEnclosingElement()))); } - /** - * Add deprecated information to the documentation tree - * - * @param deprmembers list of deprecated members - * @param headingKey the caption for the deprecated members table - * @param tableSummary the summary for the deprecated members table - * @param tableHeader table headers for the deprecated members table - * @param contentTree the content tree to which the deprecated members table will be added - */ - protected void addDeprecatedAPI(Collection deprmembers, String headingKey, - String tableSummary, List tableHeader, Content contentTree) { - if (deprmembers.size() > 0) { - Content caption = writer.getTableCaption(configuration.getContent(headingKey)); - Content table = (configuration.isOutputHtml5()) - ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) - : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption); - table.addContent(writer.getSummaryTableHeader(tableHeader, "col")); - Content tbody = new HtmlTree(HtmlTag.TBODY); - boolean altColor = true; - for (Element member : deprmembers) { - HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getDeprecatedLink(member)); - HtmlTree tr = HtmlTree.TR(thRow); - HtmlTree td = new HtmlTree(HtmlTag.TD); - td.addStyle(HtmlStyle.colLast); - List deprTrees = utils.getBlockTags(member, DocTree.Kind.DEPRECATED); - if (!deprTrees.isEmpty()) { - writer.addInlineDeprecatedComment(member, deprTrees.get(0), td); - } - tr.addContent(td); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - altColor = !altColor; - tbody.addContent(tr); - } - table.addContent(tbody); - Content li = HtmlTree.LI(HtmlStyle.blockList, table); - Content ul = HtmlTree.UL(HtmlStyle.blockList, li); - contentTree.addContent(ul); - } - } - /** * Add use information to the documentation tree. * @@ -574,19 +533,19 @@ public abstract class AbstractMemberWriter { writer.addSummaryLinkComment(this, member, firstSentenceTags, tdDesc); tr.addContent(tdDesc); if (utils.isMethod(member) && !utils.isAnnotationType(member)) { - int methodType = utils.isStatic(member) ? MethodTypes.STATIC.value() : - MethodTypes.INSTANCE.value(); + int methodType = utils.isStatic(member) ? MethodTypes.STATIC.tableTabs().value() : + MethodTypes.INSTANCE.tableTabs().value(); if (utils.isInterface(member.getEnclosingElement())) { methodType = utils.isAbstract(member) - ? methodType | MethodTypes.ABSTRACT.value() - : methodType | MethodTypes.DEFAULT.value(); + ? methodType | MethodTypes.ABSTRACT.tableTabs().value() + : methodType | MethodTypes.DEFAULT.tableTabs().value(); } else { methodType = utils.isAbstract(member) - ? methodType | MethodTypes.ABSTRACT.value() - : methodType | MethodTypes.CONCRETE.value(); + ? methodType | MethodTypes.ABSTRACT.tableTabs().value() + : methodType | MethodTypes.CONCRETE.tableTabs().value(); } if (utils.isDeprecated(member) || utils.isDeprecated(typeElement)) { - methodType = methodType | MethodTypes.DEPRECATED.value(); + methodType = methodType | MethodTypes.DEPRECATED.tableTabs().value(); } methodTypesOr = methodTypesOr | methodType; String tableId = "i" + counter; @@ -609,7 +568,7 @@ public abstract class AbstractMemberWriter { public boolean showTabs() { int value; for (MethodTypes type : EnumSet.allOf(MethodTypes.class)) { - value = type.value(); + value = type.tableTabs().value(); if ((value & methodTypesOr) == value) { methodTypes.add(type); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java index 96b985ffa12..5be296e2dd1 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java @@ -317,7 +317,7 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter List deprs = utils.getBlockTags(annotationType, DocTree.Kind.DEPRECATED); if (utils.isDeprecated(annotationType)) { CommentHelper ch = utils.getCommentHelper(annotationType); - Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(annotationType)); Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); if (!deprs.isEmpty()) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java index a5b95ff2731..85b2f3f2133 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java @@ -203,8 +203,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA); HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.header); - ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement); if (configuration.showModules) { + ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement); Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, contents.moduleLabel); Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel); moduleNameDiv.addContent(Contents.SPACE); @@ -610,7 +610,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite classInfoTree.addContent(hr); List deprs = utils.getBlockTags(typeElement, DocTree.Kind.DEPRECATED); if (utils.isDeprecated(typeElement)) { - Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(typeElement)); Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel); if (!deprs.isEmpty()) { CommentHelper ch = utils.getCommentHelper(typeElement); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java index 386c55d6eb3..0ed12a6216b 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java @@ -73,6 +73,7 @@ public class Contents { public final Content deprecatedAPI; public final Content deprecatedLabel; public final Content deprecatedPhrase; + public final Content deprecatedForRemovalPhrase; public final Content descfrmClassLabel; public final Content descfrmInterfaceLabel; public final Content descriptionLabel; @@ -186,6 +187,7 @@ public class Contents { deprecatedAPI = getContent("doclet.Deprecated_API"); deprecatedLabel = getContent("doclet.navDeprecated"); deprecatedPhrase = getContent("doclet.Deprecated"); + deprecatedForRemovalPhrase = getContent("doclet.DeprecatedForRemoval"); descfrmClassLabel = getContent("doclet.Description_From_Class"); descfrmInterfaceLabel = getContent("doclet.Description_From_Interface"); descriptionLabel = getContent("doclet.Description"); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java index 905b0806ba3..21077435f1b 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java @@ -64,6 +64,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getAnchorName(DeprElementKind kind) { switch (kind) { + case REMOVAL: + return "forRemoval"; case MODULE: return "module"; case PACKAGE: @@ -97,6 +99,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getHeadingKey(DeprElementKind kind) { switch (kind) { + case REMOVAL: + return "doclet.Deprecated_For_Removal"; case MODULE: return "doclet.Deprecated_Modules"; case PACKAGE: @@ -130,6 +134,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getSummaryKey(DeprElementKind kind) { switch (kind) { + case REMOVAL: + return "doclet.deprecated_for_removal"; case MODULE: return "doclet.deprecated_modules"; case PACKAGE: @@ -163,6 +169,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getHeaderKey(DeprElementKind kind) { switch (kind) { + case REMOVAL: + return "doclet.Element"; case MODULE: return "doclet.Module"; case PACKAGE: @@ -212,6 +220,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { writerMap = new EnumMap<>(DeprElementKind.class); for (DeprElementKind kind : DeprElementKind.values()) { switch (kind) { + case REMOVAL: case MODULE: case PACKAGE: case INTERFACE: @@ -284,16 +293,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { List memberTableHeader = new ArrayList<>(); memberTableHeader.add(resources.getText(getHeaderKey(kind))); memberTableHeader.add(resources.getText("doclet.Description")); - if (kind == DeprElementKind.MODULE) { - addModuleDeprecatedAPI(deprapi.getSet(kind), + addDeprecatedAPI(deprapi.getSet(kind), getHeadingKey(kind), memberTableSummary, memberTableHeader, div); - } else if (kind == DeprElementKind.PACKAGE) { - addPackageDeprecatedAPI(deprapi.getSet(kind), - getHeadingKey(kind), memberTableSummary, memberTableHeader, div); - } else { - writerMap.get(kind).addDeprecatedAPI(deprapi.getSet(kind), - getHeadingKey(kind), memberTableSummary, memberTableHeader, div); - } } } if (configuration.allowTag(HtmlTag.MAIN)) { @@ -395,17 +396,17 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { } /** - * Add module deprecation information to the documentation tree + * Add deprecated information to the documentation tree * - * @param deprMdles list of deprecated modules - * @param headingKey the caption for the deprecated module table - * @param tableSummary the summary for the deprecated module table - * @param tableHeader table headers for the deprecated module table - * @param contentTree the content tree to which the deprecated module table will be added + * @param deprList list of deprecated API elements + * @param headingKey the caption for the deprecated table + * @param tableSummary the summary for the deprecated table + * @param tableHeader table headers for the deprecated table + * @param contentTree the content tree to which the deprecated table will be added */ - protected void addModuleDeprecatedAPI(SortedSet deprMdles, String headingKey, + protected void addDeprecatedAPI(SortedSet deprList, String headingKey, String tableSummary, List tableHeader, Content contentTree) { - if (deprMdles.size() > 0) { + if (deprList.size() > 0) { Content caption = getTableCaption(configuration.getContent(headingKey)); Content table = (configuration.isOutputHtml5()) ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) @@ -413,16 +414,28 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { table.addContent(getSummaryTableHeader(tableHeader, "col")); Content tbody = new HtmlTree(HtmlTag.TBODY); boolean altColor = true; - for (Element e : deprMdles) { - ModuleElement mdle = (ModuleElement) e; - HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, - getModuleLink(mdle, new StringContent(mdle.getQualifiedName()))); + for (Element e : deprList) { + HtmlTree thRow; + switch (e.getKind()) { + case MODULE: + ModuleElement m = (ModuleElement)e; + thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, + getModuleLink(m, new StringContent(m.getQualifiedName()))); + break; + case PACKAGE: + PackageElement pkg = (PackageElement)e; + thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, + getPackageLink(pkg, getPackageName(pkg))); + break; + default: + thRow = getDeprecatedLink(e); + } HtmlTree tr = HtmlTree.TR(thRow); HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); tdDesc.addStyle(HtmlStyle.colLast); - List tags = utils.getDeprecatedTrees(mdle); + List tags = utils.getDeprecatedTrees(e); if (!tags.isEmpty()) { - addInlineDeprecatedComment(mdle, tags.get(0), tdDesc); + addInlineDeprecatedComment(e, tags.get(0), tdDesc); } tr.addContent(tdDesc); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); @@ -436,45 +449,30 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { } } - /** - * Add package deprecation information to the documentation tree - * - * @param deprPkgs list of deprecated packages - * @param headingKey the caption for the deprecated package table - * @param tableSummary the summary for the deprecated package table - * @param tableHeader table headers for the deprecated package table - * @param contentTree the content tree to which the deprecated package table will be added - */ - protected void addPackageDeprecatedAPI(SortedSet deprPkgs, String headingKey, - String tableSummary, List tableHeader, Content contentTree) { - if (deprPkgs.size() > 0) { - Content caption = getTableCaption(configuration.getContent(headingKey)); - Content table = (configuration.isOutputHtml5()) - ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) - : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption); - table.addContent(getSummaryTableHeader(tableHeader, "col")); - Content tbody = new HtmlTree(HtmlTag.TBODY); - boolean altColor = true; - for (Element e : deprPkgs) { - PackageElement pkg = (PackageElement) e; - HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, - getPackageLink(pkg, getPackageName(pkg))); - HtmlTree tr = HtmlTree.TR(thRow); - HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); - tdDesc.addStyle(HtmlStyle.colLast); - List tags = utils.getDeprecatedTrees(pkg); - if (!tags.isEmpty()) { - addInlineDeprecatedComment(pkg, tags.get(0), tdDesc); - } - tr.addContent(tdDesc); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - altColor = !altColor; - tbody.addContent(tr); - } - table.addContent(tbody); - Content li = HtmlTree.LI(HtmlStyle.blockList, table); - Content ul = HtmlTree.UL(HtmlStyle.blockList, li); - contentTree.addContent(ul); + protected HtmlTree getDeprecatedLink(Element e) { + AbstractMemberWriter writer; + switch (e.getKind()) { + case INTERFACE: + case CLASS: + case ENUM: + case ANNOTATION_TYPE: + writer = new NestedClassWriterImpl(this); + break; + case FIELD: + writer = new FieldWriterImpl(this); + break; + case METHOD: + writer = new MethodWriterImpl(this); + break; + case CONSTRUCTOR: + writer = new ConstructorWriterImpl(this); + break; + case ENUM_CONSTANT: + writer = new EnumConstantWriterImpl(this); + break; + default: + writer = new AnnotationTypeOptionalMemberWriterImpl(this, null); } + return HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, writer.getDeprecatedLink(e)); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index 47fbd2eff07..432806b8844 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -412,7 +412,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD); tdClassDescription.addStyle(HtmlStyle.colLast); if (utils.isDeprecated(te)) { - tdClassDescription.addContent(contents.deprecatedLabel); + tdClassDescription.addContent(getDeprecatedPhrase(te)); List tags = utils.getDeprecatedTrees(te); if (!tags.isEmpty()) { addSummaryDeprecatedComment(te, tags.get(0), tdClassDescription); @@ -1135,8 +1135,10 @@ public class HtmlDocletWriter extends HtmlDocWriter { * @return a content for the module link */ public Content getModuleLink(ModuleElement mdle, Content label) { - return getHyperLink(pathToRoot.resolve( - DocPaths.moduleSummary(mdle)), label, "", ""); + boolean included = utils.isIncluded(mdle); + return (included) + ? getHyperLink(pathToRoot.resolve(DocPaths.moduleSummary(mdle)), label, "", "") + : label; } public Content interfaceName(TypeElement typeElement, boolean qual) { @@ -1616,6 +1618,18 @@ public class HtmlDocletWriter extends HtmlDocWriter { addCommentTags(element, tag, description, false, false, htmltree); } + /** + * Get the deprecated phrase as content. + * + * @param e the Element for which the inline deprecated comment will be added + * @return a content tree for the deprecated phrase. + */ + public Content getDeprecatedPhrase(Element e) { + return (utils.isDeprecatedForRemoval(e)) + ? contents.deprecatedForRemovalPhrase + : contents.deprecatedPhrase; + } + /** * Add the inline deprecated comment. * diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java index 702d20c8402..16d7250557e 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,17 +25,24 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.util.ArrayList; -import java.util.EnumMap; +import java.util.EnumSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import javax.lang.model.element.Element; import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.ModuleElement.DirectiveKind; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; +import javax.lang.model.util.ElementFilter; import com.sun.source.doctree.DocTree; +import jdk.javadoc.doclet.DocletEnvironment.ModuleMode; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; @@ -47,12 +54,12 @@ import jdk.javadoc.internal.doclets.toolkit.ModuleSummaryWriter; import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper; import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException; import jdk.javadoc.internal.doclets.toolkit.util.DocPaths; +import jdk.javadoc.internal.doclets.toolkit.util.ModulePackageTypes; /** - * Class to generate file for each module contents in the right-hand - * frame. This will list all the packages and Class Kinds in the module. A click on any - * class-kind will update the frame with the clicked class-kind page. A click on any - * package will update the frame with the clicked module package page. + * Class to generate file for each module contents in the right-hand frame. This will list all the + * required modules, packages and service types for the module. A click on any of the links will update + * the frame with the clicked element page. * *

    This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. @@ -78,8 +85,82 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW */ protected ModuleElement mdle; - private final Map> directiveMap - = new EnumMap<>(ModuleElement.DirectiveKind.class); + /** + * The module mode for this javadoc run. It can be set to "api" or "all". + */ + private final ModuleMode moduleMode; + + /** + * Map of module elements and modifiers required by this module. + */ + private final Map requires + = new TreeMap<>(utils.makeModuleComparator()); + + /** + * Map of additional modules and modifiers, transitive closure, required by this module. + */ + private final Map additionalModules + = new TreeMap<>(utils.makeModuleComparator()); + + /** + * Map of packages exported by this module and the modules it's been exported to. + */ + private final Map> exportedPackages + = new TreeMap<>(utils.makePackageComparator()); + + /** + * Map of opened packages by this module and the modules it's been opened to. + */ + private final Map> openedPackages + = new TreeMap<>(utils.makePackageComparator()); + + /** + * Set of concealed packages of this module. + */ + private final SortedSet concealedPackages = new TreeSet<>(utils.makePackageComparator()); + + /** + * Map of additional modules (transitive closure) and its exported packages. + */ + private final Map> additionalPackages + = new TreeMap<>(utils.makeModuleComparator()); + + /** + * Map of additional modules (transitive closure) and its open packages. + */ + private final Map> additionalOpenPackages + = new TreeMap<>(utils.makeModuleComparator()); + + /** + * Set of services used by the module. + */ + private final SortedSet uses + = new TreeSet<>(utils.makeAllClassesComparator()); + + /** + * Map of services used by the module and specified using @uses javadoc tag, and description. + */ + private final Map usesTrees + = new TreeMap<>(utils.makeAllClassesComparator()); + + /** + * Map of services provided by this module, and set of its implementations. + */ + private final Map> provides + = new TreeMap<>(utils.makeAllClassesComparator()); + + /** + * Map of services provided by the module and specified using @provides javadoc tag, and + * description. + */ + private final Map providesTrees + = new TreeMap<>(utils.makeAllClassesComparator()); + + private int packageTypesOr = 0; + + protected Set modulePackageTypes = EnumSet.noneOf(ModulePackageTypes.class); + + protected Map typeMap = new LinkedHashMap<>(); /** * The HTML tree for main tag. @@ -92,8 +173,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW protected HtmlTree sectionTree = HtmlTree.SECTION(); /** - * Constructor to construct ModuleWriter object and to generate - * "moduleName-summary.html" file. + * Constructor to construct ModuleWriter object and to generate "moduleName-summary.html" file. * * @param configuration the configuration of the doclet. * @param mdle Module under consideration. @@ -106,7 +186,8 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW this.prevModule = prevModule; this.nextModule = nextModule; this.mdle = mdle; - generateDirectiveMap(); + this.moduleMode = configuration.docEnv.getModuleMode(); + computeModulesData(); } /** @@ -176,20 +257,165 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW } /** - * Generate the directive map for the directives on the module. + * Compute the modules data that will be displayed in various tables on the module summary page. */ - public void generateDirectiveMap() { - for (ModuleElement.Directive d : mdle.getDirectives()) { - if (directiveMap.containsKey(d.getKind())) { - List dir = directiveMap.get(d.getKind()); - dir.add(d); - directiveMap.put(d.getKind(), dir); - } else { - List dir = new ArrayList<>(); - dir.add(d); - directiveMap.put(d.getKind(), dir); + public void computeModulesData() { + CommentHelper ch = utils.getCommentHelper(mdle); + // Get module dependencies using the module's transitive closure. + Map dependentModules = utils.getDependentModules(mdle); + // Add all dependent modules to additional modules set. We will remove the modules, + // listed using the requires directive, from this set to come up with the table of additional + // required modules. + dependentModules.forEach((module, mod) -> { + if (shouldDocument(module)) { + additionalModules.put(module, new StringContent(mod)); } + }); + (ElementFilter.requiresIn(mdle.getDirectives())).forEach((directive) -> { + ModuleElement m = directive.getDependency(); + if (shouldDocument(m)) { + if (moduleMode == ModuleMode.ALL || directive.isTransitive()) { + requires.put(m, new StringContent(utils.getModifiers(directive))); + } else { + // For api mode, just keep the public requires in dependentModules for display of + // additional packages in the "Packages" section. + dependentModules.remove(m); + } + additionalModules.remove(m); } + }); + // Get all packages for the module and put it in the concealed packages set. + (utils.getModulePackageMap().get(mdle)).forEach((pkg) -> { + if (shouldDocument(pkg)) { + concealedPackages.add(pkg); + } + }); + // Get all exported packages for the module using the exports directive for the module. + (ElementFilter.exportsIn(mdle.getDirectives())).forEach((directive) -> { + PackageElement p = directive.getPackage(); + if (shouldDocument(p)) { + SortedSet mdleList = new TreeSet<>(utils.makeModuleComparator()); + List targetMdles = directive.getTargetModules(); + if (targetMdles != null) { + mdleList.addAll(targetMdles); + } + // Qualified exports should not be displayed in the api mode. So if mdleList is empty, + // its exported to all modules and hence can be added. + if (moduleMode == ModuleMode.ALL || mdleList.isEmpty()) { + exportedPackages.put(p, mdleList); + } + concealedPackages.remove(p); + } + }); + // Get all opened packages for the module using the opens directive for the module. + (ElementFilter.opensIn(mdle.getDirectives())).forEach((directive) -> { + PackageElement p = directive.getPackage(); + if (shouldDocument(p)) { + SortedSet mdleList = new TreeSet<>(utils.makeModuleComparator()); + List targetMdles = directive.getTargetModules(); + if (targetMdles != null) { + mdleList.addAll(targetMdles); + } + // Qualified opens should not be displayed in the api mode. So if mdleList is empty, + // it's opened to all modules and hence can be added. + if (moduleMode == ModuleMode.ALL || mdleList.isEmpty()) { + openedPackages.put(p, mdleList); + } + concealedPackages.remove(p); + } + }); + // Remove all the exported and opened packages so we have just the concealed packages now. + concealedPackages.removeAll(exportedPackages.keySet()); + concealedPackages.removeAll(openedPackages.keySet()); + // Get all the exported and opened packages, for the transitive closure of the module, to be displayed in + // the additional packages tables. + dependentModules.forEach((module, mod) -> { + SortedSet pkgList = new TreeSet<>(utils.makePackageComparator()); + (ElementFilter.exportsIn(module.getDirectives())).forEach((directive) -> { + PackageElement pkg = directive.getPackage(); + if (shouldDocument(pkg)) { + pkgList.add(pkg); + } + }); + // If none of the transitive modules have exported packages to be displayed, we should not be + // displaying the table and so it should not be added to the map. + if (!pkgList.isEmpty()) { + additionalPackages.put(module, pkgList); + } + SortedSet openPkgList = new TreeSet<>(utils.makePackageComparator()); + (ElementFilter.opensIn(module.getDirectives())).forEach((directive) -> { + PackageElement pkg = directive.getPackage(); + if (shouldDocument(pkg)) { + openPkgList.add(pkg); + } + }); + // If none of the transitive modules have opened packages to be displayed, we should not be + // displaying the table and so it should not be added to the map. + if (!openPkgList.isEmpty()) { + additionalOpenPackages.put(module, openPkgList); + } + }); + // Get all the services listed as uses directive. + (ElementFilter.usesIn(mdle.getDirectives())).forEach((directive) -> { + TypeElement u = directive.getService(); + if (shouldDocument(u)) { + uses.add(u); + } + }); + // Get all the services and implementations listed as provides directive. + (ElementFilter.providesIn(mdle.getDirectives())).forEach((directive) -> { + TypeElement u = directive.getService(); + if (shouldDocument(u)) { + List implList = directive.getImplementations(); + SortedSet implSet = new TreeSet<>(utils.makeAllClassesComparator()); + implSet.addAll(implList); + provides.put(u, implSet); + } + }); + // Generate the map of all services listed using @provides, and the description. + (utils.getBlockTags(mdle, DocTree.Kind.PROVIDES)).forEach((tree) -> { + TypeElement t = ch.getServiceType(configuration, tree); + if (t != null) { + providesTrees.put(t, commentTagsToContent(tree, mdle, ch.getDescription(configuration, tree), false)); + } + }); + // Generate the map of all services listed using @uses, and the description. + (utils.getBlockTags(mdle, DocTree.Kind.USES)).forEach((tree) -> { + TypeElement t = ch.getServiceType(configuration, tree); + if (t != null) { + usesTrees.put(t, commentTagsToContent(tree, mdle, ch.getDescription(configuration, tree), false)); + } + }); + } + + /** + * Returns true if the element should be documented on the module summary page. + * + * @param element the element to be checked + * @return true if the element should be documented + */ + public boolean shouldDocument(Element element) { + return (moduleMode == ModuleMode.ALL || utils.isIncluded(element)); + } + + /** + * Returns true if there are elements to be displayed. + * + * @param section set of elements + * @return true if there are elements to be displayed + */ + public boolean display(SortedSet section) { + return section != null && !section.isEmpty(); + } + + /** + * Returns true if there are elements to be displayed. + * + * @param section map of elements. + * @return true if there are elements to be displayed + */ + public boolean display(Map section) { + return section != null && !section.isEmpty(); } /** @@ -207,56 +433,328 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW } /** - * Add the summary for the module. + * Get table header. * * @param text the table caption * @param tableSummary the summary for the table - * @param htmltree the content tree to which the table will be added * @param tableStyle the table style * @param tableHeader the table header - * @param dirs the list of module directives + * @return a content object */ - public void addSummary(String text, String tableSummary, Content htmltree, HtmlStyle tableStyle, - List tableHeader, List dirs) { - Content table = (configuration.isOutputHtml5()) - ? HtmlTree.TABLE(tableStyle, getTableCaption(new RawHtml(text))) - : HtmlTree.TABLE(tableStyle, tableSummary, getTableCaption(new RawHtml(text))); - table.addContent(getSummaryTableHeader(tableHeader, "col")); - Content tbody = new HtmlTree(HtmlTag.TBODY); - addList(dirs, tbody); - table.addContent(tbody); - htmltree.addContent(table); + public Content getTableHeader(String text, String tableSummary, HtmlStyle tableStyle, + List tableHeader) { + return getTableHeader(getTableCaption(new RawHtml(text)), tableSummary, tableStyle, tableHeader); } /** - * Add the list of directives for the module. + * Get table header. * - * @param dirs the list of module directives - * @param tbody the content tree to which the list is added + * @param caption the table caption + * @param tableSummary the summary for the table + * @param tableStyle the table style + * @param tableHeader the table header + * @return a content object */ - public void addList(List dirs, Content tbody) { - boolean altColor = true; - for (ModuleElement.Directive direct : dirs) { - DirectiveKind kind = direct.getKind(); - switch (kind) { - case REQUIRES: - addRequiresList((ModuleElement.RequiresDirective) direct, tbody, altColor); - break; - case EXPORTS: - addExportedPackagesList((ModuleElement.ExportsDirective) direct, tbody, altColor); - break; - case OPENS: - //XXX ignore for now - break; - case USES: - addUsesList((ModuleElement.UsesDirective) direct, tbody, altColor); - break; - case PROVIDES: - addProvidesList((ModuleElement.ProvidesDirective) direct, tbody, altColor); - break; - default: - throw new AssertionError("unknown directive kind: " + kind); + public Content getTableHeader(Content caption, String tableSummary, HtmlStyle tableStyle, + List tableHeader) { + Content table = (configuration.isOutputHtml5()) + ? HtmlTree.TABLE(tableStyle, caption) + : HtmlTree.TABLE(tableStyle, tableSummary, caption); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + return table; + } + + /** + * {@inheritDoc} + */ + public void addModulesSummary(Content summaryContentTree) { + if (display(requires) || display(additionalModules)) { + HtmlTree li = new HtmlTree(HtmlTag.LI); + li.addStyle(HtmlStyle.blockList); + addSummaryHeader(HtmlConstants.START_OF_MODULES_SUMMARY, SectionName.MODULES, + contents.navModules, li); + if (display(requires)) { + String text = configuration.getText("doclet.Requires_Summary"); + String tableSummary = configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Requires_Summary"), + configuration.getText("doclet.modules")); + Content table = getTableHeader(text, tableSummary, HtmlStyle.requiresSummary, requiresTableHeader); + Content tbody = new HtmlTree(HtmlTag.TBODY); + addModulesList(requires, tbody); + table.addContent(tbody); + li.addContent(table); } + // Display additional modules table in both "api" and "all" mode. + if (display(additionalModules)) { + String amrText = configuration.getText("doclet.Additional_Modules_Required_Summary"); + String amrTableSummary = configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Additional_Modules_Required_Summary"), + configuration.getText("doclet.modules")); + Content amrTable = getTableHeader(amrText, amrTableSummary, HtmlStyle.requiresSummary, requiresTableHeader); + Content amrTbody = new HtmlTree(HtmlTag.TBODY); + addModulesList(additionalModules, amrTbody); + amrTable.addContent(amrTbody); + li.addContent(amrTable); + } + HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li); + summaryContentTree.addContent(ul); + } + } + + /** + * Add the list of modules. + * + * @param mdleMap map of modules and modifiers + * @param tbody the content tree to which the list will be added + */ + public void addModulesList(Map mdleMap, Content tbody) { + boolean altColor = true; + for (ModuleElement m : mdleMap.keySet()) { + Content tdModifiers = HtmlTree.TD(HtmlStyle.colFirst, mdleMap.get(m)); + Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName())); + Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colSecond, moduleLinkContent); + HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); + tdSummary.addStyle(HtmlStyle.colLast); + addSummaryComment(m, tdSummary); + HtmlTree tr = HtmlTree.TR(tdModifiers); + tr.addContent(thModule); + tr.addContent(tdSummary); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + tbody.addContent(tr); + altColor = !altColor; + } + } + + public void addPackagesSummary(Content summaryContentTree) { + if (display(exportedPackages) || display(openedPackages) || display(concealedPackages) + || display(additionalPackages) || display(additionalOpenPackages)) { + HtmlTree li = new HtmlTree(HtmlTag.LI); + li.addStyle(HtmlStyle.blockList); + addSummaryHeader(HtmlConstants.START_OF_PACKAGES_SUMMARY, SectionName.PACKAGES, + contents.navPackages, li); + String tableSummary = configuration.getText("doclet.Member_Table_Summary", + configuration.getText("doclet.Packages_Summary"), + configuration.getText("doclet.packages")); + if (display(exportedPackages) || display(openedPackages) || display(concealedPackages)) { + addPackageSummary(tableSummary, li); + } + if (display(additionalPackages)) { + String aepText = configuration.getText("doclet.Additional_Exported_Packages_Summary"); + String aepTableSummary = configuration.getText("doclet.Additional_Packages_Table_Summary", + configuration.getText("doclet.Additional_Exported_Packages_Summary"), + configuration.getText("doclet.modules"), + configuration.getText("doclet.packages")); + Content aepTable = getTableHeader(aepText, aepTableSummary, HtmlStyle.packagesSummary, + additionalPackagesTableHeader); + Content aepTbody = new HtmlTree(HtmlTag.TBODY); + addAdditionalPackages(aepTbody, additionalPackages); + aepTable.addContent(aepTbody); + li.addContent(aepTable); + } + if (display(additionalOpenPackages)) { + String aopText = configuration.getText("doclet.Additional_Opened_Packages_Summary"); + String aopTableSummary = configuration.getText("doclet.Additional_Packages_Table_Summary", + configuration.getText("doclet.Additional_Opened_Packages_Summary"), + configuration.getText("doclet.modules"), + configuration.getText("doclet.packages")); + Content aopTable = getTableHeader(aopText, aopTableSummary, HtmlStyle.packagesSummary, + additionalPackagesTableHeader); + Content aopTbody = new HtmlTree(HtmlTag.TBODY); + addAdditionalPackages(aopTbody, additionalOpenPackages); + aopTable.addContent(aopTbody); + li.addContent(aopTable); + } + HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li); + summaryContentTree.addContent(ul); + } + } + + /** + * Add the package summary for the module. + * + * @param tableSummary + * @param li + */ + public void addPackageSummary(String tableSummary, HtmlTree li) { + Content caption; + Content tbody = getPackageTableRows(); + if (showTabs()) { + caption = getTableCaption(); + generateTableTabTypesScript(typeMap, modulePackageTypes, "packages"); + } else { + ModulePackageTypes type = modulePackageTypes.iterator().next(); + caption = getTableCaption(configuration.getContent(type.tableTabs().resourceKey())); + } + Content table = getTableHeader(caption, tableSummary, HtmlStyle.packagesSummary, exportedPackagesTableHeader); + table.addContent(tbody); + li.addContent(table); + } + + /** + * Returns true if the table tabs needs to be displayed. + * + * @return true if the tabs should be displayed + */ + public boolean showTabs() { + int value; + for (ModulePackageTypes type : EnumSet.allOf(ModulePackageTypes.class)) { + value = type.tableTabs().value(); + if ((value & packageTypesOr) == value) { + modulePackageTypes.add(type); + } + } + boolean showTabs = modulePackageTypes.size() > 1; + if (showTabs) { + modulePackageTypes.add(ModulePackageTypes.ALL); + } + return showTabs; + } + + /** + * Get the summary table caption. + * + * @return the caption for the summary table + */ + public Content getTableCaption() { + Content tabbedCaption = new HtmlTree(HtmlTag.CAPTION); + for (ModulePackageTypes type : modulePackageTypes) { + Content captionSpan; + Content span; + if (type.tableTabs().isDefaultTab()) { + captionSpan = HtmlTree.SPAN(configuration.getContent(type.tableTabs().resourceKey())); + span = HtmlTree.SPAN(type.tableTabs().tabId(), + HtmlStyle.activeTableTab, captionSpan); + } else { + captionSpan = HtmlTree.SPAN(getPackageTypeLinks(type)); + span = HtmlTree.SPAN(type.tableTabs().tabId(), + HtmlStyle.tableTab, captionSpan); + } + Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, Contents.SPACE); + span.addContent(tabSpan); + tabbedCaption.addContent(span); + } + return tabbedCaption; + } + + /** + * Get the package type links for the table caption. + * + * @param packageType the package type to be displayed as link + * @return the content tree for the package type link + */ + public Content getPackageTypeLinks(ModulePackageTypes packageType) { + String jsShow = "javascript:showPkgs(" + packageType.tableTabs().value() + ");"; + HtmlTree link = HtmlTree.A(jsShow, configuration.getContent(packageType.tableTabs().resourceKey())); + return link; + } + + /** + * Get the package table rows. + * + * @return a content object + */ + public Content getPackageTableRows() { + Content tbody = new HtmlTree(HtmlTag.TBODY); + boolean altColor = true; + int counter = 0; + counter = addPackageTableRows(tbody, counter, ModulePackageTypes.EXPORTED, exportedPackages); + counter = addPackageTableRows(tbody, counter, ModulePackageTypes.OPENED, openedPackages); + // Show concealed packages only in "all" mode. + if (moduleMode == ModuleMode.ALL) { + for (PackageElement pkg : concealedPackages) { + Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); + Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent); + HtmlTree tdModules = new HtmlTree(HtmlTag.TD); + tdModules.addStyle(HtmlStyle.colSecond); + tdModules.addContent(configuration.getText("doclet.None")); + HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); + tdSummary.addStyle(HtmlStyle.colLast); + addSummaryComment(pkg, tdSummary); + HtmlTree tr = HtmlTree.TR(thPackage); + tr.addContent(tdModules); + tr.addContent(tdSummary); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + int pkgType = ModulePackageTypes.CONCEALED.tableTabs().value(); + packageTypesOr = packageTypesOr | pkgType; + String tableId = "i" + counter; + counter++; + typeMap.put(tableId, pkgType); + tr.addAttr(HtmlAttr.ID, tableId); + tbody.addContent(tr); + altColor = !altColor; + } + } + return tbody; + } + + public int addPackageTableRows(Content tbody, int counter, ModulePackageTypes pType, + Map> ap) { + boolean altColor = true; + for (Map.Entry> entry : ap.entrySet()) { + PackageElement pkg = entry.getKey(); + SortedSet mdleList = entry.getValue(); + Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); + Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent); + HtmlTree tr = HtmlTree.TR(thPackage); + if (moduleMode == ModuleMode.ALL) { + HtmlTree tdModules = new HtmlTree(HtmlTag.TD); + tdModules.addStyle(HtmlStyle.colSecond); + if (!mdleList.isEmpty()) { + int sep = 0; + for (ModuleElement m : mdleList) { + if (sep > 0) { + tdModules.addContent(new HtmlTree(HtmlTag.BR)); + } + tdModules.addContent(getModuleLink(m, new StringContent(m.getQualifiedName()))); + sep++; + } + } else { + tdModules.addContent(configuration.getText("doclet.All_Modules")); + } + tr.addContent(tdModules); + } + HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); + tdSummary.addStyle(HtmlStyle.colLast); + addSummaryComment(pkg, tdSummary); + tr.addContent(tdSummary); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + int pkgType = pType.tableTabs().value(); + packageTypesOr = packageTypesOr | pkgType; + String tableId = "i" + counter; + counter++; + typeMap.put(tableId, pkgType); + tr.addAttr(HtmlAttr.ID, tableId); + tbody.addContent(tr); + altColor = !altColor; + } + return counter; + } + + /** + * Add the additional packages for the module being documented. + * + * @param tbody the content tree to which the table will be added + * @param ap additional packages to be added + */ + public void addAdditionalPackages(Content tbody, Map> ap) { + boolean altColor = true; + for (Map.Entry> entry : ap.entrySet()) { + ModuleElement m = entry.getKey(); + SortedSet pkgList = entry.getValue(); + Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName())); + Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent); + HtmlTree tdPackages = new HtmlTree(HtmlTag.TD); + tdPackages.addStyle(HtmlStyle.colLast); + String sep = ""; + for (PackageElement pkg : pkgList) { + tdPackages.addContent(sep); + tdPackages.addContent(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)))); + sep = " "; + } + HtmlTree tr = HtmlTree.TR(thModule); + tr.addContent(tdPackages); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + tbody.addContent(tr); altColor = !altColor; } } @@ -264,234 +762,134 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ - @Override - public void addModulesSummary(Content summaryContentTree) { - List dirs = directiveMap.get(DirectiveKind.REQUIRES); - if (dirs != null && !dirs.isEmpty()) { - HtmlTree li = new HtmlTree(HtmlTag.LI); - li.addStyle(HtmlStyle.blockList); - addSummaryHeader(HtmlConstants.START_OF_MODULES_SUMMARY, SectionName.MODULES, - contents.navModules, li); - String text = configuration.getText("doclet.Requires_Summary"); - String tableSummary = configuration.getText("doclet.Member_Table_Summary", - configuration.getText("doclet.Requires_Summary"), - configuration.getText("doclet.modules")); - addRequiresSummary(text, tableSummary, dirs, li); - HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li); - summaryContentTree.addContent(ul); - } - } - - /** - * Add the requires summary for the module. - * - * @param text the table caption - * @param tableSummary the summary for the table - * @param dirs the list of module directives - * @param htmltree the content tree to which the table will be added - */ - public void addRequiresSummary(String text, String tableSummary, List dirs, - Content htmltree) { - addSummary(text, tableSummary, htmltree, HtmlStyle.requiresSummary, requiresTableHeader, dirs); - } - - /** - * Add the requires directive list for the module. - * - * @param direct the requires directive - * @param tbody the content tree to which the directive will be added - * @param altColor true if altColor style should be used or false if rowColor style should be used - */ - public void addRequiresList(ModuleElement.RequiresDirective direct, Content tbody, boolean altColor) { - ModuleElement m = direct.getDependency(); - Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName().toString())); - Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent); - HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); - tdSummary.addStyle(HtmlStyle.colLast); - addSummaryComment(m, tdSummary); - HtmlTree tr = HtmlTree.TR(thPackage); - tr.addContent(tdSummary); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - tbody.addContent(tr); - } - - /** - * {@inheritDoc} - */ - @Override - public void addPackagesSummary(Content summaryContentTree) { - List dirs = directiveMap.get(DirectiveKind.EXPORTS); - if (dirs != null && !dirs.isEmpty()) { - HtmlTree li = new HtmlTree(HtmlTag.LI); - li.addStyle(HtmlStyle.blockList); - addSummaryHeader(HtmlConstants.START_OF_PACKAGES_SUMMARY, SectionName.PACKAGES, - contents.navPackages, li); - String text = configuration.getText("doclet.Exported_Packages_Summary"); - String tableSummary = configuration.getText("doclet.Member_Table_Summary", - configuration.getText("doclet.Exported_Packages_Summary"), - configuration.getText("doclet.packages")); - addExportedPackagesSummary(text, tableSummary, dirs, li); - HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li); - summaryContentTree.addContent(ul); - } - } - - /** - * Add the exported packages summary for the module. - * - * @param text the table caption - * @param tableSummary the summary for the table - * @param dirs the list of module directives - * @param htmltree the content tree to which the table will be added - */ - public void addExportedPackagesSummary(String text, String tableSummary, List dirs, - Content htmltree) { - addSummary(text, tableSummary, htmltree, HtmlStyle.packagesSummary, exportedPackagesTableHeader, dirs); - } - - /** - * Add the exported packages list for the module. - * - * @param direct the requires directive - * @param tbody the content tree to which the directive will be added - * @param altColor true if altColor style should be used or false if rowColor style should be used - */ - public void addExportedPackagesList(ModuleElement.ExportsDirective direct, Content tbody, boolean altColor) { - PackageElement pkg = direct.getPackage(); - Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); - Content tdPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent); - HtmlTree thModules = new HtmlTree(HtmlTag.TD); - thModules.addStyle(HtmlStyle.colSecond); - List targetModules = direct.getTargetModules(); - if (targetModules != null) { - List mElements = direct.getTargetModules(); - for (int i = 0; i < mElements.size(); i++) { - if (i > 0) { - thModules.addContent(new HtmlTree(HtmlTag.BR)); - } - ModuleElement m = mElements.get(i); - thModules.addContent(new StringContent(m.getQualifiedName().toString())); - } - } else { - thModules.addContent(configuration.getText("doclet.All_Modules")); - } - HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); - tdSummary.addStyle(HtmlStyle.colLast); - addSummaryComment(pkg, tdSummary); - HtmlTree tr = HtmlTree.TR(tdPackage); - tr.addContent(thModules); - tr.addContent(tdSummary); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - tbody.addContent(tr); - } - - /** - * {@inheritDoc} - */ - @Override public void addServicesSummary(Content summaryContentTree) { - List usesDirs = directiveMap.get(DirectiveKind.USES); - List providesDirs = directiveMap.get(DirectiveKind.PROVIDES); - if ((usesDirs != null && !usesDirs.isEmpty()) || (providesDirs != null && !providesDirs.isEmpty())) { + if (display(uses) || display(provides)) { HtmlTree li = new HtmlTree(HtmlTag.LI); li.addStyle(HtmlStyle.blockList); addSummaryHeader(HtmlConstants.START_OF_SERVICES_SUMMARY, SectionName.SERVICES, contents.navServices, li); String text; String tableSummary; - if (usesDirs != null && !usesDirs.isEmpty()) { + if (display(uses)) { text = configuration.getText("doclet.Uses_Summary"); tableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Uses_Summary"), configuration.getText("doclet.types")); - addUsesSummary(text, tableSummary, usesDirs, li); + Content table = getTableHeader(text, tableSummary, HtmlStyle.usesSummary, usesTableHeader); + Content tbody = new HtmlTree(HtmlTag.TBODY); + addUsesList(tbody); + if (!tbody.isEmpty()) { + table.addContent(tbody); + li.addContent(table); } - if (providesDirs != null && !providesDirs.isEmpty()) { + } + if (display(provides)) { text = configuration.getText("doclet.Provides_Summary"); tableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Provides_Summary"), configuration.getText("doclet.types")); - addProvidesSummary(text, tableSummary, providesDirs, li); + Content table = getTableHeader(text, tableSummary, HtmlStyle.providesSummary, providesTableHeader); + Content tbody = new HtmlTree(HtmlTag.TBODY); + addProvidesList(tbody); + if (!tbody.isEmpty()) { + table.addContent(tbody); + li.addContent(table); + } } HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li); summaryContentTree.addContent(ul); } } - /** - * Add the uses summary for the module. - * - * @param text the table caption - * @param tableSummary the summary for the table - * @param dirs the list of module directives - * @param htmltree the content tree to which the table will be added - */ - public void addUsesSummary(String text, String tableSummary, List dirs, - Content htmltree) { - addSummary(text, tableSummary, htmltree, HtmlStyle.usesSummary, usesTableHeader, dirs); - } - /** * Add the uses list for the module. * - * @param direct the requires directive * @param tbody the content tree to which the directive will be added - * @param altColor true if altColor style should be used or false if rowColor style should be used */ - public void addUsesList(ModuleElement.UsesDirective direct, Content tbody, boolean altColor) { - TypeElement type = direct.getService(); - Content typeLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, type)); - Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, typeLinkContent); - HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); + public void addUsesList(Content tbody) { + boolean altColor = true; + Content typeLinkContent; + Content thType; + HtmlTree tdSummary; + Content description; + for (TypeElement t : uses) { + // For each uses directive in the module declaration, if we are in the "api" mode and + // if there are service types listed using @uses javadoc tag, check if the service type in + // the uses directive is specified using the @uses tag. If not, we do not display the + // service type in the "api" mode. + if (moduleMode == ModuleMode.API && display(usesTrees) && !usesTrees.containsKey(t)) { + continue; + } + typeLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, t)); + thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, typeLinkContent); + tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); - addSummaryComment(type, tdSummary); - HtmlTree tr = HtmlTree.TR(thPackage); + if (display(usesTrees)) { + description = usesTrees.get(t); + if (description != null) { + tdSummary.addContent(description); + } + } + addSummaryComment(t, tdSummary); + HtmlTree tr = HtmlTree.TR(thType); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); + altColor = !altColor; + } } /** - * Add the provides summary for the module. + * Add the provides list for the module. * - * @param text the table caption - * @param tableSummary the summary for the table - * @param dirs the list of module directives - * @param htmltree the content tree to which the table will be added - */ - public void addProvidesSummary(String text, String tableSummary, List dirs, - Content htmltree) { - addSummary(text, tableSummary, htmltree, HtmlStyle.providesSummary, providesTableHeader, dirs); - } - - /** - * Add the exported packages list for the module. - * - * @param direct the requires directive * @param tbody the content tree to which the directive will be added - * @param altColor true if altColor style should be used or false if rowColor style should be used */ - public void addProvidesList(ModuleElement.ProvidesDirective direct, Content tbody, boolean altColor) { - List impls = direct.getImplementations(); - for (TypeElement impl : impls) { - TypeElement srv = direct.getService(); - Content implLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)); + public void addProvidesList(Content tbody) { + boolean altColor = true; + TypeElement srv; + SortedSet implSet; + Content description; + for (Map.Entry> entry : provides.entrySet()) { + srv = entry.getKey(); + // For each provides directive in the module declaration, if we are in the "api" mode and + // if there are service types listed using @provides javadoc tag, check if the service type in + // the provides directive is specified using the @provides tag. If not, we do not display the + // service type in the "api" mode. + if (moduleMode == ModuleMode.API && display(providesTrees) && !providesTrees.containsKey(srv)) { + continue; + } + implSet = entry.getValue(); Content srvLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, srv)); HtmlTree thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, srvLinkContent); - thType.addContent(new HtmlTree(HtmlTag.BR)); - thType.addContent("("); - HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation); - thType.addContent(implSpan); - thType.addContent(Contents.SPACE); - thType.addContent(implLinkContent); - thType.addContent(")"); HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); tdDesc.addStyle(HtmlStyle.colLast); + if (display(providesTrees)) { + description = providesTrees.get(srv); + if (description != null) { + tdDesc.addContent(description); + } + } addSummaryComment(srv, tdDesc); + // Only display the implementation details in the "all" mode. + if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) { + tdDesc.addContent(new HtmlTree(HtmlTag.BR)); + tdDesc.addContent("("); + HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation); + tdDesc.addContent(implSpan); + tdDesc.addContent(Contents.SPACE); + String sep = ""; + for (TypeElement impl : implSet) { + tdDesc.addContent(sep); + tdDesc.addContent(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl))); + sep = ", "; + } + tdDesc.addContent(")"); + } HtmlTree tr = HtmlTree.TR(thType); tr.addContent(tdDesc); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); + altColor = !altColor; } } @@ -506,7 +904,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW CommentHelper ch = utils.getCommentHelper(mdle); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { List commentTags = ch.getDescription(configuration, deprs.get(0)); @@ -574,31 +972,23 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW ? getHyperLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription) : contents.navModuleDescription); addNavGap(liNav); - liNav.addContent(showDirectives(DirectiveKind.REQUIRES) + liNav.addContent((display(requires) || display(additionalModules)) ? getHyperLink(SectionName.MODULES, contents.navModules) : contents.navModules); addNavGap(liNav); - liNav.addContent(showDirectives(DirectiveKind.EXPORTS) + liNav.addContent((display(exportedPackages) || display(openedPackages) || display(concealedPackages) + || display(additionalPackages) || display(additionalOpenPackages)) ? getHyperLink(SectionName.PACKAGES, contents.navPackages) : contents.navPackages); addNavGap(liNav); - liNav.addContent((showDirectives(DirectiveKind.USES) || showDirectives(DirectiveKind.PROVIDES)) + liNav.addContent((display(uses) || (moduleMode == ModuleMode.API && display(usesTrees)) + || display(provides) || (moduleMode == ModuleMode.API && display(providesTrees))) ? getHyperLink(SectionName.SERVICES, contents.navServices) : contents.navServices); ulNav.addContent(liNav); return ulNav; } - /** - * Return true if the directive should be displayed. - * - * @param dirKind the kind of directive for the module - * @return true if the directive should be displayed - */ - private boolean showDirectives(DirectiveKind dirKind) { - return directiveMap.get(dirKind) != null && !directiveMap.get(dirKind).isEmpty(); - } - /** * {@inheritDoc} */ @@ -629,6 +1019,8 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} + * + * @throws jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException */ @Override public void printDocument(Content contentTree) throws DocFileIOException { @@ -648,7 +1040,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW deprs = utils.getDeprecatedTrees(pkg); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { CommentHelper ch = utils.getCommentHelper(pkg); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java index 88632495d2d..75d46ca284e 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java @@ -125,8 +125,8 @@ public class PackageWriterImpl extends HtmlDocletWriter } HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.header); - ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement); if (configuration.showModules) { + ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement); Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInClass, contents.moduleLabel); Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel); moduleNameDiv.addContent(Contents.SPACE); @@ -172,7 +172,7 @@ public class PackageWriterImpl extends HtmlDocletWriter CommentHelper ch = utils.getCommentHelper(packageElement); HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); deprDiv.addStyle(HtmlStyle.deprecatedContent); - Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement)); deprDiv.addContent(deprPhrase); if (!deprs.isEmpty()) { List commentTags = ch.getDescription(configuration, deprs.get(0)); @@ -223,7 +223,7 @@ public class PackageWriterImpl extends HtmlDocletWriter HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD); tdClassDescription.addStyle(HtmlStyle.colLast); if (utils.isDeprecated(klass)) { - tdClassDescription.addContent(contents.deprecatedLabel); + tdClassDescription.addContent(getDeprecatedPhrase(klass)); List tags = utils.getDeprecatedTrees(klass); if (!tags.isEmpty()) { addSummaryDeprecatedComment(klass, tags.get(0), tdClassDescription); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java index f21c71168dc..4ad7d9325db 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java @@ -97,7 +97,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { Content caption; if (showTabs) { caption = getTableCaption(mw.methodTypes); - generateMethodTypesScript(mw.typeMap, mw.methodTypes); + generateTableTabTypesScript(mw.typeMap, mw.methodTypes, "methods"); } else { caption = getTableCaption(mw.getCaption()); @@ -123,13 +123,13 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { for (MethodTypes type : methodTypes) { Content captionSpan; Content span; - if (type.isDefaultTab()) { - captionSpan = HtmlTree.SPAN(configuration.getContent(type.resourceKey())); - span = HtmlTree.SPAN(type.tabId(), + if (type.tableTabs().isDefaultTab()) { + captionSpan = HtmlTree.SPAN(configuration.getContent(type.tableTabs().resourceKey())); + span = HtmlTree.SPAN(type.tableTabs().tabId(), HtmlStyle.activeTableTab, captionSpan); } else { captionSpan = HtmlTree.SPAN(getMethodTypeLinks(type)); - span = HtmlTree.SPAN(type.tabId(), + span = HtmlTree.SPAN(type.tableTabs().tabId(), HtmlStyle.tableTab, captionSpan); } Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, Contents.SPACE); @@ -146,8 +146,8 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { * @return the content tree for the method type link */ public Content getMethodTypeLinks(MethodTypes methodType) { - String jsShow = "javascript:show(" + methodType.value() +");"; - HtmlTree link = HtmlTree.A(jsShow, configuration.getContent(methodType.resourceKey())); + String jsShow = "javascript:show(" + methodType.tableTabs().value() +");"; + HtmlTree link = HtmlTree.A(jsShow, configuration.getContent(methodType.tableTabs().resourceKey())); return link; } @@ -187,7 +187,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { List deprs = utils.getBlockTags(member, DocTree.Kind.DEPRECATED); Content div; if (utils.isDeprecated(member)) { - Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(member)); div = HtmlTree.DIV(HtmlStyle.block, deprLabel); div.addContent(Contents.SPACE); if (!deprs.isEmpty()) { @@ -198,7 +198,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter { } else { Element te = member.getEnclosingElement(); if (te != null && utils.isTypeElement(te) && utils.isDeprecated(te)) { - Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(te)); div = HtmlTree.DIV(HtmlStyle.block, deprLabel); div.addContent(Contents.SPACE); tdSummary.addContent(div); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java index 4a51e945149..32f3871286e 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java @@ -178,7 +178,7 @@ public class TagletWriterImpl extends TagletWriter { if (utils.isTypeElement(element)) { if (utils.isDeprecated(element)) { result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, - new StringContent(configuration.getText("doclet.Deprecated")))); + htmlWriter.getDeprecatedPhrase(element))); result.addContent(RawHtml.nbsp); if (!deprs.isEmpty()) { List commentTags = ch.getDescription(configuration, deprs.get(0)); @@ -190,7 +190,7 @@ public class TagletWriterImpl extends TagletWriter { } else { if (utils.isDeprecated(element)) { result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, - new StringContent(configuration.getText("doclet.Deprecated")))); + htmlWriter.getDeprecatedPhrase(element))); result.addContent(RawHtml.nbsp); if (!deprs.isEmpty()) { List bodyTags = ch.getBody(configuration, deprs.get(0)); @@ -199,9 +199,10 @@ public class TagletWriterImpl extends TagletWriter { result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body)); } } else { - if (utils.isDeprecated(utils.getEnclosingTypeElement(element))) { + Element ee = utils.getEnclosingTypeElement(element); + if (utils.isDeprecated(ee)) { result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel, - new StringContent(configuration.getText("doclet.Deprecated")))); + htmlWriter.getDeprecatedPhrase(ee))); result.addContent(RawHtml.nbsp); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java index e4a9265cbbd..26d4c8723c2 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java @@ -37,7 +37,7 @@ import jdk.javadoc.internal.doclets.toolkit.Content; * A sequence of Content nodes. */ public class ContentBuilder extends Content { - protected List contents = Collections.emptyList(); + protected List contents = Collections.emptyList(); @Override public void addContent(Content content) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java index 0c2bb460a82..38a89a2b56c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java @@ -43,7 +43,7 @@ import jdk.javadoc.internal.doclets.toolkit.Content; */ public class HtmlDocument extends Content { - private List docContent = Collections.emptyList(); + private List docContent = Collections.emptyList(); /** * Constructor to construct an HTML document. diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java index 062dccc8e12..b3ab27dadd3 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java @@ -53,8 +53,8 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants; public class HtmlTree extends Content { private HtmlTag htmlTag; - private Map attrs = Collections.emptyMap(); - private List content = Collections.emptyList(); + private Map attrs = Collections.emptyMap(); + private List content = Collections.emptyList(); public static final Content EMPTY = new StringContent(""); /** diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java index 59de3f0bb1c..706d7294e45 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java @@ -28,6 +28,7 @@ package jdk.javadoc.internal.doclets.formats.html.markup; import java.io.*; import java.util.*; +import jdk.javadoc.doclet.DocletEnvironment.ModuleMode; import jdk.javadoc.internal.doclets.toolkit.Configuration; import jdk.javadoc.internal.doclets.toolkit.Content; import jdk.javadoc.internal.doclets.toolkit.Resources; @@ -35,7 +36,8 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocFile; import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException; import jdk.javadoc.internal.doclets.toolkit.util.DocPath; import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants; -import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes; +import jdk.javadoc.internal.doclets.toolkit.util.ModulePackageTypes; +import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes; /** @@ -64,32 +66,37 @@ public class HtmlWriter { protected Configuration configuration; /** - * Header for table displaying modules and description.. + * Header for table displaying modules and description. */ protected final List moduleTableHeader; /** - * Header for tables displaying packages and description.. + * Header for tables displaying packages and description. */ protected final List packageTableHeader; /** - * Header for tables displaying modules and description.. + * Header for tables displaying modules and description. */ protected final List requiresTableHeader; /** - * Header for tables displaying packages and description.. + * Header for tables displaying packages and description. */ protected final List exportedPackagesTableHeader; /** - * Header for tables displaying types and description.. + * Header for tables displaying modules and exported packages. + */ + protected final List additionalPackagesTableHeader; + + /** + * Header for tables displaying types and description. */ protected final List usesTableHeader; /** - * Header for tables displaying types and description.. + * Header for tables displaying types and description. */ protected final List providesTableHeader; @@ -129,12 +136,18 @@ public class HtmlWriter { packageTableHeader.add(resources.getText("doclet.Package")); packageTableHeader.add(resources.getText("doclet.Description")); requiresTableHeader = new ArrayList<>(); + requiresTableHeader.add(resources.getText("doclet.Modifier")); requiresTableHeader.add(resources.getText("doclet.Module")); requiresTableHeader.add(resources.getText("doclet.Description")); exportedPackagesTableHeader = new ArrayList<>(); exportedPackagesTableHeader.add(resources.getText("doclet.Package")); + if (configuration.docEnv.getModuleMode() == ModuleMode.ALL) { exportedPackagesTableHeader.add(resources.getText("doclet.Module")); + } exportedPackagesTableHeader.add(resources.getText("doclet.Description")); + additionalPackagesTableHeader = new ArrayList<>(); + additionalPackagesTableHeader.add(resources.getText("doclet.Module")); + additionalPackagesTableHeader.add(resources.getText("doclet.Packages")); usesTableHeader = new ArrayList<>(); usesTableHeader.add(resources.getText("doclet.Type")); usesTableHeader.add(resources.getText("doclet.Description")); @@ -317,12 +330,15 @@ public class HtmlWriter { * Generated javascript variables for the document. * * @param typeMap map comprising of method and type relationship - * @param methodTypes set comprising of all methods types for this class + * @param tabTypes set comprising of all table tab types for this class + * @param elementName packages or methods table for which tabs need to be displayed */ - public void generateMethodTypesScript(Map typeMap, - Set methodTypes) { + public void generateTableTabTypesScript(Map typeMap, + Set tabTypes, String elementName) { String sep = ""; - StringBuilder vars = new StringBuilder("var methods = {"); + StringBuilder vars = new StringBuilder("var "); + vars.append(elementName) + .append(" = {"); for (Map.Entry entry : typeMap.entrySet()) { vars.append(sep); sep = ","; @@ -334,18 +350,18 @@ public class HtmlWriter { vars.append("};").append(DocletConstants.NL); sep = ""; vars.append("var tabs = {"); - for (MethodTypes entry : methodTypes) { + for (TableTabTypes entry : tabTypes) { vars.append(sep); sep = ","; - vars.append(entry.value()) + vars.append(entry.tableTabs().value()) .append(":") .append("[") .append("\"") - .append(entry.tabId()) + .append(entry.tableTabs().tabId()) .append("\"") .append(sep) .append("\"") - .append(configuration.getText(entry.resourceKey())) + .append(configuration.getText(entry.tableTabs().resourceKey())) .append("\"]"); } vars.append("};") diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties index 00239a4fdd9..5ba604830ab 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties @@ -3,10 +3,12 @@ doclet.Contents=Contents doclet.Overview=Overview doclet.Window_Overview=Overview List doclet.Window_Overview_Summary=Overview +doclet.Element=Element doclet.Package=Package doclet.Module=Module doclet.All_Packages=All Packages doclet.All_Modules=All Modules +doclet.None=None doclet.Tree=Tree doclet.Class_Hierarchy=Class Hierarchy doclet.Window_Class_Hierarchy=Class Hierarchy @@ -71,6 +73,7 @@ doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1} doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1} doclet.tag.invalid_usage=invalid usage of tag {0} doclet.Deprecated_API=Deprecated API +doclet.Deprecated_For_Removal=Deprecated For Removal doclet.Deprecated_Modules=Deprecated Modules doclet.Deprecated_Packages=Deprecated Packages doclet.Deprecated_Classes=Deprecated Classes @@ -84,6 +87,7 @@ doclet.Deprecated_Constructors=Deprecated Constructors doclet.Deprecated_Methods=Deprecated Methods doclet.Deprecated_Enum_Constants=Deprecated Enum Constants doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements +doclet.deprecated_for_removal=deprecated for removal doclet.deprecated_modules=deprecated modules doclet.deprecated_packages=deprecated packages doclet.deprecated_classes=deprecated classes diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java index 1a836d1ff24..5a63ae0eac0 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java @@ -263,9 +263,7 @@ public abstract class AbstractDoclet implements Doclet { generateClassFiles(classtree); SortedSet packages = new TreeSet<>(utils.makePackageComparator()); packages.addAll(configuration.getSpecifiedPackageElements()); - configuration.modulePackages.values().stream().forEach(pset -> { - packages.addAll(pset); - }); + configuration.modulePackages.values().stream().forEach(packages::addAll); for (PackageElement pkg : packages) { generateClassFiles(utils.getAllClasses(pkg), classtree); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java index 5534abd0bd3..886c31ff9d4 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java @@ -529,9 +529,7 @@ public class MemberSummaryBuilder extends AbstractMemberBuilder { buildInheritedSummary(writer, visibleMemberMap, summaryTreeList); if (!summaryTreeList.isEmpty()) { Content memberTree = writer.getMemberSummaryHeader(typeElement, memberSummaryTree); - summaryTreeList.stream().forEach((aSummaryTreeList) -> { - memberTree.addContent(aSummaryTreeList); - }); + summaryTreeList.stream().forEach(memberTree::addContent); writer.addMemberTree(memberSummaryTree, memberTree); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties index fd7bc41235d..15437fa446b 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties @@ -82,7 +82,13 @@ doclet.tag_misuse=Tag {0} cannot be used in {1} documentation. It can only be u doclet.javafx_tag_misuse=Tags @propertyGetter, @propertySetter and @propertyDescription can only be used in JavaFX properties getters and setters. doclet.Package_Summary=Package Summary doclet.Requires_Summary=Requires +doclet.Additional_Modules_Required_Summary=Additional Modules Required +doclet.Additional_Exported_Packages_Summary=Additional Exported Packages +doclet.Additional_Opened_Packages_Summary=Additional Opened Packages doclet.Exported_Packages_Summary=Exported Packages +doclet.Opened_Packages_Summary=Opened Packages +doclet.Concealed_Packages_Summary=Concealed Packages +doclet.Packages_Summary=Packages doclet.Uses_Summary=Uses doclet.Provides_Summary=Provides doclet.Module_Summary=Module Summary @@ -150,6 +156,7 @@ doclet.Property_Detail=Property Detail doclet.Method_Detail=Method Detail doclet.Constructor_Detail=Constructor Detail doclet.Deprecated=Deprecated. +doclet.DeprecatedForRemoval=Deprecated, for removal: This API element is subject to removal in a future version. doclet.Hidden=Hidden doclet.Groupname_already_used=In -group option, groupname already used: {0} doclet.value_tag_invalid_reference={0} (referenced by @value tag) is an unknown reference. @@ -160,6 +167,7 @@ doclet.in={0} in {1} doclet.Use_Table_Summary=Use table, listing {0}, and an explanation doclet.Constants_Table_Summary={0} table, listing constant fields, and values doclet.Member_Table_Summary={0} table, listing {1}, and an explanation +doclet.Additional_Packages_Table_Summary={0} table, listing {1}, and {2} doclet.fields=fields doclet.Fields=Fields doclet.properties=properties @@ -187,7 +195,7 @@ doclet.subclasses=subclasses doclet.subinterfaces=subinterfaces doclet.Modifier=Modifier doclet.Type=Type -doclet.Implementation=Implementation: +doclet.Implementation=Implementation(s): doclet.Types=Types doclet.Members=Members doclet.SearchTags=SearchTags diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js index 434b92d1644..9068885b23e 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js @@ -91,7 +91,7 @@ function show(type) count = 0; for (var key in methods) { var row = document.getElementById(key); - if ((methods[key] & type) != 0) { + if ((methods[key] & type) !== 0) { row.style.display = ''; row.className = (count++ % 2) ? rowColor : altColor; } @@ -101,6 +101,21 @@ function show(type) updateTabs(type); } +function showPkgs(type) +{ + count = 0; + for (var key in packages) { + var row = document.getElementById(key); + if ((packages[key] & type) !== 0) { + row.style.display = ''; + row.className = (count++ % 2) ? rowColor : altColor; + } + else + row.style.display = 'none'; + } + updatePkgsTabs(type); +} + function updateTabs(type) { for (var value in tabs) { @@ -122,3 +137,19 @@ function updateModuleFrame(pFrame, cFrame) top.packageFrame.location = pFrame; top.classFrame.location = cFrame; } + +function updatePkgsTabs(type) +{ + for (var value in tabs) { + var sNode = document.getElementById(tabs[value][0]); + var spanNode = sNode.firstChild; + if (value == type) { + sNode.className = activeTableTab; + spanNode.innerHTML = tabs[value][1]; + } + else { + sNode.className = tableTab; + spanNode.innerHTML = "" + tabs[value][1] + ""; + } + } +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css index 99ce43cb68d..b12d57dc17c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css @@ -472,7 +472,7 @@ Table styles border: none; height:16px; } -.memberSummary caption span.activeTableTab span { +.memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span { white-space:nowrap; padding-top:5px; padding-left:12px; @@ -483,7 +483,7 @@ Table styles background-color:#F8981D; height:16px; } -.memberSummary caption span.tableTab span { +.memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span { white-space:nowrap; padding-top:5px; padding-left:12px; @@ -494,7 +494,8 @@ Table styles background-color:#4D7A97; height:16px; } -.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab, +.packagesSummary caption span.tableTab, .packagesSummary caption span.activeTableTab { padding-top:0px; padding-left:0px; padding-right:0px; @@ -511,7 +512,7 @@ Table styles float:left; background-color:#F8981D; } -.memberSummary .activeTableTab .tabEnd { +.memberSummary .activeTableTab .tabEnd, .packagesSummary .activeTableTab .tabEnd { display:none; width:5px; margin-right:3px; @@ -519,7 +520,7 @@ Table styles float:left; background-color:#F8981D; } -.memberSummary .tableTab .tabEnd { +.memberSummary .tableTab .tabEnd, .packagesSummary .tableTab .tabEnd { display:none; width:5px; margin-right:3px; @@ -562,21 +563,28 @@ td.colSecond, th.colSecond, td.colLast, th.colLast { .providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst, .providesSummary td.colLast { white-space:normal; - width:50%; font-size:13px; } .overviewSummary td.colFirst, .overviewSummary th.colFirst, .requiresSummary td.colFirst, .requiresSummary th.colFirst, .packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th, .usesSummary td.colFirst, .usesSummary th.colFirst, -.useSummary td.colFirst, .useSummary th.colFirst, +.providesSummary td.colFirst, .providesSummary th.colFirst, .memberSummary td.colFirst, .memberSummary th.colFirst, .memberSummary td.colSecond, .memberSummary th.colSecond, .typeSummary td.colFirst{ - width:25%; vertical-align:top; } -td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colSecond a:link, td.colSecond a:active, td.colSecond a:visited, td.colSecond a:hover, th.colFirst a:link, th.colFirst a:active, th.colFirst a:visited, th.colFirst a:hover, th.colSecond a:link, th.colSecond a:active, th.colSecond a:visited, th.colSecond a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { +.packagesSummary th.colLast, .packagesSummary td.colLast { + white-space:normal; +} +td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, +td.colSecond a:link, td.colSecond a:active, td.colSecond a:visited, td.colSecond a:hover, +th.colFirst a:link, th.colFirst a:active, th.colFirst a:visited, th.colFirst a:hover, +th.colSecond a:link, th.colSecond a:active, th.colSecond a:visited, th.colSecond a:hover, +td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, +.constantValuesContainer td a:link, .constantValuesContainer td a:active, +.constantValuesContainer td a:visited, .constantValuesContainer td a:hover { font-weight:bold; } .tableSubHeadingColor { @@ -776,4 +784,4 @@ ul.ui-autocomplete li { .searchTagHolderResult { font-style:italic; font-size:12px; -} \ No newline at end of file +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java index cc9860cebfa..625334e4242 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java @@ -50,6 +50,7 @@ import com.sun.source.doctree.InlineTagTree; import com.sun.source.doctree.LinkTree; import com.sun.source.doctree.LiteralTree; import com.sun.source.doctree.ParamTree; +import com.sun.source.doctree.ProvidesTree; import com.sun.source.doctree.ReferenceTree; import com.sun.source.doctree.ReturnTree; import com.sun.source.doctree.SeeTree; @@ -61,6 +62,7 @@ import com.sun.source.doctree.StartElementTree; import com.sun.source.doctree.TextTree; import com.sun.source.doctree.ThrowsTree; import com.sun.source.doctree.UnknownBlockTagTree; +import com.sun.source.doctree.UsesTree; import com.sun.source.doctree.ValueTree; import com.sun.source.doctree.VersionTree; import com.sun.source.util.DocTreePath; @@ -107,12 +109,14 @@ public class CommentHelper { case AUTHOR: case DEPRECATED: case PARAM: + case PROVIDES: case RETURN: case SEE: case SERIAL_DATA: case SERIAL_FIELD: case THROWS: case UNKNOWN_BLOCK_TAG: + case USES: case VERSION: return ((BlockTagTree)dtree).getTagName(); case UNKNOWN_INLINE_TAG: @@ -440,6 +444,11 @@ public class CommentHelper { return visit(node.getReference(), null); } + @Override + public Element visitProvides(ProvidesTree node, Void p) { + return visit(node.getServiceType(), null); + } + @Override public Element visitValue(ValueTree node, Void p) { return visit(node.getReference(), null); @@ -455,6 +464,11 @@ public class CommentHelper { return visit(node.getType(), null); } + @Override + public Element visitUses(UsesTree node, Void p) { + return visit(node.getServiceType(), null); + } + @Override protected Element defaultAction(DocTree node, Void p) { return null; @@ -462,6 +476,14 @@ public class CommentHelper { }.visit(dtree, null); } + public TypeElement getServiceType(Configuration c, DocTree dtree) { + Element e = getReferencedElement(c, dtree); + if (e != null) { + return c.utils.isTypeElement(e) ? (TypeElement) e : null; + } + return null; + } + public String getReferencedSignature(DocTree dtree) { return new SimpleDocTreeVisitor() { @Override @@ -553,6 +575,11 @@ public class CommentHelper { return asList(node.getBody().getBody()); } + @Override + public List visitProvides(ProvidesTree node, Void p) { + return node.getDescription(); + } + @Override public List visitSince(SinceTree node, Void p) { return node.getBody(); @@ -608,6 +635,11 @@ public class CommentHelper { return node.getContent(); } + @Override + public List visitUses(UsesTree node, Void p) { + return node.getDescription(); + } + @Override protected List defaultAction(DocTree node, Void p) { return Collections.emptyList(); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java index bde350a4233..63b09e9a084 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java @@ -52,6 +52,7 @@ public class DeprecatedAPIListBuilder { private final Configuration configuration; private final Utils utils; public static enum DeprElementKind { + REMOVAL, MODULE, PACKAGE, INTERFACE, @@ -90,9 +91,13 @@ public class DeprecatedAPIListBuilder { * @param configuration the current configuration of the doclet. */ private void buildDeprecatedAPIInfo() { + SortedSet rset = deprecatedMap.get(DeprElementKind.REMOVAL); SortedSet modules = configuration.modules; SortedSet mset = deprecatedMap.get(DeprElementKind.MODULE); for (Element me : modules) { + if (utils.isDeprecatedForRemoval(me)) { + rset.add(me); + } if (utils.isDeprecated(me)) { mset.add(me); } @@ -100,6 +105,9 @@ public class DeprecatedAPIListBuilder { SortedSet packages = configuration.packages; SortedSet pset = deprecatedMap.get(DeprElementKind.PACKAGE); for (Element pe : packages) { + if (utils.isDeprecatedForRemoval(pe)) { + rset.add(pe); + } if (utils.isDeprecated(pe)) { pset.add(pe); } @@ -107,6 +115,9 @@ public class DeprecatedAPIListBuilder { for (Element e : configuration.getIncludedTypeElements()) { TypeElement te = (TypeElement)e; SortedSet eset; + if (utils.isDeprecatedForRemoval(e)) { + rset.add(e); + } if (utils.isDeprecated(e)) { switch (e.getKind()) { case ANNOTATION_TYPE: @@ -133,18 +144,18 @@ public class DeprecatedAPIListBuilder { break; } } - composeDeprecatedList(deprecatedMap.get(DeprElementKind.FIELD), + composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.FIELD), utils.getFields(te)); - composeDeprecatedList(deprecatedMap.get(DeprElementKind.METHOD), + composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.METHOD), utils.getMethods(te)); - composeDeprecatedList(deprecatedMap.get(DeprElementKind.CONSTRUCTOR), + composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.CONSTRUCTOR), utils.getConstructors(te)); if (utils.isEnum(e)) { - composeDeprecatedList(deprecatedMap.get(DeprElementKind.ENUM_CONSTANT), + composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.ENUM_CONSTANT), utils.getEnumConstants(te)); } if (utils.isAnnotationType(e)) { - composeDeprecatedList(deprecatedMap.get(DeprElementKind.ANNOTATION_TYPE_MEMBER), + composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.ANNOTATION_TYPE_MEMBER), utils.getAnnotationMembers(te)); } @@ -154,11 +165,16 @@ public class DeprecatedAPIListBuilder { /** * Add the members into a single list of deprecated members. * + * @param rset set of elements deprecated for removal. + * @param sset set of deprecated elements. * @param list List of all the particular deprecated members, e.g. methods. * @param members members to be added in the list. */ - private void composeDeprecatedList(SortedSet sset, List members) { + private void composeDeprecatedList(SortedSet rset, SortedSet sset, List members) { for (Element member : members) { + if (utils.isDeprecatedForRemoval(member)) { + rset.add(member); + } if (utils.isDeprecated(member)) { sset.add(member); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java index 63d180d8b25..a3b00d23ec9 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MethodTypes.java @@ -30,40 +30,23 @@ package jdk.javadoc.internal.doclets.toolkit.util; * * @author Bhavesh Patel */ -public enum MethodTypes { - ALL(0xffff, "doclet.All_Methods", "t0", true), - STATIC(0x1, "doclet.Static_Methods", "t1", false), - INSTANCE(0x2, "doclet.Instance_Methods", "t2", false), - ABSTRACT(0x4, "doclet.Abstract_Methods", "t3", false), - CONCRETE(0x8, "doclet.Concrete_Methods", "t4", false), - DEFAULT(0x10, "doclet.Default_Methods", "t5", false), - DEPRECATED(0x20, "doclet.Deprecated_Methods", "t6", false); +public enum MethodTypes implements TableTabTypes { - private final int value; - private final String resourceKey; - private final String tabId; - private final boolean isDefaultTab; + ALL(TableTabs.tab(0xffff, "doclet.All_Methods", "t0", true)), + STATIC(TableTabs.tab(0x1, "doclet.Static_Methods", "t1", false)), + INSTANCE(TableTabs.tab(0x2, "doclet.Instance_Methods", "t2", false)), + ABSTRACT(TableTabs.tab(0x4, "doclet.Abstract_Methods", "t3", false)), + CONCRETE(TableTabs.tab(0x8, "doclet.Concrete_Methods", "t4", false)), + DEFAULT(TableTabs.tab(0x10, "doclet.Default_Methods", "t5", false)), + DEPRECATED(TableTabs.tab(0x20, "doclet.Deprecated_Methods", "t6", false)); - MethodTypes(int v, String k, String id, boolean dt) { - this.value = v; - this.resourceKey = k; - this.tabId = id; - this.isDefaultTab = dt; + private final TableTabs tabs; + + private MethodTypes(TableTabs t) { + this.tabs = t; } - public int value() { - return value; + public TableTabs tableTabs() { + return this.tabs; } - - public String resourceKey() { - return resourceKey; } - - public String tabId() { - return tabId; - } - - public boolean isDefaultTab() { - return isDefaultTab; - } -} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java new file mode 100644 index 00000000000..ba95be20826 --- /dev/null +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ModulePackageTypes.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.javadoc.internal.doclets.toolkit.util; + +import jdk.javadoc.internal.doclets.toolkit.util.TableTabTypes.TableTabs; + +/** + * Enum representing module package types. + * + *

    This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice. + * + * @author Bhavesh Patel + */ +public enum ModulePackageTypes implements TableTabTypes { + ALL(TableTabs.tab(0xffff, "doclet.All_Packages", "t0", true)), + EXPORTED(TableTabs.tab(0x1, "doclet.Exported_Packages_Summary", "t1", false)), + OPENED(TableTabs.tab(0x2, "doclet.Opened_Packages_Summary", "t2", false)), + CONCEALED(TableTabs.tab(0x4, "doclet.Concealed_Packages_Summary", "t3", false)); + + private final TableTabs tabs; + + private ModulePackageTypes(TableTabs t) { + this.tabs = t; + } + + public TableTabs tableTabs() { + return this.tabs; + } +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java new file mode 100644 index 00000000000..29a4db4d8a0 --- /dev/null +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TableTabTypes.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.javadoc.internal.doclets.toolkit.util; + +/** + * Interface representing table tab types. + * + *

    This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice. + * + * @author Bhavesh Patel + */ +public interface TableTabTypes { + + TableTabs tableTabs(); + + public static final class TableTabs { + + private final int value; + private final String resourceKey; + private final String tabId; + private final boolean isDefaultTab; + + private TableTabs(int v, String k, String id, boolean dt) { + this.value = v; + this.resourceKey = k; + this.tabId = id; + this.isDefaultTab = dt; + } + + public static TableTabs tab(int value, String resourceKey, String tabId, boolean isDefaultTab) { + return new TableTabs(value, resourceKey, tabId, isDefaultTab); + } + + public int value() { + return this.value; + } + + public String resourceKey() { + return this.resourceKey; + } + + public String tabId() { + return this.tabId; + } + + public boolean isDefaultTab() { + return this.isDefaultTab; + } + } +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java index d0687ece1f6..f672e5efa18 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java @@ -36,11 +36,13 @@ import java.util.stream.Collectors; import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.ModuleElement; +import javax.lang.model.element.ModuleElement.RequiresDirective; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; @@ -74,10 +76,12 @@ import com.sun.source.tree.LineMap; import com.sun.source.util.DocSourcePositions; import com.sun.source.util.DocTrees; import com.sun.source.util.TreePath; +import com.sun.tools.javac.model.JavacTypes; import jdk.javadoc.internal.doclets.toolkit.CommentUtils.DocCommentDuo; import jdk.javadoc.internal.doclets.toolkit.Configuration; import jdk.javadoc.internal.doclets.toolkit.Messages; import jdk.javadoc.internal.doclets.toolkit.WorkArounds; +import jdk.javadoc.internal.tool.DocEnvImpl; import static javax.lang.model.element.ElementKind.*; import static javax.lang.model.element.Modifier.*; @@ -346,7 +350,12 @@ public class Utils { } protected Location getLocationForPackage(PackageElement pd) { - return getLocationForModule(configuration.docEnv.getElementUtils().getModuleOf(pd)); + ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(pd); + + if (mdle == null) + return defaultLocation(); + + return getLocationForModule(mdle); } protected Location getLocationForModule(ModuleElement mdle) { @@ -354,6 +363,10 @@ public class Utils { if (loc != null) return loc; + return defaultLocation(); + } + + private Location defaultLocation() { JavaFileManager fm = configuration.docEnv.getJavaFileManager(); return fm.hasLocation(StandardLocation.SOURCE_PATH) ? StandardLocation.SOURCE_PATH @@ -521,7 +534,7 @@ public class Utils { } void addModifers(Set modifiers) { - String s = set.stream().map(m -> m.toString()).collect(Collectors.joining(" ")); + String s = set.stream().map(Modifier::toString).collect(Collectors.joining(" ")); sb.append(s); if (!s.isEmpty()) sb.append(" "); @@ -1476,6 +1489,30 @@ public class Utils { return elementUtils.isDeprecated(e); } + /** + * Return true if the given Element is deprecated for removal. + * + * @param e the Element to check. + * @return true if the given Element is deprecated for removal. + */ + public boolean isDeprecatedForRemoval(Element e) { + List annotationList = e.getAnnotationMirrors(); + JavacTypes jctypes = ((DocEnvImpl) configuration.docEnv).toolEnv.typeutils; + for (AnnotationMirror anno : annotationList) { + if (jctypes.isSameType(anno.getAnnotationType().asElement().asType(), getDeprecatedType())) { + Map pairs = anno.getElementValues(); + if (!pairs.isEmpty()) { + for (ExecutableElement element : pairs.keySet()) { + if (element.getSimpleName().contentEquals("forRemoval")) { + return Boolean.parseBoolean((pairs.get(element)).toString()); + } + } + } + } + } + return false; + } + /** * A convenience method to get property name from the name of the * getter or setter method. @@ -1642,7 +1679,7 @@ public class Utils { return new Utils.ElementComparator() { @Override public int compare(Element mod1, Element mod2) { - return compareFullyQualifiedNames(mod1, mod2); + return compareNames(mod1, mod2); } }; } @@ -2157,6 +2194,64 @@ public class Utils { return member.getEnclosingElement().getEnclosedElements().indexOf(member); } + private Map> modulePackageMap = null; + public Map> getModulePackageMap() { + if (modulePackageMap == null) { + modulePackageMap = new HashMap<>(); + Set pkgs = configuration.getIncludedPackageElements(); + pkgs.forEach((pkg) -> { + ModuleElement mod = elementUtils.getModuleOf(pkg); + modulePackageMap.computeIfAbsent(mod, m -> new HashSet<>()).add(pkg); + }); + } + return modulePackageMap; + } + + public Map getDependentModules(ModuleElement mdle) { + Map result = new TreeMap<>(makeModuleComparator()); + Deque queue = new ArrayDeque<>(); + // get all the requires for the element in question + for (RequiresDirective rd : ElementFilter.requiresIn(mdle.getDirectives())) { + ModuleElement dep = rd.getDependency(); + // add the dependency to work queue + if (!result.containsKey(dep)) { + if (rd.isTransitive()) { + queue.addLast(dep); + } + } + // add all exports for the primary module + result.put(rd.getDependency(), getModifiers(rd)); + } + + // add only requires public for subsequent module dependencies + for (ModuleElement m = queue.poll(); m != null; m = queue.poll()) { + for (RequiresDirective rd : ElementFilter.requiresIn(m.getDirectives())) { + ModuleElement dep = rd.getDependency(); + if (!result.containsKey(dep)) { + if (rd.isTransitive()) { + result.put(dep, getModifiers(rd)); + queue.addLast(dep); + } + } + } + } + return result; + } + + public String getModifiers(RequiresDirective rd) { + StringBuilder modifiers = new StringBuilder(); + String sep=""; + if (rd.isTransitive()) { + modifiers.append("transitive"); + sep = " "; + } + if (rd.isStatic()) { + modifiers.append(sep); + modifiers.append("static"); + } + return (modifiers.length() == 0) ? " " : modifiers.toString(); + } + public long getLineNumber(Element e) { TreePath path = getTreePath(e); if (path == null) { // maybe null if synthesized @@ -2983,6 +3078,10 @@ public class Utils { return getBlockTags(element, DEPRECATED); } + public List getProvidesTrees(Element element) { + return getBlockTags(element, PROVIDES); + } + public List getSeeTrees(Element element) { return getBlockTags(element, SEE); } @@ -3026,6 +3125,10 @@ public class Utils { return out; } + public List getUsesTrees(Element element) { + return getBlockTags(element, USES); + } + public List getFirstSentenceTrees(Element element) { DocCommentTree dcTree = getDocCommentTree(element); if (dcTree == null) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java index 862726f6b83..71b2354c3d1 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java @@ -255,13 +255,9 @@ public abstract class LinkFactory { vars.add(t.asType()); }); } else if (linkInfo.type != null && utils.isDeclaredType(linkInfo.type)) { - ((DeclaredType)linkInfo.type).getTypeArguments().stream().forEach((t) -> { - vars.add(t); - }); + ((DeclaredType)linkInfo.type).getTypeArguments().stream().forEach(vars::add); } else if (ctype != null && utils.isDeclaredType(ctype)) { - ((DeclaredType)ctype).getTypeArguments().stream().forEach((t) -> { - vars.add(t); - }); + ((DeclaredType)ctype).getTypeArguments().stream().forEach(vars::add); } else if (linkInfo.typeElement != null) { linkInfo.typeElement.getTypeParameters().stream().forEach((t) -> { vars.add(t.asType()); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java index 1adec89117c..6c37e1f17a1 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java @@ -373,7 +373,7 @@ public class ElementsTable { // scan for modules with qualified subpackages ((List)opts.computeIfAbsent(ToolOption.SUBPACKAGES, v -> Collections.EMPTY_LIST)) .stream() - .map((packageName) -> new ModulePackage(packageName)) + .map(ModulePackage::new) .forEachOrdered((mpkg) -> { subPackages.add(mpkg); if (mpkg.hasModule()) { @@ -420,7 +420,7 @@ public class ElementsTable { */ ElementsTable packages(Collection packageNames) { packageNames.stream() - .map((packageName) -> new ModulePackage(packageName)) + .map(ModulePackage::new) .forEachOrdered((mpkg) -> cmdLinePackages.add(mpkg)); return this; } @@ -443,7 +443,7 @@ public class ElementsTable { private void computeSubpackages() throws ToolException { ((List) opts.computeIfAbsent(ToolOption.EXCLUDE, v -> Collections.EMPTY_LIST)) .stream() - .map((packageName) -> new ModulePackage(packageName)) + .map(ModulePackage::new) .forEachOrdered((mpkg) -> excludePackages.add(mpkg)); excludePackages.forEach((p) -> { @@ -620,7 +620,8 @@ public class ElementsTable { // add all specified packages specifiedPackageElements.forEach(pkg -> { ModuleElement mdle = toolEnv.elements.getModuleOf(pkg); - imodules.add(mdle); + if (mdle != null) + imodules.add(mdle); ipackages.add(pkg); }); @@ -633,7 +634,7 @@ public class ElementsTable { // add all types and its nested types specifiedTypeElements.forEach((klass) -> { ModuleElement mdle = toolEnv.elements.getModuleOf(klass); - if (!mdle.isUnnamed()) + if (mdle != null && !mdle.isUnnamed()) imodules.add(mdle); PackageElement pkg = toolEnv.elements.getPackageOf(klass); ipackages.add(pkg); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java index 8778d397e97..e554d393d05 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocClassFinder.java @@ -33,6 +33,7 @@ import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.code.Symbol.PackageSymbol; import com.sun.tools.javac.code.ClassFinder; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Context.Factory; /** Javadoc uses an extended class finder that records package.html entries * @@ -53,11 +54,7 @@ public class JavadocClassFinder extends ClassFinder { } public static void preRegister(Context context) { - context.put(classFinderKey, new Context.Factory() { - public ClassFinder make(Context c) { - return new JavadocClassFinder(c); - } - }); + context.put(classFinderKey, (Factory)JavadocClassFinder::new); } private ToolEnvironment toolEnv; diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java index 77a1630cd3c..53023a6d52b 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocEnter.java @@ -57,11 +57,7 @@ public class JavadocEnter extends Enter { } public static void preRegister(Context context) { - context.put(enterKey, new Context.Factory() { - public Enter make(Context c) { - return new JavadocEnter(c); - } - }); + context.put(enterKey, (Context.Factory)JavadocEnter::new); } protected JavadocEnter(Context context) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java index a5310b97167..ba54785ee52 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java @@ -56,11 +56,7 @@ public class JavadocMemberEnter extends MemberEnter { } public static void preRegister(Context context) { - context.put(memberEnterKey, new Context.Factory() { - public MemberEnter make(Context c) { - return new JavadocMemberEnter(c); - } - }); + context.put(memberEnterKey, (Context.Factory)JavadocMemberEnter::new); } final ToolEnvironment toolEnv; diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java index 40dbf566dee..223c5d5b9f7 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTodo.java @@ -27,6 +27,7 @@ package jdk.javadoc.internal.tool; import com.sun.tools.javac.comp.*; import com.sun.tools.javac.util.*; +import com.sun.tools.javac.util.Context.Factory; /** * Javadoc's own todo queue doesn't queue its inputs, as javadoc @@ -41,11 +42,7 @@ import com.sun.tools.javac.util.*; */ public class JavadocTodo extends Todo { public static void preRegister(Context context) { - context.put(todoKey, new Context.Factory() { - public Todo make(Context c) { - return new JavadocTodo(c); - } - }); + context.put(todoKey, (Factory)JavadocTodo::new); } protected JavadocTodo(Context context) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java index 478366d78e3..b69514775e4 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java @@ -33,6 +33,7 @@ import java.util.ResourceBundle; import javax.lang.model.element.Element; import javax.tools.Diagnostic.Kind; +import com.sun.tools.javac.util.Context.Factory; import jdk.javadoc.doclet.Reporter; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.DocSourcePositions; @@ -73,20 +74,12 @@ public class Messager extends Log implements Reporter { public static void preRegister(Context context, final String programName) { - context.put(logKey, new Context.Factory() { - public Log make(Context c) { - return new Messager(c, programName); - } - }); + context.put(logKey, (Factory)c -> new Messager(c, programName)); } public static void preRegister(Context context, final String programName, final PrintWriter outWriter, final PrintWriter errWriter) { - context.put(logKey, new Context.Factory() { - public Log make(Context c) { - return new Messager(c, programName, outWriter, errWriter); - } - }); + context.put(logKey, (Factory)c -> new Messager(c, programName, outWriter, errWriter)); } @Override diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java index b5512a22bb0..7f31da13469 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java @@ -211,7 +211,7 @@ public class Start extends ToolOption.Helper { Stream.of(ToolOption.values()) .filter(opt -> opt.kind == kind) .sorted(comp) - .forEach(opt -> showToolOption(opt)); + .forEach(this::showToolOption); } void showToolOption(ToolOption option) { @@ -241,7 +241,7 @@ public class Start extends ToolOption.Helper { doclet.getSupportedOptions().stream() .filter(opt -> opt.getKind() == kind) .sorted(comp) - .forEach(opt -> showDocletOption(opt)); + .forEach(this::showDocletOption); } void showDocletOption(Doclet.Option option) { @@ -338,7 +338,7 @@ public class Start extends ToolOption.Helper { nargv); return (rc == 0) ? OK : ERROR; } - return begin(Arrays.asList(argv), Collections. emptySet()); + return begin(Arrays.asList(argv), Collections.emptySet()); } // Called by 199 API. diff --git a/langtools/src/jdk.javadoc/share/legal/jszip.md b/langtools/src/jdk.javadoc/share/legal/jszip.md new file mode 100644 index 00000000000..46359d7ba0a --- /dev/null +++ b/langtools/src/jdk.javadoc/share/legal/jszip.md @@ -0,0 +1,26 @@ +## JSZip v2.5.0 + +### MIT License +

    +
+Copyright (c) 2009-2014 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
+
+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.
+
+
    diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java index 3cb8c1f8f9c..b624488f2d6 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java @@ -56,8 +56,8 @@ public abstract class Attribute { public static final String ModuleHashes = "ModuleHashes"; public static final String ModuleMainClass = "ModuleMainClass"; public static final String ModulePackages = "ModulePackages"; + public static final String ModuleResolution = "ModuleResolution"; public static final String ModuleTarget = "ModuleTarget"; - public static final String ModuleVersion = "ModuleVersion"; public static final String RuntimeVisibleAnnotations = "RuntimeVisibleAnnotations"; public static final String RuntimeInvisibleAnnotations = "RuntimeInvisibleAnnotations"; public static final String RuntimeVisibleParameterAnnotations = "RuntimeVisibleParameterAnnotations"; @@ -128,8 +128,8 @@ public abstract class Attribute { standardAttributes.put(ModuleHashes, ModuleHashes_attribute.class); standardAttributes.put(ModuleMainClass, ModuleMainClass_attribute.class); standardAttributes.put(ModulePackages, ModulePackages_attribute.class); + standardAttributes.put(ModuleResolution, ModuleResolution_attribute.class); standardAttributes.put(ModuleTarget, ModuleTarget_attribute.class); - standardAttributes.put(ModuleVersion, ModuleVersion_attribute.class); standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class); standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class); standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class); @@ -191,8 +191,8 @@ public abstract class Attribute { R visitModuleHashes(ModuleHashes_attribute attr, P p); R visitModuleMainClass(ModuleMainClass_attribute attr, P p); R visitModulePackages(ModulePackages_attribute attr, P p); + R visitModuleResolution(ModuleResolution_attribute attr, P p); R visitModuleTarget(ModuleTarget_attribute attr, P p); - R visitModuleVersion(ModuleVersion_attribute attr, P p); R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p); R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p); R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java index 6a5bd8ccf86..d6dd64aa340 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassTranslator.java @@ -38,7 +38,9 @@ import com.sun.tools.classfile.ConstantPool.CONSTANT_Long_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodHandle_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodType_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Methodref_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Module_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_NameAndType_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Package_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info; import com.sun.tools.classfile.ConstantPool.CPInfo; @@ -242,6 +244,7 @@ public class ClassTranslator return true; } + @Override public CPInfo visitClass(CONSTANT_Class_info info, Map translations) { CONSTANT_Class_info info2 = (CONSTANT_Class_info) translations.get(info); if (info2 == null) { @@ -255,6 +258,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitDouble(CONSTANT_Double_info info, Map translations) { CONSTANT_Double_info info2 = (CONSTANT_Double_info) translations.get(info); if (info2 == null) { @@ -264,6 +268,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitFieldref(CONSTANT_Fieldref_info info, Map translations) { CONSTANT_Fieldref_info info2 = (CONSTANT_Fieldref_info) translations.get(info); if (info2 == null) { @@ -277,6 +282,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitFloat(CONSTANT_Float_info info, Map translations) { CONSTANT_Float_info info2 = (CONSTANT_Float_info) translations.get(info); if (info2 == null) { @@ -286,6 +292,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitInteger(CONSTANT_Integer_info info, Map translations) { CONSTANT_Integer_info info2 = (CONSTANT_Integer_info) translations.get(info); if (info2 == null) { @@ -295,6 +302,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Map translations) { CONSTANT_InterfaceMethodref_info info2 = (CONSTANT_InterfaceMethodref_info) translations.get(info); if (info2 == null) { @@ -308,6 +316,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Map translations) { CONSTANT_InvokeDynamic_info info2 = (CONSTANT_InvokeDynamic_info) translations.get(info); if (info2 == null) { @@ -322,6 +331,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitLong(CONSTANT_Long_info info, Map translations) { CONSTANT_Long_info info2 = (CONSTANT_Long_info) translations.get(info); if (info2 == null) { @@ -331,19 +341,7 @@ public class ClassTranslator return info; } - public CPInfo visitNameAndType(CONSTANT_NameAndType_info info, Map translations) { - CONSTANT_NameAndType_info info2 = (CONSTANT_NameAndType_info) translations.get(info); - if (info2 == null) { - ConstantPool cp2 = translate(info.cp, translations); - if (cp2 == info.cp) - info2 = info; - else - info2 = new CONSTANT_NameAndType_info(cp2, info.name_index, info.type_index); - translations.put(info, info2); - } - return info; - } - + @Override public CPInfo visitMethodref(CONSTANT_Methodref_info info, Map translations) { CONSTANT_Methodref_info info2 = (CONSTANT_Methodref_info) translations.get(info); if (info2 == null) { @@ -357,6 +355,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitMethodHandle(CONSTANT_MethodHandle_info info, Map translations) { CONSTANT_MethodHandle_info info2 = (CONSTANT_MethodHandle_info) translations.get(info); if (info2 == null) { @@ -371,6 +370,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitMethodType(CONSTANT_MethodType_info info, Map translations) { CONSTANT_MethodType_info info2 = (CONSTANT_MethodType_info) translations.get(info); if (info2 == null) { @@ -385,6 +385,49 @@ public class ClassTranslator return info; } + @Override + public CPInfo visitModule(CONSTANT_Module_info info, Map translations) { + CONSTANT_Module_info info2 = (CONSTANT_Module_info) translations.get(info); + if (info2 == null) { + ConstantPool cp2 = translate(info.cp, translations); + if (cp2 == info.cp) + info2 = info; + else + info2 = new CONSTANT_Module_info(cp2, info.name_index); + translations.put(info, info2); + } + return info; + } + + @Override + public CPInfo visitNameAndType(CONSTANT_NameAndType_info info, Map translations) { + CONSTANT_NameAndType_info info2 = (CONSTANT_NameAndType_info) translations.get(info); + if (info2 == null) { + ConstantPool cp2 = translate(info.cp, translations); + if (cp2 == info.cp) + info2 = info; + else + info2 = new CONSTANT_NameAndType_info(cp2, info.name_index, info.type_index); + translations.put(info, info2); + } + return info; + } + + @Override + public CPInfo visitPackage(CONSTANT_Package_info info, Map translations) { + CONSTANT_Package_info info2 = (CONSTANT_Package_info) translations.get(info); + if (info2 == null) { + ConstantPool cp2 = translate(info.cp, translations); + if (cp2 == info.cp) + info2 = info; + else + info2 = new CONSTANT_Package_info(cp2, info.name_index); + translations.put(info, info2); + } + return info; + } + + @Override public CPInfo visitString(CONSTANT_String_info info, Map translations) { CONSTANT_String_info info2 = (CONSTANT_String_info) translations.get(info); if (info2 == null) { @@ -398,6 +441,7 @@ public class ClassTranslator return info; } + @Override public CPInfo visitUtf8(CONSTANT_Utf8_info info, Map translations) { CONSTANT_Utf8_info info2 = (CONSTANT_Utf8_info) translations.get(info); if (info2 == null) { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java index c3b8d811276..f1e0b60202e 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java @@ -289,13 +289,6 @@ public class ClassWriter { return 2; } - @Override - public Integer visitNameAndType(CONSTANT_NameAndType_info info, ClassOutputStream out) { - out.writeShort(info.name_index); - out.writeShort(info.type_index); - return 1; - } - @Override public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, ClassOutputStream out) { out.writeByte(info.reference_kind.tag); @@ -314,6 +307,25 @@ public class ClassWriter { return writeRef(info, out); } + @Override + public Integer visitModule(CONSTANT_Module_info info, ClassOutputStream out) { + out.writeShort(info.name_index); + return 1; + } + + @Override + public Integer visitNameAndType(CONSTANT_NameAndType_info info, ClassOutputStream out) { + out.writeShort(info.name_index); + out.writeShort(info.type_index); + return 1; + } + + @Override + public Integer visitPackage(CONSTANT_Package_info info, ClassOutputStream out) { + out.writeShort(info.name_index); + return 1; + } + @Override public Integer visitString(CONSTANT_String_info info, ClassOutputStream out) { out.writeShort(info.string_index); @@ -424,14 +436,6 @@ public class ClassWriter { return null; } - @Override - public Void visitModulePackages(ModulePackages_attribute attr, ClassOutputStream out) { - out.writeShort(attr.packages_count); - for (int i: attr.packages_index) - out.writeShort(i); - return null; - } - @Override public Void visitConstantValue(ConstantValue_attribute attr, ClassOutputStream out) { out.writeShort(attr.constantvalue_index); @@ -466,20 +470,6 @@ public class ClassWriter { return null; } - @Override - public Void visitModuleHashes(ModuleHashes_attribute attr, ClassOutputStream out) { - out.writeShort(attr.algorithm_index); - out.writeShort(attr.hashes_table.length); - for (ModuleHashes_attribute.Entry e: attr.hashes_table) { - out.writeShort(e.module_name_index); - out.writeShort(e.hash.length); - for (byte b: e.hash) { - out.writeByte(b); - } - } - return null; - } - protected void writeInnerClassesInfo(InnerClasses_attribute.Info info, ClassOutputStream out) { out.writeShort(info.inner_class_info_index); out.writeShort(info.outer_class_info_index); @@ -542,21 +532,17 @@ public class ClassWriter { return null; } - @Override - public Void visitModuleMainClass(ModuleMainClass_attribute attr, ClassOutputStream out) { - out.writeShort(attr.main_class_index); - return null; - } - @Override public Void visitModule(Module_attribute attr, ClassOutputStream out) { out.writeShort(attr.module_name); out.writeShort(attr.module_flags); + out.writeShort(attr.module_version_index); out.writeShort(attr.requires.length); for (Module_attribute.RequiresEntry e: attr.requires) { out.writeShort(e.requires_index); out.writeShort(e.requires_flags); + out.writeShort(e.requires_version_index); } out.writeShort(attr.exports.length); @@ -595,8 +581,44 @@ public class ClassWriter { } @Override - public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, ClassOutputStream out) { - annotationWriter.write(attr.annotations, out); + public Void visitModuleHashes(ModuleHashes_attribute attr, ClassOutputStream out) { + out.writeShort(attr.algorithm_index); + out.writeShort(attr.hashes_table.length); + for (ModuleHashes_attribute.Entry e: attr.hashes_table) { + out.writeShort(e.module_name_index); + out.writeShort(e.hash.length); + for (byte b: e.hash) { + out.writeByte(b); + } + } + return null; + } + + @Override + public Void visitModuleMainClass(ModuleMainClass_attribute attr, ClassOutputStream out) { + out.writeShort(attr.main_class_index); + return null; + } + + @Override + public Void visitModulePackages(ModulePackages_attribute attr, ClassOutputStream out) { + out.writeShort(attr.packages_count); + for (int i: attr.packages_index) + out.writeShort(i); + return null; + } + + @Override + public Void visitModuleResolution(ModuleResolution_attribute attr, ClassOutputStream out) { + out.writeShort(attr.resolution_flags); + return null; + } + + @Override + public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) { + out.writeShort(attr.os_name_index); + out.writeShort(attr.os_arch_index); + out.writeShort(attr.os_version_index); return null; } @@ -607,8 +629,10 @@ public class ClassWriter { } @Override - public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, ClassOutputStream out) { - annotationWriter.write(attr.annotations, out); + public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, ClassOutputStream out) { + out.writeByte(attr.parameter_annotations.length); + for (Annotation[] annos: attr.parameter_annotations) + annotationWriter.write(annos, out); return null; } @@ -618,6 +642,12 @@ public class ClassWriter { return null; } + @Override + public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, ClassOutputStream out) { + annotationWriter.write(attr.annotations, out); + return null; + } + @Override public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, ClassOutputStream out) { out.writeByte(attr.parameter_annotations.length); @@ -627,10 +657,8 @@ public class ClassWriter { } @Override - public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, ClassOutputStream out) { - out.writeByte(attr.parameter_annotations.length); - for (Annotation[] annos: attr.parameter_annotations) - annotationWriter.write(annos, out); + public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, ClassOutputStream out) { + annotationWriter.write(attr.annotations, out); return null; } @@ -685,24 +713,10 @@ public class ClassWriter { return null; } - @Override - public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) { - out.writeShort(attr.os_name_index); - out.writeShort(attr.os_arch_index); - out.writeShort(attr.os_version_index); - return null; - } - protected void writeAccessFlags(AccessFlags flags, ClassOutputStream p) { sharedOut.writeShort(flags.flags); } - @Override - public Void visitModuleVersion(ModuleVersion_attribute attr, ClassOutputStream out) { - out.writeShort(attr.version_index); - return null; - } - protected StackMapTableWriter stackMapWriter; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java index 6d5b7e6bef8..9eefdf5937a 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Code_attribute.java @@ -103,35 +103,30 @@ public class Code_attribute extends Attribute { } public Iterable getInstructions() { - return new Iterable() { - public Iterator iterator() { - return new Iterator() { + return () -> new Iterator() { - public boolean hasNext() { - return (next != null); - } - - public Instruction next() { - if (next == null) - throw new NoSuchElementException(); - - current = next; - pc += current.length(); - next = (pc < code.length ? new Instruction(code, pc) : null); - return current; - } - - public void remove() { - throw new UnsupportedOperationException("Not supported."); - } - - Instruction current = null; - int pc = 0; - Instruction next = new Instruction(code, pc); - - }; + public boolean hasNext() { + return (next != null); } + public Instruction next() { + if (next == null) + throw new NoSuchElementException(); + + current = next; + pc += current.length(); + next = (pc < code.length ? new Instruction(code, pc) : null); + return current; + } + + public void remove() { + throw new UnsupportedOperationException("Not supported."); + } + + Instruction current = null; + int pc = 0; + Instruction next = new Instruction(code, pc); + }; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java index e5dd6a04899..aba1352fc1c 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPool.java @@ -117,6 +117,8 @@ public class ConstantPool { public static final int CONSTANT_MethodHandle = 15; public static final int CONSTANT_MethodType = 16; public static final int CONSTANT_InvokeDynamic = 18; + public static final int CONSTANT_Module = 19; + public static final int CONSTANT_Package = 20; public static enum RefKind { REF_getField(1), @@ -213,10 +215,18 @@ public class ConstantPool { pool[i] = new CONSTANT_Methodref_info(this, cr); break; + case CONSTANT_Module: + pool[i] = new CONSTANT_Module_info(this, cr); + break; + case CONSTANT_NameAndType: pool[i] = new CONSTANT_NameAndType_info(this, cr); break; + case CONSTANT_Package: + pool[i] = new CONSTANT_Package_info(this, cr); + break; + case CONSTANT_String: pool[i] = new CONSTANT_String_info(this, cr); break; @@ -276,10 +286,18 @@ public class ConstantPool { return ((CONSTANT_Class_info) get(index, CONSTANT_Class)); } + public CONSTANT_Module_info getModuleInfo(int index) throws InvalidIndex, UnexpectedEntry { + return ((CONSTANT_Module_info) get(index, CONSTANT_Module)); + } + public CONSTANT_NameAndType_info getNameAndTypeInfo(int index) throws InvalidIndex, UnexpectedEntry { return ((CONSTANT_NameAndType_info) get(index, CONSTANT_NameAndType)); } + public CONSTANT_Package_info getPackageInfo(int index) throws InvalidIndex, UnexpectedEntry { + return ((CONSTANT_Package_info) get(index, CONSTANT_Package)); + } + public String getUTF8Value(int index) throws InvalidIndex, UnexpectedEntry { return getUTF8Info(index).value; } @@ -295,36 +313,32 @@ public class ConstantPool { } public Iterable entries() { - return new Iterable() { - public Iterator iterator() { - return new Iterator() { + return () -> new Iterator() { - public boolean hasNext() { - return next < pool.length; - } - - public CPInfo next() { - current = pool[next]; - switch (current.getTag()) { - case CONSTANT_Double: - case CONSTANT_Long: - next += 2; - break; - default: - next += 1; - } - return current; - } - - public void remove() { - throw new UnsupportedOperationException(); - } - - private CPInfo current; - private int next = 1; - - }; + public boolean hasNext() { + return next < pool.length; } + + public CPInfo next() { + current = pool[next]; + switch (current.getTag()) { + case CONSTANT_Double: + case CONSTANT_Long: + next += 2; + break; + default: + next += 1; + } + return current; + } + + public void remove() { + throw new UnsupportedOperationException(); + } + + private CPInfo current; + private int next = 1; + }; } @@ -339,10 +353,12 @@ public class ConstantPool { R visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, P p); R visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, P p); R visitLong(CONSTANT_Long_info info, P p); - R visitNameAndType(CONSTANT_NameAndType_info info, P p); R visitMethodref(CONSTANT_Methodref_info info, P p); R visitMethodHandle(CONSTANT_MethodHandle_info info, P p); R visitMethodType(CONSTANT_MethodType_info info, P p); + R visitModule(CONSTANT_Module_info info, P p); + R visitNameAndType(CONSTANT_NameAndType_info info, P p); + R visitPackage(CONSTANT_Package_info info, P p); R visitString(CONSTANT_String_info info, P p); R visitUtf8(CONSTANT_Utf8_info info, P p); } @@ -781,6 +797,46 @@ public class ConstantPool { } } + public static class CONSTANT_Module_info extends CPInfo { + CONSTANT_Module_info(ConstantPool cp, ClassReader cr) throws IOException { + super(cp); + name_index = cr.readUnsignedShort(); + } + + public CONSTANT_Module_info(ConstantPool cp, int name_index) { + super(cp); + this.name_index = name_index; + } + + public int getTag() { + return CONSTANT_Module; + } + + public int byteLength() { + return 3; + } + + /** + * Get the raw value of the module name referenced by this constant pool entry. + * This will be the name of the module. + * @return the raw value of the module name + */ + public String getName() throws ConstantPoolException { + return cp.getUTF8Value(name_index); + } + + @Override + public String toString() { + return "CONSTANT_Module_info[name_index: " + name_index + "]"; + } + + public R accept(Visitor visitor, D data) { + return visitor.visitModule(this, data); + } + + public final int name_index; + } + public static class CONSTANT_NameAndType_info extends CPInfo { CONSTANT_NameAndType_info(ConstantPool cp, ClassReader cr) throws IOException { super(cp); @@ -823,6 +879,46 @@ public class ConstantPool { public final int type_index; } + public static class CONSTANT_Package_info extends CPInfo { + CONSTANT_Package_info(ConstantPool cp, ClassReader cr) throws IOException { + super(cp); + name_index = cr.readUnsignedShort(); + } + + public CONSTANT_Package_info(ConstantPool cp, int name_index) { + super(cp); + this.name_index = name_index; + } + + public int getTag() { + return CONSTANT_Package; + } + + public int byteLength() { + return 3; + } + + /** + * Get the raw value of the package name referenced by this constant pool entry. + * This will be the name of the package, in internal form. + * @return the raw value of the module name + */ + public String getName() throws ConstantPoolException { + return cp.getUTF8Value(name_index); + } + + @Override + public String toString() { + return "CONSTANT_Package_info[name_index: " + name_index + "]"; + } + + public R accept(Visitor visitor, D data) { + return visitor.visitPackage(this, data); + } + + public final int name_index; + } + public static class CONSTANT_String_info extends CPInfo { CONSTANT_String_info(ConstantPool cp, ClassReader cr) throws IOException { super(cp); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java index 5de014a08c7..d4e514c2b33 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java @@ -248,11 +248,7 @@ public class Dependencies { boolean transitiveClosure) throws ClassFileNotFoundException { final Set results = new HashSet<>(); - Recorder r = new Recorder() { - public void addDependency(Dependency d) { - results.add(d); - } - }; + Recorder r = results::add; findAllDependencies(classFinder, rootClassNames, transitiveClosure, r); return results; } @@ -565,7 +561,7 @@ public class Dependencies { private Map locations = new ConcurrentHashMap<>(); Location getLocation(String className) { - return locations.computeIfAbsent(className, cn -> new SimpleLocation(cn)); + return locations.computeIfAbsent(className, SimpleLocation::new); } class Visitor implements ConstantPool.Visitor, Type.Visitor { @@ -708,6 +704,10 @@ public class Dependencies { return visitRef(info, p); } + public Void visitModule(CONSTANT_Module_info info, Void p) { + return null; + } + public Void visitNameAndType(CONSTANT_NameAndType_info info, Void p) { try { new Signature(info.type_index).getType(constant_pool).accept(this, null); @@ -717,6 +717,10 @@ public class Dependencies { } } + public Void visitPackage(CONSTANT_Package_info info, Void p) { + return null; + } + public Void visitString(CONSTANT_String_info info, Void p) { return null; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java index a6eb2ffbfe7..9b3cd433bd8 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java @@ -27,6 +27,8 @@ package com.sun.tools.classfile; import java.io.IOException; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Package_info; + /** * See JVMS, section 4.8.15. * @@ -61,7 +63,8 @@ public class ModulePackages_attribute extends Attribute { public String getPackage(int index, ConstantPool constant_pool) throws ConstantPoolException { int package_index = packages_index[index]; - return constant_pool.getUTF8Value(package_index); + CONSTANT_Package_info info = constant_pool.getPackageInfo(package_index); + return info.getName(); } @Override diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java similarity index 62% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java rename to langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java index 8415d791496..d912931a406 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleResolution_attribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,26 +35,35 @@ import java.io.IOException; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public class ModuleVersion_attribute extends Attribute { - ModuleVersion_attribute(ClassReader cr, int name_index, int length) throws IOException { +public class ModuleResolution_attribute extends Attribute { + public static final int DO_NOT_RESOLVE_BY_DEFAULT = 0x0001; + public static final int WARN_DEPRECATED = 0x0002; + public static final int WARN_DEPRECATED_FOR_REMOVAL = 0x0004; + public static final int WARN_INCUBATING = 0x0008; + + ModuleResolution_attribute(ClassReader cr, int name_index, int length) + throws IOException { super(name_index, length); - version_index = cr.readUnsignedShort(); + resolution_flags = cr.readUnsignedShort(); } - public ModuleVersion_attribute(ConstantPool constant_pool, int version_index) + public ModuleResolution_attribute(ConstantPool constant_pool, + int resolution_flags) throws ConstantPoolException { - this(constant_pool.getUTF8Index(Attribute.ModuleVersion), version_index); + this(constant_pool.getUTF8Index(Attribute.ModulePackages), + resolution_flags); } - public ModuleVersion_attribute(int name_index, int version_index) { + public ModuleResolution_attribute(int name_index, + int resolution_flags) { super(name_index, 2); - this.version_index = version_index; + this.resolution_flags = resolution_flags; } @Override public R accept(Visitor visitor, D data) { - return visitor.visitModuleVersion(this, data); + return visitor.visitModuleResolution(this, data); } - public final int version_index; + public final int resolution_flags; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java index 85262fbd8fe..67f9c755c9c 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java @@ -27,6 +27,8 @@ package com.sun.tools.classfile; import java.io.IOException; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Module_info; + /** * See Jigsaw. * @@ -48,6 +50,8 @@ public class Module_attribute extends Attribute { module_name = cr.readUnsignedShort(); module_flags = cr.readUnsignedShort(); + module_version_index = cr.readUnsignedShort(); + requires_count = cr.readUnsignedShort(); requires = new RequiresEntry[requires_count]; for (int i = 0; i < requires_count; i++) @@ -77,6 +81,7 @@ public class Module_attribute extends Attribute { public Module_attribute(int name_index, int module_name, int module_flags, + int module_version_index, RequiresEntry[] requires, ExportsEntry[] exports, OpensEntry[] opens, @@ -85,6 +90,7 @@ public class Module_attribute extends Attribute { super(name_index, 2); this.module_name = module_name; this.module_flags = module_flags; + this.module_version_index = module_version_index; requires_count = requires.length; this.requires = requires; exports_count = exports.length; @@ -109,6 +115,7 @@ public class Module_attribute extends Attribute { public final int module_name; public final int module_flags; + public final int module_version_index; public final int requires_count; public final RequiresEntry[] requires; public final int exports_count; @@ -124,21 +131,25 @@ public class Module_attribute extends Attribute { RequiresEntry(ClassReader cr) throws IOException { requires_index = cr.readUnsignedShort(); requires_flags = cr.readUnsignedShort(); + requires_version_index = cr.readUnsignedShort(); } - public RequiresEntry(int index, int flags) { + public RequiresEntry(int index, int flags, int version_index) { this.requires_index = index; this.requires_flags = flags; + this.requires_version_index = version_index; } public String getRequires(ConstantPool constant_pool) throws ConstantPoolException { - return constant_pool.getUTF8Value(requires_index); + CONSTANT_Module_info info = constant_pool.getModuleInfo(requires_index); + return info.getName(); } public static final int length = 4; public final int requires_index; public final int requires_flags; + public final int requires_version_index; } public static class ExportsEntry { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java index f6cda317c1a..664037ca7f9 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ReferenceFinder.java @@ -136,14 +136,6 @@ public final class ReferenceFinder { return false; } - public Boolean visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, ConstantPool cpool) { - return filter.accept(cpool, info); - } - - public Boolean visitMethodref(CONSTANT_Methodref_info info, ConstantPool cpool) { - return filter.accept(cpool, info); - } - public Boolean visitFieldref(CONSTANT_Fieldref_info info, ConstantPool cpool) { return filter.accept(cpool, info); } @@ -160,6 +152,10 @@ public final class ReferenceFinder { return false; } + public Boolean visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, ConstantPool cpool) { + return filter.accept(cpool, info); + } + public Boolean visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, ConstantPool cpool) { return false; } @@ -168,18 +164,30 @@ public final class ReferenceFinder { return false; } - public Boolean visitNameAndType(CONSTANT_NameAndType_info info, ConstantPool cpool) { - return false; - } - public Boolean visitMethodHandle(CONSTANT_MethodHandle_info info, ConstantPool cpool) { return false; } + public Boolean visitMethodref(CONSTANT_Methodref_info info, ConstantPool cpool) { + return filter.accept(cpool, info); + } + public Boolean visitMethodType(CONSTANT_MethodType_info info, ConstantPool cpool) { return false; } + public Boolean visitModule(CONSTANT_Module_info info, ConstantPool cpool) { + return false; + } + + public Boolean visitNameAndType(CONSTANT_NameAndType_info info, ConstantPool cpool) { + return false; + } + + public Boolean visitPackage(CONSTANT_Package_info info, ConstantPool cpool) { + return false; + } + public Boolean visitString(CONSTANT_String_info info, ConstantPool cpool) { return false; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java index 45fc421b5ac..a7c9e189c69 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java @@ -51,8 +51,8 @@ import com.sun.tools.classfile.Module_attribute; import com.sun.tools.classfile.ModuleHashes_attribute; import com.sun.tools.classfile.ModuleMainClass_attribute; import com.sun.tools.classfile.ModulePackages_attribute; +import com.sun.tools.classfile.ModuleResolution_attribute; import com.sun.tools.classfile.ModuleTarget_attribute; -import com.sun.tools.classfile.ModuleVersion_attribute; import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute; @@ -237,27 +237,6 @@ public class AttributeWriter extends BasicWriter return null; } - private String getJavaPackage(ModulePackages_attribute attr, int index) { - try { - return getJavaName(attr.getPackage(index, constant_pool)); - } catch (ConstantPoolException e) { - return report(e); - } - } - - @Override - public Void visitModulePackages(ModulePackages_attribute attr, Void ignore) { - println("ModulePackages: "); - indent(+1); - for (int i = 0; i < attr.packages_count; i++) { - print("#" + attr.packages_index[i]); - tab(); - println("// " + getJavaPackage(attr, i)); - } - indent(-1); - return null; - } - @Override public Void visitConstantValue(ConstantValue_attribute attr, Void ignore) { print("ConstantValue: "); @@ -322,39 +301,6 @@ public class AttributeWriter extends BasicWriter } } - @Override - public Void visitModuleHashes(ModuleHashes_attribute attr, Void ignore) { - println("ModuleHashes:"); - indent(+1); - print("algorithm #" + attr.algorithm_index); - tab(); - println("// " + getAlgorithm(attr)); - for (ModuleHashes_attribute.Entry e : attr.hashes_table) { - print("#" + e.module_name_index); - tab(); - println("// " + getModuleName(e)); - println("hash_length: " + e.hash.length); - println("hash: [" + toHex(e.hash) + "]"); - } - indent(-1); - return null; - } - - private String getAlgorithm(ModuleHashes_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.algorithm_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - - private String getModuleName(ModuleHashes_attribute.Entry entry) { - try { - return constant_pool.getUTF8Value(entry.module_name_index); - } catch (ConstantPoolException e) { - return report(e); - } - } @Override public Void visitInnerClasses(InnerClasses_attribute attr, Void ignore) { @@ -449,15 +395,6 @@ public class AttributeWriter extends BasicWriter return null; } - @Override - public Void visitModuleMainClass(ModuleMainClass_attribute attr, Void ignore) { - print("ModuleMainClass: #" + attr.main_class_index); - tab(); - print("// " + getJavaClassName(attr)); - println(); - return null; - } - private String getJavaClassName(ModuleMainClass_attribute a) { try { return getJavaName(a.getMainClassName(constant_pool)); @@ -495,13 +432,11 @@ public class AttributeWriter extends BasicWriter println("Module:"); indent(+1); - print(attr.module_name); - tab(); - println("// " + constantWriter.stringValue(attr.module_name)); - + print("#" + attr.module_name); + print(","); print(String.format("%x", attr.module_flags)); tab(); - print("// "); + print("// " + constantWriter.stringValue(attr.module_name)); if ((attr.module_flags & Module_attribute.ACC_OPEN) != 0) print(" ACC_OPEN"); if ((attr.module_flags & Module_attribute.ACC_MANDATED) != 0) @@ -509,6 +444,12 @@ public class AttributeWriter extends BasicWriter if ((attr.module_flags & Module_attribute.ACC_SYNTHETIC) != 0) print(" ACC_SYNTHETIC"); println(); + print("#" + attr.module_version_index); + if (attr.module_version_index != 0) { + tab(); + print("// " + constantWriter.stringValue(attr.module_version_index)); + } + println(); printRequiresTable(attr); printExportsTable(attr); @@ -538,6 +479,12 @@ public class AttributeWriter extends BasicWriter if ((e.requires_flags & Module_attribute.ACC_MANDATED) != 0) print(" ACC_MANDATED"); println(); + print("#" + e.requires_version_index); + if (e.requires_version_index != 0) { + tab(); + print("// " + constantWriter.stringValue(e.requires_version_index)); + } + println(); } indent(-1); } @@ -626,6 +573,145 @@ public class AttributeWriter extends BasicWriter indent(-1); } + @Override + public Void visitModuleHashes(ModuleHashes_attribute attr, Void ignore) { + println("ModuleHashes:"); + indent(+1); + print("algorithm: #" + attr.algorithm_index); + tab(); + println("// " + getAlgorithm(attr)); + print(attr.hashes_table_length); + tab(); + println("// hashes"); + for (ModuleHashes_attribute.Entry e : attr.hashes_table) { + print("#" + e.module_name_index); + tab(); + println("// " + getModuleName(e)); + println("hash_length: " + e.hash.length); + println("hash: [" + toHex(e.hash) + "]"); + } + indent(-1); + return null; + } + + private String getAlgorithm(ModuleHashes_attribute attr) { + try { + return constant_pool.getUTF8Value(attr.algorithm_index); + } catch (ConstantPoolException e) { + return report(e); + } + } + + private String getModuleName(ModuleHashes_attribute.Entry entry) { + try { + int utf8Index = constant_pool.getModuleInfo(entry.module_name_index).name_index; + return constant_pool.getUTF8Value(utf8Index); + } catch (ConstantPoolException e) { + return report(e); + } + } + + @Override + public Void visitModuleMainClass(ModuleMainClass_attribute attr, Void ignore) { + print("ModuleMainClass: #" + attr.main_class_index); + tab(); + print("// " + getJavaClassName(attr)); + println(); + return null; + } + + @Override + public Void visitModulePackages(ModulePackages_attribute attr, Void ignore) { + println("ModulePackages: "); + indent(+1); + for (int i = 0; i < attr.packages_count; i++) { + print("#" + attr.packages_index[i]); + tab(); + println("// " + getJavaPackage(attr, i)); + } + indent(-1); + return null; + } + + private String getJavaPackage(ModulePackages_attribute attr, int index) { + try { + return getJavaName(attr.getPackage(index, constant_pool)); + } catch (ConstantPoolException e) { + return report(e); + } + } + + @Override + public Void visitModuleResolution(ModuleResolution_attribute attr, Void ignore) { + println("ModuleResolution:"); + indent(+1); + print(String.format("%x", attr.resolution_flags)); + tab(); + print("// "); + int flags = attr.resolution_flags; + if ((flags & ModuleResolution_attribute.DO_NOT_RESOLVE_BY_DEFAULT) != 0) + print(" DO_NOT_RESOLVE_BY_DEFAULT"); + if ((flags & ModuleResolution_attribute.WARN_DEPRECATED) != 0) + print(" WARN_DEPRECATED"); + if ((flags & ModuleResolution_attribute.WARN_DEPRECATED_FOR_REMOVAL) != 0) + print(" WARN_DEPRECATED_FOR_REMOVAL"); + if ((flags & ModuleResolution_attribute.WARN_INCUBATING) != 0) + print(" WARN_INCUBATING"); + println(); + indent(-1); + return null; + } + + @Override + public Void visitModuleTarget(ModuleTarget_attribute attr, Void ignore) { + println("ModuleTarget:"); + indent(+1); + print("os_name: #" + attr.os_name_index); + if (attr.os_name_index != 0) { + tab(); + print("// " + getOSName(attr)); + } + println(); + print("os_arch: #" + attr.os_arch_index); + if (attr.os_arch_index != 0) { + tab(); + print("// " + getOSArch(attr)); + } + println(); + print("os_version: #" + attr.os_version_index); + if (attr.os_version_index != 0) { + tab(); + print("// " + getOSVersion(attr)); + } + println(); + indent(-1); + return null; + } + + private String getOSName(ModuleTarget_attribute attr) { + try { + return constant_pool.getUTF8Value(attr.os_name_index); + } catch (ConstantPoolException e) { + return report(e); + } + } + + private String getOSArch(ModuleTarget_attribute attr) { + try { + return constant_pool.getUTF8Value(attr.os_arch_index); + } catch (ConstantPoolException e) { + return report(e); + } + } + + private String getOSVersion(ModuleTarget_attribute attr) { + try { + return constant_pool.getUTF8Value(attr.os_version_index); + } catch (ConstantPoolException e) { + return report(e); + } + } + @Override public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) { println("RuntimeVisibleAnnotations:"); @@ -929,74 +1015,6 @@ public class AttributeWriter extends BasicWriter return null; } - @Override - public Void visitModuleTarget(ModuleTarget_attribute attr, Void ignore) { - println("ModuleTarget:"); - indent(+1); - print("os_name: #" + attr.os_name_index); - if (attr.os_name_index != 0) { - tab(); - print("// " + getOSName(attr)); - } - println(); - print("os_arch: #" + attr.os_arch_index); - if (attr.os_arch_index != 0) { - tab(); - print("// " + getOSArch(attr)); - } - println(); - print("os_version: #" + attr.os_version_index); - if (attr.os_version_index != 0) { - tab(); - print("// " + getOSVersion(attr)); - } - println(); - indent(-1); - return null; - } - - private String getOSName(ModuleTarget_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.os_name_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - - private String getOSArch(ModuleTarget_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.os_arch_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - - private String getOSVersion(ModuleTarget_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.os_version_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - - @Override - public Void visitModuleVersion(ModuleVersion_attribute attr, Void ignore) { - print("ModuleVersion: #" + attr.version_index); - indent(+1); - tab(); - println("// " + getVersion(attr)); - indent(-1); - return null; - } - - private String getVersion(ModuleVersion_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.version_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - static String getJavaName(String name) { return name.replace('/', '.'); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java index 0cfea172c93..4a625a7d720 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java @@ -58,6 +58,8 @@ import com.sun.tools.classfile.Type.TypeParamType; import com.sun.tools.classfile.Type.WildcardType; import static com.sun.tools.classfile.AccessFlags.*; +import static com.sun.tools.classfile.ConstantPool.CONSTANT_Module; +import static com.sun.tools.classfile.ConstantPool.CONSTANT_Package; /* * The main javap class to write the contents of a class file as text. @@ -166,7 +168,12 @@ public class ClassWriter extends BasicWriter { Module_attribute modAttr = (Module_attribute) attr; String name; try { - name = getJavaName(constant_pool.getUTF8Value(modAttr.module_name)); + // FIXME: compatibility code + if (constant_pool.get(modAttr.module_name).getTag() == CONSTANT_Module) { + name = getJavaName(constant_pool.getModuleInfo(modAttr.module_name).getName()); + } else { + name = getJavaName(constant_pool.getUTF8Value(modAttr.module_name)); + } } catch (ConstantPoolException e) { name = report(e); } @@ -175,6 +182,10 @@ public class ClassWriter extends BasicWriter { } print("module "); print(name); + if (modAttr.module_version_index != 0) { + print("@"); + print(getUTF8Value(modAttr.module_version_index)); + } } else { // fallback for malformed class files print("class "); @@ -602,19 +613,31 @@ public class ClassWriter extends BasicWriter { if ((entry.requires_flags & Module_attribute.ACC_TRANSITIVE) != 0) print(" transitive"); print(" "); - print(getUTF8Value(entry.requires_index).replace('/', '.')); + String mname; + try { + mname = getModuleName(entry.requires_index); + } catch (ConstantPoolException e) { + mname = report(e); + } + print(mname); println(";"); } for (Module_attribute.ExportsEntry entry: m.exports) { print("exports"); print(" "); - print(getUTF8Value(entry.exports_index).replace('/', '.')); + String pname; + try { + pname = getPackageName(entry.exports_index).replace('/', '.'); + } catch (ConstantPoolException e) { + pname = report(e); + } + print(pname); boolean first = true; for (int i: entry.exports_to_index) { String mname; try { - mname = classFile.constant_pool.getUTF8Value(i).replace('/', '.'); + mname = getModuleName(i); } catch (ConstantPoolException e) { mname = report(e); } @@ -635,12 +658,18 @@ public class ClassWriter extends BasicWriter { for (Module_attribute.OpensEntry entry: m.opens) { print("opens"); print(" "); - print(getUTF8Value(entry.opens_index).replace('/', '.')); + String pname; + try { + pname = getPackageName(entry.opens_index).replace('/', '.'); + } catch (ConstantPoolException e) { + pname = report(e); + } + print(pname); boolean first = true; for (int i: entry.opens_to_index) { String mname; try { - mname = classFile.constant_pool.getUTF8Value(i).replace('/', '.'); + mname = getModuleName(i); } catch (ConstantPoolException e) { mname = report(e); } @@ -684,6 +713,22 @@ public class ClassWriter extends BasicWriter { } } + String getModuleName(int index) throws ConstantPoolException { + if (constant_pool.get(index).getTag() == CONSTANT_Module) { + return constant_pool.getModuleInfo(index).getName(); + } else { + return constant_pool.getUTF8Value(index); + } + } + + String getPackageName(int index) throws ConstantPoolException { + if (constant_pool.get(index).getTag() == CONSTANT_Package) { + return constant_pool.getPackageInfo(index).getName(); + } else { + return constant_pool.getUTF8Value(index); + } + } + String getUTF8Value(int index) { try { return classFile.constant_pool.getUTF8Value(index); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java index fe0cf7831bd..f3360081428 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java @@ -109,13 +109,6 @@ public class ConstantWriter extends BasicWriter { return 2; } - public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) { - print("#" + info.name_index + ":#" + info.type_index); - tab(); - println("// " + stringValue(info)); - return 1; - } - public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) { print("#" + info.class_index + ".#" + info.name_and_type_index); tab(); @@ -137,6 +130,27 @@ public class ConstantWriter extends BasicWriter { return 1; } + public Integer visitModule(CONSTANT_Module_info info, Void p) { + print("#" + info.name_index); + tab(); + println("// " + stringValue(info)); + return 1; + } + + public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) { + print("#" + info.name_index + ":#" + info.type_index); + tab(); + println("// " + stringValue(info)); + return 1; + } + + public Integer visitPackage(CONSTANT_Package_info info, Void p) { + print("#" + info.name_index); + tab(); + println("// " + stringValue(info)); + return 1; + } + public Integer visitString(CONSTANT_String_info info, Void p) { print("#" + info.string_index); tab(); @@ -304,6 +318,14 @@ public class ConstantWriter extends BasicWriter { return info.value + "l"; } + public String visitModule(CONSTANT_Module_info info, Void p) { + try { + return checkName(info.getName()); + } catch (ConstantPoolException e) { + return report(e); + } + } + public String visitNameAndType(CONSTANT_NameAndType_info info, Void p) { return getCheckedName(info) + ":" + getType(info); } @@ -316,6 +338,14 @@ public class ConstantWriter extends BasicWriter { } } + public String visitPackage(CONSTANT_Package_info info, Void p) { + try { + return checkName(info.getName()); + } catch (ConstantPoolException e) { + return report(e); + } + } + String getType(CONSTANT_NameAndType_info info) { try { return info.getType(); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java index 7fda8d013b5..df8a3e618d6 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java @@ -408,22 +408,20 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages { private DiagnosticListener getDiagnosticListenerForWriter(Writer w) { final PrintWriter pw = getPrintWriterForWriter(w); - return new DiagnosticListener () { - public void report(Diagnostic diagnostic) { - switch (diagnostic.getKind()) { - case ERROR: - pw.print(getMessage("err.prefix")); - break; - case WARNING: - pw.print(getMessage("warn.prefix")); - break; - case NOTE: - pw.print(getMessage("note.prefix")); - break; - } - pw.print(" "); - pw.println(diagnostic.getMessage(null)); + return diagnostic -> { + switch (diagnostic.getKind()) { + case ERROR: + pw.print(getMessage("err.prefix")); + break; + case WARNING: + pw.print(getMessage("warn.prefix")); + break; + case NOTE: + pw.print(getMessage("note.prefix")); + break; } + pw.print(" "); + pw.println(diagnostic.getMessage(null)); }; } @@ -643,9 +641,15 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages { ClassFileInfo cfInfo = read(fo); if (!className.endsWith(".class")) { - String cfName = cfInfo.cf.getName(); - if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", "."))) { - reportWarning("warn.unexpected.class", className, cfName.replace('/', '.')); + if (cfInfo.cf.this_class == 0) { + if (!className.equals("module-info")) { + reportWarning("warn.unexpected.class", fo.getName(), className); + } + } else { + String cfName = cfInfo.cf.getName(); + if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", "."))) { + reportWarning("warn.unexpected.class", fo.getName(), className); + } } } write(cfInfo); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties index 673cb548e5e..1d0ed408f91 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties @@ -27,7 +27,7 @@ Usage: {0} \n\ use -help for a list of possible options warn.prefix=Warning: -warn.unexpected.class=Binary file {0} contains {1} +warn.unexpected.class=File {0} does not contain class {1} note.prefix=Note: diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java index a9d2afe4d2b..d39297a3b03 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java @@ -75,11 +75,6 @@ class CPSelector implements ConstantPool.Visitor { return null; } - @Override - public Void visitNameAndType(ConstantPool.CONSTANT_NameAndType_info info, CPEntries p) { - return null; - } - @Override public Void visitMethodref(ConstantPool.CONSTANT_Methodref_info info, CPEntries p) { p.methodRefs.add(info); @@ -96,6 +91,21 @@ class CPSelector implements ConstantPool.Visitor { return null; } + @Override + public Void visitModule(ConstantPool.CONSTANT_Module_info info, CPEntries p) { + return null; + } + + @Override + public Void visitNameAndType(ConstantPool.CONSTANT_NameAndType_info info, CPEntries p) { + return null; + } + + @Override + public Void visitPackage(ConstantPool.CONSTANT_Package_info info, CPEntries p) { + return null; + } + @Override public Void visitString(ConstantPool.CONSTANT_String_info info, CPEntries p) { return null; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java index d1e07da066a..990976dca91 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java @@ -147,11 +147,7 @@ public class ClassFileReader implements Closeable { } public Iterable getClassFiles() throws IOException { - return new Iterable() { - public Iterator iterator() { - return new FileIterator(); - } - }; + return FileIterator::new; } protected ClassFile readClassFile(Path p) throws IOException { @@ -232,7 +228,7 @@ public class ClassFileReader implements Closeable { protected Set scan() { try (Stream stream = Files.walk(path, Integer.MAX_VALUE)) { return stream.filter(ClassFileReader::isClass) - .map(f -> path.relativize(f)) + .map(path::relativize) .map(Path::toString) .map(p -> p.replace(File.separatorChar, '/')) .collect(Collectors.toSet()); @@ -264,11 +260,7 @@ public class ClassFileReader implements Closeable { public Iterable getClassFiles() throws IOException { final Iterator iter = new DirectoryIterator(); - return new Iterable() { - public Iterator iterator() { - return iter; - } - }; + return () -> iter; } class DirectoryIterator implements Iterator { @@ -387,11 +379,7 @@ public class ClassFileReader implements Closeable { public Iterable getClassFiles() throws IOException { final Iterator iter = new JarFileIterator(this, jarfile); - return new Iterable() { - public Iterator iterator() { - return iter; - } - }; + return () -> iter; } } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java index 71508e6e595..95634ab4841 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java @@ -32,6 +32,7 @@ import com.sun.tools.classfile.AccessFlags; import com.sun.tools.classfile.ClassFile; import com.sun.tools.classfile.ConstantPoolException; import com.sun.tools.classfile.Dependencies; +import com.sun.tools.classfile.Dependencies.ClassFileError; import com.sun.tools.classfile.Dependency; import com.sun.tools.classfile.Dependency.Location; @@ -172,43 +173,41 @@ class DependencyFinder { parsedArchives.get(finder).add(archive); trace("parsing %s %s%n", archive.getName(), archive.path()); - FutureTask> task = new FutureTask<>(new Callable<>() { - public Set call() throws Exception { - Set targets = new HashSet<>(); - for (ClassFile cf : archive.reader().getClassFiles()) { - if (cf.access_flags.is(AccessFlags.ACC_MODULE)) - continue; + FutureTask> task = new FutureTask<>(() -> { + Set targets = new HashSet<>(); + for (ClassFile cf : archive.reader().getClassFiles()) { + if (cf.access_flags.is(AccessFlags.ACC_MODULE)) + continue; - String classFileName; - try { - classFileName = cf.getName(); - } catch (ConstantPoolException e) { - throw new Dependencies.ClassFileError(e); - } - - // filter source class/archive - String cn = classFileName.replace('/', '.'); - if (!finder.accept(archive, cn, cf.access_flags)) - continue; - - // tests if this class matches the -include - if (!filter.matches(cn)) - continue; - - for (Dependency d : finder.findDependencies(cf)) { - if (filter.accepts(d)) { - archive.addClass(d.getOrigin(), d.getTarget()); - targets.add(d.getTarget()); - } else { - // ensure that the parsed class is added the archive - archive.addClass(d.getOrigin()); - } - parsedClasses.putIfAbsent(d.getOrigin(), archive); - } + String classFileName; + try { + classFileName = cf.getName(); + } catch (ConstantPoolException e) { + throw new ClassFileError(e); } - return targets; + // filter source class/archive + String cn = classFileName.replace('/', '.'); + if (!finder.accept(archive, cn, cf.access_flags)) + continue; + + // tests if this class matches the -include + if (!filter.matches(cn)) + continue; + + for (Dependency d : finder.findDependencies(cf)) { + if (filter.accepts(d)) { + archive.addClass(d.getOrigin(), d.getTarget()); + targets.add(d.getTarget()); + } else { + // ensure that the parsed class is added the archive + archive.addClass(d.getOrigin()); + } + parsedClasses.putIfAbsent(d.getOrigin(), archive); + } } + + return targets; }); tasks.add(task); pool.submit(task); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java index c33ac26b2fe..4eeef7f1e3b 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java @@ -28,6 +28,7 @@ package com.sun.tools.jdeps; import com.sun.tools.classfile.Dependency.Location; import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.Deque; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -91,7 +92,7 @@ public class DepsAnalyzer { // classpath to the root archives if (filter.hasIncludePattern() || filter.hasTargetFilter()) { configuration.getModules().values().stream() - .filter(source -> filter.include(source) && filter.matches(source)) + .filter(source -> include(source) && filter.matches(source)) .forEach(this.rootArchives::add); } @@ -161,14 +162,14 @@ public class DepsAnalyzer { Set archives() { if (filter.requiresFilter().isEmpty()) { return archives.stream() - .filter(filter::include) + .filter(this::include) .filter(Archive::hasDependences) .collect(Collectors.toSet()); } else { // use the archives that have dependences and not specified in --require return archives.stream() - .filter(filter::include) - .filter(source -> !filter.requiresFilter().contains(source)) + .filter(this::include) + .filter(source -> !filter.requiresFilter().contains(source.getName())) .filter(source -> source.getDependencies() .map(finder::locationToArchive) @@ -197,7 +198,6 @@ public class DepsAnalyzer { .distinct() .map(configuration::findClass) .flatMap(Optional::stream) - .filter(filter::include) .collect(toSet()); } @@ -238,7 +238,7 @@ public class DepsAnalyzer { continue; Archive archive = configuration.findClass(target).orElse(null); - if (archive != null && filter.include(archive)) { + if (archive != null) { archives.add(archive); String name = target.getName(); @@ -257,6 +257,21 @@ public class DepsAnalyzer { } while (!unresolved.isEmpty() && depth-- > 0); } + /* + * Tests if the given archive is requested for analysis. + * It includes the root modules specified in --module, --add-modules + * or modules specified on the command line + * + * This filters system module by default unless they are explicitly + * requested. + */ + public boolean include(Archive source) { + Module module = source.getModule(); + // skip system module by default + return !module.isSystem() + || configuration.rootModules().contains(source); + } + // ----- for testing purpose ----- public static enum Info { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java index 85aa1c6ff7a..9499e390d16 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java @@ -209,7 +209,7 @@ public final class Graph { visited.add(node); edges.get(node).stream() .filter(e -> includeAdjacent || !node.equals(u) || !e.equals(v)) - .forEach(e -> stack.push(e)); + .forEach(stack::push); } } assert !visited.contains(v); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java index 7e640d06aaa..c7fcc7507cb 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/InverseDepsAnalyzer.java @@ -140,9 +140,8 @@ public class InverseDepsAnalyzer extends DepsAnalyzer { // include all target nodes targets().forEach(builder::addNode); - // transpose the module graph - may filter JDK module + // transpose the module graph configuration.getModules().values().stream() - .filter(filter::include) .forEach(m -> { builder.addNode(m); m.descriptor().requires().stream() diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java index 1f887bb0e9f..fba25a5711c 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java @@ -70,6 +70,7 @@ public class JdepsConfiguration implements AutoCloseable { // the token for "all modules on the module path" public static final String ALL_MODULE_PATH = "ALL-MODULE-PATH"; public static final String ALL_DEFAULT = "ALL-DEFAULT"; + public static final String ALL_SYSTEM = "ALL-SYSTEM"; public static final String MODULE_INFO = "module-info.class"; private final SystemModuleFinder system; @@ -199,12 +200,10 @@ public class JdepsConfiguration implements AutoCloseable { return m!= null ? Optional.of(m.descriptor()) : Optional.empty(); } - boolean isSystem(Module m) { - return system.find(m.name()).isPresent(); - } - boolean isValidToken(String name) { - return ALL_MODULE_PATH.equals(name) || ALL_DEFAULT.equals(name); + return ALL_MODULE_PATH.equals(name) || + ALL_DEFAULT.equals(name) || + ALL_SYSTEM.equals(name); } /** @@ -394,29 +393,29 @@ public class JdepsConfiguration implements AutoCloseable { ModuleDescriptor descriptor = dropHashes(ModuleDescriptor.read(bin)); String mn = descriptor.name(); URI uri = URI.create("jrt:/" + path.getFileName().toString()); - Supplier readerSupplier = new Supplier<>() { + Supplier readerSupplier = () -> new ModuleReader() { @Override - public ModuleReader get() { - return new ModuleReader() { - @Override - public Optional find(String name) throws IOException { - return name.equals(mn) - ? Optional.of(uri) : Optional.empty(); - } + public Optional find(String name) throws IOException { + return name.equals(mn) + ? Optional.of(uri) : Optional.empty(); + } - @Override - public Stream list() { - return Stream.empty(); - } + @Override + public Stream list() { + return Stream.empty(); + } - @Override - public void close() { - } - }; + @Override + public void close() { } }; - return new ModuleReference(descriptor, uri, readerSupplier); + return new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + return readerSupplier.get(); + } + }; } catch (IOException e) { throw new UncheckedIOException(e); } @@ -534,6 +533,9 @@ public class JdepsConfiguration implements AutoCloseable { case ALL_DEFAULT: this.addAllDefaultModules = true; break; + case ALL_SYSTEM: + this.addAllSystemModules = true; + break; default: this.rootModules.add(mn); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java index 5549187b586..e795f93ff87 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java @@ -29,11 +29,8 @@ import com.sun.tools.classfile.Dependency; import com.sun.tools.classfile.Dependency.Location; import java.util.HashSet; -import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; /* * Filter configured based on the input jdeps option @@ -59,7 +56,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { private final boolean filterSameArchive; private final boolean findJDKInternals; private final Pattern includePattern; - private final Pattern includeSystemModules; private final Set requires; @@ -69,7 +65,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { boolean filterSameArchive, boolean findJDKInternals, Pattern includePattern, - Pattern includeSystemModules, Set requires) { this.filter = filter; this.filterPattern = filterPattern; @@ -77,7 +72,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { this.filterSameArchive = filterSameArchive; this.findJDKInternals = findJDKInternals; this.includePattern = includePattern; - this.includeSystemModules = includeSystemModules; this.requires = requires; } @@ -112,16 +106,8 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { return hasTargetFilter(); } - public boolean include(Archive source) { - Module module = source.getModule(); - // skip system module by default; or if includeSystemModules is set - // only include the ones matching the pattern - return !module.isSystem() || (includeSystemModules != null && - includeSystemModules.matcher(module.name()).matches()); - } - public boolean hasIncludePattern() { - return includePattern != null || includeSystemModules != null; + return includePattern != null; } public boolean hasTargetFilter() { @@ -197,7 +183,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { } public static class Builder { - static Pattern SYSTEM_MODULE_PATTERN = Pattern.compile("java\\..*|jdk\\..*|javafx\\..*"); Pattern filterPattern; Pattern regex; boolean filterSamePackage; @@ -205,10 +190,11 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { boolean findJDKInterals; // source filters Pattern includePattern; - Pattern includeSystemModules; Set requires = new HashSet<>(); Set targetPackages = new HashSet<>(); + public Builder() {}; + public Builder packages(Set packageNames) { this.targetPackages.addAll(packageNames); return this; @@ -229,8 +215,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { public Builder requires(String name, Set packageNames) { this.requires.add(name); this.targetPackages.addAll(packageNames); - - includeIfSystemModule(name); return this; } public Builder findJDKInternals(boolean value) { @@ -241,17 +225,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { this.includePattern = regex; return this; } - public Builder includeSystemModules(Pattern regex) { - this.includeSystemModules = regex; - return this; - } - public Builder includeIfSystemModule(String name) { - if (includeSystemModules == null && - SYSTEM_MODULE_PATTERN.matcher(name).matches()) { - this.includeSystemModules = SYSTEM_MODULE_PATTERN; - } - return this; - } public JdepsFilter build() { Dependency.Filter filter = null; @@ -266,7 +239,6 @@ public class JdepsFilter implements Dependency.Filter, Analyzer.Filter { filterSameArchive, findJDKInterals, includePattern, - includeSystemModules, requires); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java index de37add2eb6..08e3dda2256 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java @@ -386,13 +386,6 @@ class JdepsTask { } }, - // Another alternative to list modules in --add-modules option - new HiddenOption(true, "--include-system-modules") { - void process(JdepsTask task, String opt, String arg) throws BadArgs { - task.options.includeSystemModulePattern = Pattern.compile(arg); - } - }, - new Option(false, "-P", "-profile") { void process(JdepsTask task, String opt, String arg) throws BadArgs { task.options.showProfile = true; @@ -889,15 +882,11 @@ class JdepsTask { if (!ok && !options.nowarning) { reportError("err.missing.dependences"); builder.visitMissingDeps( - new Analyzer.Visitor() { - @Override - public void visitDependence(String origin, Archive originArchive, - String target, Archive targetArchive) { + (origin, originArchive, target, targetArchive) -> { if (builder.notFound(targetArchive)) log.format(" %-50s -> %-50s %s%n", origin, target, targetArchive.getName()); - } - }); + }); } return ok; } @@ -1025,8 +1014,8 @@ class JdepsTask { // source filters builder.includePattern(options.includePattern); - builder.includeSystemModules(options.includeSystemModulePattern); + // target filters builder.filter(options.filterSamePackage, options.filterSameArchive); builder.findJDKInternals(options.findJDKInternals); @@ -1048,11 +1037,6 @@ class JdepsTask { if (options.filterRegex != null) builder.filter(options.filterRegex); - // check if system module is set - config.rootModules().stream() - .map(Module::name) - .forEach(builder::includeIfSystemModule); - return builder.build(); } @@ -1166,7 +1150,6 @@ class JdepsTask { Set packageNames = new HashSet<>(); Pattern regex; // apply to the dependences Pattern includePattern; - Pattern includeSystemModulePattern; boolean inverse = false; boolean compileTimeView = false; String systemModulePath = System.getProperty("java.home"); @@ -1177,8 +1160,7 @@ class JdepsTask { Runtime.Version multiRelease; boolean hasSourcePath() { - return !addmods.isEmpty() || includePattern != null || - includeSystemModulePattern != null; + return !addmods.isEmpty() || includePattern != null; } boolean hasFilter() { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java index 056b53f2436..0a5f6cb421e 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java @@ -69,21 +69,16 @@ public class ModuleExportsAnalyzer extends DepsAnalyzer { // A visitor to record the module-level dependences as well as // use of JDK internal APIs - Analyzer.Visitor visitor = new Analyzer.Visitor() { - @Override - public void visitDependence(String origin, Archive originArchive, - String target, Archive targetArchive) - { - Set jdkInternals = - deps.computeIfAbsent(originArchive, _k -> new HashMap<>()) - .computeIfAbsent(targetArchive, _k -> new HashSet<>()); + Analyzer.Visitor visitor = (origin, originArchive, target, targetArchive) -> { + Set jdkInternals = + deps.computeIfAbsent(originArchive, _k -> new HashMap<>()) + .computeIfAbsent(targetArchive, _k -> new HashSet<>()); - Module module = targetArchive.getModule(); - if (originArchive.getModule() != module && - module.isJDK() && !module.isExported(target)) { - // use of JDK internal APIs - jdkInternals.add(target); - } + Module module = targetArchive.getModule(); + if (originArchive.getModule() != module && + module.isJDK() && !module.isExported(target)) { + // use of JDK internal APIs + jdkInternals.add(target); } }; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java index c150ca8d89b..f466a393e12 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java @@ -39,22 +39,28 @@ import java.util.Set; * Build the profile information. */ enum Profile { - COMPACT1("compact1", 1, "java.compact1"), - COMPACT2("compact2", 2, "java.compact2"), - COMPACT3("compact3", 3, "java.compact3", "java.smartcardio", "jdk.sctp", - "jdk.httpserver", "jdk.security.auth", - "jdk.naming.dns", "jdk.naming.rmi", - "jdk.management"), - // need a way to determine JRE modules - SE_JRE("Java SE JRE", 4, "java.se", "jdk.charsets", - "jdk.crypto.ec", "jdk.crypto.pkcs11", - "jdk.crypto.mscapi", "jdk.crypto.ucrypto", - "jdk.localedata", "jdk.scripting.nashorn", "jdk.zipfs"), - FULL_JRE("Full JRE", 5, "java.se.ee", "jdk.charsets", - "jdk.crypto.ec", "jdk.crypto.pkcs11", - "jdk.crypto.mscapi", "jdk.crypto.ucrypto", "jdk.jvmstat", - "jdk.localedata", "jdk.scripting.nashorn", - "jdk.unsupported", "jdk.zipfs"); + COMPACT1("compact1", 1, "java.logging", + "java.scripting"), + COMPACT2("compact2", 2, "java.rmi", + "java.sql", + "java.xml", + "jdk.xml.dom", + "jdk.httpserver"), + COMPACT3("compact3", 3, "java.smartcardio", + "java.compiler", + "java.instrument", + "java.management", + "java.naming", + "java.prefs", + "java.security.jgss", + "java.security.sasl", + "java.sql.rowset", + "java.xml.crypto", + "jdk.management", + "jdk.naming.dns", + "jdk.naming.rmi", + "jdk.sctp", + "jdk.security.auth"); final String name; final int profile; @@ -80,12 +86,6 @@ enum Profile { return JDK.isEmpty() ? 0 : Profile.values().length; } - Optional findModule(String name) { - return modules.containsKey(name) - ? Optional.of(modules.get(name)) - : Optional.empty(); - } - /** * Returns the Profile for the given package name; null if not found. */ @@ -137,6 +137,9 @@ enum Profile { // for debugging public static void main(String[] args) throws IOException { + // initialize Profiles + new JdepsConfiguration.Builder().allModules().build(); + // find platform modules if (Profile.getProfileCount() == 0) { System.err.println("No profile is present in this JDK"); @@ -147,6 +150,6 @@ enum Profile { } System.out.println("All JDK modules:-"); JDK.stream().sorted(Comparator.comparing(Module::name)) - .forEach(m -> System.out.println(m)); + .forEach(System.out::println); } } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java index e666a61aef0..ad66b67d61e 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java @@ -30,6 +30,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; + import static java.util.stream.Collectors.toList; /** @@ -139,7 +141,7 @@ class ArgTokenizer { */ int optionCount() { return (int) options.entrySet().stream() - .filter(e -> e.getValue()) + .filter(Entry::getValue) .count(); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java index ea4aa0707de..da040e65e71 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java @@ -46,7 +46,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.function.Function; -import java.util.prefs.BackingStoreException; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -97,7 +96,7 @@ class ConsoleIOContext extends IOContext { List persistenHistory = Stream.of(repl.prefs.keys()) .filter(key -> key.startsWith(HISTORY_LINE_PREFIX)) .sorted() - .map(key -> repl.prefs.get(key, null)) + .map(key -> repl.prefs.get(key)) .collect(Collectors.toList()); in.setHistory(history = new EditingHistory(in, persistenHistory) { @Override protected boolean isComplete(CharSequence input) { @@ -125,7 +124,7 @@ class ConsoleIOContext extends IOContext { boolean smart = allowSmart && suggestions.stream() - .anyMatch(s -> s.matchesType()); + .anyMatch(Suggestion::matchesType); lastTest = test; lastCursor = cursor; @@ -133,16 +132,16 @@ class ConsoleIOContext extends IOContext { suggestions.stream() .filter(s -> !smart || s.matchesType()) - .map(s -> s.continuation()) + .map(Suggestion::continuation) .forEach(result::add); boolean onlySmart = suggestions.stream() - .allMatch(s -> s.matchesType()); + .allMatch(Suggestion::matchesType); if (smart && !onlySmart) { Optional prefix = suggestions.stream() - .map(s -> s.continuation()) + .map(Suggestion::continuation) .reduce(ConsoleIOContext::commonPrefix); String prefixStr = prefix.orElse("").substring(cursor - anchor[0]); @@ -215,23 +214,21 @@ class ConsoleIOContext extends IOContext { @Override public void close() throws IOException { //save history: - try { - for (String key : repl.prefs.keys()) { - if (key.startsWith(HISTORY_LINE_PREFIX)) - repl.prefs.remove(key); + for (String key : repl.prefs.keys()) { + if (key.startsWith(HISTORY_LINE_PREFIX)) { + repl.prefs.remove(key); } - Collection savedHistory = history.save(); - if (!savedHistory.isEmpty()) { - int len = (int) Math.ceil(Math.log10(savedHistory.size()+1)); - String format = HISTORY_LINE_PREFIX + "%0" + len + "d"; - int index = 0; - for (String historyLine : savedHistory) { - repl.prefs.put(String.format(format, index++), historyLine); - } - } - } catch (BackingStoreException ex) { - throw new IllegalStateException(ex); } + Collection savedHistory = history.save(); + if (!savedHistory.isEmpty()) { + int len = (int) Math.ceil(Math.log10(savedHistory.size()+1)); + String format = HISTORY_LINE_PREFIX + "%0" + len + "d"; + int index = 0; + for (String historyLine : savedHistory) { + repl.prefs.put(String.format(format, index++), historyLine); + } + } + repl.prefs.flush(); in.shutdown(); try { in.getTerminal().restore(); @@ -281,7 +278,7 @@ class ConsoleIOContext extends IOContext { term.isAnsiSupported()); Function convertor; if (firstInvocation) { - convertor = d -> d.signature(); + convertor = Documentation::signature; } else { convertor = d -> formatter.formatJavadoc(d.signature(), d.javadoc()) + (d.javadoc() == null ? repl.messageFormat("jshell.console.no.javadoc") @@ -417,6 +414,7 @@ class ConsoleIOContext extends IOContext { } } + @Override public void beforeUserCode() { synchronized (this) { inputBytes = null; @@ -424,6 +422,7 @@ class ConsoleIOContext extends IOContext { input.setState(State.BUFFER); } + @Override public void afterUserCode() { input.setState(State.WAIT); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java index 0fc6f6ca8a5..d4b76c8e1d7 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java @@ -38,10 +38,8 @@ import jdk.jshell.SourceCodeAnalysis.Suggestion; class ContinuousCompletionProvider implements CompletionProvider { - static final BiPredicate STARTSWITH_MATCHER = - (word, input) -> word.startsWith(input); - static final BiPredicate PERFECT_MATCHER = - (word, input) -> word.equals(input); + static final BiPredicate STARTSWITH_MATCHER = String::startsWith; + static final BiPredicate PERFECT_MATCHER = String::equals; private final Supplier> wordCompletionProviderSupplier; private final BiPredicate matcher; diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java index d2eeff19c02..80641a57bdf 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java @@ -882,7 +882,7 @@ class Feedback { void showTruncationSettings(Mode sm) { if (sm == null) { - modeMap.values().forEach(m -> showTruncationSettings(m)); + modeMap.values().forEach(this::showTruncationSettings); } else { List trunc = sm.cases.get(TRUNCATION_FIELD); if (trunc != null) { @@ -897,7 +897,7 @@ class Feedback { void showPromptSettings(Mode sm) { if (sm == null) { - modeMap.values().forEach(m -> showPromptSettings(m)); + modeMap.values().forEach(this::showPromptSettings); } else { hard("/set prompt %s %s %s", sm.name, @@ -908,7 +908,7 @@ class Feedback { void showModeSettings(String umode, String msg) { if (umode == null) { - modeMap.values().forEach(n -> showModeSettings(n)); + modeMap.values().forEach(this::showModeSettings); } else { Mode m; String retained = retainedMap.get(umode); @@ -1272,7 +1272,7 @@ class Feedback { return null; } if (at.isQuoted() || - !id.codePoints().allMatch(cp -> Character.isJavaIdentifierPart(cp))) { + !id.codePoints().allMatch(Character::isJavaIdentifierPart)) { errorat(err, id); return null; } @@ -1307,8 +1307,8 @@ class Feedback { // Failing an exact match, go searching Mode[] matches = modeMap.entrySet().stream() .filter(e -> e.getKey().startsWith(umode)) - .map(e -> e.getValue()) - .toArray(size -> new Mode[size]); + .map(Entry::getValue) + .toArray(Mode[]::new); if (matches.length == 1) { return matches[0]; } else { diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java index 6738ac268a9..2ae1971ac02 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java @@ -136,25 +136,12 @@ public class JShellTool implements MessageHandler { final InputStream userin; final PrintStream userout; final PrintStream usererr; - final Preferences prefs; + final PersistentStorage prefs; final Map envvars; final Locale locale; final Feedback feedback = new Feedback(); - /** - * Simple constructor for the tool used by main. - * @param in command line input - * @param out command line output, feedback including errors, user System.out - * @param err start-up errors and debugging info, user System.err - */ - public JShellTool(InputStream in, PrintStream out, PrintStream err) { - this(in, out, err, out, null, out, err, - Preferences.userRoot().node("tool/JShell"), - System.getenv(), - Locale.getDefault()); - } - /** * The complete constructor for the tool (used by test harnesses). * @param cmdin command line input -- snippets and commands @@ -164,14 +151,14 @@ public class JShellTool implements MessageHandler { * @param userin code execution input, or null to use IOContext * @param userout code execution output -- System.out.printf("hi") * @param usererr code execution error stream -- System.err.printf("Oops") - * @param prefs preferences to use + * @param prefs persistence implementation to use * @param envvars environment variable mapping to use * @param locale locale to use */ - public JShellTool(InputStream cmdin, PrintStream cmdout, PrintStream cmderr, + JShellTool(InputStream cmdin, PrintStream cmdout, PrintStream cmderr, PrintStream console, InputStream userin, PrintStream userout, PrintStream usererr, - Preferences prefs, Map envvars, Locale locale) { + PersistentStorage prefs, Map envvars, Locale locale) { this.cmdin = cmdin; this.cmdout = cmdout; this.cmderr = cmderr; @@ -452,7 +439,7 @@ public class JShellTool implements MessageHandler { void hardPairs(Stream stream, Function a, Function b) { Map a2b = stream.collect(toMap(a, b, (m1, m2) -> m1, - () -> new LinkedHashMap<>())); + LinkedHashMap::new)); for (Entry e : a2b.entrySet()) { hard("%s", e.getKey()); rawout(prefix(e.getValue(), feedback.getPre() + "\t", feedback.getPost())); @@ -478,16 +465,6 @@ public class JShellTool implements MessageHandler { } } - /** - * Normal start entry point - * @param args - * @throws Exception - */ - public static void main(String[] args) throws Exception { - new JShellTool(System.in, System.out, System.err) - .start(args); - } - public void start(String[] args) throws Exception { List loadList = processCommandArgs(args); if (loadList == null) { @@ -502,7 +479,7 @@ public class JShellTool implements MessageHandler { private void start(IOContext in, List loadList) { // If startup hasn't been set by command line, set from retained/default if (startup == null) { - startup = prefs.get(STARTUP_KEY, null); + startup = prefs.get(STARTUP_KEY); if (startup == null) { startup = DEFAULT_STARTUP; } @@ -513,7 +490,7 @@ public class JShellTool implements MessageHandler { resetState(); // Initialize // Read replay history from last jshell session into previous history - String prevReplay = prefs.get(REPLAY_RESTORE_KEY, null); + String prevReplay = prefs.get(REPLAY_RESTORE_KEY); if (prevReplay != null) { replayableHistoryPrevious = Arrays.asList(prevReplay.split(RECORD_SEPARATOR)); } @@ -788,7 +765,7 @@ public class JShellTool implements MessageHandler { // These predefined modes are read-only feedback.markModesReadOnly(); // Restore user defined modes retained on previous run with /set mode -retain - String encoded = prefs.get(MODE_KEY, null); + String encoded = prefs.get(MODE_KEY); if (encoded != null && !encoded.isEmpty()) { if (!feedback.restoreEncodedModes(initmh, encoded)) { // Catastrophic corruption -- remove the retained modes @@ -802,7 +779,7 @@ public class JShellTool implements MessageHandler { } commandLineFeedbackMode = null; } else { - String fb = prefs.get(FEEDBACK_KEY, null); + String fb = prefs.get(FEEDBACK_KEY); if (fb != null) { // Restore the feedback mode to use that was retained // on a previous run with /set feedback -retain @@ -953,7 +930,7 @@ public class JShellTool implements MessageHandler { .stream() .filter(filter) .filter(command -> command.command.startsWith(cmd)) - .toArray(size -> new Command[size]); + .toArray(Command[]::new); } private static Path toPathResolvingUserHome(String pathString) { @@ -1125,7 +1102,7 @@ public class JShellTool implements MessageHandler { ? Stream.of(String.valueOf(k.id()) + " ", ((DeclarationSnippet) k).name() + " ") : Stream.of(String.valueOf(k.id()) + " ")) .filter(k -> k.startsWith(argPrefix)) - .map(k -> new ArgSuggestion(k)) + .map(ArgSuggestion::new) .collect(Collectors.toList()); }; } @@ -1154,7 +1131,7 @@ public class JShellTool implements MessageHandler { result = new FixedCompletionProvider(commands.values().stream() .filter(cmd -> cmd.kind.showInHelp || cmd.kind == CommandKind.HELP_SUBJECT) .map(c -> c.command + " ") - .toArray(size -> new String[size])) + .toArray(String[]::new)) .completionSuggestions(code, cursor, anchor); } else if (code.startsWith("/se")) { result = new FixedCompletionProvider(SET_SUBCOMMANDS) @@ -1264,33 +1241,33 @@ public class JShellTool implements MessageHandler { { registerCommand(new Command("/list", - arg -> cmdList(arg), + this::cmdList, snippetWithOptionCompletion(SNIPPET_HISTORY_OPTION_COMPLETION_PROVIDER, this::allSnippets))); registerCommand(new Command("/edit", - arg -> cmdEdit(arg), + this::cmdEdit, snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER, this::allSnippets))); registerCommand(new Command("/drop", - arg -> cmdDrop(arg), + this::cmdDrop, snippetCompletion(this::dropableSnippets), CommandKind.REPLAY)); registerCommand(new Command("/save", - arg -> cmdSave(arg), + this::cmdSave, saveCompletion())); registerCommand(new Command("/open", - arg -> cmdOpen(arg), + this::cmdOpen, FILE_COMPLETION_PROVIDER)); registerCommand(new Command("/vars", - arg -> cmdVars(arg), + this::cmdVars, snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER, this::allVarSnippets))); registerCommand(new Command("/methods", - arg -> cmdMethods(arg), + this::cmdMethods, snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER, this::allMethodSnippets))); registerCommand(new Command("/types", - arg -> cmdTypes(arg), + this::cmdTypes, snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER, this::allTypeSnippets))); registerCommand(new Command("/imports", @@ -1303,24 +1280,24 @@ public class JShellTool implements MessageHandler { arg -> cmdReset(), EMPTY_COMPLETION_PROVIDER)); registerCommand(new Command("/reload", - arg -> cmdReload(arg), + this::cmdReload, reloadCompletion())); registerCommand(new Command("/classpath", - arg -> cmdClasspath(arg), + this::cmdClasspath, classPathCompletion(), CommandKind.REPLAY)); registerCommand(new Command("/history", arg -> cmdHistory(), EMPTY_COMPLETION_PROVIDER)); registerCommand(new Command("/debug", - arg -> cmdDebug(arg), + this::cmdDebug, EMPTY_COMPLETION_PROVIDER, CommandKind.HIDDEN)); registerCommand(new Command("/help", - arg -> cmdHelp(arg), + this::cmdHelp, helpCompletion())); registerCommand(new Command("/set", - arg -> cmdSet(arg), + this::cmdSet, new ContinuousCompletionProvider(Map.of( // need more completion for format for usability "format", feedback.modeCompletions(), @@ -1335,7 +1312,7 @@ public class JShellTool implements MessageHandler { STARTSWITH_MATCHER))); registerCommand(new Command("/?", "help.quest", - arg -> cmdHelp(arg), + this::cmdHelp, helpCompletion(), CommandKind.NORMAL)); registerCommand(new Command("/!", @@ -1450,7 +1427,7 @@ public class JShellTool implements MessageHandler { } String[] matches = Arrays.stream(subs) .filter(s -> s.startsWith(sub)) - .toArray(size -> new String[size]); + .toArray(String[]::new); if (matches.length == 0) { // There are no matching sub-commands errormsg("jshell.err.arg", cmd, sub); @@ -1485,9 +1462,9 @@ public class JShellTool implements MessageHandler { } // returns null if not stored in preferences - static EditorSetting fromPrefs(Preferences prefs) { + static EditorSetting fromPrefs(PersistentStorage prefs) { // Read retained editor setting (if any) - String editorString = prefs.get(EDITOR_KEY, ""); + String editorString = prefs.get(EDITOR_KEY); if (editorString == null || editorString.isEmpty()) { return null; } else if (editorString.equals(BUILT_IN_REP)) { @@ -1504,11 +1481,11 @@ public class JShellTool implements MessageHandler { } } - static void removePrefs(Preferences prefs) { + static void removePrefs(PersistentStorage prefs) { prefs.remove(EDITOR_KEY); } - void toPrefs(Preferences prefs) { + void toPrefs(PersistentStorage prefs) { prefs.put(EDITOR_KEY, (this == BUILT_IN_EDITOR) ? BUILT_IN_REP : (wait ? WAIT_PREFIX : NORMAL_PREFIX) + String.join(RECORD_SEPARATOR, cmd)); @@ -1676,7 +1653,7 @@ public class JShellTool implements MessageHandler { } void showSetStart() { - String retained = prefs.get(STARTUP_KEY, null); + String retained = prefs.get(STARTUP_KEY); if (retained != null) { showSetStart(true, retained); } @@ -1774,6 +1751,7 @@ public class JShellTool implements MessageHandler { replayableHistory.subList(first + 1, replayableHistory.size())); prefs.put(REPLAY_RESTORE_KEY, hist); } + prefs.flush(); fluffmsg("jshell.msg.goodbye"); return true; } @@ -1784,7 +1762,7 @@ public class JShellTool implements MessageHandler { if (subject != null) { Command[] matches = commands.values().stream() .filter(c -> c.command.startsWith(subject)) - .toArray(size -> new Command[size]); + .toArray(Command[]::new); if (matches.length == 1) { String cmd = matches[0].command; if (cmd.equals("/set")) { @@ -2414,7 +2392,7 @@ public class JShellTool implements MessageHandler { */ List errorsOnly(List diagnostics) { return diagnostics.stream() - .filter(d -> d.isError()) + .filter(Diag::isError) .collect(toList()); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java new file mode 100644 index 00000000000..1ca9dfc8f22 --- /dev/null +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolBuilder.java @@ -0,0 +1,348 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal.jshell.tool; + +import java.io.InputStream; +import java.io.PrintStream; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.prefs.BackingStoreException; +import java.util.prefs.Preferences; +import jdk.jshell.tool.JavaShellToolBuilder; + +/** + * Builder for programmatically building the jshell tool. + */ +public class JShellToolBuilder implements JavaShellToolBuilder { + + private static final String PREFERENCES_NODE = "tool/JShell"; + private InputStream cmdIn = System.in; + private InputStream userIn = null; + private PrintStream cmdOut = System.out; + private PrintStream console = System.out; + private PrintStream userOut = System.out; + private PrintStream cmdErr = System.err; + private PrintStream userErr = System.err; + private PersistentStorage prefs = null; + private Map vars = null; + private Locale locale = Locale.getDefault(); + private boolean capturePrompt = false; + + /** + * Set the input channels. + * Default, if not set, {@code in(System.in, null)}. + * + * @param cmdIn source of command input + * @param userIn source of input for running user code, or {@code null} to + * be extracted from cmdIn + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder in(InputStream cmdIn, InputStream userIn) { + this.cmdIn = cmdIn; + this.userIn = userIn; + return this; + } + + /** + * Set the output channels. Same as {@code out(output, output, output)}. + * Default, if not set, {@code out(System.out)}. + * + * @param output destination of command feedback, console interaction, and + * user code output + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder out(PrintStream output) { + this.cmdOut = output; + this.console = output; + this.userOut = output; + return this; + } + + /** + * Set the output channels. + * Default, if not set, {@code out(System.out, System.out, System.out)}. + * + * @param cmdOut destination of command feedback including error messages + * for users + * @param console destination of console interaction + * @param userOut destination of user code output. For example, user snippet + * {@code System.out.println("Hello")} when executed {@code Hello} goes to + * userOut. + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder out(PrintStream cmdOut, PrintStream console, PrintStream userOut) { + this.cmdOut = cmdOut; + this.console = console; + this.userOut = userOut; + return this; + } + + /** + * Set the error channels. Same as {@code err(error, error)}. + * Default, if not set, {@code err(System.err)}. + * + * @param error destination of tool errors, and + * user code errors + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder err(PrintStream error) { + this.cmdErr = error; + this.userErr = error; + return this; + } + + /** + * Set the error channels. + * Default, if not set, {@code err(System.err, System.err, System.err)}. + * + * @param cmdErr destination of tool start-up and fatal errors + * @param userErr destination of user code error output. + * For example, user snippet {@code System.err.println("Oops")} + * when executed {@code Oops} goes to userErr. + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder err(PrintStream cmdErr, PrintStream userErr) { + this.cmdErr = cmdErr; + this.userErr = userErr; + return this; + } + + /** + * Set the storage mechanism for persistent information which includes + * input history and retained settings. Default if not set is the + * tool's standard persistence mechanism. + * + * @param prefs an instance of {@link java.util.prefs.Preferences} that + * is used to retrieve and store persistent information + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder persistence(Preferences prefs) { + this.prefs = new PreferencesStorage(prefs); + return this; + } + + /** + * Set the storage mechanism for persistent information which includes + * input history and retained settings. Default if not set is the + * tool's standard persistence mechanism. + * + * @param prefsMap an instance of {@link java.util.Map} that + * is used to retrieve and store persistent information + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder persistence(Map prefsMap) { + this.prefs = new MapStorage(prefsMap); + return this; + } + + /** + * Set the source for environment variables. + * Default, if not set, {@code env(System.getenv())}. + * + * @param vars the Map of environment variable names to values + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder env(Map vars) { + this.vars = vars; + return this; + } + + /** + * Set the locale. + * Default, if not set, {@code locale(Locale.getDefault())}. + * + * @param locale the locale + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder locale(Locale locale) { + this.locale = locale; + return this; + } + + /** + * Set if the special command capturing prompt override should be used. + * Default, if not set, {@code promptCapture(false)}. + * + * @param capture if {@code true}, basic prompt is the {@code ENQ} + * character and continuation prompt is the {@code ACK} character. + * If false, prompts are as set with set-up or user {@code /set} commands. + * @return the {@code JavaShellToolBuilder} instance + */ + @Override + public JavaShellToolBuilder promptCapture(boolean capture) { + this.capturePrompt = capture; + return this; + } + + /** + * Create a tool instance for testing. Not in JavaShellToolBuilder. + * + * @return the tool instance + */ + public JShellTool rawTool() { + if (prefs == null) { + prefs = new PreferencesStorage(Preferences.userRoot().node(PREFERENCES_NODE)); + } + if (vars == null) { + vars = System.getenv(); + } + JShellTool sh = new JShellTool(cmdIn, cmdOut, cmdErr, console, userIn, + userOut, userErr, prefs, vars, locale); + sh.testPrompt = capturePrompt; + return sh; + } + + /** + * Run an instance of the Java shell tool as configured by the other methods + * in this interface. This call is not destructive, more than one call of + * this method may be made from a configured builder. + * + * @param arguments the command-line arguments (including options), if any + * @throws Exception an unexpected fatal exception + */ + @Override + public void run(String... arguments) throws Exception { + rawTool().start(arguments); + } + + /** + * Persistence stored in Preferences. + */ + private static class PreferencesStorage implements PersistentStorage { + + final Preferences p; + + PreferencesStorage(Preferences p) { + this.p = p; + } + + @Override + public void clear() { + try { + p.clear(); + } catch (BackingStoreException ex) { + throw new IllegalStateException(ex); + } + } + + @Override + public String[] keys() { + try { + return p.keys(); + } catch (BackingStoreException ex) { + throw new IllegalStateException(ex); + } + } + + @Override + public String get(String key) { + return p.get(key, null); + } + + @Override + public void put(String key, String value) { + p.put(key, value); + } + + @Override + public void remove(String key) { + p.remove(key); + } + + @Override + public void flush() { + try { + p.flush(); + } catch (BackingStoreException ex) { + throw new IllegalStateException(ex); + } + } + } + + /** + * Persistence stored in a Map. + */ + private static class MapStorage implements PersistentStorage { + + final Map map; + + MapStorage(Map map) { + this.map = map; + } + + @Override + public void clear() { + + try { + map.clear(); + } catch (UnsupportedOperationException ex) { + throw new IllegalStateException(ex); + } + } + + @Override + public String[] keys() { + Set ks = map.keySet(); + return ks.toArray(new String[ks.size()]); + } + + @Override + public String get(String key) { + Objects.requireNonNull(key); + return map.get(key); + } + + @Override + public void put(String key, String value) { + Objects.requireNonNull(key); + Objects.requireNonNull(value); + map.put(key, value); + } + + @Override + public void remove(String key) { + Objects.requireNonNull(key); + map.remove(key); + } + + @Override + public void flush() { + // no-op always up-to-date + } + } + +} diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java new file mode 100644 index 00000000000..cd9d64a315d --- /dev/null +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellToolProvider.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal.jshell.tool; + +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Set; +import javax.lang.model.SourceVersion; +import javax.tools.Tool; +import jdk.jshell.tool.JavaShellToolBuilder; + +/** + * Provider for launching the jshell tool. + */ +public class JShellToolProvider implements Tool { + + /** + * Returns the name of this Java shell tool provider. + * + * @return the name of this tool provider + */ + @Override + public String name() { + return "jshell"; + } + + /** + * Run the jshell tool. The streams {@code out} and {@code err} are + * converted to {@code PrintStream} if they are not already. + * Any {@code Exception} is caught, printed and results in a non-zero return. + * + * @param in command line input (snippets and commands), and execution + * "standard" input; use System.in if null + * @param out command line output, feedback including errors, and execution + * "standard" output; use System.out if null + * @param err start-up errors and execution "standard" error; use System.err + * if null + * @param arguments arguments to pass to the tool + * @return 0 for success; nonzero otherwise + * @throws NullPointerException if the array of arguments contains + * any {@code null} elements. + */ + @Override + public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { + InputStream xin = + (in == null) + ? System.in + : in; + PrintStream xout = + (out == null) + ? System.out + : (out instanceof PrintStream) + ? (PrintStream) out + : new PrintStream(out); + PrintStream xerr = + (err == null) + ? System.err + : (err instanceof PrintStream) + ? (PrintStream) err + : new PrintStream(err); + try { + JavaShellToolBuilder + .builder() + .in(xin, null) + .out(xout) + .err(xerr) + .run(arguments); + return 0; + } catch (Throwable ex) { + xerr.println(ex.getMessage()); + return 1; + } + } + + /** + * Returns the source versions of the jshell tool. + * @return a set of supported source versions + */ + @Override + public Set getSourceVersions() { + return Collections.unmodifiableSet( + EnumSet.range(SourceVersion.RELEASE_9, SourceVersion.latest())); + } + + /** + * Launch the tool. + * @param arguments the command-line arguments (including options), if any + * @throws Exception an unexpected fatal exception + */ + public static void main(String[] arguments) throws Exception { + JavaShellToolBuilder + .builder() + .run(arguments); + } +} diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java new file mode 100644 index 00000000000..edc279a5955 --- /dev/null +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/PersistentStorage.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal.jshell.tool; + +/** + * The required functionality jshell uses for persistent storage. Implementable + * by both Preferences API and Map. + */ +interface PersistentStorage { + + /** + * Removes all of the preferences (key-value associations) in + * preferences. + * + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + */ + void clear(); + + /** + * Returns all of the keys that have an associated value in + * preferences. + * + * @return an array of the keys that have an associated value in this + * preference node. + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + */ + String[] keys(); + + /** + * Returns the value associated with the specified key in preferences. + * + * @param key key whose associated value is to be returned. + * @return the value associated with {@code key}, or {@code null} if no + * value is associated with {@code key}. + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + * @throws NullPointerException if {@code key} is {@code null}. + */ + String get(String key); + + /** + * Associates the specified value with the specified key in this + * preference node. + * + * @param key key with which the specified value is to be associated. + * @param value value to be associated with the specified key. + * @throws NullPointerException if key or value is {@code null}. + * @throws IllegalArgumentException if key or value are too long. + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + */ + void put(String key, String value); + + /** + * Removes the value associated with the specified key in preferences, + * if any. + * + * @param key key whose mapping is to be removed from the preference + * node. + * @throws NullPointerException if {@code key} is {@code null}. + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + */ + void remove(String key); + + /** + * Forces any changes in the contents of this preferences to be stored. + * Once this method returns successfully, it is safe to assume that all + * changes have become as permanent as they are going to be. + *

    + * Implementations are free to flush changes into the persistent store + * at any time. They do not need to wait for this method to be called. + * + * @throws IllegalStateException if this operation cannot be completed + * because of the state of the system. + */ + void flush(); + +} diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java index e61be499210..9a103c63d99 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java @@ -51,36 +51,33 @@ public final class StopDetectingInputStream extends InputStream { throw new IllegalStateException("Already initialized."); initialized = true; - Thread reader = new Thread() { - @Override - public void run() { - try { - int read; - while (true) { - //to support external terminal editors, the "cmdin.read" must not run when - //an external editor is running. At the same time, it needs to run while the - //user's code is running (so Ctrl-C is detected). Hence waiting here until - //there is a confirmed need for input. - StopDetectingInputStream.State currentState = waitInputNeeded(); - if (currentState == StopDetectingInputStream.State.CLOSED) { - break; - } - if ((read = input.read()) == (-1)) { - break; - } - if (read == 3 && currentState == StopDetectingInputStream.State.BUFFER) { - stop.run(); - } else { - write(read); - } + Thread reader = new Thread(() -> { + try { + int read; + while (true) { + //to support external terminal editors, the "cmdin.read" must not run when + //an external editor is running. At the same time, it needs to run while the + //user's code is running (so Ctrl-C is detected). Hence waiting here until + //there is a confirmed need for input. + State currentState = waitInputNeeded(); + if (currentState == State.CLOSED) { + break; + } + if ((read = input.read()) == (-1)) { + break; + } + if (read == 3 && currentState == State.BUFFER) { + stop.run(); + } else { + write(read); } - } catch (IOException ex) { - errorHandler.accept(ex); - } finally { - shutdown(); } + } catch (IOException ex) { + errorHandler.accept(ex); + } finally { + shutdown(); } - }; + }); reader.setDaemon(true); reader.start(); diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java index 01033ce4b4f..1cc7249615d 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java @@ -126,6 +126,6 @@ class ClassTracker { // Lookup the ClassInfo by class name, create if it does not exist. ClassInfo get(String className) { - return map.computeIfAbsent(className, k -> new ClassInfo(k)); + return map.computeIfAbsent(className, ClassInfo::new); } } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java index 8cb482815de..dcb9596c64b 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Corraller.java @@ -149,8 +149,7 @@ class Corraller extends Pretty { } JCNewClass exp = make.NewClass(null, null, expClass, List.of(make.Literal(keyIndex)), null); - resolutionExceptionBlock = make.Block(0L, List.of( - make.Throw(exp))); + resolutionExceptionBlock = make.Block(0L, List.of(make.Throw(exp))); } return resolutionExceptionBlock; } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java index 7007a5f7f1a..c0837e3a825 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/DiagList.java @@ -72,7 +72,7 @@ final class DiagList extends ArrayList { @Override public boolean addAll(Collection c) { - return c.stream().filter(d -> add(d)).count() > 0; + return c.stream().filter(this::add).count() > 0; } @Override @@ -110,7 +110,7 @@ final class DiagList extends ArrayList { Snippet snn = d.snippetOrNull(); return snn == u.snippet(); }) - .collect(Collectors.toCollection(() -> new DiagList())); + .collect(Collectors.toCollection(DiagList::new)); } boolean hasErrors() { diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java index 21ba179c580..a033b9fd757 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java @@ -635,7 +635,7 @@ class Eval { while (true) { state.debug(DBG_GEN, "compileAndLoad %s\n", ins); - ins.stream().forEach(u -> u.initialize()); + ins.stream().forEach(Unit::initialize); ins.stream().forEach(u -> u.setWrap(ins, ins)); AnalyzeTask at = state.taskFactory.new AnalyzeTask(outerWrapSet(ins)); ins.stream().forEach(u -> u.setDiagnostics(at)); @@ -654,7 +654,7 @@ class Eval { boolean success; while (true) { List legit = ins.stream() - .filter(u -> u.isDefined()) + .filter(Unit::isDefined) .collect(toList()); state.debug(DBG_GEN, "compileAndLoad ins = %s -- legit = %s\n", ins, legit); @@ -693,7 +693,7 @@ class Eval { // loop by replacing all that have been replaced if (!toReplace.isEmpty()) { replaced.addAll(toReplace); - replaced.stream().forEach(u -> u.markForReplacement()); + replaced.stream().forEach(Unit::markForReplacement); } success = toReplace.isEmpty(); @@ -703,7 +703,7 @@ class Eval { // add any new dependencies to the working set List newDependencies = ins.stream() - .flatMap(u -> u.effectedDependents()) + .flatMap(Unit::effectedDependents) .collect(toList()); state.debug(DBG_GEN, "compileAndLoad %s -- deps: %s success: %s\n", ins, newDependencies, success); @@ -711,7 +711,7 @@ class Eval { // all classes that could not be directly loaded (because they // are new) have been redefined, and no new dependnencies were // identified - ins.stream().forEach(u -> u.finish()); + ins.stream().forEach(Unit::finish); return ins; } } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java index 7b9d73c1a66..96252cf856c 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java @@ -235,8 +235,8 @@ class ReplParser extends JavacParser { // malformed declaration, return error pos = token.pos; List err = isVoid - ? List.of(toP(F.at(pos).MethodDef(mods, name, t, typarams, - List.nil(), List.nil(), null, null))) + ? List.of(toP(F.at(pos).MethodDef(mods, name, t, typarams, + List.nil(), List.nil(), null, null))) : null; return List.of(syntaxError(token.pos, err, "expected", LPAREN)); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java index 7254f2030d0..7241b1383dc 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java @@ -64,6 +64,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.function.Predicate; import javax.lang.model.element.Element; @@ -280,7 +281,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { String requiredPrefix = identifier; return computeSuggestions(codeWrap, cursor, anchor).stream() .filter(s -> s.continuation().startsWith(requiredPrefix) && !s.continuation().equals(REPL_DOESNOTMATTER_CLASS_NAME)) - .sorted(Comparator.comparing(s -> s.continuation())) + .sorted(Comparator.comparing(Suggestion::continuation)) .collect(collectingAndThen(toList(), Collections::unmodifiableList)); } @@ -509,7 +510,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { @Override public List wrappers(String input) { return proc.eval.sourceToSnippetsWithWrappers(input).stream() - .map(sn -> wrapper(sn)) + .map(this::wrapper) .collect(toList()); } @@ -637,7 +638,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { return IS_STATIC.or(IS_CLASS).or(IS_INTERFACE).negate().test(el) || IS_PACKAGE.test(encl); }; - private final Function> IDENTITY = el -> Collections.singletonList(el); + private final Function> IDENTITY = Collections::singletonList; private final Function DEFAULT_PAREN = hasParams -> hasParams ? "(" : "()"; private final Function NO_PAREN = hasParams -> ""; @@ -831,7 +832,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { }; @SuppressWarnings("unchecked") List result = Util.stream(scopeIterable) - .flatMap(s -> localElements(s)) + .flatMap(this::localElements) .flatMap(el -> Util.stream((Iterable)elementConvertor.apply(el))) .collect(toCollection(ArrayList :: new)); result.addAll(listPackages(at, "")); @@ -1118,7 +1119,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { } if (guessKind(code) == Kind.IMPORT) - return Collections.emptyList(); + return Collections.emptyList(); OuterWrap codeWrap = proc.outerMap.wrapInTrialClass(Wrap.methodWrap(code)); AnalyzeTask at = proc.taskFactory.new AnalyzeTask(codeWrap, keepParameterNames); @@ -1127,7 +1128,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { TreePath tp = pathFor(topLevel, sp, codeWrap.snippetIndexToWrapIndex(cursor)); if (tp == null) - return Collections.emptyList(); + return Collections.emptyList(); TreePath prevPath = null; while (tp != null && tp.getLeaf().getKind() != Kind.METHOD_INVOCATION && @@ -1138,7 +1139,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { } if (tp == null) - return Collections.emptyList(); + return Collections.emptyList(); Stream elements; Iterable> candidates; @@ -1174,19 +1175,19 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { el.asType().getKind() == TypeKind.ERROR || (el.getKind() == ElementKind.PACKAGE && el.getEnclosedElements().isEmpty())) { //erroneous element: - return Collections.emptyList(); + return Collections.emptyList(); } elements = Stream.of(el); } else { - return Collections.emptyList(); + return Collections.emptyList(); } List result = Collections.emptyList(); try (JavadocHelper helper = JavadocHelper.create(at.task, findSources())) { result = elements.map(el -> constructDocumentation(at, helper, el, computeJavadoc)) - .filter(r -> r != null) + .filter(Objects::nonNull) .collect(Collectors.toList()); } catch (IOException ex) { proc.debug(ex, "JavadocHelper.close()"); @@ -1273,7 +1274,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis { } List result = new ArrayList<>(); Path home = Paths.get(System.getProperty("java.home")); - Path srcZip = home.resolve("src.zip"); + Path srcZip = home.resolve("lib").resolve("src.zip"); if (!Files.isReadable(srcZip)) srcZip = home.getParent().resolve("src.zip"); if (Files.isReadable(srcZip)) { diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java index c890c61c83d..c56db661ed2 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java @@ -168,11 +168,11 @@ final class Unit { // Snippets to add to imports Collection plus = plusUnfiltered.stream() .filter(u -> !units.contains(u)) - .map(u -> u.snippet()) + .map(Unit::snippet) .collect(toList()); // Snippets to wrap in an outer List snippets = units.stream() - .map(u -> u.snippet()) + .map(Unit::snippet) .collect(toList()); // Snippet wraps to wrap in an outer List wraps = units.stream() @@ -305,8 +305,8 @@ final class Unit { return true; } ClassBytecodes[] cbcs = toRedefine.stream() - .map(ci -> ci.toClassBytecodes()) - .toArray(size -> new ClassBytecodes[size]); + .map(ClassInfo::toClassBytecodes) + .toArray(ClassBytecodes[]::new); try { state.executionControl().redefine(cbcs); state.classTracker.markLoaded(cbcs); diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java index 3b4e4cbfc35..053e9858079 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java @@ -359,7 +359,7 @@ abstract class Wrap implements GeneralWrap { @Override public String toString() { - return "CompoundWrap(" + Arrays.stream(os).map(u -> u.toString()).collect(joining(",")) + ")"; + return "CompoundWrap(" + Arrays.stream(os).map(Object::toString).collect(joining(",")) + ")"; } } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java index 81eac159b60..c0d95c54daa 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java @@ -65,7 +65,7 @@ public class RemoteExecutionControl extends DirectExecutionControl implements Ex outputs.put("out", st -> System.setOut(new PrintStream(st, true))); outputs.put("err", st -> System.setErr(new PrintStream(st, true))); Map> input = new HashMap<>(); - input.put("in", st -> System.setIn(st)); + input.put("in", System::setIn); forwardExecutionControlAndIO(new RemoteExecutionControl(), inStream, outStream, outputs, input); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html b/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html deleted file mode 100644 index 251c00910f0..00000000000 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - -This document is the API specification for JShell -- support for -Java™ Programming Language 'snippet' evaluating tools, such as -Read-Eval-Print Loops (REPLs). - - - diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java new file mode 100644 index 00000000000..1712977b81b --- /dev/null +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/JavaShellToolBuilder.java @@ -0,0 +1,193 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.jshell.tool; + +import java.io.InputStream; +import java.io.PrintStream; +import java.util.Locale; +import java.util.Map; +import java.util.prefs.Preferences; +import jdk.internal.jshell.tool.JShellToolBuilder; + +/** + * Interface to configure and run a Java shell tool instance. An instance of the + * builder is created with the static {@link #builder} method. This builder can, + * optionally, be configured with the configuration methods. All configuration + * methods return the builder instance for use in chained initialization. All + * configuration methods have sensible defaults which will be used if they are + * not called.. After zero or more calls to configuration methods, the tool is + * launched with a call to {@link #run(java.lang.String...) }. + */ +public interface JavaShellToolBuilder { + + /** + * Create a builder for launching the JDK jshell tool. + * + * @return a builder which can be used to configure and launch the jshell + * tool + */ + static JavaShellToolBuilder builder() { + return new JShellToolBuilder(); + } + + /** + * Set the input channels. + * + * @implSpec If this method is not called, the behavior should be + * equivalent to calling {@code in(System.in, null)}. + * + * @param cmdIn source of command input + * @param userIn source of input for running user code, or {@code null} to + * extract user input from cmdIn + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder in(InputStream cmdIn, InputStream userIn); + + /** + * Set the output channels. Same as {@code out(output, output, output)}. + * + * @implSpec If neither {@code out} method is called, the behavior should be + * equivalent to calling {@code out(System.out)}. + * + * @param output destination of command feedback, console interaction, and + * user code output + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder out(PrintStream output); + + /** + * Set the output channels. + * + * @implSpec If neither {@code out} method is called, the behavior should be + * equivalent to calling {@code out(System.out, System.out, System.out)}. + * + * @param cmdOut destination of command feedback including error messages + * for users + * @param console destination of console interaction + * @param userOut destination of user code output. For example, user snippet + * {@code System.out.println("Hello")} when executed {@code Hello} goes to + * userOut. + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder out(PrintStream cmdOut, PrintStream console, PrintStream userOut); + + /** + * Set the error channels. Same as {@code err(error, error)}. + * + * @implSpec If neither {@code err} method is called, the behavior should be + * equivalent to calling {@code err(System.err)}. + * + * @param error destination of tool errors, and + * user code errors + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder err(PrintStream error); + + /** + * Set the error channels. + * + * @implSpec If neither {@code err} method is called, the behavior should be + * equivalent to calling {@code err(System.err, System.err, System.err)}. + * + * @param cmdErr destination of tool start-up and fatal errors + * @param userErr destination of user code error output. + * For example, user snippet {@code System.err.println("Oops")} + * when executed {@code Oops} goes to userErr. + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder err(PrintStream cmdErr, PrintStream userErr); + + /** + * Set the storage mechanism for persistent information which includes + * input history and retained settings. + * + * @implSpec If neither {@code persistence} method is called, the behavior + * should be to use the tool's standard persistence mechanism. + * + * @param prefs an instance of {@link java.util.prefs.Preferences} that + * is used to retrieve and store persistent information + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder persistence(Preferences prefs); + + /** + * Set the storage mechanism for persistent information which includes + * input history and retained settings. + * + * @implSpec If neither {@code persistence} method is called, the behavior + * should be to use the tool's standard persistence mechanism. + * + * @param prefsMap an instance of {@link java.util.Map} that + * is used to retrieve and store persistent information + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder persistence(Map prefsMap); + + /** + * Set the source for environment variables. + * + * @implSpec If this method is not called, the behavior should be + * equivalent to calling {@code env(System.getenv())}. + * + * @param vars the Map of environment variable names to values + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder env(Map vars); + + /** + * Set the locale. + * + * @implSpec If this method is not called, the behavior should be + * equivalent to calling {@code locale(Locale.getDefault())}. + * + * @param locale the locale + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder locale(Locale locale); + + /** + * Set to enable a command capturing prompt override. + * + * @implSpec If this method is not called, the behavior should be + * equivalent to calling {@code promptCapture(false)}. + * + * @param capture if {@code true}, basic prompt is the {@code ENQ} + * character and continuation prompt is the {@code ACK} character. + * If false, prompts are as set with set-up or user {@code /set} commands. + * @return the {@code JavaShellToolBuilder} instance + */ + JavaShellToolBuilder promptCapture(boolean capture); + + /** + * Run an instance of the Java shell tool as configured by the other methods + * in this interface. This call is not destructive, more than one call of + * this method may be made from a configured builder. + * + * @param arguments the command-line arguments (including options), if any + * @throws Exception an unexpected fatal exception + */ + void run(String... arguments) throws Exception; +} diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java new file mode 100644 index 00000000000..83a5cdf41c9 --- /dev/null +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * Provides a mechanism to launch an instance of a Java™ shell tool. + * Allows configuration of the tool before launching. A builder is used + * to configure and launch the tool. + *

    + * At the simplest, a builder is retrieved, and the builder is used to run the + * tool: + * 

    + * {@code
+ *       JavaShellToolBuilder
+ *             .builder()
+ *             .run();
+ * }
+ *
    + * The builder can be configured and the run can have arguments: + * 
    + * {@code
+ *       JavaShellToolBuilder
+ *             .builder()
+ *             .out(myCommandPrintStream, myOutputPrintStream)
+ *             .locale(Locale.CANADA)
+ *             .run("--feedback", "silent", "MyStart");
+ * }
+ *
    + */ + + +package jdk.jshell.tool; + diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/langtools/src/jdk.jshell/share/classes/module-info.java index d77cad5dd9c..8ee91ff25b3 100644 --- a/langtools/src/jdk.jshell/share/classes/module-info.java +++ b/langtools/src/jdk.jshell/share/classes/module-info.java @@ -24,14 +24,38 @@ */ /** - * This document is the API specification for JShell -- support for + * This module provides support for * Java™ Programming Language 'snippet' evaluating tools, such as * Read-Eval-Print Loops (REPLs). + * Separate packages support building tools, configuring the execution of tools, + * and programmatically launching the existing Java™ shell tool. + *

    + * The {@link jdk.jshell} is the package for creating 'snippet' evaluating tools. + * Generally, this is only package that would be needed for creating tools. + *

    + *

    + * The {@link jdk.jshell.spi} package specifies a Service Provider Interface (SPI) + * for defining execution engine implementations for tools based on the + * {@link jdk.jshell} API. The {@link jdk.jshell.execution} package provides + * standard implementations of {@link jdk.jshell.spi} interfaces and supporting code. It + * also serves as a library of functionality for defining new execution engine + * implementations. + *

    + *

    + * The {@link jdk.jshell.tool} supports programmatically launching the + * "jshell tool". + *

    + *

    + * The {@link jdk.jshell.execution} package contains implementations of the + * interfaces in {@link jdk.jshell.spi}. Otherwise, the four packages are + * independent, operate at different levels, and do not share functionality or + * definitions. + *

    */ module jdk.jshell { requires transitive java.compiler; requires transitive jdk.jdi; - requires java.prefs; + requires transitive java.prefs; requires jdk.compiler; requires jdk.internal.le; requires jdk.internal.ed; @@ -40,6 +64,9 @@ module jdk.jshell { exports jdk.jshell; exports jdk.jshell.spi; exports jdk.jshell.execution; + exports jdk.jshell.tool; uses jdk.internal.editor.spi.BuildInEditorProvider; + + provides javax.tools.Tool with jdk.internal.jshell.tool.JShellToolProvider; } diff --git a/langtools/test/ProblemList.txt b/langtools/test/ProblemList.txt index b01381f7a7d..d6f525de56e 100644 --- a/langtools/test/ProblemList.txt +++ b/langtools/test/ProblemList.txt @@ -58,7 +58,6 @@ tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java 8057687 generic-all emit correct byte code an attributes for type annotations tools/javac/warnings/suppress/TypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java 8160396 generic-all current version of jtreg needs a new promotion to include lastes version of ASM -tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java 8169005 windows-all ########################################################################### # diff --git a/langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java b/langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java index 5e4caa79e89..fb876def83f 100644 --- a/langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java +++ b/langtools/test/jdk/javadoc/doclet/lib/JavadocTester.java @@ -365,6 +365,25 @@ public abstract class JavadocTester { } } + /** + * Check for content in (or not in) the generated output. + * Within the search strings, the newline character \n + * will be translated to the platform newline character sequence. + * @param path a path within the most recent output directory + * or the name of one of the output buffers, identifying + * where to look for the search strings. + * @param expectedFound true if all of the search strings are expected + * to be found, or false if the file is not expected to be found + * @param strings the strings to be searched for + */ + public void checkFileAndOutput(String path, boolean expectedFound, String... strings) { + if (expectedFound) { + checkOutput(path, true, strings); + } else { + checkFiles(false, path); + } + } + /** * Check for content in (or not in) the generated output. * Within the search strings, the newline character \n @@ -383,11 +402,9 @@ public abstract class JavadocTester { try { fileString = readFile(outputDir, path); } catch (Error e) { - if (!expectedFound) { - failed("Error reading file: " + e); - return; - } - throw e; + checking("Read file"); + failed("Error reading file: " + e); + return; } checkOutput(path, fileString, expectedFound, strings); } @@ -413,10 +430,10 @@ public abstract class JavadocTester { // Find string in file's contents boolean isFound = findString(fileString, stringToFind); if (isFound == expectedFound) { - passed(path + ": " + (isFound ? "found:" : "not found:") + "\n" + passed(path + ": following text " + (isFound ? "found:" : "not found:") + "\n" + stringToFind + "\n"); } else { - failed(path + ": " + (isFound ? "found:" : "not found:") + "\n" + failed(path + ": following text " + (isFound ? "found:" : "not found:") + "\n" + stringToFind + "\n"); } } @@ -464,9 +481,9 @@ public abstract class JavadocTester { File file = new File(outputDir, path); boolean isFound = file.exists(); if (isFound == expectedFound) { - passed(path + ": " + (isFound ? "found:" : "not found:") + "\n"); + passed(path + ": file " + (isFound ? "found:" : "not found:") + "\n"); } else { - failed(path + ": " + (isFound ? "found:" : "not found:") + "\n"); + failed(path + ": file " + (isFound ? "found:" : "not found:") + "\n"); } } } @@ -619,11 +636,9 @@ public abstract class JavadocTester { fileContentCache.put(file, new SoftReference<>(content)); return content; } catch (FileNotFoundException e) { - System.err.println(e); - throw new Error("File not found: " + fileName); + throw new Error("File not found: " + fileName + ": " + e); } catch (IOException e) { - System.err.println(e); - throw new Error("Error reading file: " + fileName); + throw new Error("Error reading file: " + fileName + ": " + e); } } diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 299aa4a365a..8d590f3e1af 100644 --- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4927552 8026567 8071982 + * @bug 4927552 8026567 8071982 8162674 * @summary * @author jamieh * @library ../lib @@ -79,14 +79,138 @@ public class TestDeprecatedDocs extends JavadocTester { "
    @Deprecated\n"
                 + "public class DeprecatedClassByAnnotation\n"
                 + "extends java.lang.Object
    ", - "
    @Deprecated\n"
+                "
    @Deprecated(forRemoval=true)\n"
                 + "public int field
    \n"
-                + "
    Deprecated. 
    ",
-                "
    @Deprecated\n"
+                + "
    Deprecated, for removal: This API element is subject to removal in a future version.  
    ",
+                "
    @Deprecated(forRemoval=true)\n"
                 + "public DeprecatedClassByAnnotation()
    \n"
-                + "
    Deprecated. 
    ",
+                + "
    Deprecated, for removal: This API element is subject to removal in a future version.  
    ",
                 "
    @Deprecated\n"
                 + "public void method()
    \n"
                 + "
    Deprecated. 
    ");
+
+        checkOutput("pkg/TestAnnotationType.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    annotation_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "@Documented\n"
+                + "public @interface TestAnnotationType
    ",
+                "
    @Deprecated(forRemoval=true)\n"
+                + "static final int field
    \n"
+                + "
    Deprecated, for removal: This "
+                + "API element is subject to removal in a future version.  annotation_test4 passes.
    ",
+                "
    @Deprecated(forRemoval=true)\n"
+                + "int required
    \n"
+                + "
    Deprecated, for removal: This API element is subject to removal in a future version.  "
+                + "annotation_test3 passes.
    ",
+                "
    java.lang.String optional
    \n"
+                + "
    Deprecated. annotation_test2 passes.
    ");
+
+        checkOutput("pkg/TestClass.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    class_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "public class TestClass\n"
+                + "extends java.lang.Object
    ",
+                "
    @Deprecated(forRemoval=true)\n"
+                + "public TestClass()
    \n"
+                + "
    Deprecated, for removal: This API element is subject to removal in a future version.  "
+                + "class_test3 passes.
    ");
+
+        checkOutput("pkg/TestEnum.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    enum_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "public enum TestEnum\n"
+                + "extends java.lang.Enum<TestEnum>
    ",
+                "
    @Deprecated(forRemoval=true)\n"
+                + "public static final TestEnum FOR_REMOVAL
    \n"
+                + "
    Deprecated, for removal: This API element is subject to removal in a future version.  "
+                + "enum_test3 passes.
    ");
+
+        checkOutput("pkg/TestError.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    error_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "public class TestError\n"
+                + "extends java.lang.Error
    ");
+
+        checkOutput("pkg/TestException.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    exception_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "public class TestException\n"
+                + "extends java.lang.Exception
    ");
+
+        checkOutput("pkg/TestInterface.html", true,
+                "
    Deprecated, for removal: This API element is subject to removal in a future version.  \n"
+                + "
    interface_test1 passes.
    \n"
+                + "
    \n"
+                + "
    \n"
+                + "
    @Deprecated(forRemoval=true)\n"
+                + "public class TestInterface\n"
+                + "extends java.lang.Object
    ");
+
+        checkOutput("deprecated-list.html", true,
+                "",
+                "",
+                "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "",
+                "
    Deprecated For Removal 
    ElementDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "
    Deprecated Enums 
    EnumDescription
    pkg.TestEnum\n"
+                + "
    enum_test1 passes.
    \n"
+                + "
    ",
+                "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "
    Deprecated Exceptions 
    ExceptionsDescription
    pkg.TestException\n"
+                + "
    exception_test1 passes.
    \n"
+                + "
    ");
     }
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
index f234c2b2b48..6770d64c506 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
@@ -26,10 +26,10 @@ package pkg;
 @Deprecated()
 public class DeprecatedClassByAnnotation {
 
-    @Deprecated()
+    @Deprecated(forRemoval=true)
     public int field;
 
-    @Deprecated()
+    @Deprecated(forRemoval=true)
     public DeprecatedClassByAnnotation() {}
 
     @Deprecated()
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java
index 7f8a0a083ae..11201f820ae 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestAnnotationType.java
@@ -28,6 +28,7 @@ import java.lang.annotation.*;
 /**
  * @deprecated annotation_test1 passes.
  */
+@Deprecated(forRemoval=true)
 @Documented public @interface TestAnnotationType {
 
     /**
@@ -38,10 +39,12 @@ import java.lang.annotation.*;
    /**
      * @deprecated annotation_test3 passes.
      */
+    @Deprecated(forRemoval=true)
     int required();
 
     /**
      * @deprecated annotation_test4 passes.
      */
+    @Deprecated(forRemoval=true)
     int field = 0;
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java
index 5320c376080..87f6f4b1b5f 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestClass.java
@@ -26,6 +26,7 @@ package pkg;
 /**
  * @deprecated class_test1 passes.
  */
+@Deprecated(forRemoval=true)
 public class TestClass {
 
     /**
@@ -36,6 +37,7 @@ public class TestClass {
     /**
      * @deprecated class_test3 passes.
      */
+    @Deprecated(forRemoval=true)
     public TestClass() {}
 
     /**
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java
index 218a9b4761e..1839f00f1ea 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestEnum.java
@@ -26,10 +26,17 @@ package pkg;
 /**
  * @deprecated enum_test1 passes.
  */
+@Deprecated(forRemoval=true)
 public enum TestEnum {
 
     /**
      * @deprecated enum_test2 passes.
      */
-    ONE, TWO, THREE;
+    ONE, TWO, THREE,
+
+    /**
+     * @deprecated enum_test3 passes.
+     */
+    @Deprecated(forRemoval=true)
+    FOR_REMOVAL;
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java
index d456a63d2ad..82cf1899dc0 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestError.java
@@ -26,6 +26,7 @@ package pkg;
 /**
  * @deprecated error_test1 passes.
  */
+@Deprecated(forRemoval=true)
 public class TestError extends Error {
 
     /**
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java
index d91a81c1fbe..1b5fc53282c 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestException.java
@@ -26,6 +26,7 @@ package pkg;
 /**
  * @deprecated exception_test1 passes.
  */
+@Deprecated(forRemoval=true)
 public class TestException extends Exception {
 
     /**
diff --git a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java
index 795ee384bc8..bebe8ee2737 100644
--- a/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java
+++ b/langtools/test/jdk/javadoc/doclet/testDeprecatedDocs/pkg/TestInterface.java
@@ -30,6 +30,7 @@ import java.util.Map;
 /**
  * @deprecated interface_test1 passes.
  */
+@Deprecated(forRemoval=true)
 public class TestInterface {
 
     /**
diff --git a/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java b/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java
index 77c9726b5a4..720628c80ad 100644
--- a/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java
+++ b/langtools/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java
@@ -171,7 +171,7 @@ public class TestHelpOption extends JavadocTester {
                 "-notimestamp ",
                 "-sourcetab ");
 
-        checkOutput("Sample.html", !withOption,
+        checkFileAndOutput("Sample.html", !withOption,
                 "
  • Help
    • ");
     }
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java b/langtools/test/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java
new file mode 100644
index 00000000000..0bc84a539b1
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testIndentation/p/IndentAnnot.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 p;
+
+public class IndentAnnot {
+    public void f1(int a, int b) {}
+
+    public void f2(int a, Object... b) {}
+
+    @Deprecated
+    public void f3(int a, int b) {}
+
+    @SafeVarargs
+    public void f4(int a, Object... b) {}
+
+    @SafeVarargs
+    @Deprecated
+    public void f5(int a, Object... b) {}
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
index 391e938abd0..892b2462499 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 8168766 8168688
+ * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 8168766 8168688 8162674 8160196
  * @summary Test modules support in javadoc.
  * @author bpatel
  * @library ../lib
@@ -45,8 +45,8 @@ public class TestModules extends JavadocTester {
     void testHtml4() {
         javadoc("-d", "out", "-use",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB");
         checkExit(Exit.OK);
         checkDescription(true);
         checkNoDescription(false);
@@ -66,8 +66,8 @@ public class TestModules extends JavadocTester {
     void testHtml5() {
         javadoc("-d", "out-html5", "-html5", "-use",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB");
         checkExit(Exit.OK);
         checkHtml5Description(true);
         checkHtml5NoDescription(false);
@@ -87,8 +87,8 @@ public class TestModules extends JavadocTester {
     void testHtml4NoComment() {
         javadoc("-d", "out-nocomment", "-nocomment", "-use",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB");
         checkExit(Exit.OK);
         checkDescription(false);
         checkNoDescription(true);
@@ -104,8 +104,8 @@ public class TestModules extends JavadocTester {
     void testHtml5NoComment() {
         javadoc("-d", "out-html5-nocomment", "-nocomment", "-html5", "-use",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB");
         checkExit(Exit.OK);
         checkHtml5Description(false);
         checkHtml5NoDescription(true);
@@ -154,8 +154,8 @@ public class TestModules extends JavadocTester {
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
-                "--add-modules", "moduletags,module2",
-                "testpkgmdltags", "testpkgmdl2");
+                "--module", "moduletags,moduleB",
+                "testpkgmdltags", "testpkgmdlB");
         checkExit(Exit.OK);
         checkModuleTags();
     }
@@ -167,8 +167,8 @@ public class TestModules extends JavadocTester {
     void testModuleSummary() {
         javadoc("-d", "out-moduleSummary", "-use",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2", "module2/testpkg2mdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB", "moduleB/testpkg2mdlB");
         checkExit(Exit.OK);
         checkModuleSummary();
         checkNegatedModuleSummary();
@@ -181,8 +181,8 @@ public class TestModules extends JavadocTester {
     void testModuleFilesAndLinks() {
         javadoc("-d", "out-modulelinks",
                 "--module-source-path", testSrc,
-                "--add-modules", "module1",
-                "testpkgmdl1");
+                "--module", "moduleA",
+                "testpkgmdlA");
         checkExit(Exit.OK);
         checkModuleFilesAndLinks(true);
         checkNegatedOverviewFrame();
@@ -197,8 +197,8 @@ public class TestModules extends JavadocTester {
                 "-tag", "regular:a:Regular Tag:",
                 "-tag", "moduletag:s:Module Tag:",
                 "--module-source-path", testSrc,
-                "--module", "module1,module2,moduletags",
-                "testpkgmdl1", "testpkgmdl2", "testpkgmdltags");
+                "--module", "moduleA,moduleB,moduletags",
+                "testpkgmdlA", "testpkgmdlB", "testpkgmdltags");
         checkExit(Exit.OK);
         checkModuleDeprecation(true);
     }
@@ -210,100 +210,135 @@ public class TestModules extends JavadocTester {
     void testModuleAnnotation() {
         javadoc("-d", "out-moduleanno",
                 "--module-source-path", testSrc,
-                "--module", "module1,module2",
-                "testpkgmdl1", "testpkgmdl2");
+                "--module", "moduleA,moduleB",
+                "testpkgmdlA", "testpkgmdlB");
         checkExit(Exit.OK);
         checkModuleAnnotation();
     }
 
+    /**
+     * Test module summary pages in "api" mode.
+     */
+    @Test
+    void testApiMode() {
+        javadoc("-d", "out-api", "-use", "--show-module-contents=api", "-author", "-version",
+                "-tag", "regular:a:Regular Tag:",
+                "-tag", "moduletag:s:Module Tag:",
+                "--module-source-path", testSrc,
+                "--module", "moduleA,moduleB,moduleC,moduletags",
+                "testpkgmdlA", "moduleA/concealedpkgmdlA", "testpkgmdlB", "testpkg2mdlB", "testpkgmdlC", "testpkgmdltags");
+        checkExit(Exit.OK);
+        checkModuleModeCommon();
+        checkModuleModeApi(true);
+        checkModuleModeAll(false);
+    }
+
+    /**
+     * Test module summary pages in "all" mode.
+     */
+    @Test
+    void testAllMode() {
+        javadoc("-d", "out-all", "-use", "--show-module-contents=all", "-author", "-version",
+                "-tag", "regular:a:Regular Tag:",
+                "-tag", "moduletag:s:Module Tag:",
+                "--module-source-path", testSrc,
+                "--module", "moduleA,moduleB,moduleC,moduletags",
+                "testpkgmdlA", "moduleA/concealedpkgmdlA", "testpkgmdlB", "testpkg2mdlB", "testpkgmdlC", "testpkgmdltags");
+        checkExit(Exit.OK);
+        checkModuleModeCommon();
+        checkModuleModeApi(false);
+        checkModuleModeAll(true);
+    }
+
     void checkDescription(boolean found) {
-        checkOutput("module1-summary.html", found,
+        checkOutput("moduleA-summary.html", found,
                 "\n"
                 + "\n"
                 + "\n"
                 + "\n"
-                + "
    This is a test description for the module1 module. Search "
+                + "
    This is a test description for the moduleA module. Search "
                 + "phrase search phrase.
    ");
-        checkOutput("module2-summary.html", found,
+        checkOutput("moduleB-summary.html", found,
                 "\n"
                 + "\n"
                 + "\n"
                 + "\n"
-                + "
    This is a test description for the module2 module. Search "
+                + "
    This is a test description for the moduleB module. Search "
                 + "word search_word with no description.
    ");
     }
 
     void checkNoDescription(boolean found) {
-        checkOutput("module1-summary.html", found,
+        checkOutput("moduleA-summary.html", found,
                 "
    \n"
                 + "
      \n"
                 + "
    • \n"
                 + "
        \n"
                 + "
      • \n"
                 + "");
-        checkOutput("module2-summary.html", found,
+        checkOutput("moduleB-summary.html", found,
                 "
        \n"
                 + "
          \n"
                 + "
        • \n"
                 + "
            \n"
                 + "
          • \n"
-                + "");
+                + "");
     }
 
     void checkHtml5Description(boolean found) {
-        checkOutput("module1-summary.html", found,
+        checkOutput("moduleA-summary.html", found,
                 "
            \n"
-                + "
            Deprecated.\n"
+                + "
            Deprecated, for removal:"
+                + " This API element is subject to removal in a future version. \n"
                 + "
            This module is deprecated.
            \n"
                 + "
            \n"
                 + "\n"
                 + "\n"
                 + "\n"
                 + "\n"
-                + "
            This is a test description for the module1 module. Search "
+                + "
            This is a test description for the moduleA module. Search "
                 + "phrase search phrase.
            ");
-        checkOutput("module2-summary.html", found,
+        checkOutput("moduleB-summary.html", found,
                 "
            \n"
                 + "\n"
                 + "\n"
                 + "\n"
                 + "\n"
-                + "
            This is a test description for the module2 module. Search "
+                + "
            This is a test description for the moduleB module. Search "
                 + "word search_word with no description.
            ");
     }
 
     void checkHtml5NoDescription(boolean found) {
-        checkOutput("module1-summary.html", found,
+        checkOutput("moduleA-summary.html", found,
                 "
            \n"
                 + "
              \n"
                 + "
            • \n"
                 + "
                \n"
                 + "
              • \n"
                 + "");
-        checkOutput("module2-summary.html", found,
+        checkOutput("moduleB-summary.html", found,
                 "
                \n"
                 + "
                  \n"
                 + "
                • \n"
                 + "
                    \n"
                 + "
                  • \n"
-                + "");
+                + "");
     }
 
     void checkModuleLink() {
         checkOutput("overview-summary.html", true,
                 "
                  • Module
                    • ");
-        checkOutput("module1-summary.html", true,
+        checkOutput("moduleA-summary.html", true,
                 "
                  • Module
                    • ");
-        checkOutput("module2-summary.html", true,
+        checkOutput("moduleB-summary.html", true,
                 "
                  • Module
                    • ");
-        checkOutput("testpkgmdl1/class-use/TestClassInModule1.html", true,
-                "
                  • Module
                    • ");
-        checkOutput("testpkgmdl2/package-summary.html", true,
-                "
                  • Module
                    • ");
-        checkOutput("testpkgmdl2/TestClassInModule2.html", true,
-                "
                  • Module
                    • ");
-        checkOutput("testpkgmdl2/class-use/TestClassInModule2.html", true,
-                "
                  • Module
                    • ");
+        checkOutput("testpkgmdlA/class-use/TestClassInModuleA.html", true,
+                "
                  • Module
                    • ");
+        checkOutput("testpkgmdlB/package-summary.html", true,
+                "
                  • Module
                    • ");
+        checkOutput("testpkgmdlB/TestClassInModuleB.html", true,
+                "
                  • Module
                    • ");
+        checkOutput("testpkgmdlB/class-use/TestClassInModuleB.html", true,
+                "
                  • Module
                    • ");
     }
 
     void checkNoModuleLink() {
@@ -321,30 +356,22 @@ public class TestModules extends JavadocTester {
     void checkModuleTags() {
         checkOutput("moduletags-summary.html", true,
                 "Type Link: TestClassInModuleTags.");
-        checkOutput("moduletags-summary.html", true,
+                + "testpkgmdltags\">TestClassInModuleTags.",
                 "Member Link: testMethod(String).");
-        checkOutput("moduletags-summary.html", true,
-                "Package Link: testpkgmdltags.");
-        checkOutput("moduletags-summary.html", true,
+                + "testMethod-java.lang.String-\">testMethod(String).",
+                "Package Link: testpkgmdltags.",
                 "
                    Since:
                    \n"
-                + "
                    JDK 9
                    ");
-        checkOutput("moduletags-summary.html", true,
+                + "
                    JDK 9
                    ",
                 "
                    See Also:
                    \n"
                 + "
                    \"Test see tag\", \n"
                 + ""
-                + "TestClassInModuleTags
                    ");
-        checkOutput("moduletags-summary.html", true,
+                + "TestClassInModuleTags",
                 "
                    Regular Tag:
                    \n"
-                + "
                    Just a regular simple tag.
                    ");
-        checkOutput("moduletags-summary.html", true,
+                + "
                    Just a regular simple tag.
                    ",
                 "
                    Module Tag:
                    \n"
-                + "
                    Just a simple module tag.
                    ");
-        checkOutput("moduletags-summary.html", true,
+                + "
                    Just a simple module tag.
                    ",
                 "
                    Version:
                    \n"
-                + "
                    1.0
                    ");
-        checkOutput("moduletags-summary.html", true,
+                + "
                    1.0
                    ",
                 "
                    Author:
                    \n"
                 + "
                    Bhavesh Patel
                    ");
         checkOutput("testpkgmdltags/TestClassInModuleTags.html", false,
@@ -421,102 +448,70 @@ public class TestModules extends JavadocTester {
     }
 
     void checkModuleSummary() {
-        checkOutput("module1-summary.html", true,
+        checkOutput("moduleA-summary.html", true,
                 "");
-        checkOutput("module1-summary.html", true,
+                + "
                  ",
                 "\n"
                 + "\n"
                 + "\n"
-                + "");
-        checkOutput("module1-summary.html", true,
-                "\n"
-                + "testpkgmdl1\n"
-                + "All Modules\n"
+                + "",
+                "\n"
+                + "testpkgmdlA\n"
                 + " \n"
-                + "");
-        checkOutput("module1-summary.html", true,
+                + "",
                 "\n"
                 + "\n"
                 + "\n"
-                + "");
-        checkOutput("module1-summary.html", true,
-                "\n"
-                + "module2\n"
+                + "",
+                "\n"
+                + "transitive\n"
+                + "moduleB\n"
                 + "\n"
-                + "
                  This is a test description for the module2 module.
                  \n"
+                + "
                  This is a test description for the moduleB module.
                  \n"
                 + "\n"
                 + "");
-        checkOutput("module2-summary.html", true,
-                "
                • Description | Modules | "
-                + "Packages | Services
                  • ");
-        checkOutput("module2-summary.html", true,
-                "\n"
-                + "\n"
-                + "\n"
-                + "");
-        checkOutput("module2-summary.html", true,
-                "\n"
-                + ""
-                + "testpkg2mdl2\n"
-                + "module1\n"
-                + " \n"
-                + "");
-        checkOutput("module2-summary.html", true,
+        checkOutput("moduleB-summary.html", true,
+                "
                • Description | Modules | "
+                + "Packages | "
+                + "Services
                  • ",
                 "\n"
                 + "\n"
                 + "\n"
-                + "");
-        checkOutput("module2-summary.html", true,
-                "\n"
-                + "java.base\n"
+                + "",
+                "\n"
+                + "testpkgmdlB\n"
                 + " \n"
-                + "");
-        checkOutput("module2-summary.html", true,
+                + "",
+                "\n"
+                + "\n"
+                + "\n"
+                + "",
                 "\n"
                 + "\n"
                 + "\n"
-                + "");
-        checkOutput("module2-summary.html", true,
+                + "",
                 "\n"
-                + "TestClassInModule2\n"
-                + " \n"
-                + "");
-        checkOutput("module2-summary.html", true,
+                + "TestClassInModuleB\n"
+                + "With a test description for uses. \n"
+                + "",
                 "\n"
-                + "TestInterfaceInModule2
                  "
-                + "(Implementation: "
-                + ""
-                + "TestClassInModule2)\n"
+                + "TestInterface2InModuleB\n"
                 + " \n"
-                + "Exported Packages \n"
+                + "",
+                "Opened Packages \n"
                 + "\n"
                 + "Package\n"
-                + "Module\n"
                 + "Description\n"
-                + "");
-        checkOutput("module2-summary.html", true,
-                "Requires \n"
-                + "\n"
-                + "Module\n"
-                + "Description\n"
-                + "");
-        checkOutput("module2-summary.html", true,
+                + "",
                 "Uses \n"
                 + "\n"
                 + "Type\n"
                 + "Description\n"
-                + "");
-        checkOutput("module2-summary.html", true,
+                + "",
                 "Provides \n"
                 + "\n"
                 + "Type\n"
@@ -525,7 +520,7 @@ public class TestModules extends JavadocTester {
     }
 
     void checkNegatedModuleSummary() {
-        checkOutput("module1-summary.html", false,
+        checkOutput("moduleA-summary.html", false,
                 "\n"
                 + "\n"
                 + "\n"
@@ -534,13 +529,12 @@ public class TestModules extends JavadocTester {
 
     void checkModuleClickThroughLinks() {
         checkOutput("module-overview-frame.html", true,
-                "
                • module1
                  • ");
-        checkOutput("module-overview-frame.html", true,
-                "
                • module2
                  • ");
+                "
                • moduleA
                  • ",
+                "
                • moduleB
                  • ");
         checkOutput("script.js", true,
                 "function updateModuleFrame(pFrame, cFrame)\n"
                 + "{\n"
@@ -551,66 +545,224 @@ public class TestModules extends JavadocTester {
 
     void checkModuleClickThrough(boolean found) {
         checkFiles(found,
-                "module1-type-frame.html",
-                "module2-type-frame.html");
+                "moduleA-type-frame.html",
+                "moduleB-type-frame.html");
     }
 
     void checkModuleFilesAndLinks(boolean found) {
-        checkOutput("testpkgmdl1/package-summary.html", found,
-                "
                • Module
                  • ");
-        checkOutput("testpkgmdl1/package-summary.html", found,
+        checkFileAndOutput("testpkgmdlA/package-summary.html", found,
+                "
                • Module
                  • ",
                 "
                  Module "
-                + "module1
                  ");
-        checkOutput("testpkgmdl1/TestClassInModule1.html", found,
-                "
                • Module
                  • ");
-        checkOutput("testpkgmdl1/TestClassInModule1.html", found,
+                + "moduleA
                ");
+        checkFileAndOutput("testpkgmdlA/TestClassInModuleA.html", found,
+                "
              • Module
                • ",
                 "
                Module "
-                + "module1
                ");
+                + "moduleA
            ");
         checkFiles(found,
-                "module1-frame.html",
-                "module1-summary.html",
+                "moduleA-frame.html",
+                "moduleA-summary.html",
                 "module-overview-frame.html");
     }
 
     void checkModulesInSearch(boolean found) {
         checkOutput("index-all.html", found,
                 "
            \n"
-                + "
            module1 - module module1
            \n"
+                + "
            moduleA - module moduleA
            \n"
                 + "
            \n"
-                + "
            This is a test description for the module1 module.
            \n"
+                + "
            This is a test description for the moduleA module.
            \n"
                 + "
            \n"
-                + "
            module2 - module module2
            \n"
+                + "
            moduleB - module moduleB
            \n"
                 + "
            \n"
-                + "
            This is a test description for the module2 module.
            \n"
+                + "
            This is a test description for the moduleB module.
            \n"
                 + "
            \n"
-                + "
            ");
-        checkOutput("index-all.html", found,
+                + "",
                 "
            \n"
-                + "
            "
-                + "search phrase - Search tag in module1
            \n"
+                + "
            "
+                + "search phrase - Search tag in moduleA
            \n"
                 + "
            with description
            \n"
-                + "
            "
-                + "search_word - Search tag in module2
            \n"
+                + "
            "
+                + "search_word - Search tag in moduleB
            \n"
                 + "
             
            \n"
                 + "
            ");
 }
 
+    void checkModuleModeCommon() {
+        checkOutput("overview-summary.html", true,
+                "moduleA\n"
+                + "\n"
+                + "
            This is a test description for the moduleA module.
            \n"
+                + "",
+                "moduleB\n"
+                + "\n"
+                + "
            This is a test description for the moduleB module.
            \n"
+                + "",
+                "moduletags\n"
+                + "\n"
+                + "
            This is a test description for the moduleA module.
            \n"
+                + " Type Link: TestClassInModuleTags.
            \n"
+                + " Member Link: testMethod(String).
            \n"
+                + " Package Link: testpkgmdltags.
            \n"
+                + "");
+        checkOutput("moduleA-summary.html", true,
+                "
          • Description | "
+                + "Modules | Packages | Services
            • ",
+                "transitive\n"
+                + "moduleB\n"
+                + "\n"
+                + "
            This is a test description for the moduleB module.
            \n"
+                + "",
+                "\n"
+                + "",
+                "
            Additional Exported Packages 
            \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n",
+                "\n"
+                + "\n");
+        checkOutput("moduleB-summary.html", true,
+                "\n"
+                + "");
+        checkOutput("moduletags-summary.html", true,
+                "
          • Description | Modules"
+                + " | Packages | Services
            • ",
+                "
            Additional Opened Packages 
            ModulePackages
            moduleBtestpkgmdlBTestClassInModuleBWith a test description for uses. 
            \n"
+                + "",
+                "\n"
+                + "\n"
+                + "",
+                "
            Additional Modules Required 
            transitivemoduleB\n"
+                + "
            This is a test description for the moduleB module.
            \n"
+                + "
            \n"
+                + "",
+                "\n"
+                + "\n"
+                + "",
+                "
            Additional Exported Packages 
            transitive staticmoduleA\n"
+                + "
            This is a test description for the moduleA module.
            \n"
+                + "
            \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "",
+                "
            Requires 
            ModifierModuleDescription
            \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "",
+                "
            Additional Modules Required 
            ModifierModuleDescription
            \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n",
+                "\n"
+                + "\n");
+    }
+
+    void checkModuleModeApi(boolean found) {
+        checkOutput("moduleA-summary.html", found,
+                "\n"
+                + "");
+        checkOutput("moduleB-summary.html", found,
+                "
          • Description | Modules | "
+                + "Packages | Services
            • ",
+                "\n"
+                + "",
+                "
            Additional Opened Packages 
            ModulePackages
            moduleBtestpkgmdlBtestpkgmdlA testpkgmdlB 
            \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "
            Opened Packages 
            PackageDescription
            testpkgmdlB 
            ");
+        checkOutput("moduletags-summary.html", found,
+                "testpkgmdltags\n"
+                + " ");
+    }
+
+    void checkModuleModeAll(boolean found) {
+        checkOutput("moduleA-summary.html", found,
+                " \n"
+                + "java.base\n"
+                + " ",
+                " \n"
+                + "moduleC\n"
+                + "\n"
+                + "
            This is a test description for the moduleC module.
            \n"
+                + "",
+                "moduleC\n"
+                + "testpkgmdlC",
+                "testpkgmdlA\n"
+                + "All Modules\n"
+                + " ",
+                "All Packages "
+                + "Exported Packages"
+                + " "
+                + "Concealed Packages ",
+                "concealedpkgmdlA\n"
+                + "None\n"
+                + " ");
+        checkOutput("moduleB-summary.html", found,
+                "
          • Description | "
+                + "Modules | Packages | Services
            • ",
+                "testpkgmdlB\n"
+                + "All Modules\n"
+                + " ",
+                " \n"
+                + "java.base\n"
+                + " ",
+                "TestClass2InModuleB\n"
+                + " ",
+                "TestInterface2InModuleB\n"
+                + " 
            (Implementation(s): TestClass2InModuleB)",
+                "TestInterfaceInModuleB\n"
+                + " 
            (Implementation(s): TestClassInModuleB)",
+                "All Packages "
+                + "Exported Packages "
+                + "Opened Packages ");
+        checkOutput("moduleC-summary.html", found,
+                "Exported Packages \n"
+                + "\n"
+                + "Package\n"
+                + "Module\n"
+                + "Description\n"
+                + "");
+        checkOutput("moduletags-summary.html", found,
+                "testpkgmdltags\n"
+                + "All Modules\n"
+                + " ");
+    }
+
     void checkModuleDeprecation(boolean found) {
-        checkOutput("module1-summary.html", found,
-                "
            Deprecated.\n"
+        checkOutput("moduleA-summary.html", found,
+                "
            Deprecated, for removal:"
+                + " This API element is subject to removal in a future version. \n"
                 + "
            This module is deprecated.
            \n"
                 + "
            ");
         checkOutput("deprecated-list.html", found,
                 "",
                 "\n"
-                + "module1\n"
+                + "moduleA\n"
                 + "\n"
                 + "
            This module is deprecated.
            \n"
                 + "\n"
                 + "");
-        checkOutput("module2-summary.html", !found,
+        checkOutput("moduleB-summary.html", !found,
                 "
            Deprecated.\n"
                 + "
            This module is deprecated using just the javadoc tag.
            ");
         checkOutput("moduletags-summary.html", found,
@@ -620,11 +772,11 @@ public class TestModules extends JavadocTester {
     }
 
     void checkModuleAnnotation() {
-        checkOutput("module2-summary.html", true,
-                "
            @AnnotationType(optional=\"Module Annotation\",\n"
-                + "                required=2016)\n"
+        checkOutput("moduleB-summary.html", true,
+                "
            @AnnotationType(optional=\"Module Annotation\",\n"
+                + "                required=2016)\n"
                 + "
            ");
-        checkOutput("module2-summary.html", false,
+        checkOutput("moduleB-summary.html", false,
                 "@AnnotationTypeUndocumented");
 }
 
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java
new file mode 100644
index 00000000000..48ba07ea667
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package concealedpkgmdlA;
+
+public class ConcealedClassInModuleA {
+    public void testMethodConcealedClass() { }
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/module-info.java
similarity index 87%
rename from langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleA/module-info.java
index c5e1fba0d3f..db081128374 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/module-info.java
@@ -24,13 +24,14 @@
  */
 
 /**
-  * This is a test description for the module1 module. Search phrase {@index "search phrase" with description}.
+  * This is a test description for the moduleA module. Search phrase {@index "search phrase" with description}.
   *
   * @deprecated This module is deprecated.
   */
-@Deprecated
-module module1 {
-    requires module2;
+@Deprecated(forRemoval=true)
+module moduleA {
+    requires transitive moduleB;
+    requires moduleC;
 
-    exports testpkgmdl1;
+    exports testpkgmdlA;
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module1/testpkgmdl1/TestClassInModule1.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java
similarity index 95%
rename from langtools/test/jdk/javadoc/doclet/testModules/module1/testpkgmdl1/TestClassInModule1.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java
index 63542730c0a..33e8f19e56c 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module1/testpkgmdl1/TestClassInModule1.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleA/testpkgmdlA/TestClassInModuleA.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package testpkgmdl1;
+package testpkgmdlA;
 
-public class TestClassInModule1 {
+public class TestClassInModuleA {
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/module-info.java
new file mode 100644
index 00000000000..41d934720e6
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/module-info.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+  * This is a test description for the moduleB module. Search word {@index search_word} with no description.
+  *
+  * @uses testpkgmdlB.TestClassInModuleB With a test description for uses.
+  * @provides testpkg2mdlB.TestInterface2InModuleB
+  * @deprecated This module is deprecated using just the javadoc tag.
+  */
+@testpkgmdlB.AnnotationType(optional="Module Annotation", required=2016)
+@testpkgmdlB.AnnotationTypeUndocumented(optional="Module Annotation", required=2016)
+module moduleB {
+    opens testpkgmdlB;
+
+    exports testpkg2mdlB to moduleA;
+
+    uses testpkgmdlB.TestClassInModuleB;
+    uses testpkgmdlB.TestClass2InModuleB;
+
+    provides testpkg2mdlB.TestInterfaceInModuleB with testpkgmdlB.TestClassInModuleB;
+    provides testpkg2mdlB.TestInterface2InModuleB with testpkgmdlB.TestClass2InModuleB;
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java
new file mode 100644
index 00000000000..df9ac6e1106
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterface2InModuleB.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testpkg2mdlB;
+
+public interface TestInterface2InModuleB {
+    void testMethod2();
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkg2mdl2/TestInterfaceInModule2.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java
similarity index 95%
rename from langtools/test/jdk/javadoc/doclet/testModules/module2/testpkg2mdl2/TestInterfaceInModule2.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java
index fb46042270b..174c8c1f6ad 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkg2mdl2/TestInterfaceInModule2.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkg2mdlB/TestInterfaceInModuleB.java
@@ -22,8 +22,8 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package testpkg2mdl2;
+package testpkg2mdlB;
 
-public interface TestInterfaceInModule2 {
+public interface TestInterfaceInModuleB {
     void testMethod();
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java
similarity index 98%
rename from langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java
index 5a0a219dd44..6f37a34d271 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationType.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package testpkgmdl2;
+package testpkgmdlB;
 
 import java.lang.annotation.*;
 
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java
similarity index 98%
rename from langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java
index 757e587dcba..066551c3c0d 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/AnnotationTypeUndocumented.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package testpkgmdl2;
+package testpkgmdlB;
 
 import java.lang.annotation.*;
 
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java
new file mode 100644
index 00000000000..81b613aef3a
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClass2InModuleB.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testpkgmdlB;
+
+import testpkg2mdlB.TestInterface2InModuleB;
+
+public class TestClass2InModuleB implements TestInterface2InModuleB {
+    void testMethod2() {}
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/TestClassInModule2.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java
similarity index 90%
rename from langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/TestClassInModule2.java
rename to langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java
index 04a6c5022ed..ed440f3a88c 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/TestClassInModule2.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleB/testpkgmdlB/TestClassInModuleB.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package testpkgmdl2;
+package testpkgmdlB;
 
-import testpkg2mdl2.TestInterfaceInModule2;
+import testpkg2mdlB.TestInterfaceInModuleB;
 
-public class TestClassInModule2 implements TestInterfaceInModule2 {
+public class TestClassInModuleB implements TestInterfaceInModuleB {
     void testMethod() {}
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleC/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleC/module-info.java
new file mode 100644
index 00000000000..2551792d689
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleC/module-info.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+  * This is a test description for the moduleC module.
+  */
+module moduleC {
+
+    exports testpkgmdlC to moduleA;
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java b/langtools/test/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java
new file mode 100644
index 00000000000..956b13d7ecd
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduleC/testpkgmdlC/TestClassInModuleC.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testpkgmdlC;
+
+public class TestClassInModuleC {
+    public void testMethodClassModuleC() { }
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java
index ecd34736968..1b0d2b24083 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java
@@ -24,7 +24,7 @@
  */
 
 /**
-  * This is a test description for the module1 module.
            
+  * This is a test description for the moduleA module.
            
   * Type Link: {@link testpkgmdltags.TestClassInModuleTags}.
            
   * Member Link: {@link testpkgmdltags.TestClassInModuleTags#testMethod(String)}.
            
   * Package Link: {@link testpkgmdltags}.
            
@@ -39,7 +39,7 @@
   */
 @Deprecated
 module moduletags {
-    requires module2;
+    requires transitive static moduleA;
 
     exports testpkgmdltags;
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index 025bf8a6c95..c54e98cc11c 100644
--- a/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261 8162363
+ * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261 8162363 8160196
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib
@@ -111,7 +111,7 @@ public class TestStylesheet extends JavadocTester {
                 + "    border: none;\n"
                 + "    height:16px;\n"
                 + "}",
-                ".memberSummary caption span.activeTableTab span {\n"
+                ".memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span {\n"
                 + "    white-space:nowrap;\n"
                 + "    padding-top:5px;\n"
                 + "    padding-left:12px;\n"
@@ -122,7 +122,7 @@ public class TestStylesheet extends JavadocTester {
                 + "    background-color:#F8981D;\n"
                 + "    height:16px;\n"
                 + "}",
-                ".memberSummary caption span.tableTab span {\n"
+                ".memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span {\n"
                 + "    white-space:nowrap;\n"
                 + "    padding-top:5px;\n"
                 + "    padding-left:12px;\n"
@@ -138,11 +138,10 @@ public class TestStylesheet extends JavadocTester {
                 + ".requiresSummary td.colFirst, .requiresSummary th.colFirst,\n"
                 + ".packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,\n"
                 + ".usesSummary td.colFirst, .usesSummary th.colFirst,\n"
-                + ".useSummary td.colFirst, .useSummary th.colFirst,\n"
+                + ".providesSummary td.colFirst, .providesSummary th.colFirst,\n"
                 + ".memberSummary td.colFirst, .memberSummary th.colFirst,\n"
                 + ".memberSummary td.colSecond, .memberSummary th.colSecond,\n"
                 + ".typeSummary td.colFirst{\n"
-                + "    width:25%;\n"
                 + "    vertical-align:top;\n"
                 + "}",
                 ".overviewSummary td, .memberSummary td, .typeSummary td,\n"
@@ -151,7 +150,8 @@ public class TestStylesheet extends JavadocTester {
                 + "    text-align:left;\n"
                 + "    padding:0px 0px 12px 10px;\n"
                 + "}",
-                ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {\n"
+                ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab,\n"
+                + ".packagesSummary caption span.tableTab, .packagesSummary caption span.activeTableTab {\n"
                 + "    padding-top:0px;\n"
                 + "    padding-left:0px;\n"
                 + "    padding-right:0px;\n"
diff --git a/langtools/test/jdk/jshell/CommandCompletionTest.java b/langtools/test/jdk/jshell/CommandCompletionTest.java
index 5602f034d3b..5671aacf432 100644
--- a/langtools/test/jdk/jshell/CommandCompletionTest.java
+++ b/langtools/test/jdk/jshell/CommandCompletionTest.java
@@ -43,22 +43,73 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import org.testng.annotations.Test;
+import jdk.internal.jshell.tool.JShellTool;
+import jdk.internal.jshell.tool.JShellToolBuilder;
+import jdk.jshell.SourceCodeAnalysis.Suggestion;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
-@Test
 public class CommandCompletionTest extends ReplToolTesting {
 
-    public void testCommand() {
-        assertCompletion("/deb|", false);
-        assertCompletion("/re|", false, "/reload ", "/reset ");
-        assertCompletion("/h|", false, "/help ", "/history ");
+
+    private JShellTool repl;
+
+    @Override
+    protected void testRawRun(Locale locale, String[] args) {
+        repl = ((JShellToolBuilder) builder(locale))
+                .rawTool();
+        try {
+            repl.start(args);
+        } catch (Exception ex) {
+            fail("Repl tool died with exception", ex);
+        }
     }
 
+    public void assertCompletion(boolean after, String code, boolean isSmart, String... expected) {
+        if (!after) {
+            setCommandInput("\n");
+        } else {
+            assertCompletion(code, isSmart, expected);
+        }
+    }
+
+    public void assertCompletion(String code, boolean isSmart, String... expected) {
+        List completions = computeCompletions(code, isSmart);
+        assertEquals(completions, Arrays.asList(expected), "Command: " + code + ", output: " +
+                completions.toString());
+    }
+
+    private List computeCompletions(String code, boolean isSmart) {
+        int cursor =  code.indexOf('|');
+        code = code.replace("|", "");
+        assertTrue(cursor > -1, "'|' not found: " + code);
+        List completions =
+                repl.commandCompletionSuggestions(code, cursor, new int[] {-1}); //XXX: ignoring anchor for now
+        return completions.stream()
+                          .filter(s -> isSmart == s.matchesType())
+                          .map(s -> s.continuation())
+                          .distinct()
+                          .collect(Collectors.toList());
+    }
+
+    @Test
+    public void testCommand() {
+        testNoStartUp(
+                a -> assertCompletion(a, "/deb|", false),
+                a -> assertCompletion(a, "/re|", false, "/reload ", "/reset "),
+                a -> assertCompletion(a, "/h|", false, "/help ", "/history ")
+        );
+    }
+
+    @Test
     public void testList() {
         test(false, new String[] {"--no-startup"},
                 a -> assertCompletion(a, "/l|", false, "/list "),
@@ -72,6 +123,7 @@ public class CommandCompletionTest extends ReplToolTesting {
         );
     }
 
+    @Test
     public void testDrop() {
         test(false, new String[] {"--no-startup"},
                 a -> assertCompletion(a, "/d|", false, "/drop "),
@@ -83,6 +135,7 @@ public class CommandCompletionTest extends ReplToolTesting {
         );
     }
 
+    @Test
     public void testEdit() {
         test(false, new String[]{"--no-startup"},
                 a -> assertCompletion(a, "/e|", false, "/edit ", "/exit "),
@@ -101,31 +154,38 @@ public class CommandCompletionTest extends ReplToolTesting {
         );
     }
 
+    @Test
     public void testHelp() {
-        assertCompletion("/help |", false,
+        testNoStartUp(
+                a -> assertCompletion(a, "/help |", false,
                 "/! ", "/- ", "/ ", "/? ", "/classpath ", "/drop ",
                 "/edit ", "/exit ", "/help ", "/history ", "/imports ",
                 "/list ", "/methods ", "/open ", "/reload ", "/reset ",
-                "/save ", "/set ", "/types ", "/vars ", "intro ", "shortcuts ");
-        assertCompletion("/? |", false,
+                "/save ", "/set ", "/types ", "/vars ", "intro ", "shortcuts "),
+                a -> assertCompletion(a, "/? |", false,
                 "/! ", "/- ", "/ ", "/? ", "/classpath ", "/drop ",
                 "/edit ", "/exit ", "/help ", "/history ", "/imports ",
                 "/list ", "/methods ", "/open ", "/reload ", "/reset ",
-                "/save ", "/set ", "/types ", "/vars ", "intro ", "shortcuts ");
-        assertCompletion("/help /s|", false,
-                "/save ", "/set ");
-        assertCompletion("/help /set |", false,
-                "editor", "feedback", "format", "mode", "prompt", "start", "truncation");
-        assertCompletion("/help /edit |", false);
+                "/save ", "/set ", "/types ", "/vars ", "intro ", "shortcuts "),
+                a -> assertCompletion(a, "/help /s|", false,
+                "/save ", "/set "),
+                a -> assertCompletion(a, "/help /set |", false,
+                "editor", "feedback", "format", "mode", "prompt", "start", "truncation"),
+                a -> assertCompletion(a, "/help /edit |", false)
+        );
     }
 
+    @Test
     public void testReload() {
-        assertCompletion("/reload |", false, "-quiet ", "-restore ");
-        assertCompletion("/reload -restore |", false, "-quiet");
-        assertCompletion("/reload -quiet |", false, "-restore");
-        assertCompletion("/reload -restore -quiet |", false);
+        testNoStartUp(
+                a -> assertCompletion(a, "/reload |", false, "-quiet ", "-restore "),
+                a -> assertCompletion(a, "/reload -restore |", false, "-quiet"),
+                a -> assertCompletion(a, "/reload -quiet |", false, "-restore"),
+                a -> assertCompletion(a, "/reload -restore -quiet |", false)
+        );
     }
 
+    @Test
     public void testVarsMethodsTypes() {
         test(false, new String[]{"--no-startup"},
                 a -> assertCompletion(a, "/v|", false, "/vars "),
@@ -141,36 +201,53 @@ public class CommandCompletionTest extends ReplToolTesting {
         );
     }
 
+    @Test
     public void testOpen() throws IOException {
         Compiler compiler = new Compiler();
-        assertCompletion("/o|", false, "/open ");
+        testNoStartUp(
+                a -> assertCompletion(a, "/o|", false, "/open ")
+        );
         List p1 = listFiles(Paths.get(""));
         getRootDirectories().forEach(s -> p1.add(s.toString()));
         Collections.sort(p1);
-        assertCompletion("/open |", false, p1.toArray(new String[p1.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/open |", false, p1.toArray(new String[p1.size()]))
+        );
         Path classDir = compiler.getClassDir();
         List p2 = listFiles(classDir);
-        assertCompletion("/open " + classDir + "/|", false, p2.toArray(new String[p2.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/open " + classDir + "/|", false, p2.toArray(new String[p2.size()]))
+        );
     }
 
+    @Test
     public void testSave() throws IOException {
         Compiler compiler = new Compiler();
-        assertCompletion("/s|", false, "/save ", "/set ");
+        testNoStartUp(
+                a -> assertCompletion(a, "/s|", false, "/save ", "/set ")
+        );
         List p1 = listFiles(Paths.get(""));
         Collections.addAll(p1, "-all ", "-history ", "-start ");
         getRootDirectories().forEach(s -> p1.add(s.toString()));
         Collections.sort(p1);
-        assertCompletion("/save |", false, p1.toArray(new String[p1.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/save |", false, p1.toArray(new String[p1.size()]))
+        );
         Path classDir = compiler.getClassDir();
         List p2 = listFiles(classDir);
-        assertCompletion("/save " + classDir + "/|",
-                false, p2.toArray(new String[p2.size()]));
-        assertCompletion("/save -all " + classDir + "/|",
-                false, p2.toArray(new String[p2.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/save " + classDir + "/|",
+                false, p2.toArray(new String[p2.size()])),
+                a -> assertCompletion(a, "/save -all " + classDir + "/|",
+                false, p2.toArray(new String[p2.size()]))
+        );
     }
 
+    @Test
     public void testClassPath() throws IOException {
-        assertCompletion("/classp|", false, "/classpath ");
+        testNoStartUp(
+                a -> assertCompletion(a, "/classp|", false, "/classpath ")
+        );
         Compiler compiler = new Compiler();
         Path outDir = compiler.getPath("testClasspathCompletion");
         Files.createDirectories(outDir);
@@ -182,9 +259,12 @@ public class CommandCompletionTest extends ReplToolTesting {
         compiler.jar(outDir, jarName, "pkg/A.class");
         compiler.getPath(outDir).resolve(jarName);
         List paths = listFiles(outDir, CLASSPATH_FILTER);
-        assertCompletion("/classpath " + outDir + "/|", false, paths.toArray(new String[paths.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/classpath " + outDir + "/|", false, paths.toArray(new String[paths.size()]))
+        );
     }
 
+    @Test
     public void testUserHome() throws IOException {
         List completions;
         Path home = Paths.get(System.getProperty("user.home"));
@@ -194,9 +274,12 @@ public class CommandCompletionTest extends ReplToolTesting {
                                  .sorted()
                                  .collect(Collectors.toList());
         }
-        assertCompletion("/classpath ~/|", false, completions.toArray(new String[completions.size()]));
+        testNoStartUp(
+                a -> assertCompletion(a, "/classpath ~/|", false, completions.toArray(new String[completions.size()]))
+        );
     }
 
+    @Test
     public void testSet() throws IOException {
         List p1 = listFiles(Paths.get(""));
         getRootDirectories().forEach(s -> p1.add(s.toString()));
diff --git a/langtools/test/jdk/jshell/HistoryTest.java b/langtools/test/jdk/jshell/HistoryTest.java
index cbad5b2b319..bc0557b6245 100644
--- a/langtools/test/jdk/jshell/HistoryTest.java
+++ b/langtools/test/jdk/jshell/HistoryTest.java
@@ -32,13 +32,29 @@
  */
 
 import java.lang.reflect.Field;
+import java.util.Locale;
 import jdk.internal.jline.extra.EditingHistory;
 import org.testng.annotations.Test;
+import jdk.internal.jshell.tool.JShellTool;
+import jdk.internal.jshell.tool.JShellToolBuilder;
 import static org.testng.Assert.*;
 
-@Test
 public class HistoryTest extends ReplToolTesting {
 
+    private JShellTool repl;
+
+    @Override
+    protected void testRawRun(Locale locale, String[] args) {
+        repl = ((JShellToolBuilder) builder(locale))
+                .rawTool();
+        try {
+            repl.start(args);
+        } catch (Exception ex) {
+            fail("Repl tool died with exception", ex);
+        }
+    }
+
+    @Test
     public void testHistory() {
         test(
              a -> {if (!a) setCommandInput("void test() {\n");},
@@ -76,6 +92,7 @@ public class HistoryTest extends ReplToolTesting {
              });
     }
 
+    @Test
     public void test8166744() {
         test(
              a -> {if (!a) setCommandInput("class C {\n");},
diff --git a/langtools/test/jdk/jshell/ReplToolTesting.java b/langtools/test/jdk/jshell/ReplToolTesting.java
index 96aa6c81ceb..1880a6720d5 100644
--- a/langtools/test/jdk/jshell/ReplToolTesting.java
+++ b/langtools/test/jdk/jshell/ReplToolTesting.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -36,17 +35,15 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.internal.jshell.tool.JShellTool;
-import jdk.jshell.SourceCodeAnalysis.Suggestion;
 
 import org.testng.annotations.BeforeMethod;
 
+import jdk.jshell.tool.JavaShellToolBuilder;
 import static java.util.stream.Collectors.toList;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -92,11 +89,9 @@ public class ReplToolTesting {
     private Map classes;
     private Map imports;
     private boolean isDefaultStartUp = true;
-    private Preferences prefs;
+    private Map prefsMap;
     private Map envvars;
 
-    public JShellTool repl = null;
-
     public interface ReplTest {
         void run(boolean after);
     }
@@ -202,6 +197,10 @@ public class ReplToolTesting {
         test(Locale.ROOT, isDefaultStartUp, args, DEFAULT_STARTUP_MESSAGE, tests);
     }
 
+    public void testNoStartUp(ReplTest... tests) {
+        test(Locale.ROOT, false, new String[] {"--no-startup"}, DEFAULT_STARTUP_MESSAGE, tests);
+    }
+
     public void test(Locale locale, boolean isDefaultStartUp, String[] args, String startUpMessage, ReplTest... tests) {
         this.isDefaultStartUp = isDefaultStartUp;
         initSnippets();
@@ -232,7 +231,7 @@ public class ReplToolTesting {
 
     @BeforeMethod
     public void setUp() {
-        prefs = new MemoryPreferences();
+        prefsMap = new HashMap<>();
         envvars = new HashMap<>();
     }
 
@@ -240,7 +239,25 @@ public class ReplToolTesting {
         envvars.put(name, value);
     }
 
-    public void testRaw(Locale locale, String[] args, ReplTest... tests) {
+    protected JavaShellToolBuilder builder(Locale locale) {
+        return JavaShellToolBuilder
+                    .builder()
+                    .in(cmdin, userin)
+                    .out(new PrintStream(cmdout), new PrintStream(console), new PrintStream(userout))
+                    .err(new PrintStream(cmderr), new PrintStream(usererr))
+                    .persistence(prefsMap)
+                    .env(envvars)
+                    .locale(locale)
+                    .promptCapture(true);
+    }
+
+    private void testRaw(Locale locale, String[] args, ReplTest... tests) {
+        testRawInit(tests);
+        testRawRun(locale, args);
+        testRawCheck(locale);
+    }
+
+    private void testRawInit(ReplTest... tests) {
         cmdin = new WaitingTestingInputStream();
         cmdout = new ByteArrayOutputStream();
         cmderr = new ByteArrayOutputStream();
@@ -248,23 +265,18 @@ public class ReplToolTesting {
         userin = new TestingInputStream();
         userout = new ByteArrayOutputStream();
         usererr = new ByteArrayOutputStream();
-        repl = new JShellTool(
-                cmdin,
-                new PrintStream(cmdout),
-                new PrintStream(cmderr),
-                new PrintStream(console),
-                userin,
-                new PrintStream(userout),
-                new PrintStream(usererr),
-                prefs,
-                envvars,
-                locale);
-        repl.testPrompt = true;
+    }
+
+    protected void testRawRun(Locale locale, String[] args) {
         try {
-            repl.start(args);
+            builder(locale)
+                    .run(args);
         } catch (Exception ex) {
             fail("Repl tool died with exception", ex);
         }
+    }
+
+    private void testRawCheck(Locale locale) {
         // perform internal consistency checks on state, if desired
         String cos = getCommandOutput();
         String ceos = getCommandErrorOutput();
@@ -272,9 +284,9 @@ public class ReplToolTesting {
         String ueos = getUserErrorOutput();
         assertTrue((cos.isEmpty() || cos.startsWith("|  Goodbye") || !locale.equals(Locale.ROOT)),
                 "Expected a goodbye, but got: " + cos);
-        assertTrue(ceos.isEmpty(), "Expected empty error output, got: " + ceos);
-        assertTrue(uos.isEmpty(), "Expected empty output, got: " + uos);
-        assertTrue(ueos.isEmpty(), "Expected empty error output, got: " + ueos);
+        assertTrue(ceos.isEmpty(), "Expected empty command error output, got: " + ceos);
+        assertTrue(uos.isEmpty(), "Expected empty user output, got: " + uos);
+        assertTrue(ueos.isEmpty(), "Expected empty user error output, got: " + ueos);
     }
 
     public void assertReset(boolean after, String cmd) {
@@ -454,36 +466,6 @@ public class ReplToolTesting {
         }
     }
 
-    public void assertCompletion(boolean after, String code, boolean isSmart, String... expected) {
-        if (!after) {
-            setCommandInput("\n");
-        } else {
-            assertCompletion(code, isSmart, expected);
-        }
-    }
-
-    public void assertCompletion(String code, boolean isSmart, String... expected) {
-        List completions = computeCompletions(code, isSmart);
-        assertEquals(completions, Arrays.asList(expected), "Command: " + code + ", output: " +
-                completions.toString());
-    }
-
-    private List computeCompletions(String code, boolean isSmart) {
-        JShellTool js = this.repl != null ? this.repl
-                                      : new JShellTool(null, null, null, null, null, null, null,
-                                              prefs, envvars, Locale.ROOT);
-        int cursor =  code.indexOf('|');
-        code = code.replace("|", "");
-        assertTrue(cursor > -1, "'|' not found: " + code);
-        List completions =
-                js.commandCompletionSuggestions(code, cursor, new int[] {-1}); //XXX: ignoring anchor for now
-        return completions.stream()
-                          .filter(s -> isSmart == s.matchesType())
-                          .map(s -> s.continuation())
-                          .distinct()
-                          .collect(Collectors.toList());
-    }
-
     public Consumer assertStartsWith(String prefix) {
         return (output) -> assertTrue(output.startsWith(prefix), "Output: \'" + output + "' does not start with: " + prefix);
     }
diff --git a/langtools/test/jdk/jshell/StartOptionTest.java b/langtools/test/jdk/jshell/StartOptionTest.java
index 727064c6891..e4e95b059eb 100644
--- a/langtools/test/jdk/jshell/StartOptionTest.java
+++ b/langtools/test/jdk/jshell/StartOptionTest.java
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test 8151754 8080883 8160089 8166581
+ * @test 8151754 8080883 8160089 8170162 8166581
  * @summary Testing start-up options.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -33,19 +33,21 @@
  * @run testng StartOptionTest
  */
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.ServiceLoader;
 import java.util.function.Consumer;
 
-import jdk.internal.jshell.tool.JShellTool;
+import javax.tools.Tool;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-
+import jdk.jshell.tool.JavaShellToolBuilder;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -59,21 +61,26 @@ public class StartOptionTest {
     private ByteArrayOutputStream userout;
     private ByteArrayOutputStream usererr;
 
-    private JShellTool getShellTool() {
-        return new JShellTool(
-                new TestingInputStream(),
-                new PrintStream(cmdout),
-                new PrintStream(cmderr),
-                new PrintStream(console),
-                null,
-                new PrintStream(userout),
-                new PrintStream(usererr),
-                new ReplToolTesting.MemoryPreferences(),
-                new HashMap<>(),
-                Locale.ROOT);
+    private JavaShellToolBuilder builder() {
+        return JavaShellToolBuilder
+                    .builder()
+                    .out(new PrintStream(cmdout), new PrintStream(console), new PrintStream(userout))
+                    .err(new PrintStream(cmderr), new PrintStream(usererr))
+                    .persistence(new HashMap<>())
+                    .env(new HashMap<>())
+                    .locale(Locale.ROOT);
     }
 
-    private void check(ByteArrayOutputStream str, Consumer checkOut, String label) {
+    private void runShell(String... args) {
+        try {
+            builder()
+                    .run(args);
+        } catch (Exception ex) {
+            fail("Repl tool died with exception", ex);
+        }
+    }
+
+    protected void check(ByteArrayOutputStream str, Consumer checkOut, String label) {
         byte[] bytes = str.toByteArray();
         str.reset();
         String out =  new String(bytes, StandardCharsets.UTF_8);
@@ -84,18 +91,28 @@ public class StartOptionTest {
         }
     }
 
-    private void start(Consumer checkOutput, Consumer checkError, String... args) throws Exception {
-        JShellTool tool = getShellTool();
-        tool.start(args);
-        check(cmdout, checkOutput, "cmdout");
+    protected void start(Consumer checkCmdOutput,
+            Consumer checkUserOutput, Consumer checkError,
+            String... args) throws Exception {
+        runShell(args);
+        check(cmdout, checkCmdOutput, "cmdout");
         check(cmderr, checkError, "cmderr");
         check(console, null, "console");
-        check(userout, null, "userout");
+        check(userout, checkUserOutput, "userout");
         check(usererr, null, "usererr");
     }
 
-    private void start(String expectedOutput, String expectedError, String... args) throws Exception {
-        start(s -> assertEquals(s.trim(), expectedOutput, "cmdout: "), s -> assertEquals(s.trim(), expectedError, "cmderr: "), args);
+    protected void start(String expectedCmdOutput, String expectedError, String... args) throws Exception {
+        startWithUserOutput(expectedCmdOutput, "",  expectedError, args);
+    }
+
+    private void startWithUserOutput(String expectedCmdOutput, String expectedUserOutput,
+            String expectedError, String... args) throws Exception {
+        start(
+                s -> assertEquals(s.trim(), expectedCmdOutput, "cmdout: "),
+                s -> assertEquals(s.trim(), expectedUserOutput, "userout: "),
+                s -> assertEquals(s.trim(), expectedError, "cmderr: "),
+                args);
     }
 
     @BeforeMethod
@@ -107,21 +124,31 @@ public class StartOptionTest {
         usererr = new ByteArrayOutputStream();
     }
 
-    @Test
+    protected String writeToFile(String stuff) throws Exception {
+        Compiler compiler = new Compiler();
+        Path p = compiler.getPath("doit.repl");
+        compiler.writeToFile(p, stuff);
+        return p.toString();
+    }
+
+    public void testCommandFile() throws Exception {
+        String fn = writeToFile("String str = \"Hello \"\n/list\nSystem.out.println(str + str)\n/exit\n");
+        startWithUserOutput("1 : String str = \"Hello \";", "Hello Hello", "", "--no-startup", fn, "-s");
+    }
+
     public void testUsage() throws Exception {
         for (String opt : new String[]{"-h", "--help"}) {
             start(s -> {
                 assertTrue(s.split("\n").length >= 7, "Not enough usage lines: " + s);
                 assertTrue(s.startsWith("Usage:   jshell "), "Unexpect usage start: " + s);
-            }, null, opt);
+            }, null, null, opt);
         }
     }
 
-    @Test
     public void testUnknown() throws Exception {
-        start(s -> { },
+        start(null, null,
               s -> assertEquals(s.trim(), "Unknown option: u"), "-unknown");
-        start(s -> { },
+        start(null, null,
               s -> assertEquals(s.trim(), "Unknown option: unknown"), "--unknown");
     }
 
@@ -138,7 +165,7 @@ public class StartOptionTest {
 
     public void testStartupFailedOption() throws Exception {
         try {
-            start("", "", "-R-hoge-foo-bar");
+            builder().run("-R-hoge-foo-bar");
         } catch (IllegalStateException ex) {
             String s = ex.getMessage();
             assertTrue(s.startsWith("Launching JShell execution engine threw: Failed remote"), s);
@@ -151,7 +178,6 @@ public class StartOptionTest {
         start("", "File 'UNKNOWN' for '--startup' is not found.", "--startup", "UNKNOWN");
     }
 
-    @Test
     public void testClasspath() throws Exception {
         for (String cp : new String[] {"--class-path"}) {
             start("", "Only one --class-path option may be used.", cp, ".", "--class-path", ".");
@@ -159,7 +185,6 @@ public class StartOptionTest {
         }
     }
 
-    @Test
     public void testFeedbackOptionConflict() throws Exception {
         start("", "Only one feedback option (--feedback, -q, -s, or -v) may be used.",
                 "--feedback", "concise", "--feedback", "verbose");
@@ -173,15 +198,13 @@ public class StartOptionTest {
         start("", "Only one feedback option (--feedback, -q, -s, or -v) may be used.", "-q", "-s");
     }
 
-    @Test
     public void testNegFeedbackOption() throws Exception {
         start("", "Argument to feedback missing.", "--feedback");
         start("", "Does not match any current feedback mode: blorp -- --feedback blorp", "--feedback", "blorp");
     }
 
-    @Test
     public void testVersion() throws Exception {
-        start(s -> assertTrue(s.startsWith("jshell"), "unexpected version: " + s), null, "--version");
+        start(s -> assertTrue(s.startsWith("jshell"), "unexpected version: " + s), null, null, "--version");
     }
 
     @AfterMethod
diff --git a/langtools/test/jdk/jshell/ToolBasicTest.java b/langtools/test/jdk/jshell/ToolBasicTest.java
index 4c4ee90d3b3..565ee3d5cee 100644
--- a/langtools/test/jdk/jshell/ToolBasicTest.java
+++ b/langtools/test/jdk/jshell/ToolBasicTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8143037 8142447 8144095 8140265 8144906 8146138 8147887 8147886 8148316 8148317 8143955 8157953 8080347 8154714 8166649 8167643
+ * @bug 8143037 8142447 8144095 8140265 8144906 8146138 8147887 8147886 8148316 8148317 8143955 8157953 8080347 8154714 8166649 8167643 8170162
  * @summary Tests for Basic tests for REPL tool
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -49,8 +49,6 @@ import java.util.Scanner;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -305,22 +303,18 @@ public class ToolBasicTest extends ReplToolTesting {
     }
 
     public void testStartupFileOption() {
-        try {
-            Compiler compiler = new Compiler();
-            Path startup = compiler.getPath("StartupFileOption/startup.txt");
-            compiler.writeToFile(startup, "class A { public String toString() { return \"A\"; } }");
-            test(new String[]{"--startup", startup.toString()},
-                    (a) -> evaluateExpression(a, "A", "new A()", "A")
-            );
-            test(new String[]{"--no-startup"},
-                    (a) -> assertCommandCheckOutput(a, "printf(\"\")", assertStartsWith("|  Error:\n|  cannot find symbol"))
-            );
-            test(
-                    (a) -> assertCommand(a, "printf(\"A\")", "", "", null, "A", "")
-            );
-        } finally {
-            removeStartup();
-        }
+        Compiler compiler = new Compiler();
+        Path startup = compiler.getPath("StartupFileOption/startup.txt");
+        compiler.writeToFile(startup, "class A { public String toString() { return \"A\"; } }");
+        test(new String[]{"--startup", startup.toString()},
+                (a) -> evaluateExpression(a, "A", "new A()", "A")
+        );
+        test(new String[]{"--no-startup"},
+                (a) -> assertCommandCheckOutput(a, "printf(\"\")", assertStartsWith("|  Error:\n|  cannot find symbol"))
+        );
+        test(
+                (a) -> assertCommand(a, "printf(\"A\")", "", "", null, "A", "")
+        );
     }
 
     public void testLoadingFromArgs() {
@@ -436,45 +430,34 @@ public class ToolBasicTest extends ReplToolTesting {
         assertEquals(Files.readAllLines(path), output);
     }
 
-    public void testStartRetain() throws BackingStoreException {
-        try {
-            Compiler compiler = new Compiler();
-            Path startUpFile = compiler.getPath("startUp.txt");
-            test(
-                    (a) -> assertVariable(a, "int", "a"),
-                    (a) -> assertVariable(a, "double", "b", "10", "10.0"),
-                    (a) -> assertMethod(a, "void f() {}", "()V", "f"),
-                    (a) -> assertImport(a, "import java.util.stream.*;", "", "java.util.stream.*"),
-                    (a) -> assertCommand(a, "/save " + startUpFile.toString(), null),
-                    (a) -> assertCommand(a, "/set start -retain " + startUpFile.toString(), null)
-            );
-            Path unknown = compiler.getPath("UNKNOWN");
-            test(
-                    (a) -> assertCommandOutputStartsWith(a, "/set start -retain " + unknown.toString(),
-                            "|  File '" + unknown + "' for '/set start' is not found.")
-            );
-            test(false, new String[0],
-                    (a) -> {
-                        loadVariable(a, "int", "a");
-                        loadVariable(a, "double", "b", "10.0", "10.0");
-                        loadMethod(a, "void f() {}", "()void", "f");
-                        loadImport(a, "import java.util.stream.*;", "", "java.util.stream.*");
-                        assertCommandCheckOutput(a, "/types", assertClasses());
-                    },
-                    (a) -> assertCommandCheckOutput(a, "/vars", assertVariables()),
-                    (a) -> assertCommandCheckOutput(a, "/methods", assertMethods()),
-                    (a) -> assertCommandCheckOutput(a, "/imports", assertImports())
-            );
-        } finally {
-            removeStartup();
-        }
-    }
-
-    private void removeStartup() {
-        Preferences preferences = Preferences.userRoot().node("tool/JShell");
-        if (preferences != null) {
-            preferences.remove("STARTUP");
-        }
+    public void testStartRetain() {
+        Compiler compiler = new Compiler();
+        Path startUpFile = compiler.getPath("startUp.txt");
+        test(
+                (a) -> assertVariable(a, "int", "a"),
+                (a) -> assertVariable(a, "double", "b", "10", "10.0"),
+                (a) -> assertMethod(a, "void f() {}", "()V", "f"),
+                (a) -> assertImport(a, "import java.util.stream.*;", "", "java.util.stream.*"),
+                (a) -> assertCommand(a, "/save " + startUpFile.toString(), null),
+                (a) -> assertCommand(a, "/set start -retain " + startUpFile.toString(), null)
+        );
+        Path unknown = compiler.getPath("UNKNOWN");
+        test(
+                (a) -> assertCommandOutputStartsWith(a, "/set start -retain " + unknown.toString(),
+                        "|  File '" + unknown + "' for '/set start' is not found.")
+        );
+        test(false, new String[0],
+                (a) -> {
+                    loadVariable(a, "int", "a");
+                    loadVariable(a, "double", "b", "10.0", "10.0");
+                    loadMethod(a, "void f() {}", "()void", "f");
+                    loadImport(a, "import java.util.stream.*;", "", "java.util.stream.*");
+                    assertCommandCheckOutput(a, "/types", assertClasses());
+                },
+                (a) -> assertCommandCheckOutput(a, "/vars", assertVariables()),
+                (a) -> assertCommandCheckOutput(a, "/methods", assertMethods()),
+                (a) -> assertCommandCheckOutput(a, "/imports", assertImports())
+        );
     }
 
     public void testStartSave() throws IOException {
diff --git a/langtools/test/jdk/jshell/ToolProviderTest.java b/langtools/test/jdk/jshell/ToolProviderTest.java
new file mode 100644
index 00000000000..c7f2b84fd42
--- /dev/null
+++ b/langtools/test/jdk/jshell/ToolProviderTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.ServiceLoader;
+import java.util.function.Consumer;
+import javax.tools.Tool;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import static org.testng.Assert.fail;
+
+/*
+ * @test
+ * @bug 8170044
+ * @summary Test ServiceLoader launching of jshell tool
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.javap
+ *          jdk.jshell/jdk.internal.jshell.tool
+ * @library /tools/lib
+ * @build Compiler toolbox.ToolBox
+ * @run testng ToolProviderTest
+ */
+@Test
+public class ToolProviderTest extends StartOptionTest {
+
+    private ByteArrayOutputStream cmdout;
+    private ByteArrayOutputStream cmderr;
+
+    @BeforeMethod
+    @Override
+    public void setUp() {
+        cmdout = new ByteArrayOutputStream();
+        cmderr = new ByteArrayOutputStream();
+    }
+
+    @Override
+    protected void start(Consumer checkCmdOutput,
+            Consumer checkUserOutput, Consumer checkError,
+            String... args) throws Exception {
+        if (runShellServiceLoader(args) != 0) {
+            fail("Repl tool failed");
+        }
+        check(cmdout, checkCmdOutput, "cmdout");
+        check(cmderr, checkError, "cmderr");
+    }
+
+    private int runShellServiceLoader(String... args) {
+        ServiceLoader sl = ServiceLoader.load(Tool.class);
+        for (Tool provider : sl) {
+            if (provider.name().equals("jshell")) {
+                return provider.run(new ByteArrayInputStream(new byte[0]), cmdout, cmderr, args);
+            }
+        }
+        throw new AssertionError("Repl tool not found by ServiceLoader: " + sl);
+    }
+
+    @Override
+    public void testCommandFile() throws Exception {
+        String fn = writeToFile("String str = \"Hello \"\n/list\nSystem.out.println(str + str)\n/exit\n");
+        start("1 : String str = \"Hello \";" + "\n" + "Hello Hello", "", "--no-startup", fn, "-s");
+    }
+
+    @Override
+    public void testStartupFailedOption() throws Exception {
+        if (runShellServiceLoader("-R-hoge-foo-bar") == 0) {
+            fail("Expected tool failure");
+        } else {
+            check(cmderr, s -> s.startsWith("Launching JShell execution engine threw: Failed remote"), "cmderr");
+        }
+    }
+}
diff --git a/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java b/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java
index 480e380c68d..59b7436baad 100644
--- a/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java
+++ b/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java
@@ -1182,16 +1182,6 @@ public class ClassfileInspector {
 
     private static class AbstractAttributeVisitor implements Attribute.Visitor {
 
-        @Override
-        public Void visitBootstrapMethods(BootstrapMethods_attribute attr, T p) {
-            return null;
-        }
-
-        @Override
-        public Void visitModulePackages(ModulePackages_attribute attr, T p) {
-            return null;
-        }
-
         @Override
         public Void visitDefault(DefaultAttribute attr, T p) {
             return null;
@@ -1202,6 +1192,11 @@ public class ClassfileInspector {
             return null;
         }
 
+        @Override
+        public Void visitBootstrapMethods(BootstrapMethods_attribute attr, T p) {
+            return null;
+        }
+
         @Override
         public Void visitCharacterRangeTable(CharacterRangeTable_attribute attr, T p) {
             return null;
@@ -1237,11 +1232,6 @@ public class ClassfileInspector {
             return null;
         }
 
-        @Override
-        public Void visitModuleHashes(ModuleHashes_attribute attr, T p) {
-            return null;
-        }
-
         @Override
         public Void visitInnerClasses(InnerClasses_attribute attr, T p) {
             return null;
@@ -1262,11 +1252,6 @@ public class ClassfileInspector {
             return null;
         }
 
-        @Override
-        public Void visitModuleMainClass(ModuleMainClass_attribute attr, T p) {
-            return null;
-        }
-
         @Override
         public Void visitMethodParameters(MethodParameters_attribute attr, T p) {
             return null;
@@ -1278,7 +1263,27 @@ public class ClassfileInspector {
         }
 
         @Override
-        public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, T p) {
+        public Void visitModuleHashes(ModuleHashes_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitModuleMainClass(ModuleMainClass_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitModulePackages(ModulePackages_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitModuleResolution(ModuleResolution_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitModuleTarget(ModuleTarget_attribute attr, T p) {
             return null;
         }
 
@@ -1287,23 +1292,28 @@ public class ClassfileInspector {
             return null;
         }
 
-        @Override
-        public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, T p) {
-            return null;
-        }
-
         @Override
         public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, T p) {
             return null;
         }
 
         @Override
-        public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, T p) {
+        public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, T p) {
             return null;
         }
 
         @Override
-        public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, T p) {
+        public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, T p) {
+            return null;
+        }
+
+        @Override
+        public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, T p) {
             return null;
         }
 
@@ -1341,17 +1351,6 @@ public class ClassfileInspector {
         public Void visitSynthetic(Synthetic_attribute attr, T p) {
             return null;
         }
-
-        @Override
-        public Void visitModuleTarget(ModuleTarget_attribute attr, T p) {
-            return null;
-        }
-
-        @Override
-        public Void visitModuleVersion(ModuleVersion_attribute attr, T p) {
-            return null;
-        }
-
     }
 
     private static final Attribute.Visitor typeAnnoMatcher
diff --git a/langtools/test/tools/doclint/ProvidesTest.java b/langtools/test/tools/doclint/ProvidesTest.java
new file mode 100644
index 00000000000..d4ac7f4c9a7
--- /dev/null
+++ b/langtools/test/tools/doclint/ProvidesTest.java
@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8160196
+ * @summary Module summary page should display information based on "api" or "detail" mode.
+ * @modules jdk.compiler/com.sun.tools.doclint
+ * @build DocLintTester
+ * @run main DocLintTester -ref ProvidesTest.out ProvidesTest.java
+ */
+
+/**
+ * Invalid use of provides in class documentation.
+ *
+ * @provides UsesTest
+ */
+public class ProvidesTest {
+    /**
+     * Invalid use of provides in field documentation
+     *
+     * @provides UsesTest Test description.
+     */
+    public int invalid_param;
+
+    /**
+     * Invalid use of provides in method documentation
+     *
+     * @provides UsesTest Test description.
+     */
+    public class InvalidParam { }
+}
diff --git a/langtools/test/tools/doclint/ProvidesTest.out b/langtools/test/tools/doclint/ProvidesTest.out
new file mode 100644
index 00000000000..2dd75a72ee9
--- /dev/null
+++ b/langtools/test/tools/doclint/ProvidesTest.out
@@ -0,0 +1,28 @@
+ProvidesTest.java:13: error: invalid use of @provides
+ * @provides UsesTest
+   ^
+ProvidesTest.java:13: error: service-type not found
+ * @provides UsesTest
+   ^
+ProvidesTest.java:13: error: reference not found
+ * @provides UsesTest
+             ^
+ProvidesTest.java:19: error: invalid use of @provides
+     * @provides UsesTest Test description.
+       ^
+ProvidesTest.java:19: error: service-type not found
+     * @provides UsesTest Test description.
+       ^
+ProvidesTest.java:19: error: reference not found
+     * @provides UsesTest Test description.
+                 ^
+ProvidesTest.java:26: error: invalid use of @provides
+     * @provides UsesTest Test description.
+       ^
+ProvidesTest.java:26: error: service-type not found
+     * @provides UsesTest Test description.
+       ^
+ProvidesTest.java:26: error: reference not found
+     * @provides UsesTest Test description.
+                 ^
+9 errors
diff --git a/langtools/test/tools/doclint/UsesTest.java b/langtools/test/tools/doclint/UsesTest.java
new file mode 100644
index 00000000000..6f15a9f64e6
--- /dev/null
+++ b/langtools/test/tools/doclint/UsesTest.java
@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8160196
+ * @summary Module summary page should display information based on "api" or "detail" mode.
+ * @modules jdk.compiler/com.sun.tools.doclint
+ * @build DocLintTester
+ * @run main DocLintTester -ref UsesTest.out UsesTest.java
+ */
+
+/**
+ * Invalid use of uses in class documentation.
+ *
+ * @uses ProvidesTest
+ */
+public class UsesTest {
+    /**
+     * Invalid use of uses in field documentation
+     *
+     * @uses ProvidesTest Test description.
+     */
+    public int invalid_param;
+
+    /**
+     * Invalid use of uses in method documentation
+     *
+     * @uses ProvidesTest Test description.
+     */
+    public class InvalidParam { }
+}
diff --git a/langtools/test/tools/doclint/UsesTest.out b/langtools/test/tools/doclint/UsesTest.out
new file mode 100644
index 00000000000..aa8aa454197
--- /dev/null
+++ b/langtools/test/tools/doclint/UsesTest.out
@@ -0,0 +1,28 @@
+UsesTest.java:13: error: invalid use of @uses
+ * @uses ProvidesTest
+   ^
+UsesTest.java:13: error: service-type not found
+ * @uses ProvidesTest
+   ^
+UsesTest.java:13: error: reference not found
+ * @uses ProvidesTest
+         ^
+UsesTest.java:19: error: invalid use of @uses
+     * @uses ProvidesTest Test description.
+       ^
+UsesTest.java:19: error: service-type not found
+     * @uses ProvidesTest Test description.
+       ^
+UsesTest.java:19: error: reference not found
+     * @uses ProvidesTest Test description.
+             ^
+UsesTest.java:26: error: invalid use of @uses
+     * @uses ProvidesTest Test description.
+       ^
+UsesTest.java:26: error: service-type not found
+     * @uses ProvidesTest Test description.
+       ^
+UsesTest.java:26: error: reference not found
+     * @uses ProvidesTest Test description.
+             ^
+9 errors
diff --git a/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java b/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java
index 85e6f105632..79292158316 100644
--- a/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java
+++ b/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java
@@ -47,8 +47,8 @@ class AttributeVisitor implements Attribute.Visitor {
     public R visitModuleHashes(ModuleHashes_attribute attr, P p) { return null; }
     public R visitModuleMainClass(ModuleMainClass_attribute attr, P p) { return null; }
     public R visitModulePackages(ModulePackages_attribute attr, P p) { return null; }
+    public R visitModuleResolution(ModuleResolution_attribute attr, P p) { return null; }
     public R visitModuleTarget(ModuleTarget_attribute attr, P p) { return null; }
-    public R visitModuleVersion(ModuleVersion_attribute attr, P p) { return null; }
     public R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p) { return null; }
     public R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p) { return null; }
     public R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p) { return null; }
diff --git a/langtools/test/tools/javac/T6403466.out b/langtools/test/tools/javac/T6403466.out
index 6a4316e3c26..453cc184805 100644
--- a/langtools/test/tools/javac/T6403466.out
+++ b/langtools/test/tools/javac/T6403466.out
@@ -20,11 +20,11 @@ Finished TaskEvent[ENTER,T6403466.java,null]
 Finished TaskEvent[ENTER,T6403466Wrapper.java,null]
 Started TaskEvent[ANNOTATION_PROCESSING_ROUND,null,null]
 Finished TaskEvent[ANNOTATION_PROCESSING_ROUND,null,null]
-Finished TaskEvent[ANNOTATION_PROCESSING,null,null]
 Started TaskEvent[ENTER,T6403466.java,null]
 Started TaskEvent[ENTER,T6403466Wrapper.java,null]
 Finished TaskEvent[ENTER,T6403466.java,null]
 Finished TaskEvent[ENTER,T6403466Wrapper.java,null]
+Finished TaskEvent[ANNOTATION_PROCESSING,null,null]
 Started TaskEvent[ANALYZE,T6403466.java,T6403466]
 Finished TaskEvent[ANALYZE,T6403466.java,T6403466]
 Started TaskEvent[GENERATE,T6403466.java,T6403466]
diff --git a/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java b/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java
index 4d52729d26e..a47dd2a9581 100644
--- a/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java
+++ b/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java
@@ -112,6 +112,8 @@ public class DetectMutableStaticFields {
                 "bootMethod", "defineModulesWithOneLoaderMethod", "configurationMethod", "layerClass");
         ignore("com/sun/tools/javac/util/JDK9Wrappers$Module",
                 "addExportsMethod", "addUsesMethod", "getModuleMethod", "getUnnamedModuleMethod");
+        ignore("com/sun/tools/javac/util/JDK9Wrappers$ModuleDescriptor$Version",
+                "versionClass", "parseMethod");
         ignore("com/sun/tools/javac/util/JDK9Wrappers$ModuleFinder",
                 "moduleFinderClass", "ofMethod");
         ignore("com/sun/tools/javac/util/JDK9Wrappers$ServiceLoaderHelper",
diff --git a/langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java b/langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java
index ba81593aa90..8c9cf5e58fb 100644
--- a/langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java
+++ b/langtools/test/tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java
@@ -28,6 +28,7 @@
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build toolbox.ToolBox toolbox.JavacTask
  * @run main ClassPathWithDoubleQuotesTest
 */
@@ -36,6 +37,7 @@ import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import com.sun.tools.javac.util.Assert;
 import toolbox.TestRunner;
 import toolbox.JarTask;
 import toolbox.JavacTask;
@@ -46,9 +48,29 @@ public class ClassPathWithDoubleQuotesTest extends TestRunner {
 
     ToolBox tb;
 
-    private static final String ASrc = "public class A {}";
+    private static final String ASrc = "public class A { J j; B b;}";
+    private static final String BSrc = "public class B {}";
     private static final String JarSrc = "public class J {}";
-    private static final String[] jarArgs = {"cf", "test/J.jar", "-C", "test", "J.java"};
+    private static final String[] jarArgs = {"cf", "test/jarOut/J.jar", "-C", "test/jarSrc", "J.java"};
+    public static final String NEW_LINE = System.getProperty("line.separator");
+    private static final String expectedFailureOutput1 =
+            "A.java:1:18: compiler.err.cant.resolve.location: kindname.class, J, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "A.java:1:23: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "2 errors" + NEW_LINE;
+    private static final String expectedFailureOutput2A =
+            "- compiler.warn.invalid.path: \"test/jarOut/J.jar" + NEW_LINE +
+            "- compiler.warn.invalid.path: test/src\"" + NEW_LINE +
+            "A.java:1:18: compiler.err.cant.resolve.location: kindname.class, J, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "A.java:1:23: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "2 errors" + NEW_LINE +
+            "2 warnings" + NEW_LINE;
+    private static final String expectedFailureOutput2B =
+            "- compiler.warn.path.element.not.found: \"test/jarOut/J.jar" + NEW_LINE +
+            "- compiler.warn.path.element.not.found: test/src\"" + NEW_LINE +
+            "A.java:1:18: compiler.err.cant.resolve.location: kindname.class, J, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "A.java:1:23: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, A, null)" + NEW_LINE +
+            "2 errors" + NEW_LINE +
+            "2 warnings" + NEW_LINE;
 
     public static void main(String... args) throws Exception {
         new ClassPathWithDoubleQuotesTest().runTests();
@@ -66,32 +88,56 @@ public class ClassPathWithDoubleQuotesTest extends TestRunner {
     @Test
     public void test(Path base) throws Exception {
         Path current = base.resolve(".");
-        tb.writeJavaFiles(current, ASrc, JarSrc);
+        Path jarSrc = current.resolve("jarSrc");
+        tb.writeJavaFiles(jarSrc, JarSrc);
+        Path jarOut = current.resolve("jarOut");
+        tb.createDirectories(jarOut);
         new JarTask(tb).run(jarArgs).writeAll();
 
-        executeTask(new JavacTask(tb, Task.Mode.EXEC)
-                    .envVar("CLASSPATH", "\"test/J.jar" + File.pathSeparator + "test\"")
-                    .files("test/A.java"));
+        Path src = current.resolve("src");
+        tb.writeJavaFiles(src, ASrc, BSrc);
 
-        executeTask(new JavacTask(tb)
-                    .classpath("\"test/J.jar" + File.pathSeparator + "test\"")
-                    .files("test/A.java"));
-    }
+        /** In any system there can be three possible scenarios:
+         *  1 - The system swallows the problem character (the quote in this case)
+         *      and the test case compiles
+         *  2 - The problem character gets into javac, but it's not bad enough to trigger
+         *      InvalidPathException, but it does mean you can't find the file you're looking for
+         *  3 - The problem character gets into javac and is bad enough to trigger
+         *      InvalidPathException, in which case javac needs to handle the exception in a reasonable way.
+         */
 
-    void executeTask(JavacTask task) {
-        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
-        Task.Expect whatToExpect = isWindows ? Task.Expect.FAIL : Task.Expect.SUCCESS;
-        try {
-            task.run(whatToExpect);
-            if (isWindows) {
-                throw new AssertionError("exception must be thrown");
-            }
-        } catch (IllegalArgumentException iae) {
-            if (!isWindows) {
-                throw new AssertionError("exception unexpectedly thrown");
-            }
-        } catch (Throwable t) {
-            throw new AssertionError("unexpected exception thrown");
-        }
+        // testing scenario 1
+        System.err.println("invoking javac EXEC mode without double quotes in the CLASSPATH env variable");
+        new JavacTask(tb, Task.Mode.EXEC)
+                .envVar("CLASSPATH", "test/jarOut/J.jar" + File.pathSeparator + "test/src")
+                .files("test/src/A.java").run(Task.Expect.SUCCESS);
+        System.err.println("successful compilation");
+        System.err.println();
+
+        // testing scenario 2
+        System.err.println("Simulate a system in which double quotes are preserved in the environment variable," +
+                "and for which they are a legal filename character");
+        String log = new JavacTask(tb, Task.Mode.EXEC)
+                .envVar("CLASSPATH", "Ztest/jarOut/J.jar" + File.pathSeparator + "test/srcZ")
+                .options("-XDrawDiagnostics")
+                .files("test/src/A.java").run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.STDERR);
+        Assert.check(log.equals(expectedFailureOutput1), "unexpected output");
+        System.err.println("compilation is expected to fail");
+        System.err.println();
+
+        // testing scenario 3
+        System.err.println("invoking javac EXEC mode with double quotes in the CLASSPATH env variable");
+        String log2 = new JavacTask(tb, Task.Mode.EXEC)
+                    .envVar("CLASSPATH", "\"test/jarOut/J.jar" + File.pathSeparator + "test/src\"")
+                    .options("-Xlint:path", "-XDrawDiagnostics")
+                    .files("test/src/A.java").run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutput(Task.OutputKind.STDERR);
+        System.err.println();
+        System.err.println("the log:" + log2);
+        Assert.check(log2.equals(expectedFailureOutput2A) || log2.equals(expectedFailureOutput2B),
+                "unexpected output");
     }
 }
diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java
index fca688aa8c7..059a8213cf7 100644
--- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java
@@ -46,7 +46,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testEmptyModule(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .write(base);
         compile(base);
         testModuleAttribute(base, moduleDescriptor);
@@ -54,7 +54,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testExports(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .exports("pack")
                 .write(base);
         tb.writeJavaFiles(base, "package pack; public class C extends java.util.ArrayList{ }");
@@ -64,7 +64,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testSeveralExports(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .exports("pack")
                 .exports("pack2")
                 .exports("pack3")
@@ -83,7 +83,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testQualifiedExports(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .exportsTo("pack", "jdk.compiler")
                 .write(base);
         tb.writeJavaFiles(base, "package pack; public class A { }");
@@ -93,7 +93,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testQualifiedDynamicExports(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .exportsTo("pack", "jdk.compiler")
                 .write(base);
         tb.writeJavaFiles(base, "package pack; public class A { }");
@@ -103,7 +103,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testSeveralQualifiedExports(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .exportsTo("pack", "jdk.compiler, jdk.jdeps")
                 .exportsTo("pack2", "jdk.jdeps")
                 .exportsTo("pack3", "jdk.compiler")
@@ -122,7 +122,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testRequires(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .requires("jdk.compiler")
                 .write(base);
         compile(base);
@@ -131,7 +131,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testRequiresTransitive(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .requires("jdk.jdeps", RequiresFlag.TRANSITIVE)
                 .write(base);
         compile(base);
@@ -140,7 +140,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testRequiresStatic(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .requires("jdk.jdeps", RequiresFlag.STATIC)
                 .write(base);
         compile(base);
@@ -149,26 +149,26 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testSeveralRequires(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1x")
                 .requires("jdk.jdeps", RequiresFlag.TRANSITIVE)
                 .requires("jdk.compiler")
-                .requires("m2", RequiresFlag.STATIC)
-                .requires("m3")
-                .requires("m4", RequiresFlag.TRANSITIVE)
-                .requires("m5", RequiresFlag.STATIC, RequiresFlag.TRANSITIVE)
-                .write(base.resolve("m1"));
-        tb.writeJavaFiles(base.resolve("m2"), "module m2 { }");
-        tb.writeJavaFiles(base.resolve("m3"), "module m3 { }");
-        tb.writeJavaFiles(base.resolve("m4"), "module m4 { }");
-        tb.writeJavaFiles(base.resolve("m5"), "module m5 { }");
+                .requires("m2x", RequiresFlag.STATIC)
+                .requires("m3x")
+                .requires("m4x", RequiresFlag.TRANSITIVE)
+                .requires("m5x", RequiresFlag.STATIC, RequiresFlag.TRANSITIVE)
+                .write(base.resolve("m1x"));
+        tb.writeJavaFiles(base.resolve("m2x"), "module m2x { }");
+        tb.writeJavaFiles(base.resolve("m3x"), "module m3x { }");
+        tb.writeJavaFiles(base.resolve("m4x"), "module m4x { }");
+        tb.writeJavaFiles(base.resolve("m5x"), "module m5x { }");
         compile(base, "--module-source-path", base.toString(),
                 "-d", base.toString());
-        testModuleAttribute(base.resolve("m1"), moduleDescriptor);
+        testModuleAttribute(base.resolve("m1x"), moduleDescriptor);
     }
 
     @Test
     public void testProvides(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .provides("java.util.Collection", "pack2.D")
                 .write(base);
         tb.writeJavaFiles(base, "package pack2; public class D extends java.util.ArrayList{ }");
@@ -178,7 +178,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testSeveralProvides(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .provides("java.util.Collection", "pack2.D")
                 .provides("java.util.List", "pack2.D")
                 .requires("jdk.compiler")
@@ -192,7 +192,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testUses(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .uses("java.util.List")
                 .write(base);
         compile(base);
@@ -201,7 +201,7 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testSeveralUses(Path base) throws Exception {
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m")
                 .uses("java.util.List")
                 .uses("java.util.Collection")
                 .requires("jdk.compiler")
@@ -213,22 +213,22 @@ public class ModuleTest extends ModuleTestBase {
 
     @Test
     public void testComplex(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
-        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1")
+        Path m1 = base.resolve("m1x");
+        ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1x")
                 .exports("pack1")
                 .exports("pack3")
-                .exportsTo("packTo1", "m2")
-                .exportsTo("packTo3", "m3")
+                .exportsTo("packTo1", "m2x")
+                .exportsTo("packTo3", "m3x")
                 .requires("jdk.compiler")
-                .requires("m2", RequiresFlag.TRANSITIVE)
-                .requires("m3", RequiresFlag.STATIC)
-                .requires("m4", RequiresFlag.TRANSITIVE, RequiresFlag.STATIC)
+                .requires("m2x", RequiresFlag.TRANSITIVE)
+                .requires("m3x", RequiresFlag.STATIC)
+                .requires("m4x", RequiresFlag.TRANSITIVE, RequiresFlag.STATIC)
                 .provides("java.util.List", "pack1.C", "pack2.D")
                 .uses("java.util.List")
                 .uses("java.nio.file.Path")
                 .requires("jdk.jdeps", RequiresFlag.STATIC, RequiresFlag.TRANSITIVE)
-                .requires("m5", RequiresFlag.STATIC)
-                .requires("m6", RequiresFlag.TRANSITIVE)
+                .requires("m5x", RequiresFlag.STATIC)
+                .requires("m6x", RequiresFlag.TRANSITIVE)
                 .requires("java.compiler")
                 .exportsTo("packTo4", "java.compiler")
                 .exportsTo("packTo2", "java.compiler")
@@ -244,11 +244,11 @@ public class ModuleTest extends ModuleTestBase {
                 "package packTo2; public class T2 {}",
                 "package packTo3; public class T3 {}",
                 "package packTo4; public class T4 {}");
-        tb.writeJavaFiles(base.resolve("m2"), "module m2 { }");
-        tb.writeJavaFiles(base.resolve("m3"), "module m3 { }");
-        tb.writeJavaFiles(base.resolve("m4"), "module m4 { }");
-        tb.writeJavaFiles(base.resolve("m5"), "module m5 { }");
-        tb.writeJavaFiles(base.resolve("m6"), "module m6 { }");
+        tb.writeJavaFiles(base.resolve("m2x"), "module m2x { }");
+        tb.writeJavaFiles(base.resolve("m3x"), "module m3x { }");
+        tb.writeJavaFiles(base.resolve("m4x"), "module m4x { }");
+        tb.writeJavaFiles(base.resolve("m5x"), "module m5x { }");
+        tb.writeJavaFiles(base.resolve("m6x"), "module m6x { }");
         compile(base, "--module-source-path", base.toString(),
                 "-d", base.toString());
         testModuleAttribute(m1, moduleDescriptor);
diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java
index 9762afd8c8e..9d2563c4525 100644
--- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java
+++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java
@@ -93,10 +93,10 @@ public class ModuleTestBase {
         tr.checkContains(actualRequires, moduleDescriptor.requires, "Lists of requires don't match");
     }
 
-    private void testExports(ModuleDescriptor moduleDescriptor, Module_attribute module, ConstantPool constantPool) throws ConstantPool.InvalidIndex, ConstantPool.UnexpectedEntry {
+    private void testExports(ModuleDescriptor moduleDescriptor, Module_attribute module, ConstantPool constantPool) throws ConstantPoolException {
         tr.checkEquals(module.exports_count, moduleDescriptor.exports.size(), "Wrong amount of exports.");
         for (Module_attribute.ExportsEntry export : module.exports) {
-            String pkg = constantPool.getUTF8Value(export.exports_index);
+            String pkg = constantPool.getPackageInfo(export.exports_index).getName();
             if (tr.checkTrue(moduleDescriptor.exports.containsKey(pkg), "Unexpected export " + pkg)) {
                 Export expectedExport = moduleDescriptor.exports.get(pkg);
                 tr.checkEquals(expectedExport.mask, export.exports_flags, "Wrong export flags");
@@ -104,7 +104,7 @@ public class ModuleTestBase {
                 tr.checkEquals(export.exports_to_count, expectedTo.size(), "Wrong amount of exports to");
                 List actualTo = new ArrayList<>();
                 for (int toIdx : export.exports_to_index) {
-                    actualTo.add(constantPool.getUTF8Value(toIdx).replace('/', '.'));
+                    actualTo.add(constantPool.getModuleInfo(toIdx).getName().replace('/', '.'));
                 }
                 tr.checkContains(actualTo, expectedTo, "Lists of \"exports to\" don't match.");
             }
diff --git a/langtools/test/tools/javac/diags/examples.not-yet.txt b/langtools/test/tools/javac/diags/examples.not-yet.txt
index f13f1e7de02..be5c0aee59f 100644
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt
@@ -114,6 +114,7 @@ compiler.err.cant.inherit.from.anon                     # error for subclass of
 compiler.misc.bad.class.file                            # class file is malformed
 compiler.misc.bad.const.pool.entry                      # constant pool entry has wrong type
 compiler.warn.access.to.member.from.serializable.lambda # in order to generate it we need to modify a restricted package
+compiler.warn.invalid.path                              # this warning is generated only in Windows systems
 
 # The following module-related messages will have to stay on the not-yet list for various reasons:
 compiler.warn.locn.unknown.file.on.module.path                # Never issued ATM (short circuited with an if (false))
diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java
index 7e4179d1bb4..a71f978d5b6 100644
--- a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m2 {
-    requires m1;
+module m1x {
+     requires m2x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java
index 438f579baac..88b0dea334b 100644
--- a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
-     requires m2;
+module m2x {
+     requires m1x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m1x/module-info.java
diff --git a/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/DuplicateModule/modulesourcepath/m2x/module-info.java
diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java
index f3b75a9eaea..d8d888b1014 100644
--- a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1x/module-info.java
@@ -22,4 +22,4 @@
  */
 
 @Deprecated
-module m1 {}
+module m1x {}
diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java
index 7e4179d1bb4..cbfced34608 100644
--- a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m2 {
-    requires m1;
+module m2x {
+    requires m1x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java
index 1623fb5482c..8aa23cc4cf2 100644
--- a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1x/module-info.java
@@ -22,4 +22,4 @@
  */
 
 @Deprecated(forRemoval=true)
-module m1 {}
+module m1x {}
diff --git a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java
index 45858e70c3f..cbfced34608 100644
--- a/langtools/test/tools/javac/diags/examples/CyclicRequires/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m2 {
-     requires m1;
+module m2x {
+    requires m1x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1/api/Api.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1/api/Api.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/api/Api.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java
index 7c67488f35d..6643a70e3b1 100644
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessible/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
+module m1x {
      exports api;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/api1/Api1.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/api1/Api1.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/api1/Api1.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java
index efb13f404fe..f0f1bfe3372 100644
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
+module m1x {
      exports api1;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/api2/Api2.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/api2/Api2.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/api2/Api2.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java
index 9711b74aeb8..f0283e73631 100644
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2x/module-info.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-module m2 {
-     requires m1;
+module m2x {
+     requires m1x;
      exports api2;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/api/Api.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/api/Api.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/api/Api.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/impl/Impl.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/impl/Impl.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/impl/Impl.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java
index 7c67488f35d..6643a70e3b1 100644
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexported/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
+module m1x {
      exports api;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/api/Api.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/api/Api.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/api/Api.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java
similarity index 96%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java
index d1ec73ac299..a7b09f65fdf 100644
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/module-info.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-module m1 {
+module m1x {
      exports api;
-     exports qapi to m2;
+     exports qapi to m2x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/qapi/QApi.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1/qapi/QApi.java
rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m1x/qapi/QApi.java
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2/module-info.java
deleted file mode 100644
index 45858e70c3f..00000000000
--- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2/module-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-module m2 {
-     requires m1;
-}
diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java
new file mode 100644
index 00000000000..88b0dea334b
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleUnexportedQualified/modulesourcepath/m2x/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module m2x {
+     requires m1x;
+}
diff --git a/langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/ModuleInfoWithoutModule/modulesourcepath/m1x/module-info.java
diff --git a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java
index 3c14a447dbd..476814bae13 100644
--- a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1x/module-info.java
@@ -21,5 +21,5 @@
  * questions.
  */
 
-module m2 {
+module m1x {
 }
diff --git a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1/module-info.java b/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java
index f6ecf6b2bf5..29bafa29166 100644
--- a/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/additional/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/MultiModuleOutputCannotBeExplodedModule/modulesourcepath/m2x/module-info.java
@@ -21,5 +21,5 @@
  * questions.
  */
 
-module m1 {
+module m2x {
 }
diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1x/module-info.java
index 7a304970b51..d2438b08c8c 100644
--- a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1x/module-info.java
@@ -21,4 +21,4 @@
  * questions.
  */
 
-module m1 {}
+module m1x {}
diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1/p1/C1.java b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1x/p1/C1.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1/p1/C1.java
rename to langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m1x/p1/C1.java
diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2x/module-info.java
index 8963c28c731..47ee1b7b662 100644
--- a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2x/module-info.java
@@ -21,4 +21,4 @@
  * questions.
  */
 
-module m2 {}
+module m2x {}
diff --git a/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2/p2/C2.java b/langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2x/p2/C2.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2/p2/C2.java
rename to langtools/test/tools/javac/diags/examples/NotDefAccessClassPackageCantAccess/modulesourcepath/m2x/p2/C2.java
diff --git a/langtools/test/tools/javac/diags/examples/NotInProfile.java b/langtools/test/tools/javac/diags/examples/NotInProfile.java
index e0c1be31140..b4ea6a91ceb 100644
--- a/langtools/test/tools/javac/diags/examples/NotInProfile.java
+++ b/langtools/test/tools/javac/diags/examples/NotInProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.err.not.in.profile
-// options: -profile compact1
+// options: --release 8 -profile compact1
 
 class NotInProfile {
     Class c = java.awt.Frame.class;
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1/exported/Api1.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1/exported/Api1.java
rename to langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/exported/Api1.java
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1/module-info.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1/module-info.java
rename to langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java
index fbe84ddc5b2..029524a066b 100644
--- a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module lib1 {
+module lib1x {
      exports exported;
 }
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2/exported/Api2.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2/exported/Api2.java
rename to langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/exported/Api2.java
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2/module-info.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2/module-info.java
rename to langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java
index d1ede79a1c4..5fbba58c669 100644
--- a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/lib2x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module lib2 {
+module lib2x {
      exports exported;
 }
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java
index 00d5d0c750f..5aa0d47a60e 100644
--- a/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequires/modulesourcepath/use/module-info.java
@@ -22,6 +22,6 @@
  */
 
 module use {
-     requires lib1;
-     requires lib2;
+     requires lib1x;
+     requires lib2x;
 }
diff --git a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1x/module-info.java
index 44b2d01cb41..763338727cd 100644
--- a/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/PackageEmptyOrNotFound/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
+module m1x {
     exports p1;
 }
diff --git a/langtools/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java b/langtools/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java
new file mode 100644
index 00000000000..134e1a2ed36
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.poor.choice.for.module.name
+// options: -Xlint:module
+
+module mango19 {}
diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/exported/Service.java b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/exported/Service.java
rename to langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/Service.java
diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/exported/ServiceImplementation.java b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/exported/ServiceImplementation.java
rename to langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/exported/ServiceImplementation.java
diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java
similarity index 98%
rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/module-info.java
rename to langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java
index 1f2444a12f0..96640f85064 100644
--- a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m1x/module-info.java
@@ -21,6 +21,6 @@
  * questions.
  */
 
-module m1 {
+module m1x {
      exports exported;
 }
diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java
similarity index 97%
rename from langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2/module-info.java
rename to langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java
index cd0acce6a1f..536a7822763 100644
--- a/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/ServiceImplementationNotInRightModule/modulesourcepath/m2x/module-info.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-module m2 {
-     requires m1;
+module m2x {
+     requires m1x;
      provides exported.Service with exported.ServiceImplementation;
 }
diff --git a/langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java b/langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java
index 7a304970b51..d2438b08c8c 100644
--- a/langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/TooManyModules/p1/module-info.java
@@ -21,4 +21,4 @@
  * questions.
  */
 
-module m1 {}
+module m1x {}
diff --git a/langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java b/langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java
index 8963c28c731..47ee1b7b662 100644
--- a/langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java
+++ b/langtools/test/tools/javac/diags/examples/TooManyModules/p2/module-info.java
@@ -21,4 +21,4 @@
  * questions.
  */
 
-module m2 {}
+module m2x {}
diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1/module-info.java
deleted file mode 100644
index 7a304970b51..00000000000
--- a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1/module-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-module m1 {}
diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1/UnnamedPackageInNamedModule.java b/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java
similarity index 100%
rename from langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1/UnnamedPackageInNamedModule.java
rename to langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/UnnamedPackageInNamedModule.java
diff --git a/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java b/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java
new file mode 100644
index 00000000000..d2438b08c8c
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/UnnamedPackageInNamedModule/modulesourcepath/m1x/module-info.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module m1x {}
diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java
new file mode 100644
index 00000000000..81b0a0d6852
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/WarnModuleNotFound.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.module.not.found
+// options: -Xlint:module
diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java
new file mode 100644
index 00000000000..bd4c4637359
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/api/Api.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package api;
+
+public class Api {
+}
diff --git a/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java
new file mode 100644
index 00000000000..e4801832406
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/WarnModuleNotFound/modulesourcepath/m/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module m {
+     exports api to does.not.exist;
+}
diff --git a/langtools/test/tools/javac/doctree/DocCommentTester.java b/langtools/test/tools/javac/doctree/DocCommentTester.java
index d56aaa67214..3486d447a07 100644
--- a/langtools/test/tools/javac/doctree/DocCommentTester.java
+++ b/langtools/test/tools/javac/doctree/DocCommentTester.java
@@ -498,6 +498,17 @@ public class DocCommentTester {
                 return null;
             }
 
+            public Void visitProvides(ProvidesTree node, Void p) {
+                header(node);
+                indent(+1);
+                print("serviceName", node.getServiceType());
+                print("description", node.getDescription());
+                indent(-1);
+                indent();
+                out.println("]");
+                return null;
+            }
+
             public Void visitReference(ReferenceTree node, Void p) {
                 header(node, compress(node.getSignature()));
                 return null;
@@ -617,6 +628,17 @@ public class DocCommentTester {
                 return null;
             }
 
+            public Void visitUses(UsesTree node, Void p) {
+                header(node);
+                indent(+1);
+                print("serviceName", node.getServiceType());
+                print("description", node.getDescription());
+                indent(-1);
+                indent();
+                out.println("]");
+                return null;
+            }
+
             public Void visitValue(ValueTree node, Void p) {
                 header(node);
                 indent(+1);
diff --git a/langtools/test/tools/javac/doctree/ProvidesTest.java b/langtools/test/tools/javac/doctree/ProvidesTest.java
new file mode 100644
index 00000000000..6c1e6745928
--- /dev/null
+++ b/langtools/test/tools/javac/doctree/ProvidesTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160196
+ * @summary Module summary page should display information based on "api" or "detail" mode.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build DocCommentTester
+ * @run main DocCommentTester ProvidesTest.java
+ */
+
+class ProvidesTest {
+    /**
+     * abc.
+     * @provides UsesTest
+      */
+    void simple_provides() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 1
+    Text[TEXT, pos:1, abc.]
+  body: empty
+  block tags: 1
+    Provides[PROVIDES, pos:7
+      serviceName:
+        Reference[REFERENCE, pos:17, UsesTest]
+      description: empty
+    ]
+]
+*/
+
+    /**
+     * abc.
+     * @provides UsesTest Test description for provides.
+      */
+    void provides_with_description() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 1
+    Text[TEXT, pos:1, abc.]
+  body: empty
+  block tags: 1
+    Provides[PROVIDES, pos:7
+      serviceName:
+        Reference[REFERENCE, pos:17, UsesTest]
+      description: 1
+        Text[TEXT, pos:26, Test_description_for_provides.]
+    ]
+]
+*/
+}
diff --git a/langtools/test/tools/javac/doctree/UsesTest.java b/langtools/test/tools/javac/doctree/UsesTest.java
new file mode 100644
index 00000000000..3d24ed065d6
--- /dev/null
+++ b/langtools/test/tools/javac/doctree/UsesTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160196
+ * @summary Module summary page should display information based on "api" or "detail" mode.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build DocCommentTester
+ * @run main DocCommentTester UsesTest.java
+ */
+
+class UsesTest {
+    /**
+     * abc.
+     * @uses ProvidesTest
+      */
+    void simple_uses() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 1
+    Text[TEXT, pos:1, abc.]
+  body: empty
+  block tags: 1
+    Uses[USES, pos:7
+      serviceName:
+        Reference[REFERENCE, pos:13, ProvidesTest]
+      description: empty
+    ]
+]
+*/
+
+    /**
+     * abc.
+     * @uses ProvidesTest Test description for uses.
+      */
+    void uses_with_description() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 1
+    Text[TEXT, pos:1, abc.]
+  body: empty
+  block tags: 1
+    Uses[USES, pos:7
+      serviceName:
+        Reference[REFERENCE, pos:13, ProvidesTest]
+      description: 1
+        Text[TEXT, pos:26, Test_description_for_uses.]
+    ]
+]
+*/
+}
diff --git a/langtools/test/tools/javac/file/ModuleAndPackageLocations.java b/langtools/test/tools/javac/file/ModuleAndPackageLocations.java
new file mode 100644
index 00000000000..5bd26779e8d
--- /dev/null
+++ b/langtools/test/tools/javac/file/ModuleAndPackageLocations.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8171005
+ * @summary Verify behavior of JavaFileManager methods w.r.t. module/package oriented locations
+ * @library /tools/lib
+ * @modules java.compiler
+ * @build toolbox.TestRunner ModuleAndPackageLocations
+ * @run main ModuleAndPackageLocations
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+import toolbox.TestRunner;
+import toolbox.TestRunner.Test;
+
+public class ModuleAndPackageLocations extends TestRunner {
+
+    public static void main(String... args) throws Exception {
+        new ModuleAndPackageLocations().runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    public ModuleAndPackageLocations() {
+        super(System.err);
+    }
+
+    @Test
+    public void testListLocations(Path outerBase) throws Exception {
+        doRunTest(outerBase, (base, fm) -> {
+            assertLocations(fm.listLocationsForModules(StandardLocation.MODULE_SOURCE_PATH),
+                            toSet("MODULE_SOURCE_PATH[a]:false:false",
+                                  "MODULE_SOURCE_PATH[b]:false:false",
+                                  "MODULE_SOURCE_PATH[c]:false:false"));
+            assertLocations(fm.listLocationsForModules(StandardLocation.MODULE_PATH),
+                            toSet("MODULE_PATH[0.X,a]:false:false",
+                                  "MODULE_PATH[0.X,b]:false:false"),
+                            toSet("MODULE_PATH[1.X,c]:false:false",
+                                  "MODULE_PATH[1.X,b]:false:false"));
+            assertLocations(fm.listLocationsForModules(StandardLocation.SOURCE_OUTPUT),
+                            toSet("SOURCE_OUTPUT[a]:false:true",
+                                  "SOURCE_OUTPUT[b]:false:true"));
+
+            fm.getLocationForModule(StandardLocation.SOURCE_OUTPUT, "c");
+
+            assertLocations(fm.listLocationsForModules(StandardLocation.SOURCE_OUTPUT),
+                            toSet("SOURCE_OUTPUT[a]:false:true",
+                                  "SOURCE_OUTPUT[b]:false:true",
+                                  "SOURCE_OUTPUT[c]:false:true"));
+        });
+    }
+
+    @Test
+    public void testGetModuleForPath(Path outerBase) throws Exception {
+        doRunTest(outerBase, (base, fm) -> {
+            Location cOutput = fm.getLocationForModule(StandardLocation.SOURCE_OUTPUT, "c");
+            JavaFileObject testFO = fm.getJavaFileForOutput(cOutput, "test.Test", Kind.CLASS, null);
+            testFO.openOutputStream().close();
+            Location cOutput2 = fm.getLocationForModule(StandardLocation.SOURCE_OUTPUT, testFO, "test");
+
+            if (cOutput != cOutput2) {
+                throw new AssertionError("Unexpected location: " + cOutput2 + ", expected: " +cOutput);
+            }
+        });
+    }
+
+    @Test
+    public void testRejects(Path outerBase) throws Exception {
+        doRunTest(outerBase, (base, fm) -> {
+            assertRefused(() -> fm.getClassLoader(StandardLocation.MODULE_SOURCE_PATH));
+            assertRefused(() -> fm.getFileForInput(StandardLocation.MODULE_SOURCE_PATH, "", ""));
+            assertRefused(() -> fm.getFileForOutput(StandardLocation.MODULE_SOURCE_PATH, "", "", null));
+            assertRefused(() -> fm.getJavaFileForInput(StandardLocation.MODULE_SOURCE_PATH, "", Kind.SOURCE));
+            assertRefused(() -> fm.getJavaFileForOutput(StandardLocation.MODULE_SOURCE_PATH, "", Kind.SOURCE, null));
+            assertRefused(() -> fm.getLocationForModule(StandardLocation.SOURCE_PATH, "test"));
+            JavaFileObject out = fm.getJavaFileForInput(StandardLocation.CLASS_OUTPUT, "test.Test", Kind.CLASS);
+            assertRefused(() -> fm.getLocationForModule(StandardLocation.SOURCE_PATH, out, "test"));
+            assertRefused(() -> fm.inferBinaryName(StandardLocation.MODULE_PATH, out));
+            assertRefused(() -> fm.inferModuleName(StandardLocation.MODULE_SOURCE_PATH));
+            assertRefused(() -> fm.list(StandardLocation.MODULE_SOURCE_PATH, "test", EnumSet.allOf(Kind.class), false));
+            assertRefused(() -> fm.listLocationsForModules(StandardLocation.SOURCE_PATH));
+        });
+    }
+
+    void doRunTest(Path base, TestExec test) throws Exception {
+        try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
+            Path msp  = base.resolve("msp");
+            Path msp1 = msp.resolve("1");
+            Path msp2 = msp.resolve("2");
+
+            Files.createDirectories(msp1.resolve("a"));
+            Files.createDirectories(msp1.resolve("b"));
+            Files.createDirectories(msp2.resolve("b"));
+            Files.createDirectories(msp2.resolve("c"));
+
+            Path mp  = base.resolve("mp");
+            Path mp1 = mp.resolve("1");
+            Path mp2 = mp.resolve("2");
+
+            touch(mp1.resolve("a/module-info.class"),
+                  mp1.resolve("b/module-info.class"),
+                  mp2.resolve("b/module-info.class"),
+                  mp2.resolve("c/module-info.class"));
+
+            Path so  = base.resolve("so");
+
+            Files.createDirectories(so.resolve("a"));
+            Files.createDirectories(so.resolve("b"));
+
+            List mspOpt = Arrays.asList(msp1.toAbsolutePath().toString() +
+                                                File.pathSeparatorChar +
+                                                msp2.toAbsolutePath().toString());
+
+            List mpOpt = Arrays.asList(mp1.toAbsolutePath().toString() +
+                                               File.pathSeparatorChar +
+                                               mp2.toAbsolutePath().toString());
+
+            fm.handleOption("--module-source-path", mspOpt.iterator());
+            fm.handleOption("--module-path", mpOpt.iterator());
+            fm.handleOption("-s", Arrays.asList(so.toString()).iterator());
+
+            test.run(base, fm);
+        }
+    }
+
+    private Set toSet(String... values) {
+        return new HashSet<>(Arrays.asList(values));
+    }
+
+    private void touch(Path... paths) throws IOException {
+        for (Path p : paths) {
+            Files.createDirectories(p.getParent());
+            Files.newOutputStream(p).close();
+        }
+    }
+
+    @SafeVarargs
+    private void assertLocations(Iterable> locations, Set... expected) {
+        List> actual =
+                StreamSupport.stream(locations.spliterator(), true)
+                             .map(locs -> locs.stream()
+                                              .map(l -> toString(l))
+                                              .collect(Collectors.toSet()))
+                             .collect(Collectors.toList());
+
+        if (!Objects.equals(actual, Arrays.asList(expected))) {
+            throw new AssertionError("Unexpected output: " + actual);
+        }
+    }
+
+    private void assertRefused(Callable r) throws Exception {
+        try {
+            r.call();
+            throw new AssertionError("Expected exception did not occur");
+        } catch (IllegalArgumentException ex) {
+            //ok
+        }
+    }
+
+    private static String toString(Location l) {
+        return l.getName().replaceAll("\\[([0-9])\\.[0-9]:", "[$1.X,") + ":" +
+               l.isModuleOrientedLocation() + ":" + l.isOutputLocation();
+    }
+
+    static interface TestExec {
+        public void run(Path base, JavaFileManager fm) throws Exception;
+    }
+
+    JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBound.java b/langtools/test/tools/javac/generics/inference/CaptureLowerBound.java
index 14f253452c3..6e0fbf7f3fb 100644
--- a/langtools/test/tools/javac/generics/inference/CaptureLowerBound.java
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBound.java
@@ -1,31 +1,9 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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
+ * @test /nodynamiccopyright/
  * @bug 8039214
  * @summary Capture variable as an inference variable's lower bound
  * @compile CaptureLowerBound.java
+ * @compile/fail/ref=CaptureLowerBound7.out -Xlint:-options -source 7 -XDrawDiagnostics CaptureLowerBound.java
  */
 
 public class CaptureLowerBound {
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBound7.out b/langtools/test/tools/javac/generics/inference/CaptureLowerBound7.out
new file mode 100644
index 00000000000..312ef6d8f19
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBound7.out
@@ -0,0 +1,2 @@
+CaptureLowerBound.java:17:7: compiler.err.cant.apply.symbol: kindname.method, m, CaptureLowerBound.I, CaptureLowerBound.C, kindname.class, CaptureLowerBound, (compiler.misc.inferred.do.not.conform.to.lower.bounds: compiler.misc.type.captureof: 1, ?, java.lang.Object)
+1 error
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.java b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.java
new file mode 100644
index 00000000000..628772947bc
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.java
@@ -0,0 +1,22 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8075793
+ * @summary Capture variable as an inference lower bound followed by an array write
+ * @compile/fail/ref=CaptureLowerBoundArray.out -XDrawDiagnostics CaptureLowerBoundArray.java
+ * @compile -Xlint:-options -source 7 CaptureLowerBoundArray.java
+ */
+
+class CaptureLowerBoundArray {
+
+    interface I {
+        T[] getArray();
+    }
+
+     T[] m(T[] arg) { return null; }
+
+    void test(I i) {
+        m(i.getArray())[0] = new Exception();
+    }
+
+
+}
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.out b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.out
new file mode 100644
index 00000000000..ecde36a42bb
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundArray.out
@@ -0,0 +1,2 @@
+CaptureLowerBoundArray.java:18:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Exception, compiler.misc.type.captureof: 1, ? extends java.lang.Exception)
+1 error
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundAssign.java b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundAssign.java
new file mode 100644
index 00000000000..7e9a3730f04
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundAssign.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8075793
+ * @summary Capture variable as an inference lower bound followed by an invariant assignment
+ * @compile CaptureLowerBoundAssign.java
+ * @compile -Xlint:-options -source 7 CaptureLowerBoundAssign.java
+ */
+
+class CaptureLowerBoundAssign {
+
+    static class C {}
+
+     C m(C x) { return null; }
+
+    void test(C arg) {
+        C c = m(arg);
+    }
+
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.java b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.java
new file mode 100644
index 00000000000..a69cae79b1c
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.java
@@ -0,0 +1,24 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8075793
+ * @summary Capture variable as an inference lower bound followed by a member reference
+ * @compile/fail/ref=CaptureLowerBoundDeref.out -XDrawDiagnostics CaptureLowerBoundDeref.java
+ * @compile -Xlint:-options -source 7 CaptureLowerBoundDeref.java
+ */
+
+class CaptureLowerBoundDeref {
+
+    interface Wrapper {
+        I get();
+    }
+
+    interface I {}
+
+    interface K { void take(T arg); }
+
+     K m(I arg) { return null; }
+
+    void test(Wrapper w) {
+        m(w.get()).take(new Object());
+    }
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.out b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.out
new file mode 100644
index 00000000000..1d158ee72ef
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundDeref.out
@@ -0,0 +1,2 @@
+CaptureLowerBoundDeref.java:22:19: compiler.err.cant.apply.symbol: kindname.method, take, compiler.misc.type.captureof: 1, ?, java.lang.Object, kindname.interface, CaptureLowerBoundDeref.K, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.Object, compiler.misc.type.captureof: 1, ?))
+1 error
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java
index 69fa4f91877..fe173e279c1 100644
--- a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.java
@@ -3,6 +3,7 @@
  * @bug 8039214
  * @summary Capture variable as an inference variable's lower bound
  * @compile/fail/ref=CaptureLowerBoundNeg.out -XDrawDiagnostics CaptureLowerBoundNeg.java
+ * @compile -Xlint:-options -source 7 CaptureLowerBoundNeg.java
  */
 
 public class CaptureLowerBoundNeg {
diff --git a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out
index 5b6c0331639..640dfd641a5 100644
--- a/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out
+++ b/langtools/test/tools/javac/generics/inference/CaptureLowerBoundNeg.out
@@ -1,2 +1,2 @@
-CaptureLowerBoundNeg.java:16:29: compiler.err.cant.apply.symbol: kindname.method, take, compiler.misc.type.captureof: 1, ? extends java.lang.Object, java.lang.Object, kindname.class, CaptureLowerBoundNeg.D, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.Object, compiler.misc.type.captureof: 1, ? extends java.lang.Object))
+CaptureLowerBoundNeg.java:17:29: compiler.err.cant.apply.symbol: kindname.method, take, compiler.misc.type.captureof: 1, ? extends java.lang.Object, java.lang.Object, kindname.class, CaptureLowerBoundNeg.D, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.Object, compiler.misc.type.captureof: 1, ? extends java.lang.Object))
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.java b/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.java
new file mode 100644
index 00000000000..6f0c2ea2f8e
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.java
@@ -0,0 +1,22 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8075793
+ * @summary Capture variable as an inference upper bound followed by a member reference
+ * @compile/fail/ref=CaptureUpperBoundDeref.out -XDrawDiagnostics CaptureUpperBoundDeref.java
+ * @compile -Xlint:-options -source 7 CaptureUpperBoundDeref.java
+ */
+
+class CaptureUpperBoundDeref {
+
+    interface Wrapper {
+        I get();
+    }
+
+    interface I {}
+
+     T m(I arg) { return null; }
+
+    void test(Wrapper w) {
+        m(w.get()).substring(0);
+    }
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.out b/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.out
new file mode 100644
index 00000000000..183beab9acc
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/CaptureUpperBoundDeref.out
@@ -0,0 +1,2 @@
+CaptureUpperBoundDeref.java:20:19: compiler.err.cant.resolve.location.args: kindname.method, substring, , int, (compiler.misc.location: kindname.class, java.lang.Object, null)
+1 error
diff --git a/langtools/test/tools/javac/generics/inference/NestedCapture.java b/langtools/test/tools/javac/generics/inference/NestedCapture.java
index c4913e32733..790616e5fb7 100644
--- a/langtools/test/tools/javac/generics/inference/NestedCapture.java
+++ b/langtools/test/tools/javac/generics/inference/NestedCapture.java
@@ -26,6 +26,7 @@
  * @bug 8039214
  * @summary Capture variable passed through multiple levels of nested inference
  * @compile NestedCapture.java
+ * @compile -Xlint:-options -source 7 NestedCapture.java
  */
 
 abstract class NestedCapture {
diff --git a/langtools/test/tools/javac/generics/inference/NestedWildcards.java b/langtools/test/tools/javac/generics/inference/NestedWildcards.java
index 52dea56f9c9..b339cf6bebe 100644
--- a/langtools/test/tools/javac/generics/inference/NestedWildcards.java
+++ b/langtools/test/tools/javac/generics/inference/NestedWildcards.java
@@ -26,6 +26,7 @@
  * @bug 8039214
  * @summary Nested generic methods that work on wildcard-parameterized types
  * @compile NestedWildcards.java
+ * @compile -Xlint:-options -source 7 NestedWildcards.java
  */
 
 public class NestedWildcards {
diff --git a/langtools/test/tools/javac/lambda/ByteCodeTest.java b/langtools/test/tools/javac/lambda/ByteCodeTest.java
index 826348fde05..f7d0cbece48 100644
--- a/langtools/test/tools/javac/lambda/ByteCodeTest.java
+++ b/langtools/test/tools/javac/lambda/ByteCodeTest.java
@@ -618,6 +618,36 @@ public class ByteCodeTest {
             return value;
         }
 
+        @Override
+        public String visitModule(CONSTANT_Module_info c, Integer p) {
+
+            String value = slist.get(p);
+            if (value == null) {
+                try {
+                    value = visit(cfpool.get(c.name_index), c.name_index);
+                    slist.set(p, value);
+                } catch (ConstantPoolException ex) {
+                    ex.printStackTrace();
+                }
+            }
+            return value;
+        }
+
+        @Override
+        public String visitPackage(CONSTANT_Package_info c, Integer p) {
+
+            String value = slist.get(p);
+            if (value == null) {
+                try {
+                    value = visit(cfpool.get(c.name_index), c.name_index);
+                    slist.set(p, value);
+                } catch (ConstantPoolException ex) {
+                    ex.printStackTrace();
+                }
+            }
+            return value;
+        }
+
         @Override
         public String visitString(CONSTANT_String_info c, Integer p) {
 
diff --git a/langtools/test/tools/javac/lib/DPrinter.java b/langtools/test/tools/javac/lib/DPrinter.java
index 2aaa848fe93..9de08b158f6 100644
--- a/langtools/test/tools/javac/lib/DPrinter.java
+++ b/langtools/test/tools/javac/lib/DPrinter.java
@@ -1085,6 +1085,13 @@ public class DPrinter {
             return visitBlockTag(node, null);
         }
 
+        public Void visitProvides(ProvidesTree node, Void p) {
+            printString("kind", node.getKind().name());
+            printDocTree("serviceType", node.getServiceType());
+            printList("description", node.getDescription());
+            return visitBlockTag(node, null);
+        }
+
         public Void visitReference(ReferenceTree node, Void p) {
             printString("signature", node.getSignature());
             return visitTree(node, null);
@@ -1152,6 +1159,13 @@ public class DPrinter {
             return visitInlineTag(node, null);
         }
 
+        public Void visitUses(UsesTree node, Void p) {
+            printString("kind", node.getKind().name());
+            printDocTree("serviceType", node.getServiceType());
+            printList("description", node.getDescription());
+            return visitBlockTag(node, null);
+        }
+
         public Void visitValue(ValueTree node, Void p) {
             printDocTree("value", node.getReference());
             return visitInlineTag(node, null);
diff --git a/langtools/test/tools/javac/modules/AddExportsTest.java b/langtools/test/tools/javac/modules/AddExportsTest.java
index e308aa50764..75aa92ea14e 100644
--- a/langtools/test/tools/javac/modules/AddExportsTest.java
+++ b/langtools/test/tools/javac/modules/AddExportsTest.java
@@ -31,13 +31,10 @@
  * @run main AddExportsTest
  */
 
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Set;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class AddExportsTest extends ModuleTestBase {
 
@@ -71,24 +68,24 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testEmptyItem(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testEmptyItem(src, classes, "m1/p1=,m2,m3");
-        testEmptyItem(src, classes, "m1/p1=m2,,m3");
-        testEmptyItem(src, classes, "m1/p1=m2,m3,");
+        testEmptyItem(src, classes, "m1x/p1=,m2x,m3x");
+        testEmptyItem(src, classes, "m1x/p1=m2x,,m3x");
+        testEmptyItem(src, classes, "m1x/p1=m2x,m3x,");
     }
 
     void testEmptyItem(Path src, Path classes, String option) throws Exception {
@@ -104,15 +101,15 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testEmptyList(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testEmptyList(src, classes, "m1/p1=");
-        testEmptyList(src, classes, "m1/p1=,");
+        testEmptyList(src, classes, "m1x/p1=");
+        testEmptyList(src, classes, "m1x/p1=,");
     }
 
     void testEmptyList(Path src, Path classes, String option) throws Exception {
@@ -132,22 +129,22 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testMissingSourceParts(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testMissingSourcePart(src, classes, "=m2");
-        testMissingSourcePart(src, classes, "/=m2");
-        testMissingSourcePart(src, classes, "m1/=m2");
-        testMissingSourcePart(src, classes, "/p1=m2");
-        testMissingSourcePart(src, classes, "m1p1=m2");
+        testMissingSourcePart(src, classes, "=m2x");
+        testMissingSourcePart(src, classes, "/=m2x");
+        testMissingSourcePart(src, classes, "m1x/=m2x");
+        testMissingSourcePart(src, classes, "/p1=m2x");
+        testMissingSourcePart(src, classes, "m1xp1=m2x");
     }
 
     private void testMissingSourcePart(Path src, Path classes, String option) throws Exception {
@@ -167,19 +164,19 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testBadSourceParts(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testBadSourcePart(src, classes, "m!/p1=m2", "m!");
-        testBadSourcePart(src, classes, "m1/p!=m2", "p!");
+        testBadSourcePart(src, classes, "m!/p1=m2x", "m!");
+        testBadSourcePart(src, classes, "m1x/p!=m2x", "p!");
     }
 
     private void testBadSourcePart(Path src, Path classes, String option, String badName)
@@ -201,9 +198,9 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testBadTarget(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -211,7 +208,7 @@ public class AddExportsTest extends ModuleTestBase {
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                          "--module-source-path", src.toString(),
-                         "--add-exports", "m1/p1=m!")
+                         "--add-exports", "m1x/p1=m!")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -225,16 +222,16 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testSourceNotFound(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }");
+                          "module m1x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                          "--module-source-path", src.toString(),
-                         "--add-exports", "DoesNotExist/p=m1")
+                         "--add-exports", "DoesNotExist/p=m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -248,9 +245,9 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testTargetNotFound(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -258,7 +255,7 @@ public class AddExportsTest extends ModuleTestBase {
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                          "--module-source-path", src.toString(),
-                         "--add-exports", "m1/p1=DoesNotExist")
+                         "--add-exports", "m1x/p1=DoesNotExist")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -272,20 +269,20 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testDuplicate(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-exports", "m1/p1=m2,m2")
+                         "--add-exports", "m1x/p1=m2x,m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -295,21 +292,21 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testRepeated_SameTarget(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-exports", "m1/p1=m2",
-                         "--add-exports", "m1/p1=m2")
+                         "--add-exports", "m1x/p1=m2x",
+                         "--add-exports", "m1x/p1=m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -319,25 +316,25 @@ public class AddExportsTest extends ModuleTestBase {
     @Test
     public void testRepeated_DifferentTarget(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-exports", "m1/p1=m2",
-                         "--add-exports", "m1/p1=m3")
+                         "--add-exports", "m1x/p1=m2x",
+                         "--add-exports", "m1x/p1=m3x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
diff --git a/langtools/test/tools/javac/modules/AddLimitMods.java b/langtools/test/tools/javac/modules/AddLimitMods.java
index ecc4133bec2..c66aad962cf 100644
--- a/langtools/test/tools/javac/modules/AddLimitMods.java
+++ b/langtools/test/tools/javac/modules/AddLimitMods.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @bug 8142968 8154956 8170987 8171412
  * @summary Test --add-modules and --limit-modules; also test the "enabled" modules.
  * @library /tools/lib
  * @modules
@@ -81,22 +82,22 @@ public class AddLimitMods extends ModuleTestBase {
     @Test
     public void testManual(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { requires m2; requires m3; }");
+                          "module m1x { requires m2x; requires m3x; }");
 
-        Path m2 = moduleSrc.resolve("m2");
+        Path m2 = moduleSrc.resolve("m2x");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { requires m3; exports m2; }",
-                          "package m2; public class M2 {}");
+                          "module m2x { requires m3x; exports m2x; }",
+                          "package m2x; public class M2 {}");
 
-        Path m3 = moduleSrc.resolve("m3");
+        Path m3 = moduleSrc.resolve("m3x");
 
         tb.writeJavaFiles(m3,
-                          "module m3 { exports m3; }",
-                          "package m3; public class M3 {}");
+                          "module m3x { exports m3x; }",
+                          "package m3x; public class M3 {}");
 
         Path modulePath = base.resolve("module-path");
 
@@ -130,7 +131,7 @@ public class AddLimitMods extends ModuleTestBase {
                 .options("--module-path", modulePath.toString(),
                          "--should-stop:ifNoError=FLOW",
                          "--limit-modules", "java.base",
-                         "--add-modules", "m2")
+                         "--add-modules", "m2x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
                 .run(Task.Expect.FAIL)
@@ -140,7 +141,7 @@ public class AddLimitMods extends ModuleTestBase {
                 .options("--module-path", modulePath.toString(),
                          "--should-stop:ifNoError=FLOW",
                          "--limit-modules", "java.base",
-                         "--add-modules", "m2,m3")
+                         "--add-modules", "m2x,m3x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
                 .run()
@@ -149,7 +150,7 @@ public class AddLimitMods extends ModuleTestBase {
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
                          "--should-stop:ifNoError=FLOW",
-                         "--limit-modules", "m2")
+                         "--limit-modules", "m2x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
                 .run()
@@ -158,7 +159,7 @@ public class AddLimitMods extends ModuleTestBase {
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
                          "--should-stop:ifNoError=FLOW",
-                         "--limit-modules", "m3")
+                         "--limit-modules", "m3x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
                 .run(Task.Expect.FAIL)
@@ -167,8 +168,8 @@ public class AddLimitMods extends ModuleTestBase {
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
                          "--should-stop:ifNoError=FLOW",
-                         "--limit-modules", "m3",
-                         "--add-modules", "m2")
+                         "--limit-modules", "m3x",
+                         "--add-modules", "m2x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
                 .run()
@@ -233,10 +234,10 @@ public class AddLimitMods extends ModuleTestBase {
             tb.cleanDirectory(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports api; }",
+                          "module m1x { exports api; }",
                           "package api; public class Api { }");
 
         Path modulePath = base.resolve("module-path");
@@ -319,7 +320,7 @@ public class AddLimitMods extends ModuleTestBase {
             throw new IllegalStateException("incorrect errors; actual=" + actual);
         }
 
-        tb.writeJavaFiles(cpSrc, "module m1 {}");
+        tb.writeJavaFiles(cpSrc, "module m1x {}");
 
         actual = new JavacTask(tb)
                    .options("-XDrawDiagnostics",
@@ -382,10 +383,10 @@ public class AddLimitMods extends ModuleTestBase {
           .run();
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports api; }",
+                          "module m1x { exports api; }",
                           "package api; public class Api { public void test() { } }");
 
         System.err.println("Compiling module-src files:");
@@ -405,8 +406,8 @@ public class AddLimitMods extends ModuleTestBase {
 
                 System.err.println("Running check: " + moduleInfo + "; " + Arrays.asList(options));
 
-                Path m2Runtime = base.resolve(index + "-runtime").resolve("m2");
-                Path out = base.resolve(index + "-runtime").resolve("out").resolve("m2");
+                Path m2Runtime = base.resolve(index + "-runtime").resolve("m2x");
+                Path out = base.resolve(index + "-runtime").resolve("out").resolve("m2x");
 
                 Files.createDirectories(out);
 
@@ -443,14 +444,14 @@ public class AddLimitMods extends ModuleTestBase {
                 String output;
 
                 try {
-                    System.err.println("Running m2/test.Test:");
+                    System.err.println("Running m2x/test.Test:");
                     output = new JavaTask(tb)
                        .vmOptions(augmentOptions(options,
                                                  Collections.emptyList(),
                                                  "--module-path", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
                                                  "--class-path", classpathOut.toString(),
-                                                 "--add-reads", "m2=ALL-UNNAMED,automatic",
-                                                 "-m", "m2/test.Test"))
+                                                 "--add-reads", "m2x=ALL-UNNAMED,automatic",
+                                                 "-m", "m2x/test.Test"))
                        .run()
                        .writeAll()
                        .getOutput(Task.OutputKind.STDERR);
@@ -461,7 +462,7 @@ public class AddLimitMods extends ModuleTestBase {
                     output = "";
                 }
 
-                Path m2 = base.resolve(String.valueOf(index)).resolve("m2");
+                Path m2 = base.resolve(String.valueOf(index)).resolve("m2x");
 
                 tb.writeJavaFiles(m2,
                                   moduleInfo,
@@ -475,7 +476,7 @@ public class AddLimitMods extends ModuleTestBase {
                     "-XDaccessInternalAPI=true"
                 ) : Collections.emptyList();
 
-                System.err.println("Compiling/processing m2 files:");
+                System.err.println("Compiling/processing m2x files:");
                 new JavacTask(tb)
                    .options(augmentOptions(options,
                                            auxOptions,
@@ -515,8 +516,8 @@ public class AddLimitMods extends ModuleTestBase {
     private static final Map MODULES_TO_CHECK_TO_SAMPLE_CLASS = new LinkedHashMap<>();
 
     static {
-        MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m1", "api.Api");
-        MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m2", "test.Test");
+        MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m1x", "api.Api");
+        MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m2x", "test.Test");
         MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("java.base", "java.lang.Object");
     };
 
@@ -578,19 +579,19 @@ public class AddLimitMods extends ModuleTestBase {
     }
 
     private static final String[] MODULE_INFO_VARIANTS = {
-        "module m2 { exports test; }",
-        "module m2 { requires m1; exports test; }"
+        "module m2x { exports test; }",
+        "module m2x { requires m1x; exports test; }"
     };
 
     private static final String[][] OPTIONS_VARIANTS = {
         {"--add-modules", "automatic"},
-        {"--add-modules", "m1,automatic"},
+        {"--add-modules", "m1x,automatic"},
         {"--add-modules", "jdk.compiler,automatic"},
-        {"--add-modules", "m1,jdk.compiler,automatic"},
+        {"--add-modules", "m1x,jdk.compiler,automatic"},
         {"--add-modules", "ALL-SYSTEM,automatic"},
         {"--limit-modules", "java.base", "--add-modules", "automatic"},
         {"--limit-modules", "java.base", "--add-modules", "ALL-SYSTEM,automatic"},
-        {"--limit-modules", "m2", "--add-modules", "automatic"},
+        {"--limit-modules", "m2x", "--add-modules", "automatic"},
         {"--limit-modules", "jdk.compiler", "--add-modules", "automatic"},
     };
 }
diff --git a/langtools/test/tools/javac/modules/AddModulesTest.java b/langtools/test/tools/javac/modules/AddModulesTest.java
index 9e89edaf855..8aaba8ecb90 100644
--- a/langtools/test/tools/javac/modules/AddModulesTest.java
+++ b/langtools/test/tools/javac/modules/AddModulesTest.java
@@ -36,7 +36,6 @@ import java.nio.file.Path;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class AddModulesTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -70,18 +69,18 @@ public class AddModulesTest extends ModuleTestBase {
     @Test
     public void testEmptyItem(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }");
-        Path src_m2 = src.resolve("m2");
+                          "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }");
+                          "module m2x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testEmptyItem(src, classes, ",m1");
-        testEmptyItem(src, classes, "m1,,m2");
-        testEmptyItem(src, classes, "m1,");
+        testEmptyItem(src, classes, ",m1x");
+        testEmptyItem(src, classes, "m1x,,m2x");
+        testEmptyItem(src, classes, "m1x,");
     }
 
     private void testEmptyItem(Path src, Path classes, String option) throws Exception {
@@ -159,9 +158,9 @@ public class AddModulesTest extends ModuleTestBase {
         Path src = base.resolve("src");
 
         // setup a utility module
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -182,7 +181,7 @@ public class AddModulesTest extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-path", modules.toString(),
-                         "--add-modules", "m1,m1")
+                         "--add-modules", "m1x,m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src2))
                 .run()
@@ -194,13 +193,13 @@ public class AddModulesTest extends ModuleTestBase {
         Path src = base.resolve("src");
 
         // setup some utility modules
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { exports p2; }",
+                          "module m2x { exports p2; }",
                           "package p2; public class C2 { }");
         Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -221,8 +220,8 @@ public class AddModulesTest extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-path", modules.toString(),
-                         "--add-modules", "m1",
-                         "--add-modules", "m2")
+                         "--add-modules", "m1x",
+                         "--add-modules", "m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src2))
                 .run()
diff --git a/langtools/test/tools/javac/modules/AddReadsTest.java b/langtools/test/tools/javac/modules/AddReadsTest.java
index 65a12116b49..f19bad4b6a0 100644
--- a/langtools/test/tools/javac/modules/AddReadsTest.java
+++ b/langtools/test/tools/javac/modules/AddReadsTest.java
@@ -60,13 +60,13 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testAddReads(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports api; }",
+                          "module m1x { exports api; }",
                           "package api; public class Api { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package test; public class Test extends api.Api { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -85,7 +85,7 @@ public class AddReadsTest extends ModuleTestBase {
 
         //test add dependencies:
         new JavacTask(tb)
-                .options("--add-reads", "m2=m1",
+                .options("--add-reads", "m2x=m1x",
                          "--module-source-path", src.toString(),
                          "-processor", VerifyRequires.class.getName())
                 .outdir(classes)
@@ -94,18 +94,19 @@ public class AddReadsTest extends ModuleTestBase {
                 .writeAll();
 
         String decompiled = new JavapTask(tb)
-                .options("-verbose", classes.resolve("m2").resolve("module-info.class").toString())
+                .options("-verbose",
+                        classes.resolve("m2x").resolve("module-info.class").toString())
                 .run()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (decompiled.contains("m1")) {
-            throw new Exception("Incorrectly refers to m1 module.");
+        if (decompiled.contains("m1x")) {
+            throw new Exception("Incorrectly refers to m1x module.");
         }
 
         //cyclic dependencies OK when created through addReads:
         new JavacTask(tb)
-                .options("--add-reads", "m2=m1",
-                         "--add-reads", "m1=m2",
+                .options("--add-reads", "m2x=m1x",
+                         "--add-reads", "m1x=m2x",
                          "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
@@ -113,10 +114,10 @@ public class AddReadsTest extends ModuleTestBase {
                 .writeAll();
 
         tb.writeJavaFiles(src_m2,
-                          "module m2 { requires m1; }");
+                          "module m2x { requires m1x; }");
 
         new JavacTask(tb)
-                .options("--add-reads", "m1=m2",
+                .options("--add-reads", "m1x=m2x",
                          "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
@@ -129,16 +130,16 @@ public class AddReadsTest extends ModuleTestBase {
 
         @Override
         public boolean process(Set annotations, RoundEnvironment roundEnv) {
-            ModuleElement m2Module = processingEnv.getElementUtils().getModuleElement("m2");
+            ModuleElement m2Module = processingEnv.getElementUtils().getModuleElement("m2x");
             if (m2Module == null) {
-                throw new AssertionError("Cannot find the m2 module!");
+                throw new AssertionError("Cannot find the m2x module!");
             }
             boolean foundM1 = false;
             for (RequiresDirective rd : ElementFilter.requiresIn(m2Module.getDirectives())) {
-                foundM1 |= rd.getDependency().getSimpleName().contentEquals("m1");
+                foundM1 |= rd.getDependency().getSimpleName().contentEquals("m1x");
             }
             if (!foundM1) {
-                throw new AssertionError("Cannot find the dependency on m1 module!");
+                throw new AssertionError("Cannot find the dependency on m1x module!");
             }
             return false;
         }
@@ -155,19 +156,19 @@ public class AddReadsTest extends ModuleTestBase {
         Path jar = prepareTestJar(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package impl; public class Impl { api.Api api; }");
 
         new JavacTask(tb)
           .options("--class-path", jar.toString(),
-                   "--add-reads", "m1=ALL-UNNAMED",
+                   "--add-reads", "m1x=ALL-UNNAMED",
                    "-XDrawDiagnostics")
           .outdir(classes)
           .files(findJavaFiles(moduleSrc))
@@ -180,21 +181,21 @@ public class AddReadsTest extends ModuleTestBase {
         Path jar = prepareTestJar(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package api; public class Api { public static void test() { } }",
                           "package impl; public class Impl { { api.Api.test(); } }");
 
         new JavacTask(tb)
           .options("--class-path", jar.toString(),
                    "--module-source-path", moduleSrc.toString(),
-                   "--add-reads", "m1=ALL-UNNAMED",
+                   "--add-reads", "m1x=ALL-UNNAMED",
                    "-XDrawDiagnostics")
           .outdir(classes)
           .files(m1.resolve("impl").resolve("Impl.java"))
@@ -279,9 +280,9 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testX(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { provides java.lang.Runnable with impl.Impl; }",
+                          "module m1x { provides java.lang.Runnable with impl.Impl; }",
                           "package impl; public class Impl implements Runnable { public void run() { } }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -302,8 +303,8 @@ public class AddReadsTest extends ModuleTestBase {
                           "package impl; public class Impl { }");
 
         new JavacTask(tb)
-          .options("--add-reads", "m1=ALL-UNNAMED",
-                   "-Xmodule:m1",
+          .options("--add-reads", "m1x=ALL-UNNAMED",
+                   "-Xmodule:m1x",
                    "--module-path", classes.toString())
           .outdir(unnamedClasses)
           .files(findJavaFiles(unnamedSrc))
@@ -314,16 +315,16 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testAddSelf(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m1=m1")
+                         "--add-reads", "m1x=m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -357,24 +358,24 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testEmptyItem(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testEmptyItem(src, classes, "m3=,m1");
-        testEmptyItem(src, classes, "m3=m1,,m2");
-        testEmptyItem(src, classes, "m3=m1,");
+        testEmptyItem(src, classes, "m3x=,m1x");
+        testEmptyItem(src, classes, "m3x=m1x,,m2x");
+        testEmptyItem(src, classes, "m3x=m1x,");
     }
 
     private void testEmptyItem(Path src, Path classes, String option) throws Exception {
@@ -390,23 +391,23 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testEmptyList(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
-        testEmptyList(src, classes, "m3=");
-        testEmptyList(src, classes, "m3=,");
+        testEmptyList(src, classes, "m3x=");
+        testEmptyList(src, classes, "m3x=,");
     }
 
     private void testEmptyList(Path src, Path classes, String option) throws Exception {
@@ -426,25 +427,25 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testMultipleAddReads_DifferentModules(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m2=m1",
-                         "--add-reads", "m3=m1")
+                         "--add-reads", "m2x=m1x",
+                         "--add-reads", "m3x=m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -454,25 +455,25 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testMultipleAddReads_SameModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { exports p2; }",
+                          "module m2x { exports p2; }",
                           "package p2; public class C2 { }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; p2.C2 c2; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m3=m1",
-                         "--add-reads", "m3=m2")
+                         "--add-reads", "m3x=m1x",
+                         "--add-reads", "m3x=m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -482,20 +483,20 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testDuplicateAddReads_SameOption(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { exports p2; }",
+                          "module m2x { exports p2; }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m2=m1,m1")
+                         "--add-reads", "m2x=m1x,m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -505,21 +506,21 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testDuplicateAddReads_MultipleOptions(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package p2; class C2 { p1.C1 c1; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m2=m1",
-                         "--add-reads", "m2=m1")
+                         "--add-reads", "m2x=m1x",
+                         "--add-reads", "m2x=m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -529,25 +530,25 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testRepeatedAddReads(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { exports p2; }",
+                          "module m2x { exports p2; }",
                           "package p2; public class C2 { }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { }",
+                          "module m3x { }",
                           "package p3; class C3 { p1.C1 c1; p2.C2 c2; }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--add-reads", "m3=m1",
-                         "--add-reads", "m3=m2")
+                         "--add-reads", "m3x=m1x",
+                         "--add-reads", "m3x=m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -563,7 +564,7 @@ public class AddReadsTest extends ModuleTestBase {
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
-                         "--add-reads", "m1:m2")
+                         "--add-reads", "m1x:m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -571,7 +572,7 @@ public class AddReadsTest extends ModuleTestBase {
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-reads option: 'm1:m2'");
+            "javac: bad value for --add-reads option: 'm1x:m2x'");
     }
 
     @Test
@@ -583,7 +584,7 @@ public class AddReadsTest extends ModuleTestBase {
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--add-reads", "bad*Source=m2")
+                         "--add-reads", "bad*Source=m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -597,16 +598,16 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testBadTargetName(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package p1; class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--add-reads", "m1=badTarget!")
+                         "--add-reads", "m1x=badTarget!")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -620,16 +621,16 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testSourceNameNotFound(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--add-reads", "missingSource=m1")
+                         "--add-reads", "missingSource=m")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -643,16 +644,16 @@ public class AddReadsTest extends ModuleTestBase {
     @Test
     public void testTargetNameNotFound(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports p1; }",
+                          "module m1x { exports p1; }",
                           "package p1; public class C1 { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--add-reads", "m1=missingTarget")
+                         "--add-reads", "m1x=missingTarget")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
diff --git a/langtools/test/tools/javac/modules/AnnotationProcessing.java b/langtools/test/tools/javac/modules/AnnotationProcessing.java
index bcd8b4dd60c..20f9f825242 100644
--- a/langtools/test/tools/javac/modules/AnnotationProcessing.java
+++ b/langtools/test/tools/javac/modules/AnnotationProcessing.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8133884 8162711
+ * @bug 8133884 8162711 8133896
  * @summary Verify that annotation processing works.
  * @library /tools/lib
  * @modules
@@ -33,23 +33,36 @@
  * @run main AnnotationProcessing
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.FilerException;
 import javax.annotation.processing.Messager;
+import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.ModuleElement.ProvidesDirective;
 import javax.lang.model.element.ModuleElement.UsesDirective;
@@ -60,10 +73,20 @@ import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.ElementScanner9;
 import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
 
 import toolbox.JavacTask;
 import toolbox.Task;
 import toolbox.Task.Mode;
+import toolbox.Task.OutputKind;
 
 public class AnnotationProcessing extends ModuleTestBase {
 
@@ -74,20 +97,20 @@ public class AnnotationProcessing extends ModuleTestBase {
     @Test
     public void testAPSingleModule(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package impl; public class Impl { }");
 
         String log = new JavacTask(tb)
                 .options("--module-source-path", moduleSrc.toString(),
                          "-processor", AP.class.getName(),
-                         "-AexpectedEnclosedElements=m1=>impl")
+                         "-AexpectedEnclosedElements=m1x=>impl")
                 .outdir(classes)
                 .files(findJavaFiles(moduleSrc))
                 .run()
@@ -101,25 +124,25 @@ public class AnnotationProcessing extends ModuleTestBase {
     @Test
     public void testAPMultiModule(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
-        Path m2 = moduleSrc.resolve("m2");
+        Path m1 = moduleSrc.resolve("m1x");
+        Path m2 = moduleSrc.resolve("m2x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package impl1; public class Impl1 { }");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package impl2; public class Impl2 { }");
 
         String log = new JavacTask(tb)
                 .options("--module-source-path", moduleSrc.toString(),
                          "-processor", AP.class.getName(),
-                         "-AexpectedEnclosedElements=m1=>impl1,m2=>impl2")
+                         "-AexpectedEnclosedElements=m1x=>impl1,m2x=>impl2")
                 .outdir(classes)
                 .files(findJavaFiles(moduleSrc))
                 .run()
@@ -135,6 +158,7 @@ public class AnnotationProcessing extends ModuleTestBase {
     public static final class AP extends AbstractProcessor {
 
         private Map> module2ExpectedEnclosedElements;
+        private Set seenModules = new HashSet<>();
 
         @Override
         public boolean process(Set annotations, RoundEnvironment roundEnv) {
@@ -181,12 +205,16 @@ public class AnnotationProcessing extends ModuleTestBase {
                               .map(p -> p.getQualifiedName().toString())
                               .collect(Collectors.toList());
 
-                assertEquals(module2ExpectedEnclosedElements.remove(module.getQualifiedName().toString()),
+                String moduleName = module.getQualifiedName().toString();
+
+                assertEquals(module2ExpectedEnclosedElements.get(moduleName),
                              actualElements);
+
+                seenModules.add(moduleName);
             }
 
             if (roundEnv.processingOver()) {
-                assertEquals(true, module2ExpectedEnclosedElements.isEmpty());
+                assertEquals(module2ExpectedEnclosedElements.keySet(), seenModules);
             }
 
             return false;
@@ -202,14 +230,14 @@ public class AnnotationProcessing extends ModuleTestBase {
     @Test
     public void testVerifyUsesProvides(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports api; uses api.Api; provides api.Api with impl.Impl; }",
+                          "module m1x { exports api; uses api.Api; provides api.Api with impl.Impl; }",
                           "package api; public class Api { }",
                           "package impl; public class Impl extends api.Api { }");
 
@@ -307,20 +335,20 @@ public class AnnotationProcessing extends ModuleTestBase {
     @Test
     public void testQualifiedClassForProcessing(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
-        Path m2 = moduleSrc.resolve("m2");
+        Path m1 = moduleSrc.resolve("m1x");
+        Path m2 = moduleSrc.resolve("m2x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
-                          "package impl; public class Impl { int m1; }");
+                          "module m1x { }",
+                          "package impl; public class Impl { int m1x; }");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { }",
-                          "package impl; public class Impl { int m2; }");
+                          "module m2x { }",
+                          "package impl; public class Impl { int m2x; }");
 
         new JavacTask(tb)
             .options("--module-source-path", moduleSrc.toString())
@@ -330,13 +358,13 @@ public class AnnotationProcessing extends ModuleTestBase {
             .writeAll()
             .getOutput(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("Note: field: m1");
+        List expected = Arrays.asList("Note: field: m1x");
 
         for (Mode mode : new Mode[] {Mode.API, Mode.CMDLINE}) {
             List log = new JavacTask(tb, mode)
                     .options("-processor", QualifiedClassForProcessing.class.getName(),
                              "--module-path", classes.toString())
-                    .classes("m1/impl.Impl")
+                    .classes("m1x/impl.Impl")
                     .outdir(classes)
                     .run()
                     .writeAll()
@@ -352,8 +380,8 @@ public class AnnotationProcessing extends ModuleTestBase {
 
         @Override
         public boolean process(Set annotations, RoundEnvironment roundEnv) {
-            if (processingEnv.getElementUtils().getModuleElement("m1") == null) {
-                throw new AssertionError("No m1 module found.");
+            if (processingEnv.getElementUtils().getModuleElement("m1x") == null) {
+                throw new AssertionError("No m1x module found.");
             }
 
             Messager messager = processingEnv.getMessager();
@@ -374,6 +402,779 @@ public class AnnotationProcessing extends ModuleTestBase {
 
     }
 
+    @Test
+    public void testModuleInRootElements(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("m1");
+
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        tb.writeJavaFiles(m1,
+                          "module m1x { exports api; }",
+                          "package api; public class Api { }");
+
+        List log = new JavacTask(tb)
+                .options("-processor", ModuleInRootElementsAP.class.getName())
+                .outdir(classes)
+                .files(findJavaFiles(moduleSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.STDERR);
+
+        assertEquals(Arrays.asList("module: m1x"), log);
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class ModuleInRootElementsAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            roundEnv.getRootElements()
+                    .stream()
+                    .filter(el -> el.getKind() == ElementKind.MODULE)
+                    .forEach(mod -> System.err.println("module: " + mod.getSimpleName()));
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
+    @Test
+    public void testAnnotationsInModuleInfo(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("m1");
+
+        tb.writeJavaFiles(m1,
+                          "@Deprecated module m1x { }");
+
+        Path m2 = moduleSrc.resolve("m2x");
+
+        tb.writeJavaFiles(m2,
+                          "@SuppressWarnings(\"\") module m2x { }");
+
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        List log = new JavacTask(tb)
+                .options("-processor", AnnotationsInModuleInfoPrint.class.getName())
+                .outdir(classes)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List expectedLog = Arrays.asList("Note: AP Invoked",
+                                                 "Note: AP Invoked");
+
+        assertEquals(expectedLog, log);
+
+        new JavacTask(tb)
+            .options("-processor", AnnotationsInModuleInfoFail.class.getName())
+            .outdir(classes)
+            .files(findJavaFiles(m2))
+            .run()
+            .writeAll();
+    }
+
+    @SupportedAnnotationTypes("java.lang.Deprecated")
+    public static final class AnnotationsInModuleInfoPrint extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            processingEnv.getMessager().printMessage(Kind.NOTE, "AP Invoked");
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
+    @SupportedAnnotationTypes("java.lang.Deprecated")
+    public static final class AnnotationsInModuleInfoFail extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            throw new AssertionError();
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
+    @Test
+    public void testGenerateInMultiModeAPI(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        Path m1 = moduleSrc.resolve("m1x");
+
+        tb.writeJavaFiles(m1,
+                          "module m1x { exports api1; }",
+                          "package api1; public class Api { GenApi ga; impl.Impl i; }");
+
+        writeFile("1", m1, "api1", "api");
+        writeFile("1", m1, "impl", "impl");
+
+        Path m2 = moduleSrc.resolve("m2x");
+
+        tb.writeJavaFiles(m2,
+                          "module m2x { requires m1x; exports api2; }",
+                          "package api2; public class Api { api1.GenApi ga1; GenApi qa2; impl.Impl i;}");
+
+        writeFile("2", m2, "api2", "api");
+        writeFile("2", m2, "impl", "impl");
+
+        for (FileType fileType : FileType.values()) {
+            if (Files.isDirectory(classes)) {
+                tb.cleanDirectory(classes);
+            } else {
+                Files.createDirectories(classes);
+            }
+
+            new JavacTask(tb)
+              .options("-processor", MultiModeAPITestAP.class.getName(),
+                       "--module-source-path", moduleSrc.toString(),
+                       "-Afiletype=" + fileType.name())
+              .outdir(classes)
+              .files(findJavaFiles(moduleSrc))
+              .run()
+              .writeAll();
+
+            assertFileExists(classes, "m1x", "api1", "GenApi.class");
+            assertFileExists(classes, "m1x", "impl", "Impl.class");
+            assertFileExists(classes, "m1x", "api1", "gen1");
+            assertFileExists(classes, "m2x", "api2", "GenApi.class");
+            assertFileExists(classes, "m2x", "impl", "Impl.class");
+            assertFileExists(classes, "m2x", "api2", "gen1");
+        }
+    }
+
+    enum FileType {
+        SOURCE,
+        CLASS;
+    }
+
+    public static abstract class GeneratingAP extends AbstractProcessor {
+
+        void createSource(CreateFileObject file, String name, String content) {
+            try (Writer out = file.create().openWriter()) {
+                out.write(content);
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        void createClass(CreateFileObject file, String name, String content) {
+            String fileNameStub = name.replace(".", File.separator);
+
+            try (OutputStream out = file.create().openOutputStream()) {
+                Path scratch = Files.createDirectories(Paths.get(""));
+                Path scratchSrc = scratch.resolve(fileNameStub + ".java").toAbsolutePath();
+
+                Files.createDirectories(scratchSrc.getParent());
+
+                try (Writer w = Files.newBufferedWriter(scratchSrc)) {
+                    w.write(content);
+                }
+
+                Path scratchClasses = scratch.resolve("classes");
+
+                Files.createDirectories(scratchClasses);
+
+                JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+                try (StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null)) {
+                    List options = Arrays.asList("-d", scratchClasses.toString());
+                    Iterable files = fm.getJavaFileObjects(scratchSrc);
+                    CompilationTask task = comp.getTask(null, fm, null, options, null, files);
+
+                    if (!task.call()) {
+                        throw new AssertionError("compilation failed");
+                    }
+                }
+
+                Path classfile = scratchClasses.resolve(fileNameStub + ".class");
+
+                Files.copy(classfile, out);
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        void doReadResource(CreateFileObject file, String expectedContent) {
+            try {
+                StringBuilder actualContent = new StringBuilder();
+
+                try (Reader r = file.create().openReader(true)) {
+                    int read;
+
+                    while ((read = r.read()) != (-1)) {
+                        actualContent.append((char) read);
+                    }
+
+                }
+
+                assertEquals(expectedContent, actualContent.toString());
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        public interface CreateFileObject {
+            public FileObject create() throws IOException;
+        }
+
+        void expectFilerException(Callable c) {
+            try {
+                c.call();
+                throw new AssertionError("Expected exception not thrown");
+            } catch (FilerException ex) {
+                //expected
+            } catch (Exception ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
+    @SupportedAnnotationTypes("*")
+    @SupportedOptions({"filetype", "modulename"})
+    public static final class MultiModeAPITestAP extends GeneratingAP {
+
+        int round;
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (round++ != 0)
+                return false;
+
+            createClass("m1x", "api1.GenApi", "package api1; public class GenApi {}");
+            createClass("m1x", "impl.Impl", "package impl; public class Impl {}");
+            createClass("m2x", "api2.GenApi", "package api2; public class GenApi {}");
+            createClass("m2x", "impl.Impl", "package impl; public class Impl {}");
+
+            createResource("m1x", "api1", "gen1");
+            createResource("m2x", "api2", "gen1");
+
+            readResource("m1x", "api1", "api", "1");
+            readResource("m1x", "impl", "impl", "1");
+            readResource("m2x", "api2", "api", "2");
+            readResource("m2x", "impl", "impl", "2");
+
+            Filer filer = processingEnv.getFiler();
+
+            expectFilerException(() -> filer.createSourceFile("fail.Fail"));
+            expectFilerException(() -> filer.createClassFile("fail.Fail"));
+            expectFilerException(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "fail", "fail"));
+            expectFilerException(() -> filer.getResource(StandardLocation.MODULE_SOURCE_PATH, "fail", "fail"));
+
+            //must not generate to unnamed package:
+            expectFilerException(() -> filer.createSourceFile("m1/Fail"));
+            expectFilerException(() -> filer.createClassFile("m1/Fail"));
+
+            //cannot generate resources to modules that are not root modules:
+            expectFilerException(() -> filer.createSourceFile("java.base/fail.Fail"));
+            expectFilerException(() -> filer.createClassFile("java.base/fail.Fail"));
+            expectFilerException(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "java.base/fail", "Fail"));
+
+            return false;
+        }
+
+        void createClass(String expectedModule, String name, String content) {
+            Filer filer = processingEnv.getFiler();
+            FileType filetype = FileType.valueOf(processingEnv.getOptions().getOrDefault("filetype", ""));
+
+            switch (filetype) {
+                case SOURCE:
+                    createSource(() -> filer.createSourceFile(expectedModule + "/" + name), name, content);
+                    break;
+                case CLASS:
+                    createClass(() -> filer.createClassFile(expectedModule + "/" + name), name, content);
+                    break;
+                default:
+                    throw new AssertionError("Unexpected filetype: " + filetype);
+            }
+        }
+
+        void createResource(String expectedModule, String pkg, String relName) {
+            try {
+                Filer filer = processingEnv.getFiler();
+
+                filer.createResource(StandardLocation.CLASS_OUTPUT, expectedModule + "/" + pkg, relName)
+                     .openOutputStream()
+                     .close();
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+
+        void readResource(String expectedModule, String pkg, String relName, String expectedContent) {
+            Filer filer = processingEnv.getFiler();
+
+            doReadResource(() -> filer.getResource(StandardLocation.MODULE_SOURCE_PATH, expectedModule + "/" + pkg, relName),
+                           expectedContent);
+        }
+
+    }
+
+    @Test
+    public void testGenerateInSingleNameModeAPI(Path base) throws Exception {
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        Path m1 = base.resolve("module-src");
+
+        tb.writeJavaFiles(m1,
+                          "module m1x { }");
+
+        writeFile("3", m1, "impl", "resource");
+
+        new JavacTask(tb)
+          .options("-processor", SingleNameModeAPITestAP.class.getName(),
+                   "-sourcepath", m1.toString())
+          .outdir(classes)
+          .files(findJavaFiles(m1))
+          .run()
+          .writeAll();
+
+        assertFileExists(classes, "impl", "Impl1.class");
+        assertFileExists(classes, "impl", "Impl2.class");
+        assertFileExists(classes, "impl", "Impl3");
+        assertFileExists(classes, "impl", "Impl4.class");
+        assertFileExists(classes, "impl", "Impl5.class");
+        assertFileExists(classes, "impl", "Impl6");
+        assertFileExists(classes, "impl", "Impl7.class");
+        assertFileExists(classes, "impl", "Impl8.class");
+        assertFileExists(classes, "impl", "Impl9");
+    }
+
+
+    @SupportedAnnotationTypes("*")
+    public static final class SingleNameModeAPITestAP extends GeneratingAP {
+
+        int round;
+
+        @Override
+        public synchronized void init(ProcessingEnvironment processingEnv) {
+            super.init(processingEnv);
+        }
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (round++ != 0)
+                return false;
+
+            Filer filer = processingEnv.getFiler();
+
+            createSource(() -> filer.createSourceFile("impl.Impl1"), "impl.Impl1", "package impl; class Impl1 {}");
+            createClass(() -> filer.createClassFile("impl.Impl2"), "impl.Impl2", "package impl; class Impl2 {}");
+            createSource(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "impl", "Impl3"), "impl.Impl3", "");
+            doReadResource(() -> filer.getResource(StandardLocation.SOURCE_PATH, "impl", "resource"), "3");
+
+            createSource(() -> filer.createSourceFile("m1x/impl.Impl4"), "impl.Impl4", "package impl; class Impl4 {}");
+            createClass(() -> filer.createClassFile("m1x/impl.Impl5"), "impl.Impl5", "package impl; class Impl5 {}");
+            createSource(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "m1x/impl", "Impl6"), "impl.Impl6", "");
+            doReadResource(() -> filer.getResource(StandardLocation.SOURCE_PATH, "m1x/impl", "resource"), "3");
+
+            TypeElement jlObject = processingEnv.getElementUtils().getTypeElement("java.lang.Object");
+
+            //"broken" originating element:
+            createSource(() -> filer.createSourceFile("impl.Impl7", jlObject), "impl.Impl7", "package impl; class Impl7 {}");
+            createClass(() -> filer.createClassFile("impl.Impl8", jlObject), "impl.Impl8", "package impl; class Impl8 {}");
+            createSource(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "impl", "Impl9", jlObject), "impl.Impl9", "");
+
+            //must not generate to unnamed package:
+            expectFilerException(() -> filer.createSourceFile("Fail"));
+            expectFilerException(() -> filer.createClassFile("Fail"));
+            expectFilerException(() -> filer.createSourceFile("m1x/Fail"));
+            expectFilerException(() -> filer.createClassFile("m1x/Fail"));
+
+            //cannot generate resources to modules that are not root modules:
+            expectFilerException(() -> filer.createSourceFile("java.base/fail.Fail"));
+            expectFilerException(() -> filer.createClassFile("java.base/fail.Fail"));
+            expectFilerException(() -> filer.createResource(StandardLocation.CLASS_OUTPUT, "java.base/fail", "Fail"));
+
+            return false;
+        }
+
+    }
+
+    @Test
+    public void testGenerateInUnnamedModeAPI(Path base) throws Exception {
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "class T {}");
+
+        new JavacTask(tb)
+          .options("-processor", UnnamedModeAPITestAP.class.getName(),
+                   "-sourcepath", src.toString())
+          .outdir(classes)
+          .files(findJavaFiles(src))
+          .run()
+          .writeAll();
+
+        assertFileExists(classes, "Impl1.class");
+        assertFileExists(classes, "Impl2.class");
+    }
+
+    @Test
+    public void testGenerateInNoModeAPI(Path base) throws Exception {
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "class T {}");
+
+        new JavacTask(tb)
+          .options("-processor", UnnamedModeAPITestAP.class.getName(),
+                   "-source", "8", "-target", "8",
+                   "-sourcepath", src.toString())
+          .outdir(classes)
+          .files(findJavaFiles(src))
+          .run()
+          .writeAll();
+
+        assertFileExists(classes, "Impl1.class");
+        assertFileExists(classes, "Impl2.class");
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class UnnamedModeAPITestAP extends GeneratingAP {
+
+        int round;
+
+        @Override
+        public synchronized void init(ProcessingEnvironment processingEnv) {
+            super.init(processingEnv);
+        }
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (round++ != 0)
+                return false;
+
+            Filer filer = processingEnv.getFiler();
+
+            //must not generate to unnamed package:
+            createSource(() -> filer.createSourceFile("Impl1"), "Impl1", "class Impl1 {}");
+            createClass(() -> filer.createClassFile("Impl2"), "Impl2", "class Impl2 {}");
+
+            return false;
+        }
+
+    }
+
+    @Test
+    public void testDisambiguateAnnotations(Path base) throws Exception {
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        Path src = base.resolve("src");
+        Path m1 = src.resolve("m1x");
+
+        tb.writeJavaFiles(m1,
+                          "module m1x { exports api; }",
+                          "package api; public @interface A {}",
+                          "package api; public @interface B {}");
+
+        Path m2 = src.resolve("m2x");
+
+        tb.writeJavaFiles(m2,
+                          "module m2x { exports api; }",
+                          "package api; public @interface A {}",
+                          "package api; public @interface B {}");
+
+        Path m3 = src.resolve("m3x");
+
+        tb.writeJavaFiles(m3,
+                          "module m3x { requires m1x; }",
+                          "package impl; import api.*; @A @B public class T {}");
+
+        Path m4 = src.resolve("m4x");
+
+        tb.writeJavaFiles(m4,
+                          "module m4x { requires m2x; }",
+                          "package impl; import api.*; @A @B public class T {}");
+
+        List log;
+        List expected;
+
+        log = new JavacTask(tb)
+            .options("-processor", SelectAnnotationATestAP.class.getName() + "," + SelectAnnotationBTestAP.class.getName(),
+                     "--module-source-path", src.toString(),
+                     "-m", "m1x,m2x")
+            .outdir(classes)
+            .run()
+            .writeAll()
+            .getOutputLines(OutputKind.STDERR);
+
+        expected = Arrays.asList("");
+
+        if (!expected.equals(log)) {
+            throw new AssertionError("Output does not match; output: " + log);
+        }
+
+        log = new JavacTask(tb)
+            .options("-processor", SelectAnnotationATestAP.class.getName() + "," + SelectAnnotationBTestAP.class.getName(),
+                     "--module-source-path", src.toString(),
+                     "-m", "m3x")
+            .outdir(classes)
+            .run()
+            .writeAll()
+            .getOutputLines(OutputKind.STDERR);
+
+        expected = Arrays.asList("SelectAnnotationBTestAP",
+                                 "SelectAnnotationBTestAP");
+
+        if (!expected.equals(log)) {
+            throw new AssertionError("Output does not match; output: " + log);
+        }
+
+        log = new JavacTask(tb)
+            .options("-processor", SelectAnnotationATestAP.class.getName() + "," + SelectAnnotationBTestAP.class.getName(),
+                     "--module-source-path", src.toString(),
+                     "-m", "m4x")
+            .outdir(classes)
+            .run()
+            .writeAll()
+            .getOutputLines(OutputKind.STDERR);
+
+        expected = Arrays.asList("SelectAnnotationATestAP",
+                                 "SelectAnnotationBTestAP",
+                                 "SelectAnnotationATestAP",
+                                 "SelectAnnotationBTestAP");
+
+        if (!expected.equals(log)) {
+            throw new AssertionError("Output does not match; output: " + log);
+        }
+    }
+
+    @SupportedAnnotationTypes("m2x/api.A")
+    public static final class SelectAnnotationATestAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            System.err.println("SelectAnnotationATestAP");
+
+            return false;
+        }
+
+    }
+
+    @SupportedAnnotationTypes("api.B")
+    public static final class SelectAnnotationBTestAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            System.err.println("SelectAnnotationBTestAP");
+
+            return false;
+        }
+
+    }
+
+    private static void writeFile(String content, Path base, String... pathElements) throws IOException {
+        Path file = resolveFile(base, pathElements);
+
+        Files.createDirectories(file.getParent());
+
+        try (Writer out = Files.newBufferedWriter(file)) {
+            out.append(content);
+        }
+    }
+
+    @Test
+    public void testUnboundLookup(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "package impl.conflict.src; public class Impl { }");
+
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("m1x");
+        Path m2 = moduleSrc.resolve("m2x");
+
+        Path classes = base.resolve("classes");
+        Path cpClasses = base.resolve("cpClasses");
+
+        Files.createDirectories(classes);
+        Files.createDirectories(cpClasses);
+
+        tb.writeJavaFiles(m1,
+                          "module m1x { }",
+                          "package impl1; public class Impl { }",
+                          "package impl.conflict.module; class Impl { }",
+                          "package impl.conflict.clazz; public class pkg { public static class I { } }",
+                          "package impl.conflict.src; public class Impl { }");
+
+        tb.writeJavaFiles(m2,
+                          "module m2x { }",
+                          "package impl2; public class Impl { }",
+                          "package impl.conflict.module; class Impl { }",
+                          "package impl.conflict; public class clazz { public static class pkg { } }");
+
+        //from source:
+        new JavacTask(tb)
+            .options("--module-source-path", moduleSrc.toString(),
+                     "--source-path", src.toString(),
+                     "-processorpath", System.getProperty("test.class.path"),
+                     "-processor", UnboundLookup.class.getName())
+            .outdir(classes)
+            .files(findJavaFiles(moduleSrc))
+            .run()
+            .writeAll();
+
+        new JavacTask(tb)
+            .options("--source-path", src.toString())
+            .outdir(cpClasses)
+            .files(findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        //from classfiles:
+        new JavacTask(tb)
+            .options("--module-path", classes.toString(),
+                     "--class-path", cpClasses.toString(),
+                     "--add-modules", "m1x,m2x",
+                     "-processorpath", System.getProperty("test.class.path"),
+                     "-processor", UnboundLookup.class.getName(),
+                     "-proc:only")
+            .classes("java.lang.Object")
+            .run()
+            .writeAll();
+
+        //source 8:
+        new JavacTask(tb)
+            .options("--source-path", src.toString(),
+                     "-source", "8",
+                     "-processorpath", System.getProperty("test.class.path"),
+                     "-processor", UnboundLookup8.class.getName())
+            .outdir(cpClasses)
+            .files(findJavaFiles(src))
+            .run()
+            .writeAll();
+
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class UnboundLookup extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            assertTypeElementExists("impl1.Impl", "m1x");
+            assertPackageElementExists("impl1", "m1x");
+            assertTypeElementExists("impl2.Impl", "m2x");
+            assertTypeElementExists("impl.conflict.clazz.pkg.I", "m1x");
+            assertTypeElementExists("impl.conflict.clazz", "m2x");
+            assertPackageElementExists("impl.conflict.clazz", "m1x");
+            assertPackageElementExists("impl2", "m2x");
+            assertTypeElementNotFound("impl.conflict.module.Impl");
+            assertPackageElementNotFound("impl.conflict.module");
+            assertTypeElementNotFound("impl.conflict.src.Impl");
+            assertPackageElementNotFound("impl.conflict.src");
+            assertTypeElementNotFound("impl.conflict.clazz.pkg");
+
+            return false;
+        }
+
+        private void assertTypeElementExists(String name, String expectedModule) {
+            assertElementExists(name, "class", processingEnv.getElementUtils() :: getTypeElement, expectedModule);
+        }
+
+        private void assertPackageElementExists(String name, String expectedModule) {
+            assertElementExists(name, "package", processingEnv.getElementUtils() :: getPackageElement, expectedModule);
+        }
+
+        private void assertElementExists(String name, String type, Function getter, String expectedModule) {
+            Element clazz = getter.apply(name);
+
+            if (clazz == null) {
+                throw new AssertionError("No " + name + " " + type + " found.");
+            }
+
+            ModuleElement mod = processingEnv.getElementUtils().getModuleOf(clazz);
+
+            if (!mod.getQualifiedName().contentEquals(expectedModule)) {
+                throw new AssertionError(name + " found in an unexpected module: " + mod.getQualifiedName());
+            }
+        }
+
+        private void assertTypeElementNotFound(String name) {
+            assertElementNotFound(name, processingEnv.getElementUtils() :: getTypeElement);
+        }
+
+        private void assertPackageElementNotFound(String name) {
+            assertElementNotFound(name, processingEnv.getElementUtils() :: getPackageElement);
+        }
+
+        private void assertElementNotFound(String name, Function getter) {
+            Element found = getter.apply(name);
+
+            if (found != null) {
+                fail("Element found unexpectedly: " + found);
+            }
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class UnboundLookup8 extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (processingEnv.getElementUtils().getTypeElement("impl.conflict.src.Impl") == null) {
+                throw new AssertionError("impl.conflict.src.Impl.");
+            }
+
+            if (processingEnv.getElementUtils().getModuleElement("java.base") != null) {
+                throw new AssertionError("getModuleElement != null for -source 8");
+            }
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+
+    }
+
     private static void assertNonNull(String msg, Object val) {
         if (val == null) {
             throw new AssertionError(msg);
@@ -392,4 +1193,26 @@ public class AnnotationProcessing extends ModuleTestBase {
         }
     }
 
+    private static void assertFileExists(Path base, String... pathElements) {
+        Path file = resolveFile(base, pathElements);
+
+        if (!Files.exists(file)) {
+            throw new AssertionError("Expected file: " + file + " exist, but it does not.");
+        }
+    }
+
+    static Path resolveFile(Path base, String... pathElements) {
+        Path file = base;
+
+        for (String el : pathElements) {
+            file = file.resolve(el);
+        }
+
+        return file;
+    }
+
+    private static void fail(String msg) {
+        throw new AssertionError(msg);
+    }
+
 }
diff --git a/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java b/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java
index c8c936287b0..60bfafae9ad 100644
--- a/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java
+++ b/langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java
@@ -38,7 +38,6 @@ import java.util.List;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class AnnotationProcessorsInModulesTest extends ModuleTestBase {
 
@@ -47,7 +46,7 @@ public class AnnotationProcessorsInModulesTest extends ModuleTestBase {
     }
 
     private static final String annotationProcessorModule1 =
-            "module anno_proc1 {\n" +
+            "module anno_proc1x {\n" +
             "    requires java.compiler;\n" +
             "\n" +
             "    provides javax.annotation.processing.Processor\n" +
@@ -55,7 +54,7 @@ public class AnnotationProcessorsInModulesTest extends ModuleTestBase {
             "}";
 
     private static final String annotationProcessorModule2 =
-            "module anno_proc2 {\n" +
+            "module anno_proc2x {\n" +
             "    requires java.compiler;\n" +
             "\n" +
             "    provides javax.annotation.processing.Processor\n" +
@@ -118,8 +117,8 @@ public class AnnotationProcessorsInModulesTest extends ModuleTestBase {
 
     void initialization(Path base) throws Exception {
         moduleSrc = base.resolve("anno_proc_src");
-        Path anno_proc1 = moduleSrc.resolve("anno_proc1");
-        Path anno_proc2 = moduleSrc.resolve("anno_proc2");
+        Path anno_proc1 = moduleSrc.resolve("anno_proc1x");
+        Path anno_proc2 = moduleSrc.resolve("anno_proc2x");
 
         processorCompiledModules = base.resolve("mods");
 
diff --git a/langtools/test/tools/javac/modules/AnnotationsOnModules.java b/langtools/test/tools/javac/modules/AnnotationsOnModules.java
index 454ad9e5833..33bfb69eb03 100644
--- a/langtools/test/tools/javac/modules/AnnotationsOnModules.java
+++ b/langtools/test/tools/javac/modules/AnnotationsOnModules.java
@@ -21,14 +21,15 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @summary Test --add-modules and --limit-modules; also test the "enabled" modules.
+ * @bug 8159602 8170549 8171255
+ * @summary Test annotations on module declaration.
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.classfile
- * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavaTask ModuleTestBase
+ * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
  * @run main AnnotationsOnModules
  */
 
@@ -55,6 +56,7 @@ import com.sun.tools.classfile.ClassFile;
 import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
 import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
 import toolbox.JavacTask;
+import toolbox.Task;
 import toolbox.Task.OutputKind;
 
 public class AnnotationsOnModules extends ModuleTestBase {
@@ -67,10 +69,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
     @Test
     public void testSimpleAnnotation(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "@Deprecated module m1 { }");
+                          "@Deprecated module m1x { }");
 
         Path modulePath = base.resolve("module-path");
 
@@ -83,7 +85,7 @@ public class AnnotationsOnModules extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        ClassFile cf = ClassFile.read(modulePath.resolve("m1").resolve("module-info.class"));
+        ClassFile cf = ClassFile.read(modulePath.resolve("m1x").resolve("module-info.class"));
         RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
 
         if (annotations == null || annotations.annotations.length != 1) {
@@ -92,13 +94,212 @@ public class AnnotationsOnModules extends ModuleTestBase {
     }
 
     @Test
-    public void testAnnotationWithImport(Path base) throws Exception {
+    public void testSimpleJavadocDeprecationTag(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("src1/A");
 
         tb.writeJavaFiles(m1,
-                          "import m1.A; @A module m1 { }",
-                          "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}");
+                "/** @deprecated */ module A { }");
+
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        List warning = new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString(),
+                        "-XDrawDiagnostics")
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        List expected = List.of(
+                "module-info.java:1:20: compiler.warn.missing.deprecated.annotation",
+                "1 warning");
+        if (!warning.containsAll(expected)) {
+            throw new AssertionError("Expected output not found. Expected: " + expected);
+        }
+
+        Path m2 = base.resolve("src2/B");
+
+        tb.writeJavaFiles(m2,
+                "module B { requires A; }");
+        String log = new JavacTask(tb)
+                .options("--module-source-path", m2.getParent().toString(),
+                        "--module-path", modulePath.toString(),
+                        "-XDrawDiagnostics")
+                .outdir(modulePath)
+                .files(findJavaFiles(m2))
+                .run()
+                .writeAll()
+                .getOutput(OutputKind.DIRECT);
+
+        if (!log.isEmpty()) {
+            throw new AssertionError("Output is not empty. Expected no output and no warnings.");
+        }
+
+        ClassFile cf = ClassFile.read(modulePath.resolve("A").resolve("module-info.class"));
+        RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
+
+        if (annotations != null && annotations.annotations.length > 0) {
+            throw new AssertionError("Found annotation attributes. Expected no annotations for javadoc @deprecated tag.");
+        }
+
+        if (cf.attributes.map.get(Attribute.Deprecated) != null) {
+            throw new AssertionError("Found Deprecated attribute. Expected no Deprecated attribute for javadoc @deprecated tag.");
+        }
+    }
+
+    @Test
+    public void testEnhancedDeprecatedAnnotation(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("src1/A");
+
+        tb.writeJavaFiles(m1,
+                "@Deprecated(since=\"10.X\", forRemoval=true) module A { }");
+
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString())
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll();
+
+        Path m2 = base.resolve("src2/B");
+
+        tb.writeJavaFiles(m2,
+                "module B { requires A; }");
+        List log = new JavacTask(tb)
+                .options("--module-source-path", m2.getParent().toString(),
+                        "--module-path", modulePath.toString(),
+                        "-XDrawDiagnostics")
+                .outdir(modulePath)
+                .files(findJavaFiles(m2))
+                .run()
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        List expected = List.of("module-info.java:1:21: compiler.warn.has.been.deprecated.for.removal.module: A",
+                "1 warning");
+        if (!log.containsAll(expected)) {
+            throw new AssertionError("Expected output not found. Expected: " + expected);
+        }
+
+        ClassFile cf = ClassFile.read(modulePath.resolve("A").resolve("module-info.class"));
+        RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
+
+        if (annotations == null ) {
+            throw new AssertionError("Annotations not found!");
+        }
+        int length = annotations.annotations.length;
+        if (length != 1 ) {
+            throw new AssertionError("Incorrect number of annotations: " + length);
+        }
+        int pairsCount = annotations.annotations[0].num_element_value_pairs;
+        if (pairsCount != 2) {
+            throw new AssertionError("Incorrect number of key-value pairs in annotation: " + pairsCount + " Expected two: forRemoval and since.");
+        }
+    }
+
+    @Test
+    public void testDeprecatedModuleRequiresDeprecatedForRemovalModule(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("src1/A");
+
+        tb.writeJavaFiles(m1,
+                "@Deprecated(forRemoval=true) module A { }");
+
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString())
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll();
+
+        Path m2 = base.resolve("src2/B");
+
+        tb.writeJavaFiles(m2,
+                "@Deprecated(forRemoval=false) module B { requires A; }");
+        List log = new JavacTask(tb)
+                .options("--module-source-path", m2.getParent().toString(),
+                        "--module-path", modulePath.toString(),
+                        "-XDrawDiagnostics")
+                .outdir(modulePath)
+                .files(findJavaFiles(m2))
+                .run()
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        List expected = List.of("module-info.java:1:51: compiler.warn.has.been.deprecated.for.removal.module: A",
+                "1 warning");
+        if (!log.containsAll(expected)) {
+            throw new AssertionError("Expected output not found. Expected: " + expected);
+        }
+    }
+
+    @Test
+    public void testExportsAndOpensToDeprecatedModule(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+
+
+        tb.writeJavaFiles(moduleSrc.resolve("B"),
+                "@Deprecated module B { }");
+        tb.writeJavaFiles(moduleSrc.resolve("C"),
+                "@Deprecated(forRemoval=true) module C { }");
+
+        Path modulePath = base.resolve("module-path");
+        Files.createDirectories(modulePath);
+
+        new JavacTask(tb)
+                .options("--module-source-path", moduleSrc.toString())
+                .outdir(modulePath)
+                .files(findJavaFiles(moduleSrc))
+                .run()
+                .writeAll();
+
+        Path m1 = base.resolve("src1/A");
+
+        tb.writeJavaFiles(m1,
+                "module A { " +
+                        "exports p1 to B; opens p1 to B;" +
+                        "exports p2 to C; opens p2 to C;" +
+                        "exports p3 to B,C; opens p3 to B,C;" +
+                        "}",
+                "package p1; public class A { }",
+                "package p2; public class A { }",
+                "package p3; public class A { }");
+        String log = new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString(),
+                        "--module-path", modulePath.toString(),
+                        "-XDrawDiagnostics")
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll()
+                .getOutput(OutputKind.DIRECT);
+
+        if (!log.isEmpty()) {
+            throw new AssertionError("Output is not empty! " + log);
+        }
+    }
+
+    @Test
+    public void testAnnotationWithImport(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("m1x");
+
+        tb.writeJavaFiles(m1,
+                          "import m1x.A; @A module m1x { }",
+                          "package m1x; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}");
 
         Path modulePath = base.resolve("module-path");
 
@@ -111,7 +312,7 @@ public class AnnotationsOnModules extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        ClassFile cf = ClassFile.read(modulePath.resolve("m1").resolve("module-info.class"));
+        ClassFile cf = ClassFile.read(modulePath.resolve("m1x").resolve("module-info.class"));
         RuntimeInvisibleAnnotations_attribute annotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations);
 
         if (annotations == null || annotations.annotations.length != 1) {
@@ -120,15 +321,106 @@ public class AnnotationsOnModules extends ModuleTestBase {
     }
 
     @Test
-    public void testModuleInfoAnnotationsInAPI(Path base) throws Exception {
+    public void testAnnotationWithImportFromAnotherModule(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("src1/A");
 
         tb.writeJavaFiles(m1,
-                          "import m1.*; @A @Deprecated @E @E module m1 { }",
-                          "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}",
-                          "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) @Repeatable(C.class) public @interface E {}",
-                          "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface C { public E[] value(); }");
+                "module A { exports p1; exports p2; }",
+                "package p1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A { }",
+                "package p2; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface B { }");
+
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString())
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll();
+
+        Path m2 = base.resolve("src2/B");
+
+        tb.writeJavaFiles(m2,
+                "import p1.A; @A @p2.B module B { requires A; }");
+        new JavacTask(tb)
+                .options("--module-source-path", m2.getParent().toString(),
+                        "--module-path", modulePath.toString()
+                )
+                .outdir(modulePath)
+                .files(findJavaFiles(m2))
+                .run()
+                .writeAll();
+
+        ClassFile cf = ClassFile.read(modulePath.resolve("B").resolve("module-info.class"));
+        RuntimeInvisibleAnnotations_attribute annotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations);
+
+        if (annotations == null ) {
+            throw new AssertionError("Annotations not found!");
+        }
+        int length = annotations.annotations.length;
+        if (length != 2 ) {
+            throw new AssertionError("Incorrect number of annotations: " + length);
+        }
+    }
+
+    @Test
+    public void testAnnotationWithImportAmbiguity(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("src1/A");
+
+        tb.writeJavaFiles(m1,
+                "module A { exports p1; exports p2; }",
+                "package p1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A { }",
+                "package p2; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A { }");
+
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        new JavacTask(tb)
+                .options("--module-source-path", m1.getParent().toString())
+                .outdir(modulePath)
+                .files(findJavaFiles(m1))
+                .run()
+                .writeAll();
+
+        Path m2 = base.resolve("src2/B");
+
+        tb.writeJavaFiles(m2,
+                "import p1.*; import p2.*; @A module B { requires A; }");
+        List log = new JavacTask(tb)
+                .options("--module-source-path", m2.getParent().toString(),
+                        "--module-path", modulePath.toString(),
+                        "-XDrawDiagnostics"
+                )
+                .outdir(modulePath)
+                .files(findJavaFiles(m2))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        List expected = List.of("module-info.java:1:28: compiler.err.ref.ambiguous: A, kindname.class, p2.A, p2, kindname.class, p1.A, p1",
+                "module-info.java:1:27: compiler.err.annotation.type.not.applicable",
+                "2 errors");
+        if (!log.containsAll(expected)) {
+            throw new AssertionError("Expected output not found. Expected: " + expected);
+        }
+
+    }
+
+    @Test
+    public void testModuleInfoAnnotationsInAPI(Path base) throws Exception {
+        Path moduleSrc = base.resolve("module-src");
+        Path m1 = moduleSrc.resolve("m1x");
+
+        tb.writeJavaFiles(m1,
+                          "import m1x.*; @A @Deprecated @E @E module m1x { }",
+                          "package m1x; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}",
+                          "package m1x; import java.lang.annotation.*; @Target(ElementType.MODULE) @Repeatable(C.class) public @interface E {}",
+                          "package m1x; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface C { public E[] value(); }");
 
         Path modulePath = base.resolve("module-path");
 
@@ -153,7 +445,7 @@ public class AnnotationsOnModules extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--add-modules", "m1",
+                         "--add-modules", "m1x",
                          "-processor", AP.class.getName())
                 .outdir(out)
                 .files(findJavaFiles(src))
@@ -162,10 +454,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString() + File.pathSeparator + out.toString(),
-                         "--add-modules", "m1",
+                         "--add-modules", "m1x",
                          "-processor", AP.class.getName(),
                          "-proc:only")
-                .classes("m1/m1.A")
+                .classes("m1x/m1x.A")
                 .files(findJavaFiles(src))
                 .run()
                 .writeAll();
@@ -176,10 +468,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
 
         @Override
         public boolean process(Set annotations, RoundEnvironment roundEnv) {
-            ModuleElement m1 = processingEnv.getElementUtils().getModuleElement("m1");
+            ModuleElement m1 = processingEnv.getElementUtils().getModuleElement("m1x");
             Set actualAnnotations = new HashSet<>();
             Set expectedAnnotations =
-                    new HashSet<>(Arrays.asList("@m1.A", "@java.lang.Deprecated", "@m1.C({@m1.E, @m1.E})"));
+                    new HashSet<>(Arrays.asList("@m1x.A", "@java.lang.Deprecated", "@m1x.C({@m1x.E, @m1x.E})"));
 
             for (AnnotationMirror am : m1.getAnnotationMirrors()) {
                 actualAnnotations.add(am.toString());
@@ -197,17 +489,17 @@ public class AnnotationsOnModules extends ModuleTestBase {
     @Test
     public void testModuleDeprecation(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "@Deprecated module m1 { }");
+                          "@Deprecated module m1x { }");
 
-        Path m2 = moduleSrc.resolve("m2");
+        Path m2 = moduleSrc.resolve("m2x");
 
         tb.writeJavaFiles(m2,
-                          "@Deprecated module m2 { }");
+                          "@Deprecated module m2x { }");
 
-        Path m3 = moduleSrc.resolve("m3");
+        Path m3 = moduleSrc.resolve("m3x");
 
         Path modulePath = base.resolve("module-path");
 
@@ -216,14 +508,15 @@ public class AnnotationsOnModules extends ModuleTestBase {
         List actual;
         List expected;
 
-        for (String suppress : new String[] {"", "@Deprecated ", "@SuppressWarnings(\"deprecation\") "}) {
+        String DEPRECATED_JAVADOC = "/** @deprecated */";
+        for (String suppress : new String[] {"", DEPRECATED_JAVADOC, "@Deprecated ", "@SuppressWarnings(\"deprecation\") "}) {
             tb.writeJavaFiles(m3,
-                              suppress + "module m3 {\n" +
-                              "    requires m1;\n" +
-                              "    exports api to m1, m2;\n" +
+                              suppress + "module m3x {\n" +
+                              "    requires m1x;\n" +
+                              "    exports api to m1x, m2x;\n" +
                               "}",
                               "package api; public class Api { }");
-            System.err.println("compile m3");
+            System.err.println("compile m3x");
             actual = new JavacTask(tb)
                     .options("--module-source-path", moduleSrc.toString(),
                              "-XDrawDiagnostics")
@@ -237,6 +530,12 @@ public class AnnotationsOnModules extends ModuleTestBase {
                 expected = Arrays.asList(
                         "- compiler.note.deprecated.filename: module-info.java",
                         "- compiler.note.deprecated.recompile");
+            } else if (suppress.equals(DEPRECATED_JAVADOC)) {
+                expected = Arrays.asList(
+                        "module-info.java:1:19: compiler.warn.missing.deprecated.annotation",
+                        "- compiler.note.deprecated.filename: module-info.java",
+                        "- compiler.note.deprecated.recompile",
+                        "1 warning");
             } else {
                 expected = Arrays.asList("");
             }
@@ -245,7 +544,7 @@ public class AnnotationsOnModules extends ModuleTestBase {
                 throw new AssertionError("Unexpected output: " + actual + "; suppress: " + suppress);
             }
 
-            System.err.println("compile m3 with -Xlint:-deprecation");
+            System.err.println("compile m3x with -Xlint:-deprecation");
             actual = new JavacTask(tb)
                     .options("--module-source-path", moduleSrc.toString(),
                              "-XDrawDiagnostics",
@@ -258,8 +557,13 @@ public class AnnotationsOnModules extends ModuleTestBase {
 
             if (suppress.isEmpty()) {
                 expected = Arrays.asList(
-                        "module-info.java:2:14: compiler.warn.has.been.deprecated.module: m1",
+                        "module-info.java:2:14: compiler.warn.has.been.deprecated.module: m1x",
                         "1 warning");
+            } else if (suppress.equals(DEPRECATED_JAVADOC)) {
+                expected = Arrays.asList(
+                        "module-info.java:1:19: compiler.warn.missing.deprecated.annotation",
+                        "module-info.java:2:14: compiler.warn.has.been.deprecated.module: m1x",
+                        "2 warnings");
             } else {
                 expected = Arrays.asList("");
             }
@@ -269,13 +573,13 @@ public class AnnotationsOnModules extends ModuleTestBase {
             }
 
             //load the deprecated module-infos from classfile:
-            System.err.println("compile m3 with -Xlint:-deprecation, loading deprecated modules from classes");
+            System.err.println("compile m3x with -Xlint:-deprecation, loading deprecated modules from classes");
             actual = new JavacTask(tb)
                     .options("--module-path", modulePath.toString(),
                              "-XDrawDiagnostics",
                              "-Xlint:deprecation")
-                    .outdir(modulePath.resolve("m3"))
-                    .files(findJavaFiles(moduleSrc.resolve("m3")))
+                    .outdir(modulePath.resolve("m3x"))
+                    .files(findJavaFiles(moduleSrc.resolve("m3x")))
                     .run()
                     .writeAll()
                     .getOutputLines(OutputKind.DIRECT);
@@ -335,6 +639,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
                          "public int[] value();",
                          "{1, 2}",
                          "@test.A({1, 2})"),
+            new TestCase("package test; public enum E {A;}",
+                        "int integer(); boolean flag(); double value(); String string(); E enumeration(); ",
+                        "enumeration = test.E.A, integer = 42, flag = true, value = 3.5, string = \"Text\"",
+                        "@test.A(enumeration=test.E.A, integer=42, flag=true, value=3.5, string=\"Text\")"),
         };
 
         Path extraSrc = base.resolve("extra-src");
diff --git a/langtools/test/tools/javac/modules/AutomaticModules.java b/langtools/test/tools/javac/modules/AutomaticModules.java
index 53beb76ab00..3a40c907db1 100644
--- a/langtools/test/tools/javac/modules/AutomaticModules.java
+++ b/langtools/test/tools/javac/modules/AutomaticModules.java
@@ -82,14 +82,14 @@ public class AutomaticModules extends ModuleTestBase {
           .run();
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { requires test.api; requires java.desktop; }",
+                          "module m1x { requires test.api; requires java.desktop; }",
                           "package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }");
 
         new JavacTask(tb)
@@ -140,14 +140,14 @@ public class AutomaticModules extends ModuleTestBase {
           .run();
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { requires test.api; }",
+                          "module m1x { requires test.api; }",
                           "package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }");
 
         new JavacTask(tb)
@@ -193,7 +193,7 @@ public class AutomaticModules extends ModuleTestBase {
         Files.createDirectories(depClasses);
 
         tb.writeJavaFiles(depSrc,
-                          "module m1 { requires transitive automatic; }",
+                          "module m1x { requires transitive automatic; }",
                           "package dep; public class Dep { api.Api api; }");
 
         new JavacTask(tb)
@@ -203,7 +203,7 @@ public class AutomaticModules extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        Path moduleJar = modulePath.resolve("m1.jar");
+        Path moduleJar = modulePath.resolve("m1x.jar");
 
         new JarTask(tb, moduleJar)
           .baseDir(depClasses)
@@ -217,7 +217,7 @@ public class AutomaticModules extends ModuleTestBase {
         Files.createDirectories(testClasses);
 
         tb.writeJavaFiles(testSrc,
-                          "module m2 { requires automatic; }",
+                          "module m2x { requires automatic; }",
                           "package test; public class Test { }");
 
         new JavacTask(tb)
@@ -260,13 +260,13 @@ public class AutomaticModules extends ModuleTestBase {
 
         Path moduleSrc = base.resolve("module-src");
 
-        tb.writeJavaFiles(moduleSrc.resolve("m1"),
-                          "module m1 { requires static automaticA; }",
-                          "package impl; public class Impl { apiA.Api a; apiB.Api b; m2.M2 m;}");
+        tb.writeJavaFiles(moduleSrc.resolve("m1x"),
+                          "module m1x { requires static automaticA; }",
+                          "package impl; public class Impl { apiA.Api a; apiB.Api b; m2x.M2 m;}");
 
-        tb.writeJavaFiles(moduleSrc.resolve("m2"),
-                          "module m2 { exports m2; }",
-                          "package m2; public class M2 { }");
+        tb.writeJavaFiles(moduleSrc.resolve("m2x"),
+                          "module m2x { exports m2x; }",
+                          "package m2x; public class M2 { }");
 
         Path classes = base.resolve("classes");
 
@@ -283,7 +283,7 @@ public class AutomaticModules extends ModuleTestBase {
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
+        List expected = Arrays.asList("Impl.java:1:62: compiler.err.not.def.access.package.cant.access: m2x.M2, m2x",
                                               "1 error");
 
         if (!expected.equals(log)) {
@@ -301,7 +301,7 @@ public class AutomaticModules extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         expected = Arrays.asList("Impl.java:1:51: compiler.err.doesnt.exist: apiB",
-                                 "Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
+                                 "Impl.java:1:62: compiler.err.not.def.access.package.cant.access: m2x.M2, m2x",
                                  "2 errors");
 
         if (!expected.equals(log)) {
diff --git a/langtools/test/tools/javac/modules/DoclintOtherModules.java b/langtools/test/tools/javac/modules/DoclintOtherModules.java
index f2960261c59..9355a949dce 100644
--- a/langtools/test/tools/javac/modules/DoclintOtherModules.java
+++ b/langtools/test/tools/javac/modules/DoclintOtherModules.java
@@ -49,14 +49,14 @@ public class DoclintOtherModules extends ModuleTestBase {
     @Test
     public void testSimple(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
-        Path m2 = src.resolve("m2");
+        Path m1 = src.resolve("m1x");
+        Path m2 = src.resolve("m2x");
         tb.writeJavaFiles(m1,
-                          "module m1 {}",
-                          "package m1; /** @see m2.B */ @Deprecated public class A {}");
+                          "module m1x {}",
+                          "package m1x; /** @see m2x.B */ @Deprecated public class A {}");
         tb.writeJavaFiles(m2,
-                          "module m2 { requires m1; exports m2; }",
-                          "package m2; public class B extends Foo {} @Deprecated class Foo {}");
+                          "module m2x { requires m1x; exports m2x; }",
+                          "package m2x; public class B extends Foo {} @Deprecated class Foo {}");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
 
diff --git a/langtools/test/tools/javac/modules/DuplicateClassTest.java b/langtools/test/tools/javac/modules/DuplicateClassTest.java
index 8e1aef06796..68dbc774d44 100644
--- a/langtools/test/tools/javac/modules/DuplicateClassTest.java
+++ b/langtools/test/tools/javac/modules/DuplicateClassTest.java
@@ -37,7 +37,6 @@ import java.nio.file.Path;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class DuplicateClassTest extends ModuleTestBase {
 
@@ -48,13 +47,13 @@ public class DuplicateClassTest extends ModuleTestBase {
 
     @Test
     public void testSimple(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
-        Path m2 = base.resolve("m2");
+        Path m1 = base.resolve("m1x");
+        Path m2 = base.resolve("m2x");
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package impl; public class Impl { }");
         tb.writeJavaFiles(m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package impl; public class Impl { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
diff --git a/langtools/test/tools/javac/modules/EdgeCases.java b/langtools/test/tools/javac/modules/EdgeCases.java
index 86242983f66..0bbc6046a06 100644
--- a/langtools/test/tools/javac/modules/EdgeCases.java
+++ b/langtools/test/tools/javac/modules/EdgeCases.java
@@ -97,9 +97,9 @@ public class EdgeCases extends ModuleTestBase {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
             Path moduleSrc = base.resolve("module-src");
-            Path m1 = moduleSrc.resolve("m1");
+            Path m1 = moduleSrc.resolve("m1x");
 
-            tb.writeJavaFiles(m1, "module m1 { }");
+            tb.writeJavaFiles(m1, "module m1x { }");
 
             Iterable files = fm.getJavaFileObjects(findJavaFiles(moduleSrc));
             com.sun.source.util.JavacTask task =
@@ -107,7 +107,7 @@ public class EdgeCases extends ModuleTestBase {
 
             task.analyze();
 
-            ModuleSymbol msym = (ModuleSymbol) task.getElements().getModuleElement("m1");
+            ModuleSymbol msym = (ModuleSymbol) task.getElements().getModuleElement("m1x");
 
             msym.outermostClass();
         }
@@ -118,9 +118,9 @@ public class EdgeCases extends ModuleTestBase {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
             Path moduleSrc = base.resolve("module-src");
-            Path m1 = moduleSrc.resolve("m1");
+            Path m1 = moduleSrc.resolve("m1x");
 
-            tb.writeJavaFiles(m1, "module m1 { }",
+            tb.writeJavaFiles(m1, "module m1x { }",
                                   "package p;",
                                   "package p; class T { }");
 
@@ -154,17 +154,17 @@ public class EdgeCases extends ModuleTestBase {
     @Test
     public void testModuleImplicitModuleBoundaries(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports api1; }",
+                          "module m1x { exports api1; }",
                           "package api1; public class Api1 { public void call() { } }");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { requires m1; exports api2; }",
+                          "module m2x { requires m1x; exports api2; }",
                           "package api2; public class Api2 { public static api1.Api1 get() { return null; } }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { requires m2; }",
+                          "module m3x { requires m2x; }",
                           "package test; public class Test { { api2.Api2.get().call(); api2.Api2.get().toString(); } }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -214,13 +214,13 @@ public class EdgeCases extends ModuleTestBase {
           .run();
 
         Path src = base.resolve("src");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { requires a; exports api2; }",
+                          "module m2x { requires a; exports api2; }",
                           "package api2; public class Api2 { public static api1.Api1 get() { return null; } }");
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                          "module m3 { requires a; requires m2; }",
+                          "module m3x { requires a; requires m2x; }",
                           "package test; public class Test { { api2.Api2.get(); api1.Api1 a1; } }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
@@ -245,7 +245,7 @@ public class EdgeCases extends ModuleTestBase {
     @Test
     public void testEmptyImplicitModuleInfo(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         Files.createDirectories(src_m1);
         try (Writer w = Files.newBufferedWriter(src_m1.resolve("module-info.java"))) {}
         tb.writeJavaFiles(src_m1,
@@ -262,7 +262,7 @@ public class EdgeCases extends ModuleTestBase {
                 .writeAll();
 
         tb.writeJavaFiles(src_m1,
-                          "module m1 {}");
+                          "module m1x {}");
 
         new JavacTask(tb)
                 .options("--source-path", src_m1.toString())
@@ -276,16 +276,16 @@ public class EdgeCases extends ModuleTestBase {
     @Test
     public void testClassPackageClash(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { exports test.m1; }",
-                          "package test.m1;\n" +
+                          "module m1x { exports test.m1x; }",
+                          "package test.m1x;\n" +
                           "public class Test {}\n");
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { requires m1; }",
+                          "module m2x { requires m1x; }",
                           "package test;\n" +
-                          "public class m1 {}\n");
+                          "public class m1x {}\n");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
@@ -299,7 +299,7 @@ public class EdgeCases extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List expected = Arrays.asList(
-            "m1.java:2:8: compiler.err.clash.with.pkg.of.same.name: kindname.class, test.m1",
+            "m1x.java:2:8: compiler.err.clash.with.pkg.of.same.name: kindname.class, test.m1x",
             "1 error"
         );
 
@@ -383,7 +383,7 @@ public class EdgeCases extends ModuleTestBase {
     @Test
     public void testModuleInfoNameMismatchSource(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Files.createDirectories(m1);
         tb.writeJavaFiles(m1, "module other { }",
                               "package test; public class Test {}");
@@ -400,8 +400,8 @@ public class EdgeCases extends ModuleTestBase {
             .getOutputLines(OutputKind.DIRECT);
 
         List expected = Arrays.asList(
-                "module-info.java:1:1: compiler.err.module.name.mismatch: other, m1",
-                "- compiler.err.cant.access: m1.module-info, (compiler.misc.cant.resolve.modules)",
+                "module-info.java:1:1: compiler.err.module.name.mismatch: other, m1x",
+                "- compiler.err.cant.access: m1x.module-info, (compiler.misc.cant.resolve.modules)",
                 "2 errors");
 
         if (!expected.equals(log)) {
@@ -416,7 +416,7 @@ public class EdgeCases extends ModuleTestBase {
         tb.writeJavaFiles(src, "module other { }",
                                "package test; public class Test {}");
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         tb.createDirectories(m1Classes);
 
         new JavacTask(tb)
@@ -428,7 +428,7 @@ public class EdgeCases extends ModuleTestBase {
 
         Path src2 = base.resolve("src2");
         Files.createDirectories(src2);
-        tb.writeJavaFiles(src2, "module use { requires m1; }");
+        tb.writeJavaFiles(src2, "module use { requires m1x; }");
 
         Path classes2 = base.resolve("classes2");
         tb.createDirectories(classes2);
@@ -443,7 +443,7 @@ public class EdgeCases extends ModuleTestBase {
             .getOutputLines(OutputKind.DIRECT);
 
         List expected = Arrays.asList(
-                "- compiler.err.cant.access: m1.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.name.mismatch: other, m1))",
+                "- compiler.err.cant.access: m1x.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.name.mismatch: other, m1x))",
                 "1 error");
 
         if (!expected.equals(log)) {
diff --git a/langtools/test/tools/javac/modules/ExportsUnexported.java b/langtools/test/tools/javac/modules/ExportsUnexported.java
index 691eaea0760..c64f4c18003 100644
--- a/langtools/test/tools/javac/modules/ExportsUnexported.java
+++ b/langtools/test/tools/javac/modules/ExportsUnexported.java
@@ -75,7 +75,7 @@ public class ExportsUnexported extends ModuleTestBase {
                 System.err.println("testing: " + test);
 
                 Path src = base.resolve("src");
-                Path src_m1 = src.resolve("m1");
+                Path src_m1 = src.resolve("m1x");
                 StringBuilder testCode = new StringBuilder();
                 List expectedLog = new ArrayList<>();
                 int line = 1;
@@ -99,7 +99,9 @@ public class ExportsUnexported extends ModuleTestBase {
                             default:
                                 throw new AssertionError(typeName.toString());
                         }
-                        expectedLog.add("Api.java:" + line + ":" + col + ": compiler.warn.leaks.not.accessible.unexported: " + kindName + ", impl.impl." + typeName + ", m1");
+                        expectedLog.add("Api.java:" + line + ":" + col
+                                + ": compiler.warn.leaks.not.accessible.unexported: "
+                                + kindName + ", impl.impl." + typeName + ", m1x");
                         continue;
                     }
 
@@ -121,7 +123,7 @@ public class ExportsUnexported extends ModuleTestBase {
                 Collections.sort(expectedLog);
 
                 tb.writeJavaFiles(src_m1,
-                                  "module m1 { exports api; }",
+                                  "module m1x { exports api; }",
                                   testCode.toString(),
                                   "package impl.impl; public class Cls { }",
                                   "package impl.impl; public class Exc extends Exception { }",
@@ -155,22 +157,22 @@ public class ExportsUnexported extends ModuleTestBase {
     @Test
     public void testAccessibleToSpecificOrAll(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_lib1 = src.resolve("lib1");
+        Path src_lib1 = src.resolve("lib1x");
         tb.writeJavaFiles(src_lib1,
-                          "module lib1 { exports lib1; }",
+                          "module lib1x { exports lib1; }",
                           "package lib1; public class Lib1 {}");
-        Path src_lib2 = src.resolve("lib2");
+        Path src_lib2 = src.resolve("lib2x");
         tb.writeJavaFiles(src_lib2,
-                          "module lib2 { exports lib2; }",
+                          "module lib2x { exports lib2; }",
                           "package lib2; public class Lib2 {}");
         Path src_api = src.resolve("api");
         tb.writeJavaFiles(src_api,
                           "module api {\n" +
                           "    exports api;\n" +
-                          "    exports qapi1 to qual1;\n" +
-                          "    exports qapi2 to qual1, qual2;\n" +
-                          "    requires transitive lib1;\n" +
-                          "    requires lib2;\n" +
+                          "    exports qapi1 to qual1x;\n" +
+                          "    exports qapi2 to qual1x, qual2x;\n" +
+                          "    requires transitive lib1x;\n" +
+                          "    requires lib2x;\n" +
                           "}\n",
                           "package api;\n" +
                           "public class Api {\n" +
@@ -190,10 +192,10 @@ public class ExportsUnexported extends ModuleTestBase {
                           "package impl;\n" +
                           "public class Impl {\n" +
                           "}");
-        Path src_qual1 = src.resolve("qual1");
-        tb.writeJavaFiles(src_qual1, "module qual1 { }");
-        Path src_qual2 = src.resolve("qual2");
-        tb.writeJavaFiles(src_qual2, "module qual2 { }");
+        Path src_qual1 = src.resolve("qual1x");
+        tb.writeJavaFiles(src_qual1, "module qual1x { }");
+        Path src_qual2 = src.resolve("qual2x");
+        tb.writeJavaFiles(src_qual2, "module qual2x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
@@ -209,7 +211,7 @@ public class ExportsUnexported extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List expected = Arrays.asList(
-            "Api.java:4:16: compiler.warn.leaks.not.accessible.not.required.transitive: kindname.class, lib2.Lib2, lib2",
+            "Api.java:4:16: compiler.warn.leaks.not.accessible.not.required.transitive: kindname.class, lib2.Lib2, lib2x",
             "Api.java:5:17: compiler.warn.leaks.not.accessible.unexported.qualified: kindname.class, qapi1.QApi1, api",
             "Api.java:6:16: compiler.warn.leaks.not.accessible.unexported: kindname.class, impl.Impl, api",
             "- compiler.err.warnings.and.werror",
diff --git a/langtools/test/tools/javac/modules/GetLocationForModuleTest.java b/langtools/test/tools/javac/modules/GetLocationForModuleTest.java
index b840f54161c..c354f69bf3a 100644
--- a/langtools/test/tools/javac/modules/GetLocationForModuleTest.java
+++ b/langtools/test/tools/javac/modules/GetLocationForModuleTest.java
@@ -48,10 +48,10 @@ public class GetLocationForModuleTest extends ModuleTestBase {
     public void run(Path base) throws Exception {
         // Set up some trivial modules
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
-        tb.writeJavaFiles(m1, "module m1 { }");
-        Path m2 = moduleSrc.resolve("m2");
-        tb.writeJavaFiles(m2, "module m2 { }");
+        Path m1 = moduleSrc.resolve("m1x");
+        tb.writeJavaFiles(m1, "module m1x { }");
+        Path m2 = moduleSrc.resolve("m2x");
+        tb.writeJavaFiles(m2, "module m2x { }");
 
         Path modulePath = base.resolve("module-path");
         Files.createDirectories(modulePath);
@@ -69,7 +69,7 @@ public class GetLocationForModuleTest extends ModuleTestBase {
 
         // Test
         test(fm, StandardLocation.SYSTEM_MODULES, "java.base", "java.compiler");
-        test(fm, StandardLocation.MODULE_PATH, "m1", "m2");
+        test(fm, StandardLocation.MODULE_PATH, "m1x", "m2x");
     }
 
     void test(JavaFileManager fm, JavaFileManager.Location locn, String... mods) throws IOException {
diff --git a/langtools/test/tools/javac/modules/HelloWorldTest.java b/langtools/test/tools/javac/modules/HelloWorldTest.java
index ba0456f69f0..a592e9316fc 100644
--- a/langtools/test/tools/javac/modules/HelloWorldTest.java
+++ b/langtools/test/tools/javac/modules/HelloWorldTest.java
@@ -123,9 +123,9 @@ public class HelloWorldTest extends ModuleTestBase {
     @Test
     public void testModuleSourcePath(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }");
-        tb.writeJavaFiles(src_m1, PKG_HELLO_WORLD);
+        Path src_m = src.resolve("m");
+        tb.writeFile(src_m.resolve("module-info.java"), "module m { }");
+        tb.writeJavaFiles(src_m, PKG_HELLO_WORLD);
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -133,13 +133,13 @@ public class HelloWorldTest extends ModuleTestBase {
         new JavacTask(tb)
             .options("--module-source-path", src.toString())
             .outdir(classes)
-            .files(src_m1.resolve("p/HelloWorld.java"))
+            .files(src_m.resolve("p/HelloWorld.java"))
             .run()
             .writeAll();
 
         checkFiles(
-            classes.resolve("m1/module-info.class"),
-            classes.resolve("m1/p/HelloWorld.class"));
+            classes.resolve("m/module-info.class"),
+            classes.resolve("m/p/HelloWorld.class"));
     }
 
     void checkFiles(Path... files) throws Exception {
diff --git a/langtools/test/tools/javac/modules/LimitModulesTest.java b/langtools/test/tools/javac/modules/LimitModulesTest.java
index 3ed381196c3..0ea6872813b 100644
--- a/langtools/test/tools/javac/modules/LimitModulesTest.java
+++ b/langtools/test/tools/javac/modules/LimitModulesTest.java
@@ -36,7 +36,6 @@ import java.nio.file.Path;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class LimitModulesTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -78,18 +77,18 @@ public class LimitModulesTest extends ModuleTestBase {
     @Test
     public void testEmptyItem(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                          "module m1 { }");
-        Path src_m2 = src.resolve("m2");
+                          "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                          "module m2 { }");
+                          "module m2x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--limit-modules", ",m1")
+                         "--limit-modules", ",m1x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -97,7 +96,7 @@ public class LimitModulesTest extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--limit-modules", "m1,,m2")
+                         "--limit-modules", "m1x,,m2x")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
@@ -105,7 +104,7 @@ public class LimitModulesTest extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString(),
-                         "--limit-modules", "m1,")
+                         "--limit-modules", "m1x,")
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
diff --git a/langtools/test/tools/javac/modules/MOptionTest.java b/langtools/test/tools/javac/modules/MOptionTest.java
index c0fb0d7968f..b48aa2f8aec 100644
--- a/langtools/test/tools/javac/modules/MOptionTest.java
+++ b/langtools/test/tools/javac/modules/MOptionTest.java
@@ -49,21 +49,21 @@ public class MOptionTest extends ModuleTestBase {
     @Test
     public void testOneModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
-        Path moduleInfoClass = build.resolve("m1/module-info.class");
-        Path testTestClass = build.resolve("m1/test/Test.class");
+        Path moduleInfoClass = build.resolve("m1x/module-info.class");
+        Path testTestClass = build.resolve("m1x/test/Test.class");
 
         FileTime moduleInfoTimeStamp = Files.getLastModifiedTime(moduleInfoClass);
         FileTime testTestTimeStamp = Files.getLastModifiedTime(testTestClass);
@@ -81,7 +81,7 @@ public class MOptionTest extends ModuleTestBase {
         Thread.sleep(2000); //timestamps
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
@@ -98,7 +98,7 @@ public class MOptionTest extends ModuleTestBase {
         Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
@@ -114,17 +114,17 @@ public class MOptionTest extends ModuleTestBase {
     @Test
     public void testNoOutputDir(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                    "-m", "m1",
+                    "-m", "m1x",
                     "--module-source-path", src.toString())
                 .run(Task.Expect.FAIL)
                 .writeAll()
@@ -137,17 +137,17 @@ public class MOptionTest extends ModuleTestBase {
     @Test
     public void testNoModuleSourcePath(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                        "-m", "m1",
+                        "-m", "m1x",
                         "-d", build.toString())
                 .run(Task.Expect.FAIL)
                 .writeAll()
@@ -160,29 +160,29 @@ public class MOptionTest extends ModuleTestBase {
     @Test
     public void testMultiModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
-        Path m2 = src.resolve("m2");
+        Path m1 = src.resolve("m1x");
+        Path m2 = src.resolve("m2x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package p1; public class C1 {}");
 
         tb.writeJavaFiles(m2,
-                "module m2 {}",
+                "module m2x {}",
                 "package p2; public class C2 {}");
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
-        Path m1ModuleInfoClass = build.resolve("m1/module-info.class");
-        Path classC1 = build.resolve("m1/p1/C1.class");
+        Path m1ModuleInfoClass = build.resolve("m1x/module-info.class");
+        Path classC1 = build.resolve("m1x/p1/C1.class");
 
-        Path m2ModuleInfoClass = build.resolve("m2/module-info.class");
-        Path classC2 = build.resolve("m2/p2/C2.class");
+        Path m2ModuleInfoClass = build.resolve("m2x/module-info.class");
+        Path classC2 = build.resolve("m2x/p2/C2.class");
 
         FileTime m1ModuleInfoTimeStamp = Files.getLastModifiedTime(m1ModuleInfoClass);
         FileTime C1TimeStamp = Files.getLastModifiedTime(classC1);
@@ -215,7 +215,7 @@ public class MOptionTest extends ModuleTestBase {
         Thread.sleep(2000); //timestamps
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
@@ -241,7 +241,7 @@ public class MOptionTest extends ModuleTestBase {
         Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
diff --git a/langtools/test/tools/javac/modules/ModuleFinderTest.java b/langtools/test/tools/javac/modules/ModuleFinderTest.java
index f11ca7c801b..56bf4a3c229 100644
--- a/langtools/test/tools/javac/modules/ModuleFinderTest.java
+++ b/langtools/test/tools/javac/modules/ModuleFinderTest.java
@@ -38,7 +38,6 @@ import java.nio.file.Path;
 import toolbox.JarTask;
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class ModuleFinderTest extends ModuleTestBase {
 
@@ -50,7 +49,7 @@ public class ModuleFinderTest extends ModuleTestBase {
     @Test
     public void testDuplicateModulesOnPath(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m1 { }");
+        tb.writeJavaFiles(src, "module m1x { }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -63,18 +62,18 @@ public class ModuleFinderTest extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        new JarTask(tb, modules.resolve("m1-1.jar"))
+        new JarTask(tb, modules.resolve("m1x-1.jar"))
                 .baseDir(classes)
                 .files(".")
                 .run();
 
-        new JarTask(tb, modules.resolve("m1-2.jar"))
+        new JarTask(tb, modules.resolve("m1x-2.jar"))
                 .baseDir(classes)
                 .files(".")
                 .run();
 
         Path src2 = base.resolve("src2");
-        tb.writeJavaFiles(src2, "module m2 { requires m1; }");
+        tb.writeJavaFiles(src2, "module m2x { requires m1x; }");
 
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
@@ -85,7 +84,7 @@ public class ModuleFinderTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("- compiler.err.duplicate.module.on.path: (compiler.misc.locn.module_path), m1"))
+        if (!log.contains("- compiler.err.duplicate.module.on.path: (compiler.misc.locn.module_path), m1x"))
             throw new Exception("expected output not found");
     }
 }
diff --git a/langtools/test/tools/javac/modules/ModuleInfoTest.java b/langtools/test/tools/javac/modules/ModuleInfoTest.java
index 7adec9b85fe..3d08be1cecc 100644
--- a/langtools/test/tools/javac/modules/ModuleInfoTest.java
+++ b/langtools/test/tools/javac/modules/ModuleInfoTest.java
@@ -34,14 +34,12 @@
  * @run main ModuleInfoTest
  */
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class ModuleInfoTest extends ModuleTestBase {
 
@@ -137,21 +135,129 @@ public class ModuleInfoTest extends ModuleTestBase {
     }
 
     /**
-     * Verify that missing exports are reported.
+     * Verify that missing exports targets are reported.
      */
     @Test
     public void testExportsNotFound(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module M1 { exports p to M2; }");
+        tb.writeJavaFiles(src,
+                          "module M { exports p to N; }",
+                          "package p; public class C {}");
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics")
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
+                .files(findJavaFiles(src))
+                .run()
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.contains("module-info.java:1:25: compiler.warn.module.not.found: N"))
+            throw new Exception("expected output not found, actual output: " + log);
+    }
+
+    /**
+     * Verify that duplicated qualified missing exports targets are reported.
+     */
+    @Test
+    public void testExportsNotFoundDuplicated(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "module M { exports p to N, N; }",
+                          "package p; public class C {}");
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:26: compiler.err.module.not.found: M2"))
-            throw new Exception("expected output not found");
+        if (!log.contains("module-info.java:1:28: compiler.err.conflicting.exports.to.module: N"))
+            throw new Exception("expected output not found, actual output: " + log);
+    }
+
+    /**
+     * Verify that missing exports target warning can be suppressed.
+     */
+    @Test
+    public void testExportsNotFoundSuppress(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "@SuppressWarnings(\"module\") module M { exports p to N; }",
+                          "package p; public class C {}");
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
+                .files(findJavaFiles(src))
+                .run()
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.isEmpty())
+            throw new Exception("expected output not found, actual output: " + log);
+    }
+
+    /**
+     * Verify that missing opens targets are reported.
+     */
+    @Test
+    public void testOpensNotFound(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "module M { opens p to N; }",
+                          "package p; public class C {}");
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
+                .files(findJavaFiles(src))
+                .run()
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.contains("module-info.java:1:23: compiler.warn.module.not.found: N"))
+            throw new Exception("expected output not found, actual output: " + log);
+    }
+
+    /**
+     * Verify that duplicated qualified missing opens targets are reported.
+     */
+    @Test
+    public void testOpensNotFoundDuplicated(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "module M { opens p to N, N; }",
+                          "package p; public class C {}");
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.contains("module-info.java:1:26: compiler.err.conflicting.opens.to.module: N"))
+            throw new Exception("expected output not found, actual output: " + log);
+    }
+
+    /**
+     * Verify that missing opens target warning can be suppressed.
+     */
+    @Test
+    public void testOpensNotFoundSuppress(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "@SuppressWarnings(\"module\") module M { opens p to N; }",
+                          "package p; public class C {}");
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module")
+                .files(findJavaFiles(src))
+                .run()
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.isEmpty())
+            throw new Exception("expected output not found, actual output: " + log);
     }
 
     /**
@@ -178,12 +284,12 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testRequiresLoop(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { requires m2; }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires m3; }");
-        Path src_m3 = src.resolve("m3");
-        tb.writeFile(src_m3.resolve("module-info.java"), "module m3 { requires m1; }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeFile(src_m1.resolve("module-info.java"), "module m1x { requires m2x; }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeFile(src_m2.resolve("module-info.java"), "module m2x { requires m3x; }");
+        Path src_m3 = src.resolve("m3x");
+        tb.writeFile(src_m3.resolve("module-info.java"), "module m3x { requires m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -196,7 +302,7 @@ public class ModuleInfoTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:22: compiler.err.cyclic.requires: m3"))
+        if (!log.contains("module-info.java:1:23: compiler.err.cyclic.requires: m3x"))
             throw new Exception("expected output not found");
     }
 
@@ -206,12 +312,12 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testRequiresTransitiveLoop(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { requires m2; }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires transitive m3; }");
-        Path src_m3 = src.resolve("m3");
-        tb.writeFile(src_m3.resolve("module-info.java"), "module m3 { requires m1; }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeFile(src_m1.resolve("module-info.java"), "module m1x { requires m2x; }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeFile(src_m2.resolve("module-info.java"), "module m2x { requires transitive m3x; }");
+        Path src_m3 = src.resolve("m3x");
+        tb.writeFile(src_m3.resolve("module-info.java"), "module m3x { requires m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -224,7 +330,7 @@ public class ModuleInfoTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:33: compiler.err.cyclic.requires: m3"))
+        if (!log.contains("module-info.java:1:34: compiler.err.cyclic.requires: m3x"))
             throw new Exception("expected output not found");
     }
 
@@ -234,10 +340,10 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testDuplicateRequires(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires m1; requires m1; }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeFile(src_m1.resolve("module-info.java"), "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeFile(src_m2.resolve("module-info.java"), "module m2x { requires m1x; requires m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -250,7 +356,7 @@ public class ModuleInfoTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:35: compiler.err.duplicate.requires: m1"))
+        if (!log.contains("module-info.java:1:37: compiler.err.duplicate.requires: m1x"))
             throw new Exception("expected output not found");
     }
 
@@ -260,10 +366,10 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testDuplicateRequiresTransitiveStatic(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires transitive m1; requires static m1; }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeFile(src_m1.resolve("module-info.java"), "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeFile(src_m2.resolve("module-info.java"), "module m2x { requires transitive m1x; requires static m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -276,7 +382,7 @@ public class ModuleInfoTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:53: compiler.err.duplicate.requires: m1"))
+        if (!log.contains("module-info.java:1:55: compiler.err.duplicate.requires: m1x"))
             throw new Exception("expected output not found");
     }
 
@@ -290,64 +396,64 @@ public class ModuleInfoTest extends ModuleTestBase {
                                           null);
         verifyConflictingExports_packages(base,
                                           "exports p; exports p;",
-                                          "module-info.java:1:32: compiler.err.conflicting.exports: p");
+                                          "module-info.java:1:33: compiler.err.conflicting.exports: p");
         verifyConflictingExports_packages(base,
                                           "exports p; opens p;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "exports p; exports p to m2;",
-                                          "module-info.java:1:32: compiler.err.conflicting.exports: p");
+                                          "exports p; exports p to m2x;",
+                                          "module-info.java:1:33: compiler.err.conflicting.exports: p");
         verifyConflictingExports_packages(base,
-                                          "exports p; opens p to m2;",
+                                          "exports p; opens p to m2x;",
                                           null);
         verifyConflictingExports_packages(base,
                                           "opens p; exports p;",
                                           null);
         verifyConflictingExports_packages(base,
                                           "opens p; opens p;",
-                                          "module-info.java:1:28: compiler.err.conflicting.opens: p");
+                                          "module-info.java:1:29: compiler.err.conflicting.opens: p");
         verifyConflictingExports_packages(base,
-                                          "opens p; exports p to m2;",
+                                          "opens p; exports p to m2x;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p; opens p to m2;",
-                                          "module-info.java:1:28: compiler.err.conflicting.opens: p");
+                                          "opens p; opens p to m2x;",
+                                          "module-info.java:1:29: compiler.err.conflicting.opens: p");
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; exports p;",
-                                          "module-info.java:1:38: compiler.err.conflicting.exports: p");
+                                          "exports p to m2x; exports p;",
+                                          "module-info.java:1:40: compiler.err.conflicting.exports: p");
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; opens p;",
+                                          "exports p to m2x; opens p;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; exports p to m2;",
-                                          "module-info.java:1:43: compiler.err.conflicting.exports.to.module: m2");
+                                          "exports p to m2x; exports p to m2x;",
+                                          "module-info.java:1:45: compiler.err.conflicting.exports.to.module: m2x");
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; opens p to m2;",
+                                          "exports p to m2x; opens p to m2x;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; exports p;",
+                                          "opens p to m2x; exports p;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; opens p;",
-                                          "module-info.java:1:34: compiler.err.conflicting.opens: p");
+                                          "opens p to m2x; opens p;",
+                                          "module-info.java:1:36: compiler.err.conflicting.opens: p");
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; exports p to m2;",
+                                          "opens p to m2x; exports p to m2x;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; opens p to m2;",
-                                          "module-info.java:1:34: compiler.err.conflicting.opens: p");
+                                          "opens p to m2x; opens p to m2x;",
+                                          "module-info.java:1:36: compiler.err.conflicting.opens: p");
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; exports p to m3;",
-                                          "module-info.java:1:38: compiler.err.conflicting.exports: p");
+                                          "exports p to m2x; exports p to m3x;",
+                                          "module-info.java:1:40: compiler.err.conflicting.exports: p");
         verifyConflictingExports_packages(base,
-                                          "exports p to m2; opens p to m3;",
+                                          "exports p to m2x; opens p to m3x;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; exports p to m3;",
+                                          "opens p to m2x; exports p to m3x;",
                                           null);
         verifyConflictingExports_packages(base,
-                                          "opens p to m2; opens p to m3;",
-                                          "module-info.java:1:34: compiler.err.conflicting.opens: p");
+                                          "opens p to m2x; opens p to m3x;",
+                                          "module-info.java:1:36: compiler.err.conflicting.opens: p");
     }
 
     private void verifyConflictingExports_packages(Path base, String code, String expected) throws Exception {
@@ -355,14 +461,14 @@ public class ModuleInfoTest extends ModuleTestBase {
         tb.cleanDirectory(base);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                          "module m1 { " + code + " }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                          "module m1x { " + code + " }",
                           "package p; public class P {}",
                           "package q; public class Q {}");
-        tb.writeJavaFiles(src.resolve("m2"),
-                          "module m2 { requires m1; }");
-        tb.writeJavaFiles(src.resolve("m3"),
-                          "module m3 { requires m1; }");
+        tb.writeJavaFiles(src.resolve("m2x"),
+                          "module m2x { requires m1x; }");
+        tb.writeJavaFiles(src.resolve("m3x"),
+                          "module m3x { requires m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -386,10 +492,10 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testConflictingExports_modules(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { exports p to m1, m1; }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeFile(src_m1.resolve("module-info.java"), "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeFile(src_m2.resolve("module-info.java"), "module m2x { exports p to m1x, m1x; }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -402,7 +508,7 @@ public class ModuleInfoTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:30: compiler.err.conflicting.exports.to.module: m1"))
+        if (!log.contains("module-info.java:1:32: compiler.err.conflicting.exports.to.module: m1x"))
             throw new Exception("expected output not found");
     }
 
@@ -413,7 +519,7 @@ public class ModuleInfoTest extends ModuleTestBase {
     @Test
     public void testAnnotations(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1.sub");
+        Path src_m1 = src.resolve("m1x.sub");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
 
diff --git a/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java b/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java
index 3cd1e783f20..8d7b73cd1d6 100644
--- a/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java
+++ b/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java
@@ -46,7 +46,6 @@ import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.api.JavacTrees;
 
-import toolbox.ToolBox;
 
 public class ModuleInfoTreeAccess extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -66,14 +65,14 @@ public class ModuleInfoTreeAccess extends ModuleTestBase {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
             Path src = base.resolve("src");
-            tb.writeJavaFiles(src, "/** Test module */ module m1 {}");
+            tb.writeJavaFiles(src, "/** Test module */ module m1x {}");
 
             Iterable files = fm.getJavaFileObjects(findJavaFiles(src));
             JavacTask task = (JavacTask) compiler.getTask(null, fm, null, null, null, files);
 
             task.analyze();
             JavacTrees trees = JavacTrees.instance(task);
-            ModuleElement mdle = (ModuleElement) task.getElements().getModuleElement("m1");
+            ModuleElement mdle = (ModuleElement) task.getElements().getModuleElement("m1x");
 
             TreePath path = trees.getPath(mdle);
             assertNotNull("path", path);
@@ -91,14 +90,14 @@ public class ModuleInfoTreeAccess extends ModuleTestBase {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) {
             Path src = base.resolve("src");
-            tb.writeJavaFiles(src, "import java.lang.Deprecated; /** Test module */ @Deprecated module m1 {}");
+            tb.writeJavaFiles(src, "import java.lang.Deprecated; /** Test module */ @Deprecated module m1x {}");
 
             Iterable files = fm.getJavaFileObjects(findJavaFiles(src));
             JavacTask task = (JavacTask) compiler.getTask(null, fm, null, null, null, files);
 
             task.analyze();
             JavacTrees trees = JavacTrees.instance(task);
-            ModuleElement mdle = (ModuleElement) task.getElements().getModuleElement("m1");
+            ModuleElement mdle = (ModuleElement) task.getElements().getModuleElement("m1x");
 
             TreePath path = trees.getPath(mdle);
             assertNotNull("path", path);
diff --git a/langtools/test/tools/javac/modules/ModulePathTest.java b/langtools/test/tools/javac/modules/ModulePathTest.java
index e5efb2b720e..7315ad10e66 100644
--- a/langtools/test/tools/javac/modules/ModulePathTest.java
+++ b/langtools/test/tools/javac/modules/ModulePathTest.java
@@ -113,7 +113,7 @@ public class ModulePathTest extends ModuleTestBase {
     public void testExplodedModuleOnPath(Path base) throws Exception {
         Path modSrc = base.resolve("modSrc");
         tb.writeJavaFiles(modSrc,
-                "module m1 { exports p; }",
+                "module m1x { exports p; }",
                 "package p; public class CC { }");
         Path modClasses = base.resolve("modClasses");
         Files.createDirectories(modClasses);
@@ -126,7 +126,7 @@ public class ModulePathTest extends ModuleTestBase {
 
         Path src = base.resolve("src");
         tb.writeJavaFiles(src,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -142,11 +142,11 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void testBadExplodedModuleOnPath(Path base) throws Exception {
         Path modClasses = base.resolve("modClasses");
-        tb.writeFile(modClasses.resolve("module-info.class"), "module m1 { }");
+        tb.writeFile(modClasses.resolve("module-info.class"), "module m1x { }");
 
         Path src = base.resolve("src");
         tb.writeJavaFiles(src,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -201,7 +201,7 @@ public class ModulePathTest extends ModuleTestBase {
     public void testModJarOnPath(Path base) throws Exception {
         Path jarSrc = base.resolve("jarSrc");
         tb.writeJavaFiles(jarSrc,
-                "module m1 { exports p; }",
+                "module m1x { exports p; }",
                 "package p; public class CC { }");
         Path jarClasses = base.resolve("jarClasses");
         Files.createDirectories(jarClasses);
@@ -220,7 +220,7 @@ public class ModulePathTest extends ModuleTestBase {
 
         Path src = base.resolve("src");
         tb.writeJavaFiles(src,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -255,7 +255,7 @@ public class ModulePathTest extends ModuleTestBase {
     public void testJModOnPath(Path base) throws Exception {
         Path jmodSrc = base.resolve("jmodSrc");
         tb.writeJavaFiles(jmodSrc,
-                "module m1 { exports p; }",
+                "module m1x { exports p; }",
                 "package p; public class CC { }");
         Path jmodClasses = base.resolve("jmodClasses");
         Files.createDirectories(jmodClasses);
@@ -271,7 +271,7 @@ public class ModulePathTest extends ModuleTestBase {
 
         Path src = base.resolve("src");
         tb.writeJavaFiles(src,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -305,10 +305,10 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void relativePath(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1").build(modules);
+        new ModuleBuilder(tb, "m1x").build(modules);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
@@ -321,10 +321,10 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void duplicatePaths_1(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1").build(modules);
+        new ModuleBuilder(tb, "m1x").build(modules);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
@@ -337,10 +337,10 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void duplicatePaths_2(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1").build(modules);
+        new ModuleBuilder(tb, "m1x").build(modules);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
@@ -354,20 +354,20 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void oneModuleHidesAnother(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(modules);
 
         Path deepModuleDirSrc = base.resolve("deepModuleDirSrc");
         Path deepModuleDir = modules.resolve("deepModuleDir");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class E { }")
                 .build(deepModuleDirSrc, deepModuleDir);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }", " package p; class A { void main() { pkg2.E.class.getName(); } }");
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }", " package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
@@ -380,23 +380,23 @@ public class ModulePathTest extends ModuleTestBase {
     @Test
     public void modulesInDifferentContainers(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("one")
                 .classes("package one; public class A { }")
                 .build(modules);
 
-        new ModuleBuilder(tb, "m2")
-                .requires("m1", modules)
+        new ModuleBuilder(tb, "m2x")
+                .requires("m1x", modules)
                 .build(base.resolve("tmp"));
-        jar(base.resolve("tmp/m2"), modules.resolve("m2.jar"));
+        jar(base.resolve("tmp/m2x"), modules.resolve("m2x.jar"));
 
-        new ModuleBuilder(tb, "m3")
-                .requires("m2", modules)
+        new ModuleBuilder(tb, "m3x")
+                .requires("m2x", modules)
                 .build(base.resolve("tmp"));
-        jmod(base.resolve("tmp/m3"), modules.resolve("m3.jmod"));
+        jmod(base.resolve("tmp/m3x"), modules.resolve("m3x.jmod"));
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m { requires m3; requires m2; requires m1; }",
+        tb.writeJavaFiles(src, "module m { requires m3x; requires m2x; requires m1x; }",
                 "package p; class A { void main() { one.A.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
diff --git a/langtools/test/tools/javac/modules/ModuleSourcePathTest.java b/langtools/test/tools/javac/modules/ModuleSourcePathTest.java
index 07deb3b9c17..68b490d484d 100644
--- a/langtools/test/tools/javac/modules/ModuleSourcePathTest.java
+++ b/langtools/test/tools/javac/modules/ModuleSourcePathTest.java
@@ -76,8 +76,8 @@ public class ModuleSourcePathTest extends ModuleTestBase {
     @Test
     public void testUnnormalizedPath1(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeJavaFiles(src_m1, "module m1 { }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeJavaFiles(src_m1, "module m1x { }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
@@ -93,8 +93,8 @@ public class ModuleSourcePathTest extends ModuleTestBase {
     @Test
     public void testUnnormalizedPath2(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeJavaFiles(src_m1, "module m1 { }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeJavaFiles(src_m1, "module m1x { }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
@@ -124,15 +124,15 @@ public class ModuleSourcePathTest extends ModuleTestBase {
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                         "--module-source-path", base + "/{src1,src2/inner_dir}")
-                .files(base.resolve("src1/m0/pkg0/A.java"), base.resolve("src2/inner_dir/m1/pkg1/A.java"))
+                .files(base.resolve("src1/m0x/pkg0/A.java"), base.resolve("src2/inner_dir/m1x/pkg1/A.java"))
                 .outdir(modules)
                 .run()
                 .writeAll();
 
-        checkFiles(modules.resolve("m0/pkg0/A.class"),
-                modules.resolve("m1/pkg1/A.class"),
-                modules.resolve("m0/module-info.class"),
-                modules.resolve("m1/module-info.class"));
+        checkFiles(modules.resolve("m0x/pkg0/A.class"),
+                modules.resolve("m1x/pkg1/A.class"),
+                modules.resolve("m0x/module-info.class"),
+                modules.resolve("m1x/module-info.class"));
     }
 
     @Test
@@ -191,9 +191,9 @@ public class ModuleSourcePathTest extends ModuleTestBase {
                 .writeAll();
 
         for (int i = 0; i < modulePaths.length; i++) {
-            checkFiles(modules.resolve("m" + i + "/module-info.class"));
+            checkFiles(modules.resolve("m" + i + "x/module-info.class"));
         }
-        checkFiles(modules.resolve("m8/pkg8/A.class"));
+        checkFiles(modules.resolve("m8x/pkg8/A.class"));
     }
 
     @Test
@@ -298,7 +298,7 @@ public class ModuleSourcePathTest extends ModuleTestBase {
     @Test
     public void duplicatePaths(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"), "module m1 { }", "package a; class A { }");
+        tb.writeJavaFiles(src.resolve("m1x"), "module m1x { }", "package a; class A { }");
 
         final Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -306,17 +306,17 @@ public class ModuleSourcePathTest extends ModuleTestBase {
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                         "--module-source-path", base + "/{src,src,src}")
-                .files(src.resolve("m1/a/A.java"))
+                .files(src.resolve("m1x/a/A.java"))
                 .outdir(modules)
                 .run()
                 .writeAll();
 
-        checkFiles(modules.resolve("m1/module-info.class"));
+        checkFiles(modules.resolve("m1x/module-info.class"));
     }
 
     @Test
     public void notExistentPaths(Path base) throws Exception {
-        tb.writeJavaFiles(base.resolve("m1"), "module m1 { requires m0; }", "package a; class A { }");
+        tb.writeJavaFiles(base.resolve("m1x"), "module m1x { requires m0x; }", "package a; class A { }");
 
         final Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -324,18 +324,18 @@ public class ModuleSourcePathTest extends ModuleTestBase {
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                         "--module-source-path", base + "/not_exist" + PATH_SEP + base + "/{not_exist,}")
-                .files(base.resolve("m1/a/A.java"))
+                .files(base.resolve("m1x/a/A.java"))
                 .outdir(modules)
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
-        if (!log.contains("compiler.err.module.not.found: m0"))
+        if (!log.contains("compiler.err.module.not.found: m0x"))
             throw new Exception("expected output for not existent module source path not found");
     }
 
     @Test
     public void notExistentPathShouldBeSkipped(Path base) throws Exception {
-        tb.writeJavaFiles(base.resolve("m1"), "module m1 { }", "package a; class A { }");
+        tb.writeJavaFiles(base.resolve("m1x"), "module m1x { }", "package a; class A { }");
 
         final Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -343,18 +343,18 @@ public class ModuleSourcePathTest extends ModuleTestBase {
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                         "--module-source-path", base + "{/not_exist,/}")
-                .files(base.resolve("m1/a/A.java"))
+                .files(base.resolve("m1x/a/A.java"))
                 .outdir(modules)
                 .run()
                 .writeAll();
 
-        checkFiles(modules.resolve("m1/module-info.class"));
+        checkFiles(modules.resolve("m1x/module-info.class"));
     }
 
     @Test
     public void commas(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"), "module m1 { }", "package a; class A { }");
+        tb.writeJavaFiles(src.resolve("m1x"), "module m1x { }", "package a; class A { }");
 
         final Path modules = base.resolve("modules");
         tb.createDirectories(modules);
@@ -362,12 +362,12 @@ public class ModuleSourcePathTest extends ModuleTestBase {
         new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics",
                         "--module-source-path", base + "/{,{,,,,src,,,}}")
-                .files(src.resolve("m1/a/A.java"))
+                .files(src.resolve("m1x/a/A.java"))
                 .outdir(modules)
                 .run()
                 .writeAll();
 
-        checkFiles(modules.resolve("m1/module-info.class"));
+        checkFiles(modules.resolve("m1x/module-info.class"));
     }
 
     @Test
@@ -444,8 +444,8 @@ public class ModuleSourcePathTest extends ModuleTestBase {
 
     private void generateModules(Path base, String... paths) throws IOException {
         for (int i = 0; i < paths.length; i++) {
-            String moduleName = "m" + i;
-            String dependency = i > 0 ? "requires m" + (i - 1) + ";" : "";
+            String moduleName = "m" + i + "x";
+            String dependency = i > 0 ? "requires m" + (i - 1) + "x;" : "";
             tb.writeJavaFiles(base.resolve(paths[i]).resolve(moduleName),
                     "module " + moduleName + " { " + dependency + " }",
                     "package pkg" + i + "; class A { }");
diff --git a/langtools/test/tools/javac/modules/ModuleVersion.java b/langtools/test/tools/javac/modules/ModuleVersion.java
new file mode 100644
index 00000000000..5ae6757475b
--- /dev/null
+++ b/langtools/test/tools/javac/modules/ModuleVersion.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary simple tests of module uses
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
+ * @run main ModuleVersion
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPoolException;
+import com.sun.tools.classfile.Module_attribute;
+import toolbox.JavacTask;
+import toolbox.Task.Expect;
+import toolbox.Task.OutputKind;
+
+public class ModuleVersion extends ModuleTestBase {
+    public static void main(String... args) throws Exception {
+        ModuleVersion t = new ModuleVersion();
+        t.runTests();
+    }
+
+    @Test
+    public void testSetSingleModuleVersion(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                "module m { }");
+        Path classes = base.resolve("classes");
+        Files.createDirectories(classes);
+
+        String version = "1.2.3.4";
+
+        new JavacTask(tb)
+            .options("--module-version", version)
+            .outdir(classes)
+            .files(findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        checkModuleVersion(classes.resolve("module-info.class"), version);
+    }
+
+    @Test
+    public void testMultipleModuleVersions(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path m1 = src.resolve("m1");
+        tb.writeJavaFiles(m1,
+                "module m1 { }");
+        Path m2 = src.resolve("m2");
+        tb.writeJavaFiles(m2,
+                "module m2 { }");
+        Path classes = base.resolve("classes");
+        Files.createDirectories(classes);
+
+        String version = "1.2.3.4";
+
+        new JavacTask(tb)
+            .options("--module-source-path", src.toString(),
+                     "--module-version", version)
+            .outdir(classes)
+            .files(findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        checkModuleVersion(classes.resolve("m1").resolve("module-info.class"), version);
+        checkModuleVersion(classes.resolve("m2").resolve("module-info.class"), version);
+
+        String log = new JavacTask(tb, JavacTask.Mode.CMDLINE)
+            .options("--module-source-path", src.toString(),
+                     "--module-version", "b",
+                     "-XDrawDiagnostics")
+            .outdir(classes)
+            .files(findJavaFiles(src))
+            .run(Expect.FAIL)
+            .writeAll()
+            .getOutput(OutputKind.DIRECT);
+
+        String expectedLog = "bad value for --module-version option: 'b'";
+
+        if (!log.contains(expectedLog)) {
+            throw new AssertionError("Incorrect log: " + log);
+        }
+    }
+
+    private void checkModuleVersion(Path classfile, String version) throws IOException, ConstantPoolException {
+        ClassFile cf = ClassFile.read(classfile);
+
+        Module_attribute moduleAttribute = (Module_attribute) cf.attributes.get(Attribute.Module);
+
+        if (moduleAttribute == null) {
+            throw new AssertionError("Version attribute missing!");
+        }
+
+        String actualVersion = cf.constant_pool.getUTF8Value(moduleAttribute.module_version_index);
+
+        if (!version.equals(actualVersion)) {
+            throw new AssertionError("Incorrect version in the classfile: " + actualVersion);
+        }
+    }
+
+}
diff --git a/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java b/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java
index fc5b51ac777..e88aeadc93b 100644
--- a/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java
+++ b/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java
@@ -58,14 +58,14 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
         Path jar = prepareTestJar(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m { }",
                           "package impl; public class Impl { api.Api api; }");
 
         List modLog = new JavacTask(tb)
@@ -86,7 +86,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
 
         new JavacTask(tb)
           .options("--class-path", jar.toString(),
-                   "--add-reads", "m1=ALL-UNNAMED")
+                   "--add-reads", "m=ALL-UNNAMED")
           .outdir(classes)
           .files(findJavaFiles(moduleSrc))
           .run()
@@ -95,7 +95,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
 
         new JavacTask(tb)
           .options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
-                   "--add-reads", "m1=ALL-UNNAMED",
+                   "--add-reads", "m=ALL-UNNAMED",
                    "-processor", ProcessorImpl.class.getName())
           .outdir(classes)
           .files(findJavaFiles(moduleSrc))
@@ -109,14 +109,14 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
         Path jar = prepareTestJar(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m { }",
                           "package impl; public class Impl { api.Api api; }");
 
         List modLog = new JavacTask(tb)
@@ -142,14 +142,14 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
         Path jar = prepareTestJar(base);
 
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m { }",
                           "package impl; public class Impl { api.Api api; }");
 
         new JavacTask(tb)
@@ -222,14 +222,14 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
     @Test
     public void testClassOutputVisibleForIncrementalCompilation(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m");
 
         Path classes = base.resolve("classes");
 
         Files.createDirectories(classes);
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports impl; }",
+                          "module m { exports impl; }",
                           "package impl; public class Impl { }",
                           "package src; public class Src { }",
                           "package test; public class TestCP extends impl.Impl { }",
diff --git a/langtools/test/tools/javac/modules/MultiModuleModeTest.java b/langtools/test/tools/javac/modules/MultiModuleModeTest.java
index 90fb571d815..437a675bea3 100644
--- a/langtools/test/tools/javac/modules/MultiModuleModeTest.java
+++ b/langtools/test/tools/javac/modules/MultiModuleModeTest.java
@@ -51,10 +51,10 @@ public class MultiModuleModeTest extends ModuleTestBase {
     @Test
     public void testDuplicateModules(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeJavaFiles(src_m1, "module m1 { }");
-        Path src_m2 = src.resolve("m2");
-        tb.writeJavaFiles(src_m2, "module m1 { }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeJavaFiles(src_m1, "module m1x { }");
+        Path src_m2 = src.resolve("m2x");
+        tb.writeJavaFiles(src_m2, "module m1x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
@@ -67,15 +67,15 @@ public class MultiModuleModeTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:1: compiler.err.duplicate.module: m1"))
+        if (!log.contains("module-info.java:1:1: compiler.err.duplicate.module: m1x"))
             throw new Exception("expected output not found");
     }
 
     @Test
     public void testCantFindModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeJavaFiles(src_m1, "module m1 { }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeJavaFiles(src_m1, "module m1x { }");
         Path misc = base.resolve("misc");
         tb.writeJavaFiles(misc, "package p; class C { }");
         Path classes = base.resolve("classes");
@@ -97,8 +97,8 @@ public class MultiModuleModeTest extends ModuleTestBase {
     @Test
     public void testModuleNameMismatch(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path src_m1 = src.resolve("m1");
-        tb.writeJavaFiles(src_m1, "module m2 { }");
+        Path src_m1 = src.resolve("m1x");
+        tb.writeJavaFiles(src_m1, "module m2x { }");
         Path classes = base.resolve("classes");
         tb.createDirectories(classes);
 
@@ -111,22 +111,22 @@ public class MultiModuleModeTest extends ModuleTestBase {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("module-info.java:1:8: compiler.err.module.name.mismatch: m2, m1"))
+        if (!log.contains("module-info.java:1:8: compiler.err.module.name.mismatch: m2x, m1x"))
             throw new Exception("expected output not found");
     }
 
     @Test
     public void testImplicitModuleSource(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"), "module m1 { }");
-        tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; }");
+        tb.writeJavaFiles(src.resolve("m1x"), "module m1x { }");
+        tb.writeJavaFiles(src.resolve("m2x"), "module m2x { requires m1x; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
         new JavacTask(tb)
                 .options("--module-source-path", src.toString())
                 .outdir(modules)
-                .files(src.resolve("m2/module-info.java"))
+                .files(src.resolve("m2x/module-info.java"))
                 .run()
                 .writeAll();
     }
@@ -134,19 +134,19 @@ public class MultiModuleModeTest extends ModuleTestBase {
     @Test
     public void testImplicitModuleClass(Path base) throws Exception {
         Path src1 = base.resolve("src1");
-        tb.writeJavaFiles(src1.resolve("m1"), "module m1 { }");
+        tb.writeJavaFiles(src1.resolve("m1x"), "module m1x { }");
         Path modules1 = base.resolve("modules1");
         Files.createDirectories(modules1);
 
         new JavacTask(tb)
                 .options("--module-source-path", src1.toString())
                 .outdir(modules1)
-                .files(src1.resolve("m1/module-info.java"))
+                .files(src1.resolve("m1x/module-info.java"))
                 .run()
                 .writeAll();
 
         Path src2= base.resolve("src2");
-        tb.writeJavaFiles(src2.resolve("m2"), "module m2 { requires m1; }");
+        tb.writeJavaFiles(src2.resolve("m2x"), "module m2x { requires m1x; }");
         Path modules2 = base.resolve("modules2");
         Files.createDirectories(modules2);
 
@@ -154,7 +154,7 @@ public class MultiModuleModeTest extends ModuleTestBase {
                 .options("--module-path", modules1.toString(),
                         "--module-source-path", src2.toString())
                 .outdir(modules2)
-                .files(src2.resolve("m2/module-info.java"))
+                .files(src2.resolve("m2x/module-info.java"))
                 .run()
                 .writeAll();
     }
diff --git a/langtools/test/tools/javac/modules/OpenModulesTest.java b/langtools/test/tools/javac/modules/OpenModulesTest.java
index 9d477fbf9b4..52ec90b8a82 100644
--- a/langtools/test/tools/javac/modules/OpenModulesTest.java
+++ b/langtools/test/tools/javac/modules/OpenModulesTest.java
@@ -61,14 +61,14 @@ public class OpenModulesTest extends ModuleTestBase {
 
     @Test
     public void testStrongModule(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
+        Path m1 = base.resolve("m1x");
         tb.writeJavaFiles(m1,
-                          "module m1 { exports api1; opens api2; }",
+                          "module m1x { exports api1; opens api2; }",
                           "package api1; public class Api1 {}",
                           "package api2; public class Api2 {}",
                           "package impl; public class Impl {}");
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         tb.createDirectories(m1Classes);
 
         String log = new JavacTask(tb)
@@ -87,9 +87,10 @@ public class OpenModulesTest extends ModuleTestBase {
                 .run()
                 .writeAll()
                 .getOutput(OutputKind.DIRECT)
-                .replace(System.getProperty("line.separator"), "\n");
+                .replace(System.getProperty("line.separator"), "\n")
+                .replaceAll("@[^;]*;", ";");
 
-        String expected = "module m1 {\n" +
+        String expected = "module m1x {\n" +
                           "  requires java.base;\n" +
                           "  exports api1;\n" +
                           "  opens api2;\n" +
@@ -100,11 +101,11 @@ public class OpenModulesTest extends ModuleTestBase {
         }
 
         //compiling against a strong module read from binary:
-        Path m2 = base.resolve("m2");
+        Path m2 = base.resolve("m2x");
         tb.writeJavaFiles(m2,
-                          "module m2 { requires m1; }",
+                          "module m2x { requires m1x; }",
                           "package test; public class Test { api1.Api1 a1; api2.Api2 a2; }");
-        Path m2Classes = classes.resolve("m2");
+        Path m2Classes = classes.resolve("m2x");
         tb.createDirectories(m2Classes);
 
         List log2 = new JavacTask(tb)
@@ -124,14 +125,14 @@ public class OpenModulesTest extends ModuleTestBase {
 
     @Test
     public void testOpenModule(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
+        Path m1 = base.resolve("m1x");
         tb.writeJavaFiles(m1,
-                          "open module m1 { exports api1; }",
+                          "open module m1x { exports api1; }",
                           "package api1; public class Api1 {}",
                           "package api2; public class Api2 {}",
                           "package impl; public class Impl {}");
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         tb.createDirectories(m1Classes);
 
         String log = new JavacTask(tb)
@@ -150,9 +151,10 @@ public class OpenModulesTest extends ModuleTestBase {
                 .run()
                 .writeAll()
                 .getOutput(OutputKind.DIRECT)
-                .replace(System.getProperty("line.separator"), "\n");
+                .replace(System.getProperty("line.separator"), "\n")
+                .replaceAll("@[^;]*;", ";");
 
-        String expected = "open module m1 {\n" +
+        String expected = "open module m1x {\n" +
                           "  requires java.base;\n" +
                           "  exports api1;\n" +
                           "}";
@@ -162,11 +164,11 @@ public class OpenModulesTest extends ModuleTestBase {
         }
 
         //compiling against a ordinary module read from binary:
-        Path m2 = base.resolve("m2");
+        Path m2 = base.resolve("m2x");
         tb.writeJavaFiles(m2,
-                          "module m2 { requires m1; }",
+                          "module m2x { requires m1x; }",
                           "package test; public class Test { api1.Api1 a1; api2.Api2 a2; }");
-        Path m2Classes = classes.resolve("m2");
+        Path m2Classes = classes.resolve("m2x");
         tb.createDirectories(m2Classes);
 
         List log2 = new JavacTask(tb)
@@ -186,14 +188,14 @@ public class OpenModulesTest extends ModuleTestBase {
 
     @Test
     public void testOpenModuleNoOpens(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
+        Path m1 = base.resolve("m1x");
         tb.writeJavaFiles(m1,
-                          "open module m1 { exports api1; opens api2; }",
+                          "open module m1x { exports api1; opens api2; }",
                           "package api1; public class Api1 {}",
                           "package api2; public class Api2 {}",
                           "package impl; public class Impl {}");
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         tb.createDirectories(m1Classes);
 
         List log = new JavacTask(tb)
@@ -204,7 +206,7 @@ public class OpenModulesTest extends ModuleTestBase {
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("module-info.java:1:32: compiler.err.no.opens.unless.strong",
+        List expected = Arrays.asList("module-info.java:1:33: compiler.err.no.opens.unless.strong",
                                               "1 error");
 
         if (!expected.equals(log))
@@ -214,12 +216,12 @@ public class OpenModulesTest extends ModuleTestBase {
 
     @Test
     public void testNonZeroOpensInOpen(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
+        Path m1 = base.resolve("m1x");
         tb.writeJavaFiles(m1,
-                          "module m1 { opens api; }",
+                          "module m1x { opens api; }",
                           "package api; public class Api {}");
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         tb.createDirectories(m1Classes);
 
         new JavacTask(tb)
@@ -235,6 +237,7 @@ public class OpenModulesTest extends ModuleTestBase {
         Module_attribute newModule = new Module_attribute(module.attribute_name_index,
                                                           module.module_name,
                                                           module.module_flags | Module_attribute.ACC_OPEN,
+                                                          module.module_version_index,
                                                           module.requires,
                                                           module.exports,
                                                           module.opens,
@@ -270,14 +273,17 @@ public class OpenModulesTest extends ModuleTestBase {
         List log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
                          "--module-path", classes.toString(),
-                         "--add-modules", "m1")
+                         "--add-modules", "m1x")
                 .outdir(testClasses)
                 .files(findJavaFiles(test))
                 .run(Expect.FAIL)
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("- compiler.err.cant.access: m1.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.non.zero.opens: m1))",
+        List expected = Arrays.asList(
+                "- compiler.err.cant.access: m1x.module-info, "
+                        + "(compiler.misc.bad.class.file.header: module-info.class, "
+                        + "(compiler.misc.module.non.zero.opens: m1x))",
                                               "1 error");
 
         if (!expected.equals(log))
diff --git a/langtools/test/tools/javac/modules/OutputDirTest.java b/langtools/test/tools/javac/modules/OutputDirTest.java
index bbaf64ca411..8420cba58da 100644
--- a/langtools/test/tools/javac/modules/OutputDirTest.java
+++ b/langtools/test/tools/javac/modules/OutputDirTest.java
@@ -100,7 +100,7 @@ public class OutputDirTest extends ModuleTestBase {
     public void testExplodedOutDir(Path base) throws Exception {
         Path modSrc = base.resolve("modSrc");
         tb.writeJavaFiles(modSrc,
-                "module m1 { exports p; }",
+                "module m1x { exports p; }",
                 "package p; public class CC { }");
         Path modClasses = base.resolve("modClasses");
         Files.createDirectories(modClasses);
@@ -114,7 +114,7 @@ public class OutputDirTest extends ModuleTestBase {
         Path src = base.resolve("src");
         Path src_m = src.resolve("m");
         tb.writeJavaFiles(src_m,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
@@ -134,7 +134,7 @@ public class OutputDirTest extends ModuleTestBase {
     public void testInExplodedOutDir(Path base) throws Exception {
         Path modSrc = base.resolve("modSrc");
         tb.writeJavaFiles(modSrc,
-                "module m1 { exports p; }",
+                "module m1x { exports p; }",
                 "package p; public class CC { }");
         Path modClasses = base.resolve("modClasses");
         Files.createDirectories(modClasses);
@@ -147,7 +147,7 @@ public class OutputDirTest extends ModuleTestBase {
 
         Path src = base.resolve("src");
         tb.writeJavaFiles(src,
-                "module m { requires m1 ; }",
+                "module m { requires m1x ; }",
                 "class C { }");
 
         Path classes = modClasses.resolve("m");
diff --git a/langtools/test/tools/javac/modules/PackageConflictTest.java b/langtools/test/tools/javac/modules/PackageConflictTest.java
index 3391d4fb3f7..dda964f8731 100644
--- a/langtools/test/tools/javac/modules/PackageConflictTest.java
+++ b/langtools/test/tools/javac/modules/PackageConflictTest.java
@@ -40,7 +40,6 @@ import java.util.List;
 import toolbox.JavacTask;
 import toolbox.ModuleBuilder;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class PackageConflictTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -70,13 +69,13 @@ public class PackageConflictTest extends ModuleTestBase {
 
     @Test
     public void testDisjoint(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
-        Path m2 = base.resolve("m2");
+        Path m1 = base.resolve("m1x");
+        Path m2 = base.resolve("m2x");
         tb.writeJavaFiles(m1,
-                          "module m1 { }",
+                          "module m1x { }",
                           "package test; public class A { }");
         tb.writeJavaFiles(m2,
-                          "module m2 { }",
+                          "module m2x { }",
                           "package test; public class B { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -91,17 +90,17 @@ public class PackageConflictTest extends ModuleTestBase {
 
     @Test
     public void testConflictInDependencies(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
-        Path m2 = base.resolve("m2");
-        Path m3 = base.resolve("m3");
+        Path m1 = base.resolve("m1x");
+        Path m2 = base.resolve("m2x");
+        Path m3 = base.resolve("m3x");
         tb.writeJavaFiles(m1,
-                          "module m1 { exports test; }",
+                          "module m1x { exports test; }",
                           "package test; public class A { }");
         tb.writeJavaFiles(m2,
-                          "module m2 { exports test; }",
+                          "module m2x { exports test; }",
                           "package test; public class B { }");
         tb.writeJavaFiles(m3,
-                          "module m3 { requires m1; requires m2; }",
+                          "module m3x { requires m1x; requires m2x; }",
                           "package impl; public class Impl { }");
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
@@ -115,7 +114,7 @@ public class PackageConflictTest extends ModuleTestBase {
                        .getOutputLines(Task.OutputKind.DIRECT);
 
         List expected =
-                Arrays.asList("module-info.java:1:1: compiler.err.package.clash.from.requires: m3, test, m1, m2",
+                Arrays.asList("module-info.java:1:1: compiler.err.package.clash.from.requires: m3x, test, m1x, m2x",
                               "1 error");
 
         if (!expected.equals(log)) {
diff --git a/langtools/test/tools/javac/modules/PackageMultipleModules.java b/langtools/test/tools/javac/modules/PackageMultipleModules.java
index f47ba95c096..28899c69c51 100644
--- a/langtools/test/tools/javac/modules/PackageMultipleModules.java
+++ b/langtools/test/tools/javac/modules/PackageMultipleModules.java
@@ -49,14 +49,14 @@ public class PackageMultipleModules extends ModuleTestBase {
 
     @Test
     public void testSimple(Path base) throws Exception {
-        Path m1 = base.resolve("m1");
-        Path m2 = base.resolve("m2");
+        Path m1 = base.resolve("m1x");
+        Path m2 = base.resolve("m2x");
         tb.writeJavaFiles(m1,
-                          "module m1 {}",
+                          "module m1x {}",
                           "package test; import test.B; public class A {}",
                           "package test; public class A1 extends A {}");
         tb.writeJavaFiles(m2,
-                          "module m2 {}",
+                          "module m2x {}",
                           "package test; import test.A; public class B {}",
                           "package test; public class B1 extends B {}");
         Path classes = base.resolve("classes");
diff --git a/langtools/test/tools/javac/modules/PluginsInModulesTest.java b/langtools/test/tools/javac/modules/PluginsInModulesTest.java
index b887af8ae1a..48f6c609bbb 100644
--- a/langtools/test/tools/javac/modules/PluginsInModulesTest.java
+++ b/langtools/test/tools/javac/modules/PluginsInModulesTest.java
@@ -39,7 +39,6 @@ import java.util.List;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class PluginsInModulesTest extends ModuleTestBase {
 
@@ -48,7 +47,7 @@ public class PluginsInModulesTest extends ModuleTestBase {
     }
 
     private static final String pluginModule1 =
-            "module pluginMod1 {\n" +
+            "module pluginMod1x {\n" +
             "    requires jdk.compiler;\n" +
             "\n" +
             "    provides com.sun.source.util.Plugin\n" +
@@ -95,7 +94,7 @@ public class PluginsInModulesTest extends ModuleTestBase {
 
     void initialization(Path base) throws Exception {
         moduleSrc = base.resolve("plugin_mods_src");
-        Path pluginMod1 = moduleSrc.resolve("pluginMod1");
+        Path pluginMod1 = moduleSrc.resolve("pluginMod1x");
 
         processorCompiledModules = base.resolve("mods");
 
diff --git a/langtools/test/tools/javac/modules/PoorChoiceForModuleNameTest.java b/langtools/test/tools/javac/modules/PoorChoiceForModuleNameTest.java
new file mode 100644
index 00000000000..9bb8f15fa0c
--- /dev/null
+++ b/langtools/test/tools/javac/modules/PoorChoiceForModuleNameTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160181
+ * @summary Add lint warning for digits in module names
+ * @library /tools/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.code
+ *      jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
+ * @run main PoorChoiceForModuleNameTest
+ */
+
+
+import java.nio.file.Path;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+
+public class PoorChoiceForModuleNameTest extends ModuleTestBase {
+
+    public static void main(String... args) throws Exception {
+        new PoorChoiceForModuleNameTest().runTests();
+    }
+
+    @Test
+    public void testDigitsInModuleNames(Path base) throws Exception {
+
+        Path src = base.resolve("src");
+
+        // Nitpickable module name
+        Path src_m1 = src.resolve("mango19");
+        tb.writeJavaFiles(src_m1, "module mango19 { }");
+
+        // Acceptable module name.
+        Path src_m2 = src.resolve("mango20kg");
+        tb.writeJavaFiles(src_m2, "module mango20kg { }");
+
+        // Nitpickable, but should not due to annotation.
+        Path src_m3 = src.resolve("mango100");
+        tb.writeJavaFiles(src_m3, "@SuppressWarnings(\"module\") module mango100 { }");
+
+        Path classes = base.resolve("classes");
+        tb.createDirectories(classes);
+
+        String log = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Xlint:module",
+                         "-Werror",
+                         "--module-source-path", src.toString())
+                .outdir(classes)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!log.contains("module-info.java:1:8: compiler.warn.poor.choice.for.module.name: mango19") ||
+            !log.contains("- compiler.err.warnings.and.werror") ||
+            !log.contains("1 error") ||
+            !log.contains("1 warning"))
+            throw new Exception("expected output not found: " + log);
+    }
+}
+
diff --git a/langtools/test/tools/javac/modules/ProvidesTest.java b/langtools/test/tools/javac/modules/ProvidesTest.java
index b3aaa06048c..68ffe57d8cc 100644
--- a/langtools/test/tools/javac/modules/ProvidesTest.java
+++ b/langtools/test/tools/javac/modules/ProvidesTest.java
@@ -68,11 +68,11 @@ public class ProvidesTest extends ModuleTestBase {
     @Test
     public void testMulti(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; provides p1.C1 with p2.C2; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; provides p1.C1 with p2.C2; }",
                 "package p2; public class C2 extends p1.C1 { }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
diff --git a/langtools/test/tools/javac/modules/QueryBeforeEnter.java b/langtools/test/tools/javac/modules/QueryBeforeEnter.java
index 83fc1d44cfa..b88f5fab07f 100644
--- a/langtools/test/tools/javac/modules/QueryBeforeEnter.java
+++ b/langtools/test/tools/javac/modules/QueryBeforeEnter.java
@@ -77,17 +77,17 @@ public class QueryBeforeEnter extends ModuleTestBase {
     @Test
     public void testUnnamed(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports m1; }",
-                          "package m1; public class M1 {}");
+                          "module m1x { exports m1x; }",
+                          "package m1x; public class M1 {}");
 
-        Path m2 = moduleSrc.resolve("m2");
+        Path m2 = moduleSrc.resolve("m2x");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { exports m2; }",
-                          "package m2; public class M2 {}");
+                          "module m2x { exports m2x; }",
+                          "package m2x; public class M2 {}");
 
         Path modulePath = base.resolve("module-path");
 
@@ -138,32 +138,32 @@ public class QueryBeforeEnter extends ModuleTestBase {
                                                               fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
             assertNotNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
-            assertNull(task.getElements().getTypeElement("m1.M1"));
-            assertNull(task.getElements().getTypeElement("m2.M2"));
+            assertNull(task.getElements().getTypeElement("m1x.M1"));
+            assertNull(task.getElements().getTypeElement("m2x.M2"));
             assertNotNull(task.getElements().getTypeElement("cp.CP"));
             assertNotNull(task.getElements().getTypeElement("test.Test1"));
             assertNotNull(task.getElements().getTypeElement("test.Test2"));
             assertNotNull(task.getElements().getModuleElement("java.base"));
             assertNotNull(task.getElements().getModuleElement("java.compiler"));
-            assertNull(task.getElements().getModuleElement("m1"));
-            assertNull(task.getElements().getModuleElement("m2"));
+            assertNull(task.getElements().getModuleElement("m1x"));
+            assertNull(task.getElements().getModuleElement("m2x"));
         }
     }
 
     @Test
     public void testSingleNamed(Path base) throws Exception {
         Path moduleSrc = base.resolve("module-src");
-        Path m1 = moduleSrc.resolve("m1");
+        Path m1 = moduleSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports m1; }",
-                          "package m1; public class M1 {}");
+                          "module m1x { exports m1x; }",
+                          "package m1x; public class M1 {}");
 
-        Path m2 = moduleSrc.resolve("m2");
+        Path m2 = moduleSrc.resolve("m2x");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { exports m2; }",
-                          "package m2; public class M2 {}");
+                          "module m2x { exports m2x; }",
+                          "package m2x; public class M2 {}");
 
         Path modulePath = base.resolve("module-path");
 
@@ -194,7 +194,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
         Path src = base.resolve("src");
 
         tb.writeJavaFiles(src,
-                          "module test { requires java.base; requires m1; } ",
+                          "module test { requires java.base; requires m1x; } ",
                           "package test; public class Test {}");
 
         Path out = base.resolve("out");
@@ -214,13 +214,13 @@ public class QueryBeforeEnter extends ModuleTestBase {
                                                               fm.getJavaFileObjects(findJavaFiles(src)));
             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
-            assertNotNull(task.getElements().getTypeElement("m1.M1"));
-            assertNull(task.getElements().getTypeElement("m2.M2"));
+            assertNotNull(task.getElements().getTypeElement("m1x.M1"));
+            assertNull(task.getElements().getTypeElement("m2x.M2"));
             assertNotNull(task.getElements().getTypeElement("test.Test"));
             assertNotNull(task.getElements().getModuleElement("java.base"));
             assertNull(task.getElements().getModuleElement("java.compiler"));
-            assertNotNull(task.getElements().getModuleElement("m1"));
-            assertNull(task.getElements().getModuleElement("m2"));
+            assertNotNull(task.getElements().getModuleElement("m1x"));
+            assertNull(task.getElements().getModuleElement("m2x"));
             assertNotNull(task.getElements().getModuleElement("test"));
         }
     }
@@ -228,17 +228,17 @@ public class QueryBeforeEnter extends ModuleTestBase {
     @Test
     public void testMultiModule(Path base) throws Exception {
         Path modulePathSrc = base.resolve("module-path-src");
-        Path m1 = modulePathSrc.resolve("m1");
+        Path m1 = modulePathSrc.resolve("m1x");
 
         tb.writeJavaFiles(m1,
-                          "module m1 { exports m1; }",
-                          "package m1; public class M1 {}");
+                          "module m1x { exports m1x; }",
+                          "package m1x; public class M1 {}");
 
-        Path m2 = modulePathSrc.resolve("m2");
+        Path m2 = modulePathSrc.resolve("m2x");
 
         tb.writeJavaFiles(m2,
-                          "module m2 { exports m2; }",
-                          "package m2; public class M2 {}");
+                          "module m2x { exports m2x; }",
+                          "package m2x; public class M2 {}");
 
         Path modulePath = base.resolve("module-path");
 
@@ -267,17 +267,17 @@ public class QueryBeforeEnter extends ModuleTestBase {
                 .writeAll();
 
         Path moduleSrc = base.resolve("module-src");
-        Path m3 = moduleSrc.resolve("m3");
+        Path m3 = moduleSrc.resolve("m3x");
 
         tb.writeJavaFiles(m3,
-                          "module m3 { requires m1; exports m3; }",
-                          "package m3; public class M3 {  }");
+                          "module m3x { requires m1x; exports m3x; }",
+                          "package m3x; public class M3 {  }");
 
-        Path m4 = moduleSrc.resolve("m4");
+        Path m4 = moduleSrc.resolve("m4x");
 
         tb.writeJavaFiles(m4,
-                          "module m4 { exports m4; }",
-                          "package m4; public class M4 {}");
+                          "module m4x { exports m4x; }",
+                          "package m4x; public class M4 {}");
 
         Path out = base.resolve("out");
 
@@ -297,16 +297,16 @@ public class QueryBeforeEnter extends ModuleTestBase {
                                                               fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
-            assertNotNull(task.getElements().getTypeElement("m1.M1"));
-            assertNull(task.getElements().getTypeElement("m2.M2"));
-            assertNotNull(task.getElements().getTypeElement("m3.M3"));
-            assertNotNull(task.getElements().getTypeElement("m4.M4"));
+            assertNotNull(task.getElements().getTypeElement("m1x.M1"));
+            assertNull(task.getElements().getTypeElement("m2x.M2"));
+            assertNotNull(task.getElements().getTypeElement("m3x.M3"));
+            assertNotNull(task.getElements().getTypeElement("m4x.M4"));
             assertNotNull(task.getElements().getModuleElement("java.base"));
             assertNull(task.getElements().getModuleElement("java.compiler"));
-            assertNotNull(task.getElements().getModuleElement("m1"));
-            assertNull(task.getElements().getModuleElement("m2"));
-            assertNotNull(task.getElements().getModuleElement("m3"));
-            assertNotNull(task.getElements().getModuleElement("m4"));
+            assertNotNull(task.getElements().getModuleElement("m1x"));
+            assertNull(task.getElements().getModuleElement("m2x"));
+            assertNotNull(task.getElements().getModuleElement("m3x"));
+            assertNotNull(task.getElements().getModuleElement("m4x"));
         }
     }
 
diff --git a/langtools/test/tools/javac/modules/RequiresStaticTest.java b/langtools/test/tools/javac/modules/RequiresStaticTest.java
index 5a96bb25fe9..83affcfc4d3 100644
--- a/langtools/test/tools/javac/modules/RequiresStaticTest.java
+++ b/langtools/test/tools/javac/modules/RequiresStaticTest.java
@@ -146,19 +146,19 @@ public class RequiresStaticTest extends ModuleTestBase {
 
     /*
      * Set up the following module graph
-     *     m1 -> m2 => m3 -=-> m4 --> m5
+     *     m1x -> m2x => m3x -=-> m4x --> m5
      *            \           /
      *              \       /
      *                v   v
-     *                  m6 => m7 --> m8
+     *                  m6x => m7x --> m8
      * where -> is requires, => is requires transitive, --> is requires static, -=-> is requires transitive static
      */
     Path getComplexSrc(Path base, String m1_extraImports, String m1_extraUses) throws Exception {
         Path src = base.resolve("src");
 
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                "module m1 { requires m2; }",
+                "module m1x { requires m2x; }",
                 "package p1;\n"
                 + "import p2.C2;\n"
                 + "import p3.C3;\n"
@@ -169,49 +169,49 @@ public class RequiresStaticTest extends ModuleTestBase {
                 + m1_extraUses
                 + "}\n");
 
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                "module m2 {\n"
-                + "  requires transitive m3;\n"
-                + "  requires static m6;\n"
+                "module m2x {\n"
+                + "  requires transitive m3x;\n"
+                + "  requires static m6x;\n"
                 + "  exports p2;\n"
                 + "}",
                 "package p2;\n"
                 + "public class C2 {p7.C7 c7; p6.C6 c6; p4.C4 c4;}\n");
 
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                "module m3 { requires transitive static m4; exports p3; }",
+                "module m3x { requires transitive static m4x; exports p3; }",
                 "package p3;\n"
                 + "public class C3 { }\n");
 
-        Path src_m4 = src.resolve("m4");
+        Path src_m4 = src.resolve("m4x");
         tb.writeJavaFiles(src_m4,
-                "module m4 { requires m5; requires static m6; exports p4; }",
+                "module m4x { requires m5x; requires static m6x; exports p4; }",
                 "package p4;\n"
                 + "public class C4 { p6.C6 c6; p7.C7 c7;}\n");
 
-        Path src_m5 = src.resolve("m5");
+        Path src_m5 = src.resolve("m5x");
         tb.writeJavaFiles(src_m5,
-                "module m5 { exports p5; }",
+                "module m5x { exports p5; }",
                 "package p5;\n"
                 + "public class C5 { }\n");
 
-        Path src_m6 = src.resolve("m6");
+        Path src_m6 = src.resolve("m6x");
         tb.writeJavaFiles(src_m6,
-                "module m6 { requires transitive m7; exports p6; }",
+                "module m6x { requires transitive m7x; exports p6; }",
                 "package p6;\n"
                 + "public class C6 { p7.C7 c7; }\n");
 
-        Path src_m7 = src.resolve("m7");
+        Path src_m7 = src.resolve("m7x");
         tb.writeJavaFiles(src_m7,
-                "module m7 { requires static m8; exports p7; }",
+                "module m7x { requires static m8x; exports p7; }",
                 "package p7;\n"
                 + "public class C7 { p8.C8 c8; }\n");
 
-        Path src_m8 = src.resolve("m8");
+        Path src_m8 = src.resolve("m8x");
         tb.writeJavaFiles(src_m8,
-                "module m8 { exports p8; }",
+                "module m8x { exports p8; }",
                 "package p8;\n"
                         + "public class C8 { }\n");
 
@@ -221,14 +221,14 @@ public class RequiresStaticTest extends ModuleTestBase {
     @Test
     public void testRequiresStatic(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         tb.writeJavaFiles(m1,
-                "module m1 { exports m1; }",
-                "package m1;" +
+                "module m1x { exports m1x; }",
+                "package m1x;" +
                 "public class Api { }\n");
 
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         Files.createDirectories(m1Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -237,25 +237,25 @@ public class RequiresStaticTest extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        Path m3 = src.resolve("m3");
+        Path m3 = src.resolve("m3x");
         tb.writeJavaFiles(m3,
-                "module m3 { requires static m1; }",
-                "package m3;\n" +
+                "module m3x { requires static m1x; }",
+                "package m3x;\n" +
                 "public class Test {\n" +
                 "    public static void main(String... args) {\n" +
                 "        try {\n" +
-                "           Class.forName(\"m1.Api\");\n" +
+                "           Class.forName(\"m1x.Api\");\n" +
                 "        } catch (ClassNotFoundException e) {\n" +
                 "            System.err.println(\"ok\");\n" +
                 "        }\n" +
                 "    }\n" +
                 "}",
-                "package m3;\n" +
+                "package m3x;\n" +
                 "public class ApiUse{\n" +
-                "    m1.Api api;\n" +
+                "    m1x.Api api;\n" +
                 "}");
 
-        Path m3Classes = classes.resolve("m3");
+        Path m3Classes = classes.resolve("m3x");
         Files.createDirectories(m3Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -266,8 +266,8 @@ public class RequiresStaticTest extends ModuleTestBase {
                 .writeAll();
 
         String log = new JavaTask(tb)
-                .vmOptions("--module-path", m3Classes.toString(), "--add-modules", "m3")
-                .className("m3.Test")
+                .vmOptions("--module-path", m3Classes.toString(), "--add-modules", "m3x")
+                .className("m3x.Test")
                 .run()
                 .writeAll()
                 .getOutput(OutputKind.STDERR);
@@ -282,14 +282,14 @@ public class RequiresStaticTest extends ModuleTestBase {
     @Test
     public void testRequiresTransitiveStatic(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         tb.writeJavaFiles(m1,
-                "module m1 { exports m1; }",
-                "package m1;" +
+                "module m1x { exports m1x; }",
+                "package m1x;" +
                 "public class Api { }\n");
 
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         Files.createDirectories(m1Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -298,11 +298,11 @@ public class RequiresStaticTest extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        Path m2 = src.resolve("m2");
+        Path m2 = src.resolve("m2x");
         tb.writeJavaFiles(m2,
-                "module m2 { requires transitive static m1; }");
+                "module m2x { requires transitive static m1x; }");
 
-        Path m2Classes = classes.resolve("m2");
+        Path m2Classes = classes.resolve("m2x");
         Files.createDirectories(m2Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -312,25 +312,25 @@ public class RequiresStaticTest extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        Path m3 = src.resolve("m3");
+        Path m3 = src.resolve("m3x");
         tb.writeJavaFiles(m3,
-                "module m3 { requires m2; }",
-                "package m3;\n" +
+                "module m3x { requires m2x; }",
+                "package m3x;\n" +
                 "public class Test {\n" +
                 "    public static void main(String... args) {\n" +
                 "        try {\n" +
-                "           Class.forName(\"m1.Api\");\n" +
+                "           Class.forName(\"m1x.Api\");\n" +
                 "        } catch (ClassNotFoundException e) {\n" +
                 "            System.err.println(\"ok\");\n" +
                 "        }\n" +
                 "    }\n" +
                 "}",
-                "package m3;\n" +
+                "package m3x;\n" +
                 "public class ApiUse{\n" +
-                "    m1.Api api;\n" +
+                "    m1x.Api api;\n" +
                 "}");
 
-        Path m3Classes = classes.resolve("m3");
+        Path m3Classes = classes.resolve("m3x");
         Files.createDirectories(m3Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -342,8 +342,8 @@ public class RequiresStaticTest extends ModuleTestBase {
 
         String log = new JavaTask(tb)
                 .vmOptions("--module-path", m2Classes.toString() + File.pathSeparator + m3Classes.toString(),
-                           "--add-modules", "m3")
-                .className("m3.Test")
+                           "--add-modules", "m3x")
+                .className("m3x.Test")
                 .run()
                 .writeAll()
                 .getOutput(OutputKind.STDERR);
@@ -358,14 +358,14 @@ public class RequiresStaticTest extends ModuleTestBase {
     @Test
     public void testRequiresStaticTransitive(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         tb.writeJavaFiles(m1,
-                "module m1 { exports m1; }",
-                "package m1;" +
+                "module m1x { exports m1x; }",
+                "package m1x;" +
                 "public class Api { }\n");
 
         Path classes = base.resolve("classes");
-        Path m1Classes = classes.resolve("m1");
+        Path m1Classes = classes.resolve("m1x");
         Files.createDirectories(m1Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -374,11 +374,11 @@ public class RequiresStaticTest extends ModuleTestBase {
                 .run()
                 .writeAll();
 
-        Path m2 = src.resolve("m2");
+        Path m2 = src.resolve("m2x");
         tb.writeJavaFiles(m2,
-                "module m2 { requires transitive static m1; }");
+                "module m2x { requires transitive static m1x; }");
 
-        Path m2Classes = classes.resolve("m2");
+        Path m2Classes = classes.resolve("m2x");
         Files.createDirectories(m2Classes);
 
         new JavacTask(tb, Task.Mode.CMDLINE)
diff --git a/langtools/test/tools/javac/modules/RequiresTransitiveTest.java b/langtools/test/tools/javac/modules/RequiresTransitiveTest.java
index 44e1c243375..ac2d3694b20 100644
--- a/langtools/test/tools/javac/modules/RequiresTransitiveTest.java
+++ b/langtools/test/tools/javac/modules/RequiresTransitiveTest.java
@@ -140,16 +140,16 @@ public class RequiresTransitiveTest extends ModuleTestBase {
 
     /*
      * Set up the following module graph
-     *     m1 -> m2 => m3 => m4 -> m5
-     *              -> m6 => m7
+     *     m1x -> m2x => m3x => m4x -> m5x
+     *              -> m6x => m7x
      * where -> is requires, => is requires transitive
      */
     Path getComplexSrc(Path base, String m1_extraImports, String m1_extraUses) throws Exception {
         Path src = base.resolve("src");
 
-        Path src_m1 = src.resolve("m1");
+        Path src_m1 = src.resolve("m1x");
         tb.writeJavaFiles(src_m1,
-                "module m1 { requires m2; }",
+                "module m1x { requires m2x; }",
                 "package p1;\n"
                 + "import p2.C2;\n"
                 + "import p3.C3;\n"
@@ -160,43 +160,43 @@ public class RequiresTransitiveTest extends ModuleTestBase {
                 + m1_extraUses
                 + "}\n");
 
-        Path src_m2 = src.resolve("m2");
+        Path src_m2 = src.resolve("m2x");
         tb.writeJavaFiles(src_m2,
-                "module m2 {\n"
-                + "  requires transitive m3;\n"
-                + "  requires        m6;\n"
+                "module m2x {\n"
+                + "  requires transitive m3x;\n"
+                + "  requires        m6x;\n"
                 + "  exports p2;\n"
                 + "}",
                 "package p2;\n"
                 + "public class C2 { }\n");
 
-        Path src_m3 = src.resolve("m3");
+        Path src_m3 = src.resolve("m3x");
         tb.writeJavaFiles(src_m3,
-                "module m3 { requires transitive m4; exports p3; }",
+                "module m3x { requires transitive m4x; exports p3; }",
                 "package p3;\n"
                 + "public class C3 { }\n");
 
-        Path src_m4 = src.resolve("m4");
+        Path src_m4 = src.resolve("m4x");
         tb.writeJavaFiles(src_m4,
-                "module m4 { requires m5; exports p4; }",
+                "module m4x { requires m5x; exports p4; }",
                 "package p4;\n"
                 + "public class C4 { }\n");
 
-        Path src_m5 = src.resolve("m5");
+        Path src_m5 = src.resolve("m5x");
         tb.writeJavaFiles(src_m5,
-                "module m5 { exports p5; }",
+                "module m5x { exports p5; }",
                 "package p5;\n"
                 + "public class C5 { }\n");
 
-        Path src_m6 = src.resolve("m6");
+        Path src_m6 = src.resolve("m6x");
         tb.writeJavaFiles(src_m6,
-                "module m6 { requires transitive m7; exports p6; }",
+                "module m6x { requires transitive m7x; exports p6; }",
                 "package p6;\n"
                 + "public class C6 { }\n");
 
-        Path src_m7 = src.resolve("m7");
+        Path src_m7 = src.resolve("m7x");
         tb.writeJavaFiles(src_m7,
-                "module m7 { exports p7; }",
+                "module m7x { exports p7; }",
                 "package p7;\n"
                 + "public class C7 { }\n");
 
diff --git a/langtools/test/tools/javac/modules/ResolveTest.java b/langtools/test/tools/javac/modules/ResolveTest.java
index 91ba84af5de..79f664595d5 100644
--- a/langtools/test/tools/javac/modules/ResolveTest.java
+++ b/langtools/test/tools/javac/modules/ResolveTest.java
@@ -36,7 +36,6 @@ import java.nio.file.*;
 
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class ResolveTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
@@ -83,11 +82,11 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testUnexportedTypeUnreadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -107,11 +106,11 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testUnexportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -131,14 +130,14 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testQualifiedExportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1 to m3; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1 to m3x; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
-        tb.writeJavaFiles(src.resolve("m3"),
-                "module m3 { requires m1; }");
+        tb.writeJavaFiles(src.resolve("m3x"),
+                "module m3x { requires m1x; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
@@ -157,11 +156,11 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testExportedTypeUnreadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -181,11 +180,11 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testExportedTypeReadableModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -201,11 +200,11 @@ public class ResolveTest extends ModuleTestBase {
     @Test
     public void testExportedTypeReadableModule2(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1 to m2; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1 to m2x; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; }",
                 "package p2; public class C2 { p1.C1 c; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
diff --git a/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java b/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java
index 0abad978c56..8d846069caf 100644
--- a/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java
+++ b/langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java
@@ -78,13 +78,13 @@ public class ServiceProvidedButNotExportedOrUsedTest extends ModuleTestBase {
     @Test
     public void testImplementationMustBeInSameModuleAsProvidesDirective(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p1; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p1; }",
                 "package p1; public class C1 { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; requires m3; provides p1.C1 with p2.C2; }");
-        tb.writeJavaFiles(src.resolve("m3"),
-                "module m3 { requires m1; exports p2; }",
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; requires m3x; provides p1.C1 with p2.C2; }");
+        tb.writeJavaFiles(src.resolve("m3x"),
+                "module m3x { requires m1x; exports p2; }",
                 "package p2; public class C2 extends p1.C1 { }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
@@ -97,7 +97,7 @@ public class ServiceProvidedButNotExportedOrUsedTest extends ModuleTestBase {
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
         List expected = Arrays.asList(
-                "module-info.java:1:39: compiler.err.service.implementation.not.in.right.module: m3",
+                "module-info.java:1:42: compiler.err.service.implementation.not.in.right.module: m3x",
                 "1 error");
         if (!output.containsAll(expected)) {
             throw new Exception("Expected output not found");
diff --git a/langtools/test/tools/javac/modules/SingleModuleModeTest.java b/langtools/test/tools/javac/modules/SingleModuleModeTest.java
index 17aa42c93f1..e4120f35d92 100644
--- a/langtools/test/tools/javac/modules/SingleModuleModeTest.java
+++ b/langtools/test/tools/javac/modules/SingleModuleModeTest.java
@@ -61,8 +61,8 @@ public class SingleModuleModeTest extends ModuleTestBase{
     @Test
     public void testTooManyModules(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"), "module m1 { }");
-        tb.writeJavaFiles(src.resolve("m2"), "module m2 { }");
+        tb.writeJavaFiles(src.resolve("m1x"), "module m1x { }");
+        tb.writeJavaFiles(src.resolve("m2x"), "module m2x { }");
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics")
diff --git a/langtools/test/tools/javac/modules/UpgradeModulePathTest.java b/langtools/test/tools/javac/modules/UpgradeModulePathTest.java
index 1a923e940f8..75ea9ff2a4b 100644
--- a/langtools/test/tools/javac/modules/UpgradeModulePathTest.java
+++ b/langtools/test/tools/javac/modules/UpgradeModulePathTest.java
@@ -38,7 +38,6 @@ import java.nio.file.Path;
 import toolbox.JavacTask;
 import toolbox.ModuleBuilder;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class UpgradeModulePathTest extends ModuleTestBase {
 
@@ -50,19 +49,19 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void simpleUsage(Path base) throws Exception {
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(modules);
 
         final Path upgradeModules = base.resolve("upgradeModules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class E { }")
                 .build(upgradeModules);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -76,19 +75,19 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void onlyUpgradeModulePath(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(module);
 
         final Path upgradeModule = base.resolve("upgradeModule");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class E { }")
                 .build(upgradeModule);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -101,28 +100,28 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void withModuleSourcePath(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(module);
 
         final Path upgradeModule = base.resolve("upgradeModule");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class E { }")
                 .build(upgradeModule);
 
         final Path s = base.resolve("source");
-        tb.writeJavaFiles(s.resolve("m3"), "module m3 { }");
+        tb.writeJavaFiles(s.resolve("m3x"), "module m3x { }");
 
         final Path upgradeModule3 = base.resolve("upgradeModule");
-        new ModuleBuilder(tb, "m3")
+        new ModuleBuilder(tb, "m3x")
                 .exports("pkg3")
                 .classes("package pkg3; public class E { }")
                 .build(upgradeModule);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; requires m3; }",
+        tb.writeJavaFiles(src.resolve("m2x"), "module m2x { requires m1x; requires m3x; }",
                 "package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -138,19 +137,19 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void sameUpgradeAndModulePath(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(module);
 
         final Path upgradeModule = base.resolve("upgradeModule");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class E { }")
                 .build(upgradeModule);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -164,7 +163,7 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void dummyFileInUpgradeModulePath(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(module);
@@ -173,7 +172,7 @@ public class UpgradeModulePathTest extends ModuleTestBase {
         tb.writeFile(dummy, "");
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.E.class.getName(); } }");
 
         String output = new JavacTask(tb, Task.Mode.CMDLINE)
@@ -192,28 +191,28 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void severalUpgradeModules(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class A { }")
                 .build(module);
 
-        new ModuleBuilder(tb, "m2")
+        new ModuleBuilder(tb, "m2x")
                 .exports("pkg2")
                 .classes("package pkg2; public class B { }")
                 .build(module);
 
         Path upgradeModule = base.resolve("upgradeModule");
-        new ModuleBuilder(tb, "m2")
+        new ModuleBuilder(tb, "m2x")
                 .exports("pkg2")
                 .classes("package pkg2; public class BC { }")
                 .build(upgradeModule);
-        new ModuleBuilder(tb, "m3")
+        new ModuleBuilder(tb, "m3x")
                 .exports("pkg3")
                 .classes("package pkg3; public class DC { }")
                 .build(upgradeModule);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m4 { requires m1; requires m2; requires m3; }",
+        tb.writeJavaFiles(src, "module m4x { requires m1x; requires m2x; requires m3x; }",
                 "package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -224,7 +223,7 @@ public class UpgradeModulePathTest extends ModuleTestBase {
                 .writeAll();
 
         Path src2 = base.resolve("src2");
-        tb.writeJavaFiles(src2, "module m4 { requires m1; }",
+        tb.writeJavaFiles(src2, "module m4x { requires m1x; }",
                 "package p; class A { void main() { pkg2.B.class.getName(); } }");
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
@@ -243,25 +242,25 @@ public class UpgradeModulePathTest extends ModuleTestBase {
     @Test
     public void severalUpgradeModulePathsLastWin(Path base) throws Exception {
         final Path module = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg1")
                 .classes("package pkg1; public class E { }")
                 .build(module);
 
         final Path upgradeModule1 = base.resolve("upgradeModule1");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class EC1 { }")
                 .build(upgradeModule1);
 
         final Path upgradeModule2 = base.resolve("upgradeModule2");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("pkg2")
                 .classes("package pkg2; public class EC2 { }")
                 .build(upgradeModule2);
 
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.EC2.class.getName(); } }");
 
         new JavacTask(tb, Task.Mode.CMDLINE)
@@ -273,7 +272,7 @@ public class UpgradeModulePathTest extends ModuleTestBase {
                 .writeAll();
 
         Path src2 = base.resolve("src2");
-        tb.writeJavaFiles(src2, "module m2 { requires m1; }",
+        tb.writeJavaFiles(src2, "module m2x { requires m1x; }",
                 "package p; class A { void main() { pkg2.EC1.class.getName(); } }");
 
         final String log = new JavacTask(tb, Task.Mode.CMDLINE)
diff --git a/langtools/test/tools/javac/modules/UsesTest.java b/langtools/test/tools/javac/modules/UsesTest.java
index a9920dfe5a5..0d9f9a283ae 100644
--- a/langtools/test/tools/javac/modules/UsesTest.java
+++ b/langtools/test/tools/javac/modules/UsesTest.java
@@ -145,11 +145,11 @@ public class UsesTest extends ModuleTestBase {
     @Test
     public void testMulti(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { exports p; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { exports p; }",
                 "package p; public class C { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; uses p.C; }");
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; uses p.C; }");
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);
 
@@ -165,19 +165,19 @@ public class UsesTest extends ModuleTestBase {
     public void testMultiOnModulePath(Path base) throws Exception {
         Path modSrc = base.resolve("modSrc");
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("p")
                 .classes("package p; public class C { }")
                 .build(modules);
-        new ModuleBuilder(tb, "m2")
-                .requires("m1")
+        new ModuleBuilder(tb, "m2x")
+                .requires("m1x")
                 .uses("p.C")
                 .write(modSrc);
 
         new JavacTask(tb)
                 .options("-p", modules.toString())
                 .outdir(modules)
-                .files(findJavaFiles(modSrc.resolve("m2")))
+                .files(findJavaFiles(modSrc.resolve("m2x")))
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
     }
@@ -186,19 +186,19 @@ public class UsesTest extends ModuleTestBase {
     public void testMultiOnModulePathInner(Path base) throws Exception {
         Path modSrc = base.resolve("modSrc");
         Path modules = base.resolve("modules");
-        new ModuleBuilder(tb, "m1")
+        new ModuleBuilder(tb, "m1x")
                 .exports("p")
                 .classes("package p; public class C { public class Inner { } }")
                 .build(modules);
-        new ModuleBuilder(tb, "m2")
-                .requires("m1")
+        new ModuleBuilder(tb, "m2x")
+                .requires("m1x")
                 .uses("p.C.Inner")
                 .write(modSrc);
 
         new JavacTask(tb)
                 .options("-p", modules.toString())
                 .outdir(modules)
-                .files(findJavaFiles(modSrc.resolve("m2")))
+                .files(findJavaFiles(modSrc.resolve("m2x")))
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
     }
@@ -248,11 +248,11 @@ public class UsesTest extends ModuleTestBase {
     @Test
     public void testUsesUnexportedService(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { }",
                 "package p; public class C { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; uses p.C; }");
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; uses p.C; }");
 
         List output = new JavacTask(tb)
                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
@@ -262,7 +262,7 @@ public class UsesTest extends ModuleTestBase {
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("module-info.java:1:32: compiler.err.not.def.access.package.cant.access: p.C, p",
+        List expected = Arrays.asList("module-info.java:1:34: compiler.err.not.def.access.package.cant.access: p.C, p",
                 "1 error");
         if (!output.containsAll(expected)) {
             throw new Exception("Expected output not found");
@@ -272,11 +272,11 @@ public class UsesTest extends ModuleTestBase {
     @Test
     public void testUsesUnexportedButProvidedService(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src.resolve("m1"),
-                "module m1 { provides p.C with p.C; }",
+        tb.writeJavaFiles(src.resolve("m1x"),
+                "module m1x { provides p.C with p.C; }",
                 "package p; public class C { }");
-        tb.writeJavaFiles(src.resolve("m2"),
-                "module m2 { requires m1; uses p.C; }");
+        tb.writeJavaFiles(src.resolve("m2x"),
+                "module m2x { requires m1x; uses p.C; }");
 
         List output = new JavacTask(tb)
                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
@@ -286,7 +286,7 @@ public class UsesTest extends ModuleTestBase {
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List expected = Arrays.asList("module-info.java:1:32: compiler.err.not.def.access.package.cant.access: p.C, p",
+        List expected = Arrays.asList("module-info.java:1:34: compiler.err.not.def.access.package.cant.access: p.C, p",
                 "1 error");
         if (!output.containsAll(expected)) {
             throw new Exception("Expected output not found");
diff --git a/langtools/test/tools/javac/processing/model/element/TestOrigin.java b/langtools/test/tools/javac/processing/model/element/TestOrigin.java
new file mode 100644
index 00000000000..c2cc6e31628
--- /dev/null
+++ b/langtools/test/tools/javac/processing/model/element/TestOrigin.java
@@ -0,0 +1,411 @@
+/*
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8171355
+ * @summary Test behavior of javax.lang.model.util.Elements.getOrigin.
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner
+ * @build TestOrigin
+ * @run main TestOrigin
+ */
+
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import javax.lang.model.element.ModuleElement.Directive;
+import javax.lang.model.element.ModuleElement.ExportsDirective;
+import javax.lang.model.element.ModuleElement.OpensDirective;
+import javax.lang.model.element.ModuleElement.RequiresDirective;
+import javax.lang.model.util.Elements;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.Attributes;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ClassWriter;
+import com.sun.tools.classfile.Module_attribute;
+import com.sun.tools.classfile.Module_attribute.ExportsEntry;
+import com.sun.tools.classfile.Module_attribute.OpensEntry;
+import com.sun.tools.classfile.Module_attribute.RequiresEntry;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class TestOrigin extends TestRunner {
+
+    private final ToolBox tb;
+
+    TestOrigin() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String... args) throws Exception {
+        new TestOrigin().runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void testGeneratedConstr(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "package test; public class Test { private void test() { } }",
+                          "class Dummy {}");
+        Path classes = base.resolve("classes");
+        tb.createDirectories(classes);
+
+        List log;
+        List expected;
+
+        //from source:
+        log = new JavacTask(tb)
+            .options("-processor", ListMembersAP.class.getName())
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList(
+                ":MANDATED",
+                "test:EXPLICIT");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+
+        //from class:
+        log = new JavacTask(tb)
+            .options("-classpath", classes.toString(),
+                     "-processorpath", System.getProperty("test.classes"),
+                     "-processor", ListMembersAP.class.getName())
+            .outdir(classes)
+            .files(src.resolve("Dummy.java"))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList(
+                ":EXPLICIT",
+                "test:EXPLICIT");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class ListMembersAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (!roundEnv.processingOver())
+                return false;
+
+            Elements elements = processingEnv.getElementUtils();
+            TypeElement test = elements.getTypeElement("test.Test");
+            List members = new ArrayList<>(test.getEnclosedElements());
+
+            Collections.sort(members,
+                             (e1, e2) -> e1.getSimpleName().toString().compareTo(e2.getSimpleName().toString()));
+
+            for (Element el : members) {
+                System.out.println(el.getSimpleName() + ":" + elements.getOrigin(el));
+            }
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latestSupported();
+        }
+
+    }
+
+    @Test
+    public void testRepeatableAnnotations(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "package test; @A @A public class Test { }",
+                          "package test;" +
+                          "import java.lang.annotation.*;" +
+                          "@Repeatable(Container.class)" +
+                          "@Retention(RetentionPolicy.CLASS)" +
+                          "@interface A {}",
+                          "package test; @interface Container { A[] value(); }",
+                          "class Dummy {}");
+        Path classes = base.resolve("classes");
+        tb.createDirectories(classes);
+
+        List log;
+        List expected;
+
+        //from source:
+        log = new JavacTask(tb)
+            .options("-processor", ListAnnotationsAP.class.getName())
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList("test.Container:MANDATED");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+
+        //from class:
+        log = new JavacTask(tb)
+            .options("-classpath", classes.toString(),
+                     "-processorpath", System.getProperty("test.classes"),
+                     "-processor", ListAnnotationsAP.class.getName())
+            .outdir(classes)
+            .files(src.resolve("Dummy.java"))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList("test.Container:EXPLICIT");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class ListAnnotationsAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (!roundEnv.processingOver())
+                return false;
+
+            Elements elements = processingEnv.getElementUtils();
+            TypeElement test = elements.getTypeElement("test.Test");
+
+            for (AnnotationMirror am : test.getAnnotationMirrors()) {
+                System.out.println(am.getAnnotationType() + ":" + elements.getOrigin(test, am));
+            }
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latestSupported();
+        }
+
+    }
+
+    @Test
+    public void testModuleDirectives(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          "module m {}",
+                          "package p1; class Test {}",
+                          "package p2; class Test {}",
+                          "package p3; class Test {}",
+                          "package test; class Dummy {}");
+        Path classes = base.resolve("classes");
+        tb.createDirectories(classes);
+
+        List log;
+        List expected;
+
+        //from source:
+        log = new JavacTask(tb)
+            .options("-processor", ListModuleAP.class.getName())
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList("REQUIRES:java.base:MANDATED");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+
+        tb.writeJavaFiles(src,
+                          "module m {" +
+                          "    requires java.base;" +
+                          "    requires java.compiler;" +
+                          "    requires jdk.compiler;" +
+                          "    exports p1;" +
+                          "    exports p2;" +
+                          "    exports p3;" +
+                          "    opens p1;" +
+                          "    opens p2;" +
+                          "    opens p3;" +
+                          "}");
+
+        new JavacTask(tb)
+            .outdir(classes)
+            .files(src.resolve("module-info.java"))
+            .run()
+            .writeAll();
+
+        Path moduleInfo = classes.resolve("module-info.class");
+        ClassFile cf = ClassFile.read(moduleInfo);
+        Module_attribute module = (Module_attribute) cf.getAttribute(Attribute.Module);
+
+        RequiresEntry[] newRequires = new RequiresEntry[3];
+        newRequires[0] = new RequiresEntry(module.requires[0].requires_index,
+                                           Module_attribute.ACC_MANDATED,
+                                           module.requires[0].requires_version_index);
+        newRequires[1] = new RequiresEntry(module.requires[1].requires_index,
+                                           Module_attribute.ACC_SYNTHETIC,
+                                           module.requires[1].requires_version_index);
+        newRequires[2] = module.requires[2];
+
+        ExportsEntry[] newExports = new ExportsEntry[3];
+        newExports[0] = new ExportsEntry(module.exports[0].exports_index,
+                                         Module_attribute.ACC_MANDATED,
+                                         module.exports[0].exports_to_index);
+        newExports[1] = new ExportsEntry(module.exports[1].exports_index,
+                                         Module_attribute.ACC_SYNTHETIC,
+                                         module.exports[1].exports_to_index);
+        newExports[2] = module.exports[2];
+
+        OpensEntry[] newOpens = new OpensEntry[3];
+        newOpens[0] = new OpensEntry(module.opens[0].opens_index,
+                                     Module_attribute.ACC_MANDATED,
+                                     module.opens[0].opens_to_index);
+        newOpens[1] = new OpensEntry(module.opens[1].opens_index,
+                                     Module_attribute.ACC_SYNTHETIC,
+                                     module.opens[1].opens_to_index);
+        newOpens[2] = module.opens[2];
+
+        Module_attribute newModule = new Module_attribute(module.attribute_name_index,
+                                                          module.module_name,
+                                                          module.module_flags,
+                                                          module.module_version_index,
+                                                          newRequires,
+                                                          newExports,
+                                                          newOpens,
+                                                          module.uses_index,
+                                                          module.provides);
+        Map newAttributesMap = new HashMap<>(cf.attributes.map);
+
+        newAttributesMap.put(Attribute.Module, newModule);
+
+        Attributes newAttributes = new Attributes(newAttributesMap);
+        ClassFile newClassFile = new ClassFile(cf.magic,
+                                               cf.minor_version,
+                                               cf.major_version,
+                                               cf.constant_pool,
+                                               cf.access_flags,
+                                               cf.this_class,
+                                               cf.super_class,
+                                               cf.interfaces,
+                                               cf.fields,
+                                               cf.methods,
+                                               newAttributes);
+
+        try (OutputStream out = Files.newOutputStream(moduleInfo)) {
+            new ClassWriter().write(newClassFile, out);
+        }
+
+        //from class:
+        log = new JavacTask(tb)
+            .options("-processor", ListModuleAP.class.getName())
+            .outdir(classes)
+            .files(src.resolve("test").resolve("Dummy.java"))
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.STDOUT);
+
+        expected = Arrays.asList(
+                "REQUIRES:java.base:MANDATED",
+                "REQUIRES:java.compiler:SYNTHETIC",
+                "REQUIRES:jdk.compiler:EXPLICIT",
+                "EXPORTS:p1:MANDATED",
+                "EXPORTS:p2:SYNTHETIC",
+                "EXPORTS:p3:EXPLICIT",
+                "OPENS:p1:MANDATED",
+                "OPENS:p2:SYNTHETIC",
+                "OPENS:p3:EXPLICIT");
+
+        if (!expected.equals(log))
+            throw new AssertionError("expected output not found: " + log);
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class ListModuleAP extends AbstractProcessor {
+
+        @Override
+        public boolean process(Set annotations, RoundEnvironment roundEnv) {
+            if (!roundEnv.processingOver())
+                return false;
+
+            Elements elements = processingEnv.getElementUtils();
+            ModuleElement m = elements.getModuleElement("m");
+
+            for (Directive d : m.getDirectives()) {
+                switch (d.getKind()) {
+                    case REQUIRES:
+                        RequiresDirective rd = (RequiresDirective) d;
+                        System.out.println(rd.getKind() + ":" +
+                                           rd.getDependency().getQualifiedName() + ":" +
+                                           elements.getOrigin(m, rd));
+                        break;
+                    case EXPORTS:
+                        ExportsDirective ed = (ExportsDirective) d;
+                        System.out.println(ed.getKind() + ":" +
+                                           ed.getPackage() + ":" +
+                                           elements.getOrigin(m, ed));
+                        break;
+                    case OPENS:
+                        OpensDirective od = (OpensDirective) d;
+                        System.out.println(od.getKind() + ":" +
+                                           od.getPackage() + ":" +
+                                           elements.getOrigin(m, od));
+                        break;
+                }
+            }
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latestSupported();
+        }
+
+    }
+
+}
diff --git a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out
index 0e22a7f5240..6870a23f6dc 100644
--- a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out
@@ -1,4 +1,4 @@
-Processor Test matches [java.lang.Override] and returns true.
+Processor Test matches [java.base/java.lang.Override] and returns true.
 - compiler.note.proc.messager: round 1
 Processor Test matches [] and returns true.
 - compiler.note.proc.messager: round 2
diff --git a/langtools/test/tools/javac/profiles/ProfileOptionTest.java b/langtools/test/tools/javac/profiles/ProfileOptionTest.java
index c9bd8b39920..af6a1183035 100644
--- a/langtools/test/tools/javac/profiles/ProfileOptionTest.java
+++ b/langtools/test/tools/javac/profiles/ProfileOptionTest.java
@@ -75,7 +75,7 @@ public class ProfileOptionTest {
     void testInvalidProfile_API() throws Exception {
         JavaFileObject fo = new StringJavaFileObject("Test.java", "class Test { }");
         String badName = "foo";
-        List opts = Arrays.asList("-profile", badName);
+        List opts = Arrays.asList("--release", "8", "-profile", badName);
         StringWriter sw = new StringWriter();
         try {
             JavacTask task = (JavacTask) javac.getTask(sw, fm, null, opts, null,
@@ -89,7 +89,7 @@ public class ProfileOptionTest {
     @Test
     void testInvalidProfile_CommandLine() throws Exception {
         String badName = "foo";
-        String[] opts = { "-profile", badName };
+        String[] opts = { "--release", "8", "-profile", badName };
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         int rc = com.sun.tools.javac.Main.compile(opts, pw);
@@ -144,10 +144,19 @@ public class ProfileOptionTest {
 
                 switch (t) {
                     case JDK1_8:
-                    case JDK1_9:
                         if (ise != null)
                             error("unexpected exception from compiler: " + ise);
                         break;
+                    case JDK1_9:
+                        if (p == Profile.DEFAULT)
+                            break;
+                        if (ise == null)
+                            error("IllegalStateException not thrown as expected");
+                        else if (!ise.getMessage().contains("option -profile " +
+                                "not allowed with target " + t.name)) {
+                            error("exception not thrown as expected: " + ise);
+                        }
+                        break;
                     default:
                         if (p == Profile.DEFAULT)
                             break;
@@ -157,6 +166,7 @@ public class ProfileOptionTest {
                                     + " is not valid for target release " + t.name)) {
                             error("exception not thrown as expected: " + ise);
                         }
+                        break;
                 }
             }
         }
@@ -171,7 +181,7 @@ public class ProfileOptionTest {
                             new DiagnosticCollector();
                     List opts = (p == Profile.DEFAULT)
                             ? Collections.emptyList()
-                            : Arrays.asList("-profile", p.name);
+                            : Arrays.asList("--release", "8", "-profile", p.name);
                     JavacTask task = (JavacTask) javac.getTask(null, fm, dl, opts, null,
                             Arrays.asList(fo));
                     task.analyze();
@@ -203,9 +213,12 @@ public class ProfileOptionTest {
         init(Profile.COMPACT2,
                 javax.xml.XMLConstants.class);
 
+        //init(Profile.COMPACT3,
+        //        javax.sql.rowset.Predicate.class,
+        //        com.sun.security.auth.PolicyFile.class); // specifically included in 3
+
         init(Profile.COMPACT3,
-                javax.sql.rowset.Predicate.class,
-                com.sun.security.auth.PolicyFile.class); // specifically included in 3
+                javax.sql.rowset.Predicate.class);
 
         init(Profile.DEFAULT,
                 java.beans.BeanInfo.class);
diff --git a/langtools/test/tools/javap/TestClassNameWarning.java b/langtools/test/tools/javap/TestClassNameWarning.java
new file mode 100644
index 00000000000..20e43f9f0c1
--- /dev/null
+++ b/langtools/test/tools/javap/TestClassNameWarning.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8170708
+ * @summary javap -m  cannot read a module-info.class
+ * @library /tools/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ *      jdk.jdeps/com.sun.tools.classfile
+ *      jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.JavacTask toolbox.JavapTask toolbox.ToolBox toolbox.TestRunner
+ * @run main TestClassNameWarning
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ClassWriter;
+
+import toolbox.JavacTask;
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class TestClassNameWarning extends TestRunner {
+    public static void main(String... args) throws Exception {
+        new TestClassNameWarning().runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    private ToolBox tb = new ToolBox();
+
+    TestClassNameWarning() {
+        super(System.err);
+    }
+
+    /**
+     * Baseline test for normal classes.
+     */
+    @Test
+    public void testStandardClass(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        tb.writeJavaFiles(src, "class A { }");
+
+        new JavacTask(tb)
+                .outdir(classes.toString())
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        List log = new JavapTask(tb)
+                .classpath(classes.toString())
+                .classes("A")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkOutput(log, false, "^(Warning|Error)");
+        checkOutput(log, true, "class A");
+    }
+
+    /**
+     * Test that module-info can be used to name the .class file
+     * for a module declaration (i.e. ACC_MODULE, this_class == 0)
+     * This is the primary test case for the bug as reported.
+     */
+    @Test
+    public void testStandardModuleInfo(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        tb.writeJavaFiles(src, "module m { }");
+
+        new JavacTask(tb)
+                .outdir(classes.toString())
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        List log = new JavapTask(tb)
+                .options("--module-path", classes.toString(),
+                        "--module", "m")
+                .classes("module-info")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkOutput(log, false, "^(Warning|Error)");
+        checkOutput(log, true, "module m");
+    }
+
+    /**
+     * Test module-info can still be used to find a weirdly named
+     * class equivalent to "class module-info { }" if that were legal in JLS.
+     * Such a class file would arguably be legal in certain selected contexts.
+     */
+    @Test
+    public void testLegacyModuleInfo(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        tb.writeJavaFiles(src, "class module_info { }");
+
+        new JavacTask(tb)
+                .outdir(classes.toString())
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        byte[] bytes = Files.readAllBytes(classes.resolve("module_info.class"));
+        byte[] searchBytes = "module_info".getBytes("UTF-8");
+        byte[] replaceBytes = "module-info".getBytes("UTF-8");
+        for (int i = 0; i < bytes.length - searchBytes.length; i++) {
+            if (Arrays.equals(bytes, i, i + searchBytes.length,
+                                searchBytes, 0, searchBytes.length)) {
+                System.arraycopy(replaceBytes, 0, bytes, i, replaceBytes.length);
+            }
+        }
+        Files.write(classes.resolve("module-info.class"), bytes);
+
+        List log = new JavapTask(tb)
+                .classpath(classes.toString())
+                .options("-bootclasspath", "") // hide all system classes
+                .classes("module-info")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkOutput(log, false, "^(Warning|Error)");
+        checkOutput(log, true, "class module-info");
+    }
+
+    /**
+     * Test an invalid class, with this_class == 0.
+     */
+    @Test
+    public void testNoNameClass(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        tb.writeJavaFiles(src, "class A { }");
+
+        new JavacTask(tb)
+                .outdir(classes.toString())
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        ClassFile cf = ClassFile.read(classes.resolve("A.class"));
+        ClassFile cf2 = new ClassFile(
+                cf.magic, cf.minor_version, cf.major_version, cf.constant_pool,
+                cf.access_flags,
+                0, // this_class,
+                cf.super_class, cf.interfaces, cf.fields, cf.methods, cf.attributes);
+        new ClassWriter().write(cf2, Files.newOutputStream(classes.resolve("Z.class")));
+
+        List log = new JavapTask(tb)
+                .classpath(classes.toString())
+                .classes("Z")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkOutput(log, true, "Warning:.*Z.class does not contain class Z");
+    }
+
+    /**
+     * Test a class with unexpected contents.
+     * This is the arguably the most common negative case.
+     */
+    @Test
+    public void testWrongNameClass(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = Files.createDirectories(base.resolve("classes"));
+        tb.writeJavaFiles(src, "class A { }");
+
+        new JavacTask(tb)
+                .outdir(classes.toString())
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        Files.move(classes.resolve("A.class"), classes.resolve("B.class"));
+
+        List log = new JavapTask(tb)
+                .classpath(classes.toString())
+                .classes("B")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkOutput(log, true, "Warning:.*B.class does not contain class B");
+    }
+
+    /**
+     * Check that the output does, or does not, contain lines matching a regex.
+     */
+    private void checkOutput(List log, boolean expect, String regex) {
+        Pattern p = Pattern.compile(regex);
+        List matches = log.stream()
+                .filter(line -> p.matcher(line).find())
+                .collect(Collectors.toList());
+        if (expect) {
+            if (matches.isEmpty()) {
+                error("expected output not found: " + regex);
+            }
+        } else {
+            if (!matches.isEmpty()) {
+                error("unexpected output found: " + matches);
+            }
+        }
+    }
+}
+
diff --git a/langtools/test/tools/jdeps/lib/JdepsUtil.java b/langtools/test/tools/jdeps/lib/JdepsUtil.java
index 9b9c51681c5..606a37a5b6c 100644
--- a/langtools/test/tools/jdeps/lib/JdepsUtil.java
+++ b/langtools/test/tools/jdeps/lib/JdepsUtil.java
@@ -147,11 +147,6 @@ public final class JdepsUtil {
             return this;
         }
 
-        public Command includeSystemMoudles(String regex) {
-            filter.includeSystemModules(Pattern.compile(regex));
-            return this;
-        }
-
         public Command apiOnly() {
             this.apiOnly = true;
             return this;
diff --git a/langtools/test/tools/jdeps/modules/CheckModuleTest.java b/langtools/test/tools/jdeps/modules/CheckModuleTest.java
index 96a6d1f6ce0..724784147c9 100644
--- a/langtools/test/tools/jdeps/modules/CheckModuleTest.java
+++ b/langtools/test/tools/jdeps/modules/CheckModuleTest.java
@@ -52,9 +52,9 @@ public class CheckModuleTest {
     private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
     private static final Path MODS_DIR = Paths.get("mods");
 
-    // m4 and m5 are analyzed.  Others are compiled to make sure they are present
+    // mIV and mV are analyzed.  Others are compiled to make sure they are present
     // on the module path for analysis
-    private static final Set modules = Set.of("unsafe", "m4", "m5", "mVI", "mVII", "m8");
+    private static final Set modules = Set.of("unsafe", "mIV", "mV", "mVI", "mVII", "mVIII");
 
     private static final String JAVA_BASE = "java.base";
 
@@ -97,39 +97,39 @@ public class CheckModuleTest {
     @DataProvider(name = "modules")
     public Object[][] unnamed() {
         return new Object[][]{
-            { "m4", new ModuleMetaData[] {
+            { "mIV", new ModuleMetaData[] {
                         // original
-                        new ModuleMetaData("m4")
+                        new ModuleMetaData("mIV")
                             .requiresTransitive("java.compiler")
                             .requires("java.logging")
                             // unnused exports
                             .exports("p4.internal", Set.of("mVI", "mVII")),
                         // suggested version
-                        new ModuleMetaData("m4")
+                        new ModuleMetaData("mIV")
                             .requires("java.compiler"),
                         // reduced version
-                        new ModuleMetaData("m4")
+                        new ModuleMetaData("mIV")
                             .requires("java.compiler")
                     }
             },
-            { "m5", new ModuleMetaData[] {
+            { "mV", new ModuleMetaData[] {
                         // original
-                        new ModuleMetaData("m5")
+                        new ModuleMetaData("mV")
                             .requiresTransitive("java.compiler")
                             .requiresTransitive("java.logging")
                             .requires("java.sql")
-                            .requiresTransitive("m4"),
+                            .requiresTransitive("mIV"),
                         // suggested version
-                        new ModuleMetaData("m5")
+                        new ModuleMetaData("mV")
                             .requiresTransitive("java.compiler")
                             .requires("java.logging")
                             .requiresTransitive("java.sql")
-                            .requiresTransitive("m4"),
+                            .requiresTransitive("mIV"),
                         // reduced version
-                        new ModuleMetaData("m5")
+                        new ModuleMetaData("mV")
                             .requiresTransitive("java.compiler")
                             .requiresTransitive("java.sql")
-                            .requiresTransitive("m4"),
+                            .requiresTransitive("mIV"),
                     }
             },
         };
diff --git a/langtools/test/tools/jdeps/modules/InverseDeps.java b/langtools/test/tools/jdeps/modules/InverseDeps.java
index b9bd916dd0d..1c6a83f0c5b 100644
--- a/langtools/test/tools/jdeps/modules/InverseDeps.java
+++ b/langtools/test/tools/jdeps/modules/InverseDeps.java
@@ -61,7 +61,7 @@ public class InverseDeps {
     private static final Path LIBS_DIR = Paths.get("libs");
 
     private static final Set modules = new LinkedHashSet(
-        List.of("unsafe", "m4", "m5", "mVI", "mVII")
+        List.of("unsafe", "mIV", "mV", "mVI", "mVII")
     );
 
     /**
@@ -93,18 +93,18 @@ public class InverseDeps {
         return new Object[][] {
             // --require and result
             { "java.sql", new String[][] {
-                    new String[] { "java.sql", "m5" },
+                    new String[] { "java.sql", "mV" },
                 }
             },
             { "java.compiler", new String[][] {
-                    new String[] { "java.compiler", "m5" },
-                    new String[] { "java.compiler", "m4", "m5" },
+                    new String[] { "java.compiler", "mV" },
+                    new String[] { "java.compiler", "mIV", "mV" },
                 }
             },
             { "java.logging", new String[][]{
-                    new String[] {"java.logging", "m5"},
-                    new String[] {"java.logging", "m4", "m5"},
-                    new String[] {"java.logging", "java.sql", "m5"},
+                    new String[] {"java.logging", "mV"},
+                    new String[] {"java.logging", "mIV", "mV"},
+                    new String[] {"java.logging", "java.sql", "mV"},
                 }
             },
             { "jdk.unsupported", new String[][] {
@@ -146,12 +146,12 @@ public class InverseDeps {
         return new Object[][] {
             // -package and result
             { "p4", new String[][] {
-                        new String[] { "m4", "m5"},
+                        new String[] { "mIV", "mV"},
                     }
             },
             { "javax.tools", new String[][] {
-                        new String[] {"java.compiler", "m5"},
-                        new String[] {"java.compiler", "m4", "m5"},
+                        new String[] {"java.compiler", "mV"},
+                        new String[] {"java.compiler", "mIV", "mV"},
                     }
             },
             { "sun.misc", new String[][] {
@@ -187,7 +187,7 @@ public class InverseDeps {
             { "java.util.logging.*|org.safe.Lib", new String[][] {
                     new String[] { "unsafe", "mVII"},
                     new String[] { "unsafe", "mVI", "mVII"},
-                    new String[] { "java.logging", "m5"},
+                    new String[] { "java.logging", "mV"},
                 }
             }
         };
@@ -224,7 +224,7 @@ public class InverseDeps {
             { "java.util.logging.*|org.safe.Lib", new String[][] {
                     new String[] { "unsafe.jar", "mVII.jar"},
                     new String[] { "unsafe.jar", "mVI.jar", "mVII.jar"},
-                    new String[] { "java.logging", "m5.jar"},
+                    new String[] { "java.logging", "mV.jar"},
                 }
             }
         };
diff --git a/langtools/test/tools/jdeps/modules/ModuleTest.java b/langtools/test/tools/jdeps/modules/ModuleTest.java
index cf58b028035..9dcefb3ca7f 100644
--- a/langtools/test/tools/jdeps/modules/ModuleTest.java
+++ b/langtools/test/tools/jdeps/modules/ModuleTest.java
@@ -58,7 +58,7 @@ public class ModuleTest {
 
     // the names of the modules in this test
     private static final String UNSUPPORTED = "unsupported";
-    private static String[] modules = new String[] {"mI", "mII", "mIII", "m4", UNSUPPORTED};
+    private static String[] modules = new String[] {"mI", "mII", "mIII", "mIV", UNSUPPORTED};
     /**
      * Compiles all modules used by the test
      */
@@ -70,7 +70,7 @@ public class ModuleTest {
         assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
                                                "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
         // m4 is not referenced
-        Arrays.asList("mI", "mII", "mIII", "m4")
+        Arrays.asList("mI", "mII", "mIII", "mIV")
               .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
 
         assertTrue(CompilerUtils.compile(SRC_DIR.resolve("mIII"), UNNAMED_DIR, "-p", MODS_DIR.toString()));
diff --git a/langtools/test/tools/jdeps/modules/src/m4/module-info.java b/langtools/test/tools/jdeps/modules/src/mIV/module-info.java
similarity index 98%
rename from langtools/test/tools/jdeps/modules/src/m4/module-info.java
rename to langtools/test/tools/jdeps/modules/src/mIV/module-info.java
index 38288bf3be0..769cf6dc999 100644
--- a/langtools/test/tools/jdeps/modules/src/m4/module-info.java
+++ b/langtools/test/tools/jdeps/modules/src/mIV/module-info.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-module m4 {
+module mIV {
     // not used in signature
     requires transitive java.compiler;
 
diff --git a/langtools/test/tools/jdeps/modules/src/m4/p4/Lib.java b/langtools/test/tools/jdeps/modules/src/mIV/p4/Lib.java
similarity index 100%
rename from langtools/test/tools/jdeps/modules/src/m4/p4/Lib.java
rename to langtools/test/tools/jdeps/modules/src/mIV/p4/Lib.java
diff --git a/langtools/test/tools/jdeps/modules/src/m4/p4/internal/Impl.java b/langtools/test/tools/jdeps/modules/src/mIV/p4/internal/Impl.java
similarity index 100%
rename from langtools/test/tools/jdeps/modules/src/m4/p4/internal/Impl.java
rename to langtools/test/tools/jdeps/modules/src/mIV/p4/internal/Impl.java
diff --git a/langtools/test/tools/jdeps/modules/src/m5/module-info.java b/langtools/test/tools/jdeps/modules/src/mV/module-info.java
similarity index 87%
rename from langtools/test/tools/jdeps/modules/src/m5/module-info.java
rename to langtools/test/tools/jdeps/modules/src/mV/module-info.java
index f8d05e479dd..76e0cd2e26b 100644
--- a/langtools/test/tools/jdeps/modules/src/m5/module-info.java
+++ b/langtools/test/tools/jdeps/modules/src/mV/module-info.java
@@ -21,9 +21,9 @@
  * questions.
  */
 
-module m5 {
-    // m4 requires transitive java.compiler
-    requires transitive m4;
+module mV {
+    // mIV requires transitive java.compiler
+    requires transitive mIV;
     requires transitive java.compiler;
 
     // java.sql should be requires transitive
@@ -34,6 +34,6 @@ module m5 {
 
     exports p5;
 
-    // m8 is not in the resolved graph but used by m8
-    exports p5.internal to m8;
+    // m8 is not in the resolved graph but used by mVIII
+    exports p5.internal to mVIII;
 }
diff --git a/langtools/test/tools/jdeps/modules/src/m5/p5/Main.java b/langtools/test/tools/jdeps/modules/src/mV/p5/Main.java
similarity index 100%
rename from langtools/test/tools/jdeps/modules/src/m5/p5/Main.java
rename to langtools/test/tools/jdeps/modules/src/mV/p5/Main.java
diff --git a/langtools/test/tools/jdeps/modules/src/m5/p5/internal/T.java b/langtools/test/tools/jdeps/modules/src/mV/p5/internal/T.java
similarity index 100%
rename from langtools/test/tools/jdeps/modules/src/m5/p5/internal/T.java
rename to langtools/test/tools/jdeps/modules/src/mV/p5/internal/T.java
diff --git a/langtools/test/tools/jdeps/modules/src/m8/module-info.java b/langtools/test/tools/jdeps/modules/src/mVIII/module-info.java
similarity index 97%
rename from langtools/test/tools/jdeps/modules/src/m8/module-info.java
rename to langtools/test/tools/jdeps/modules/src/mVIII/module-info.java
index 128025f352b..ac8dee5d994 100644
--- a/langtools/test/tools/jdeps/modules/src/m8/module-info.java
+++ b/langtools/test/tools/jdeps/modules/src/mVIII/module-info.java
@@ -21,8 +21,8 @@
  * questions.
  */
 
-module m8 {
-    requires m5;
+module mVIII {
+    requires mV;
 
     // use p5.internal
 }
diff --git a/langtools/test/tools/jdeps/modules/src/m8/p8/Main.java b/langtools/test/tools/jdeps/modules/src/mVIII/p8/Main.java
similarity index 100%
rename from langtools/test/tools/jdeps/modules/src/m8/p8/Main.java
rename to langtools/test/tools/jdeps/modules/src/mVIII/p8/Main.java
diff --git a/langtools/test/tools/lib/toolbox/TestRunner.java b/langtools/test/tools/lib/toolbox/TestRunner.java
index da05e76ffad..cdc63f635ac 100644
--- a/langtools/test/tools/lib/toolbox/TestRunner.java
+++ b/langtools/test/tools/lib/toolbox/TestRunner.java
@@ -90,7 +90,7 @@ public abstract class TestRunner {
                 } catch (InvocationTargetException e) {
                     errorCount++;
                     Throwable cause = e.getCause();
-                    out.println("Exception: " + e.getCause());
+                    out.println("Exception running test " + testName + ": " + e.getCause());
                     cause.printStackTrace(out);
                 }
                 out.println();
diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 5fa35e1ac6f..04e68575fc8 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -43,16 +43,21 @@ endif
 $(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
 ################################################################################
 # BUNDLE : Name of bundle to create
-# FILES : Files in BASE_DIR to add to bundle
-# SPECIAL_INCLUDES : List of directories inside BASE_DIR to look for additional
+# FILES : Files in BASE_DIRS to add to bundle
+# SPECIAL_INCLUDES : List of directories inside BASE_DIRS to look for additional
 #     files in. These files will not get proper dependency handling. Use when
 #     files or directories may contain spaces.
-# BASE_DIR : Base directory for the root dir in the bundle.
+# BASE_DIRS : Base directories for the root dir in the bundle.
 # SUBDIR : Optional name of root dir in bundle.
 SetupBundleFile = $(NamedParamsMacroTemplate)
 define SetupBundleFileBody
 
-  $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, %, $$($1_FILES))
+  $$(foreach d, $$($1_BASE_DIRS), \
+    $$(eval $1_$$d_RELATIVE_FILES := $$$$(patsubst $$d/%, %, \
+        $$$$(filter $$d/%, $$$$($1_FILES)))) \
+    $$(eval $1_$$d_LIST_FILE := \
+        $(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(TOPDIR)/%,%,$$d)_files)) \
+  )
 
   ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )
     $1_TYPE := tar.gz
@@ -65,55 +70,65 @@ define SetupBundleFileBody
   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
 
   $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
-	$$(eval $$(call ListPathsSafely, \
-	    $1_RELATIVE_FILES, \
-	    $(SUPPORT_OUTPUTDIR)/bundles/_$1_files))
+	$$(foreach d, $$($1_BASE_DIRS), \
+	  $$(eval $$(call ListPathsSafely, \
+	      $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
+	)
 	$$(call MakeDir, $$(@D))
         ifneq ($$($1_SPECIAL_INCLUDES), )
 	  $$(foreach i, $$($1_SPECIAL_INCLUDES), \
-	      ($(CD) $$($1_BASE_DIR) && $(FIND) $$i \
-	          >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; )
+	    $$(foreach d, $$d, \
+	      ($(CD) $$d && $(FIND) $$i \
+	          >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ))
         endif
-        ifneq ($$($1_SUBDIR), )
-          ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false)
-	    $(CD) $$($1_BASE_DIR) \
-	        && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-                    -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
-	            --transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \
-	        | $(GZIP) > $$@
-          else
-            # If a subdir has been specified, copy all files into a temporary
-            # location with this subdir before creating the tar file
-	    $(RM) -r $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
-	    $(MKDIR) -p $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
-	    ( $(CD) $$($1_BASE_DIR) \
-	        && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
-	            $(TAR_IGNORE_EXIT_VALUE) ) \
-	        | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )
-            # Unzip any zipped debuginfo files
-            ifeq ($$($1_UNZIP_DEBUGINFO), true)
-	      for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
-	        $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
-	      done
-            endif
-            ifeq ($$($1_TYPE), tar.gz)
-	      $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
-	          ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) \
-	          | $(GZIP) > $$@
-            else ifeq ($$($1_TYPE), zip)
-	      $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
-            endif
-          endif
+        ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO), .-zip-false)
+          # If no subdir is specified, zip can be done directly from BASE_DIRS.
+	  $$(foreach d, $$($1_BASE_DIRS), \
+	    ( $(CD) $$d \
+	    && $(ZIPEXE) -qru $$@ . -i@$$($1_$$d_LIST_FILE) \
+	    || test "$$$$?" = "12" )$$(NEWLINE))
+        else ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
+            .-tar.gz-false-1)
+          # If no subdir is specified and only one BASE_DIR, tar.gz can be done
+          # directly from BASE_DIR.
+	  $(CD) $$($1_BASE_DIRS) \
+	      && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
+	          -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
+	          $(TAR_IGNORE_EXIT_VALUE) ) \
+	      | $(GZIP) > $$@
+        else ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
+            tar.gz-true-false-1)
+          # If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
+          # transform option to create bundle directly from the BASE_DIR.
+	  $(CD) $$($1_BASE_DIRS) \
+	      && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
+	          -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
+	          $$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|') \
+	          $(TAR_IGNORE_EXIT_VALUE) ) \
+	      | $(GZIP) > $$@
         else
+          # In all other cases, need to copy all files into a temporary location
+          # before creation bundle.
+	  $(RM) -r $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
+	  $(MKDIR) -p $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
+	  $$(foreach d, $$($1_BASE_DIRS), \
+	    ( $(CD) $$d \
+	    && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
+	        $(TAR_IGNORE_EXIT_VALUE) ) \
+	    | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
+          # Unzip any zipped debuginfo files
+          ifeq ($$($1_UNZIP_DEBUGINFO), true)
+	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
+	      $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
+	    done
+          endif
           ifeq ($$($1_TYPE), tar.gz)
-	    $(CD) $$($1_BASE_DIR) \
-	        && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-	            -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
-	            $(TAR_IGNORE_EXIT_VALUE) ) \
-	        | $(GZIP) > $$@
+	    $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
+	    ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
+	        $$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
+	    | $(GZIP) > $$@
           else ifeq ($$($1_TYPE), zip)
-	    $(CD) $$($1_BASE_DIR) \
-	        && $(ZIPEXE) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files
+	    $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
           endif
         endif
 
@@ -219,7 +234,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
       BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
       FILES := $(JDK_BUNDLE_FILES), \
       SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
-      BASE_DIR := $(JDK_IMAGE_DIR), \
+      BASE_DIRS := $(JDK_IMAGE_DIR), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
@@ -228,7 +243,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
       BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
       FILES := $(JRE_BUNDLE_FILES), \
-      BASE_DIR := $(JRE_IMAGE_DIR), \
+      BASE_DIRS := $(JRE_IMAGE_DIR), \
       SUBDIR := $(JRE_BUNDLE_SUBDIR), \
   ))
 
@@ -237,7 +252,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
       BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
       FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
-      BASE_DIR := $(JDK_IMAGE_DIR), \
+      BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
       UNZIP_DEBUGINFO := true, \
   ))
@@ -247,7 +262,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \
       BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \
       FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \
-      BASE_DIR := $(JRE_IMAGE_DIR), \
+      BASE_DIRS := $(JRE_IMAGE_DIR), \
       SUBDIR := $(JRE_BUNDLE_SUBDIR), \
       UNZIP_DEBUGINFO := true, \
   ))
@@ -257,7 +272,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \
       BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \
       FILES := $(DEMOS_BUNDLE_FILES), \
-      BASE_DIR := $(JDK_IMAGE_DIR), \
+      BASE_DIRS := $(JDK_IMAGE_DIR), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
@@ -272,7 +287,7 @@ ifneq ($(filter test-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \
       BUNDLE_NAME := $(TEST_BUNDLE_NAME), \
       FILES := $(TEST_BUNDLE_FILES), \
-      BASE_DIR := $(TEST_IMAGE_DIR), \
+      BASE_DIRS := $(TEST_IMAGE_DIR), \
   ))
 
   TEST_TARGETS += $(BUILD_TEST_BUNDLE)
@@ -286,7 +301,7 @@ ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
       BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \
       FILES := $(DOCS_BUNDLE_FILES), \
-      BASE_DIR := $(DOCS_IMAGE_DIR), \
+      BASE_DIRS := $(DOCS_IMAGE_DIR), \
       SUBDIR := docs, \
   ))
 
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 59d317a99bc..b9c7c767aff 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -344,8 +344,6 @@ jdk.charsets_COPY := .dat
 
 ################################################################################
 
-jdk.accessibility_ADD_JAVAC_FLAGS := -Xlint:-exports
-
 ################################################################################
 
 jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \
@@ -448,7 +446,51 @@ jdk.jvmstat_COPY := aliasmap
 
 ################################################################################
 
-jdk.vm.ci_ADD_JAVAC_FLAGS := -Xlint:-exports
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JVMCI startup performance.
+
+jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
+
+################################################################################
+
+jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
+
+jdk.vm.compiler_EXCLUDES += \
+    org.graalvm.compiler.core.match.processor \
+    org.graalvm.compiler.nodeinfo.processor \
+    org.graalvm.compiler.options.processor \
+    org.graalvm.compiler.serviceprovider.processor \
+    org.graalvm.compiler.replacements.verifier \
+    org.graalvm.compiler.api.directives.test \
+    org.graalvm.compiler.api.test \
+    org.graalvm.compiler.asm.aarch64.test \
+    org.graalvm.compiler.asm.amd64.test \
+    org.graalvm.compiler.asm.sparc.test \
+    org.graalvm.compiler.asm.test \
+    org.graalvm.compiler.core.amd64.test \
+    org.graalvm.compiler.core.sparc.test \
+    org.graalvm.compiler.core.test \
+    org.graalvm.compiler.debug.test \
+    org.graalvm.compiler.graph.test \
+    org.graalvm.compiler.hotspot.amd64.test \
+    org.graalvm.compiler.hotspot.lir.test \
+    org.graalvm.compiler.hotspot.test \
+    org.graalvm.compiler.jtt \
+    org.graalvm.compiler.lir.jtt \
+    org.graalvm.compiler.lir.test \
+    org.graalvm.compiler.microbenchmarks \
+    org.graalvm.compiler.nodes.test \
+    org.graalvm.compiler.options.test \
+    org.graalvm.compiler.phases.common.test \
+    org.graalvm.compiler.replacements.test \
+    org.graalvm.compiler.test \
+    org.graalvm.compiler.virtual.bench \
+    #
+
+################################################################################
+
+jdk.aot_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
 
 ################################################################################
 
@@ -511,6 +553,22 @@ ifeq ($(MODULE), jdk.vm.ci)
   MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
 endif
 
+ifeq ($(MODULE), jdk.vm.compiler)
+  ## WORKAROUND jdk.vm.compiler source structure issue
+  VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
+          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+  MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
+endif
+
+ifeq ($(MODULE), jdk.aot)
+  ## WORKAROUND jdk.aot source structure issue
+  AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+  MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
+endif
+
 $(eval $(call SetupJavaCompilation, $(MODULE), \
     SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
     MODULE := $(MODULE), \
diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 8f3748b6908..fd502f116d9 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -79,6 +79,21 @@ ifneq ($(MAN_DIR), )
   DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
+LEGAL_NOTICES := \
+    $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
+    $(call FindModuleLegalDirs, $(MODULE)) \
+    #
+
+LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
+DEPS += $(call CacheFind, $(LEGAL_NOTICES))
+
+JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
+
+ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
+  JMOD_FLAGS += --do-not-resolve-by-default
+  JMOD_FLAGS += --warn-if-resolved=incubating
+endif
+
 # Add dependencies on other jmod files. Only java.base needs access to other
 # jmods.
 ifeq ($(MODULE), java.base)
@@ -112,7 +127,6 @@ ifeq ($(INTERIM_JMOD), true)
   DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
 endif
 
-# TODO: What about headers?
 # Create jmods in a temp dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
 $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
diff --git a/make/Help.gmk b/make/Help.gmk
index 45a5820c52e..bd10fa2ccb7 100644
--- a/make/Help.gmk
+++ b/make/Help.gmk
@@ -66,6 +66,12 @@ help:
 	$(info $(_) make clean-- # Remove all build results related to a certain)
 	$(info $(_)                        # module and phase)
 	$(info )
+	$(info Targets for Hotspot)
+	$(info $(_) make hotspot           # Build all of hotspot)
+	$(info $(_) make hotspot- # Build just the specified jvm variant)
+	$(info $(_) make hotspot-gensrc    # Only build the gensrc part of hotspot)
+	$(info $(_) make hotspot-- # Build the specified phase for the specified module)
+	$(info )
 	$(info Targets for specific modules)
 	$(info $(_) make           # Build  and everything it depends on)
 	$(info $(_) make -  # Compile the specified phase for the specified module)
diff --git a/make/Images.gmk b/make/Images.gmk
index fa3d3ba1db7..1806b9e8696 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -47,16 +47,43 @@ JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
     $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 JDK_MODULES += $(ALL_MODULES)
 
-# Compact builds have additional modules
-COMPACT1_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec \
-    jdk.unsupported
-COMPACT2_EXTRA_MODULES := jdk.xml.dom jdk.httpserver
-COMPACT3_EXTRA_MODULES := java.smartcardio jdk.management \
-    jdk.naming.dns jdk.naming.rmi jdk.sctp jdk.security.auth
+# Modules list for compact builds 
+JRE_COMPACT1_MODULES := \
+    java.logging \
+    java.scripting \
+    jdk.localedata \
+    jdk.crypto.token \
+    jdk.crypto.ec \
+    jdk.unsupported \
+    #
 
-JRE_COMPACT1_MODULES := java.compact1 $(COMPACT1_EXTRA_MODULES)
-JRE_COMPACT2_MODULES := $(JRE_COMPACT1_MODULES) java.compact2 $(COMPACT2_EXTRA_MODULES)
-JRE_COMPACT3_MODULES := $(JRE_COMPACT2_MODULES) java.compact3 $(COMPACT3_EXTRA_MODULES)
+JRE_COMPACT2_MODULES := \
+    $(JRE_COMPACT1_MODULES) \
+    java.rmi \
+    java.sql \
+    java.xml \
+    jdk.xml.dom \
+    jdk.httpserver \
+    #
+
+JRE_COMPACT3_MODULES := \
+    $(JRE_COMPACT2_MODULES) \
+    java.smartcardio \
+    java.compiler \
+    java.instrument \
+    java.management \
+    java.naming \
+    java.prefs \
+    java.security.jgss \
+    java.security.sasl \
+    java.sql.rowset \
+    java.xml.crypto \
+    jdk.management \
+    jdk.naming.dns \
+    jdk.naming.rmi \
+    jdk.sctp \
+    jdk.security.auth \
+    #
 
 JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
 JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
@@ -92,6 +119,7 @@ JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \
     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
+    --dedup-legal-notices=error-if-not-same-content \
     $(JLINK_JLI_CLASSES) \
     #
 
@@ -287,8 +315,6 @@ endif # Windows
 ################################################################################
 # doc files
 
-JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
-JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
 JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
 
@@ -317,11 +343,11 @@ JDK_TARGETS += $(JDK_DOC_TARGETS)
 ################################################################################
 # src.zip
 
-$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
+$(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
 	$(install-file)
 
-JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
+JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
 
 ################################################################################
 # /demo dir
diff --git a/make/InterimImage.gmk b/make/InterimImage.gmk
index d22a7096be7..486b24db2d7 100644
--- a/make/InterimImage.gmk
+++ b/make/InterimImage.gmk
@@ -38,7 +38,7 @@ INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
 
 JMODS := $(patsubst %, $(INTERIM_JMODS_DIR)/%.jmod, $(INTERIM_IMAGE_MODULES))
 
-JLINK_TOOL := $(JLINK) \
+JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
     --module-path $(INTERIM_JMODS_DIR) \
     --endian $(OPENJDK_BUILD_CPU_ENDIAN)
 
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index b16cba126bd..c8e0a4484c9 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -122,6 +122,7 @@ CORE_EXCLUDED_PACKAGES += \
     org.w3c.dom.html \
     org.w3c.dom.stylesheets \
     org.w3c.dom.xpath \
+    org.graalvm.compiler.% \
     #
 
 CORE_PACKAGES := $(filter-out $(CORE_EXCLUDED_PACKAGES), \
@@ -576,12 +577,13 @@ $(eval $(call SetupJavadocGeneration, jshellapi, \
     PACKAGES := \
         jdk.jshell \
         jdk.jshell.spi \
-        jdk.jshell.execution, \
+        jdk.jshell.execution \
+        jdk.jshell.tool, \
     API_ROOT := jdk, \
     DEST_DIR := jshell, \
-    OVERVIEW := $(LANGTOOLS_TOPDIR)/src/jdk.jshell/share/classes/jdk/jshell/overview.html, \
     TITLE := JShell API, \
     FIRST_COPYRIGHT_YEAR := 2015, \
+    SPLIT_INDEX := TRUE, \
 ))
 
 TARGETS += $(jshellapi)
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
index d42f361e1c9..3a337af85a1 100644
--- a/make/Jprt.gmk
+++ b/make/Jprt.gmk
@@ -81,7 +81,6 @@ ifeq ($(JPRT_TARGET), $(DEFAULT_MAKE_TARGET))
   # Optional symbols bundle
   ifeq ($(GCOV_ENABLED), true)
     jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
-    zip-bundles: $(SYMBOLS_ZIP_BUNDLE)
 
     $(JPRT_ARCHIVE_SYMBOLS_BUNDLE): product-images
 	$(call MakeDir, $(@D))
diff --git a/make/Main.gmk b/make/Main.gmk
index e264d91d6ad..6aa135b91a8 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -85,10 +85,14 @@ ifneq ($(CREATING_BUILDJDK), true)
 
   buildtools-modules:
 	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
+
+  buildtools-hotspot:
+	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
-    interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules
+    interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
+    buildtools-hotspot
 
 ################################################################################
 # Special targets for certain modules
@@ -236,15 +240,35 @@ ALL_TARGETS += $(LAUNCHER_TARGETS)
 ################################################################################
 # Build hotspot target
 
-ifeq ($(BUILD_HOTSPOT),true)
-  hotspot:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk)
-endif
+HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
+HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
+HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
+
+define DeclareHotspotGensrcRecipe
+  hotspot-$1-gensrc:
+	$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
+	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
+	    JVM_VARIANT=$1)
+endef
+
+$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
+
+define DeclareHotspotLibsRecipe
+  hotspot-$1-libs:
+	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
+	    JVM_VARIANT=$1)
+endef
+
+$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
+
+hotspot-jsig:
+	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
 
 hotspot-ide-project:
 	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
 
-ALL_TARGETS += hotspot hotspot-ide-project
+ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
+    $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
 
 ################################################################################
 # Build demos and samples targets
@@ -527,11 +551,13 @@ else
 
   buildtools-jdk: interim-langtools interim-cldrconverter
 
+  buildtools-hotspot: interim-langtools
+
   buildtools-modules: exploded-image-base
 
   $(CORBA_GENSRC_TARGETS): interim-langtools
 
-  $(HOTSPOT_GENSRC_TARGETS): interim-langtools
+  $(HOTSPOT_GENSRC_TARGETS): interim-langtools buildtools-hotspot
 
   $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
 
@@ -545,11 +571,18 @@ else
 
   $(JAVA_TARGETS): interim-langtools
 
+  # Declare dependencies between hotspot-* targets
+  $(foreach v, $(JVM_VARIANTS), \
+      $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
+      $(eval hotspot-$v-libs: hotspot-$v-gensrc) \
+  )
+
   hotspot-ide-project: hotspot exploded-image
 
   generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
 
-  $(LIBS_TARGETS): hotspot
+  # Building one JVM variant is enough to start building the other libs
+  $(LIBS_TARGETS): hotspot-$(JVM_VARIANT_MAIN)-libs
 
   $(LAUNCHER_TARGETS): java.base-libs
 
@@ -601,6 +634,14 @@ else
   # current JDK.
   jdk.vm.ci-gensrc-hotspot: java.base-java
 
+  # The annotation processing for jdk.vm.compiler needs classes from the current JDK.
+  jdk.vm.compiler-gensrc-hotspot: java.base-java java.management-java \
+      jdk.management-java jdk.vm.ci-java jdk.unsupported-java
+
+  # For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
+  # file to be processed by the gensrc-moduleinfo target.
+  jdk.vm.compiler-gensrc-moduleinfo: jdk.vm.compiler-gensrc-hotspot
+
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
 
@@ -615,6 +656,9 @@ else
         $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
   endif
 
+  # Building java.base-jmod requires all of hotspot to be built.
+  java.base-jmod: hotspot
+
   # Declare dependencies from -jmod to all other module targets
   # When creating a BUILDJDK, the java compilation has already been done by the
   # normal build and copied in.
@@ -659,6 +703,9 @@ else
         exploded-image-optimize
   endif
 
+  # All modules include the main license files from java.base.
+  $(JMOD_TARGETS): java.base-copy
+
   zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
       $(filter jdk.crypto%, $(JAVA_TARGETS))
 
@@ -686,6 +733,7 @@ else
 
   jdk-image: jmods zip-source demos samples release-file
   jre-image: jmods release-file
+  symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
 
   profiles: jmods release-file
 
@@ -702,7 +750,7 @@ else
   docs-javadoc: $(GENSRC_TARGETS) rmic
 
   # The gensrc step for jdk.jdi creates an html file that is used by docs-copy.
-  docs-copy: hotspot jdk.jdi-gensrc
+  docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc
 
   docs-zip: docs-javadoc docs-copy
 
@@ -725,7 +773,8 @@ else
 
   test-image-failure-handler: build-test-failure-handler
 
-  build-test-hotspot-jtreg-native: buildtools-jdk hotspot
+  build-test-hotspot-jtreg-native: buildtools-jdk \
+      hotspot-$(JVM_VARIANT_MAIN)-libs
 
   build-test-jdk-jtreg-native: buildtools-jdk
 
@@ -757,7 +806,17 @@ endif
 # Virtual targets without recipes
 
 buildtools: buildtools-langtools interim-langtools interim-rmic \
-    buildtools-jdk
+    buildtools-jdk buildtools-hotspot
+
+hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig
+
+hotspot-libs: hotspot-jsig
+
+# Create targets hotspot-libs and hotspot-gensrc.
+$(foreach v, $(JVM_VARIANTS), \
+  $(eval hotspot-libs: hotspot-$v-libs) \
+  $(eval hotspot-gensrc: hotspot-$v-gensrc) \
+)
 
 gensrc: $(GENSRC_TARGETS)
 
@@ -788,6 +847,10 @@ $(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
 $(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs))
 $(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
 $(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy))
+
+# Building java.base includes building all of hotspot.
+java.base: hotspot
+
 demos: demos-jdk
 
 samples: samples-jdk
@@ -843,7 +906,8 @@ all-images: product-images test-image docs-image
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles
 
-ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
+ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
+    copy java rmic libs launchers jmods \
     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \
     exploded-image-base exploded-image \
     create-buildjdk mac-bundles product-images docs-image test-image all-images \
diff --git a/make/ReleaseFile.gmk b/make/ReleaseFile.gmk
index d68d9e47901..b57cb7be780 100644
--- a/make/ReleaseFile.gmk
+++ b/make/ReleaseFile.gmk
@@ -47,6 +47,7 @@ define create-info-file
   $(if $(JDK_ARCH_ABI_PROP_NAME), \
     $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
   $(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))")
+  $(call info-file-item, "IMPLEMENTOR", "$(COMPANY_NAME)")
 endef
 
 # Param 1 - The file containing the MODULES list
diff --git a/make/ZipSecurity.gmk b/make/ZipSecurity.gmk
index c894a8a33bb..465171ac6d6 100644
--- a/make/ZipSecurity.gmk
+++ b/make/ZipSecurity.gmk
@@ -43,8 +43,8 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
         modules/java.base/com/sun/crypto/provider \
         modules/jdk.crypto.ec/sun/security/ec \
         modules/jdk.crypto.mscapi/sun/security/mscapi \
-        modules/jdk.crypto.pkcs11/sun/security/pkcs11 \
-        modules/jdk.crypto.pkcs11/sun/security/pkcs11/wrapper \
+        modules/jdk.crypto.token/sun/security/pkcs11 \
+        modules/jdk.crypto.token/sun/security/pkcs11/wrapper \
         modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \
         modules/java.base/javax/net \
         modules/java.base/javax/security/cert \
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index ec04e1b68f7..8c033a74243 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -861,13 +861,8 @@ ExecuteWithLog = \
 ################################################################################
 # Find lib dir for module
 # Param 1 - module name
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
-else
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
-endif
+FindLibDirForModule = \
+    $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
 
 ################################################################################
 # Return a string suitable for use after a -classpath or --module-path option. It
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index bb990d0a6fc..9749420276f 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -83,9 +83,6 @@ UPGRADEABLE_MODULES += \
 NON_UPGRADEABLE_MODULES +=
 
 AGGREGATOR_MODULES += \
-    java.compact1 \
-    java.compact2 \
-    java.compact3 \
     java.se \
     java.se.ee \
     #
@@ -107,7 +104,7 @@ PLATFORM_MODULES += \
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \
-    jdk.crypto.pkcs11 \
+    jdk.crypto.token \
     jdk.desktop \
     jdk.dynalink \
     jdk.jsobject \
@@ -122,7 +119,7 @@ PLATFORM_MODULES += \
 
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
-    jdk.pack200 \
+    jdk.pack \
     jdk.scripting.nashorn.shell \
     #
 
@@ -144,6 +141,20 @@ ifeq ($(INCLUDE_SA), false)
   MODULES_FILTER += jdk.hotspot.agent
 endif
 
+################################################################################
+# Filter out Graal specific modules if Graal build is disabled
+
+ifeq ($(INCLUDE_GRAAL), false)
+  MODULES_FILTER += jdk.vm.compiler
+endif
+
+################################################################################
+# Filter out aot specific modules if aot is disabled
+
+ifeq ($(ENABLE_AOT), false)
+  MODULES_FILTER += jdk.aot
+endif
+
 ################################################################################
 # Module list macros
 
@@ -286,6 +297,21 @@ FindAllUpgradeableModules = \
 
 ################################################################################
 
+LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal
+ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
+  LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
+endif
+LEGAL_SUBDIRS += share/legal
+
+# Find all legal dirs for a particular module
+# $1 - Module to find legal dirs for
+FindModuleLegalDirs = \
+    $(strip $(wildcard \
+        $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
+        $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+
+################################################################################
+
 # Param 1 - Name of module
 define ReadSingleImportMetaData
     ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), )
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 1f29f88a593..66da00edcbd 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -382,3 +382,4 @@ a7f21ee6ed30695a6de14e74035d2857a754f62b jdk-9+144
 55f5a96988de8237f3ee65a69aa4a48aed9ca8d4 jdk-9+146
 9e86d6383456a1eb0298c72bb9ca363939ad90cf jdk-9+147
 0a4bc2f049132ddc20985565bb41b2be8a458dda jdk-9+148
+c281306d33d83c92e0d870ace385d5f99678d7e7 jdk-9+149
diff --git a/nashorn/THIRD_PARTY_README b/nashorn/THIRD_PARTY_README
deleted file mode 100644
index a93b35b994c..00000000000
--- a/nashorn/THIRD_PARTY_README
+++ /dev/null
@@ -1,3605 +0,0 @@
-DO NOT TRANSLATE OR LOCALIZE.
------------------------------
-
-%% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
-OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2000-2011 France Télécom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
---- end of LICENSE ---
-
---------------------------------------------------------------------------------
-
-%% This notice is provided with respect to BSDiff v4.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright 2003-2005 Colin Percival
-All rights reserved
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted providing 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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to CodeViewer 1.0, which may be
-included with JDK 8.
-
---- begin of LICENSE ---
-
-Copyright 1999 by CoolServlets.com.
-
-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. 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.
-
-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.
-
-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."
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Cryptix AES 3.2.0, which may be
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-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 ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to CUP Parser Generator for 
-Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-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
-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.
-
-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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Document Object Model (DOM) Level 2
-& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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
-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
-site-policy@w3.org.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Dynalink v0.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2009-2013, Attila Szegedi
-
-All rights reserved.Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following conditions are
-met:* 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 Attila
-Szegedi nor the names of its contributors may be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Elliptic Curve Cryptography, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
-
-You are receiving a copy of the Elliptic Curve Cryptography library in source
-form with the JDK 8 and OpenJDK 8 source distributions, and as object code in
-the JRE 8 & JDK 8 runtimes.
-
-In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do
-NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
-following license, separately from Oracle's JDK & JRE.  If you do not wish to
-install the Elliptic Curve Cryptography library, 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.
-
-    
-    Copyright (C)   
-
-    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.
-
-  , 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  ECMAScript Language
-Specification ECMA-262 Edition 5.1 which may be included with 
-JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright notice
-Copyright © 2011 Ecma International
-Ecma International
-Rue du Rhone 114
-CH-1204 Geneva
-Tel: +41 22 849 6000
-Fax: +41 22 849 6001
-Web: http://www.ecma-international.org
-
-This document and possible translations of it may be copied and furnished to
-others, and derivative works that comment on or otherwise explain it or assist
-in its implementation may be prepared, copied, published, and distributed, in
-whole or in part, without restriction of any kind, provided that the above
-copyright notice and this section are included on all such copies and derivative
-works. However, this document itself may not be modified in any way, including
-by removing the copyright notice or references to Ecma International, except as
-needed for the purpose of developing any document or deliverable produced by
-Ecma International (in which case the rules applied to copyrights must be
-followed) or as required to translate it into languages other than English. The
-limited permissions granted above are perpetual and will not be revoked by Ecma
-International or its successors or assigns. This document and the information
-contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
-WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP
-RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE." Software License
-
-All Software contained in this document ("Software)" is protected by copyright
-and is being made available under the "BSD License", included below. This
-Software may be subject to third party rights (rights from parties other than
-Ecma International), including patent rights, and no licenses under such third
-party rights are granted under this license even if the third party concerned is
-a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS
-AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR
-INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO
-IMPLEMENT ECMA INTERNATIONAL STANDARDS*. 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 authors nor Ecma International may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "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 ECMA INTERNATIONAL 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 Dynalink library which is included
-with the Nashorn technology.
-
---- begin of LICENSE ---
-Copyright (c) 2009-2013, Attila Szegedi
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-* 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 the copyright holder nor the names of
-  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 COPYRIGHT HOLDER
-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 Joni library which is included
-with the Nashorn technology.
-
---- begin of 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:
-
-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 FontConfig 2.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright © 2001,2003 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 of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to IAIK PKCS#11 Wrapper, 
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-IAIK PKCS#11 Wrapper 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:
-
-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 IAIK of Graz University of
-    Technology."
-
-   Alternately, this acknowledgment may appear in the software itself, if and
-   wherever such third-party acknowledgments normally appear.
-
-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.
-
-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.
-
-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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 1995-2010 International Business Machines Corporation and others 
-
-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, 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.
-
-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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to IJG JPEG 6b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-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.
-
-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".
-
-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.
-
---- end of LICENSE ---
-
---------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Joni v1.1.9, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of 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:
-
-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 JOpt-Simple v3.0,  which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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 JSON, which may be included 
-with JRE 8 & JDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2002 JSON.org
-
-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 shall be used for Good, not Evil.
-
-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 may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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 may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
- 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.
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Kronos OpenGL headers, which may be 
-included with JDK 8 and OpenJDK 8 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.5.4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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 following
-this sentence.
-
-This code is released under the libpng license.
-
-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-Copyright (c) 2004, 2006-2011 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
-
-   Cosmin Truta
-
-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.
-
-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:
-
-   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:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-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:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-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 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.
-
-2. Altered versions must be plainly marked as such and must not
-   be misrepresented as being the original source.
-
-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, 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:
-
-   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 a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-July 7, 2011
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to libungif 4.1.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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 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 Little CMS 2.4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Little CMS
-Copyright (c) 1998-2010 Marti Maria Saguer
-
-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 ---
-
--------------------------------------------------------------------------------
-
-%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the
-U.S. and other countries.
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Mesa 3D Graphics Library v4.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions.
-
---- begin of LICENSE ---
-
- 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 of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Mozilla Network Security
-Services (NSS), which is supplied with the JDK test suite in the OpenJDK
-source code repository. It is licensed under Mozilla Public License (MPL),
-version 2.0.
-
-The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
-
-The NSS source code is available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/src
-
-The NSS libraries are available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/lib
-
---- begin of LICENSE ---
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    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. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-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 such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-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 Software 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 placed in a text file included with all distributions of the Covered
-Software under this License. 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. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software 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 Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any 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 Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, 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.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the 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. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright (c) 1999-2004 David Corcoran 
-Copyright (c) 1999-2004 Ludovic Rousseau 
-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. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by: 
-      David Corcoran 
-      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.
-
-Changes to this license can be made only by the copyright author with 
-explicit written consent.
-
-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.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to PorterStemmer v4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-See: http://tartarus.org/~martin/PorterStemmer
-
-The software is completely free for any purpose, unless notes at the head of
-the program text indicates otherwise (which is rare). In any case, the notes
-about licensing are never more restrictive than the BSD License.
-
-In every case where the software is not written by me (Martin Porter), this
-licensing arrangement has been endorsed by the contributor, and it is
-therefore unnecessary to ask the contributor again to confirm it.
-
-I have not asked any contributors (or their employers, if they have them) for
-proofs that they have the right to distribute their software in this way.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Relax NG Object/Parser v.20050510,
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) Kohsuke Kawaguchi
-
-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 RelaxNGCC v1.12, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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:
-
-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 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.
-
-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.
-
-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.
-
-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 ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to SAX 2.0.1, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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.
-
- 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.
-
- David Megginson, sax@megginson.com
- 1998-05-11
-
- SAX 2.0 
-
- 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@megginson.com
- 2000-05-05
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to SoftFloat version 2b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 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 ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Sparkle 1.5,
-which may be included with JRE 8 on Mac OS X.
-
---- begin of LICENSE ---
-
-Copyright (c) 2012 Sparkle.org and Andy Matuschak
-
-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 ---
-
--------------------------------------------------------------------------------
-
-%% Portions licensed from Taligent, Inc.
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Thai Dictionary, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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.2.0 & CLDR 21.0.1
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
-
---- 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-2013 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-2012 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 may be included 
-with JRE 8 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
-
-
-PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
-TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-
-
-ABSTRACT
-========
-
-   UPX and UCL are copyrighted software distributed under the terms
-   of the GNU General Public License (hereinafter the "GPL").
-
-   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.
-
-   As a special exception we grant the free usage of UPX for all
-   executables, including commercial programs.
-   See below for details and restrictions.
-
-
-COPYRIGHT
-=========
-
-   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@jk.uni-linz.ac.at        ml1050@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 may be included with JRE 8, JDK 8, and OpenJDK 8 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 may be 
-included with JRE 8, JDK 8, and OpenJDK 8 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.
-
-2. XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following
-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:
-
-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)  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 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.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2. The Open Group
-
-Copyright  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.
-
-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.  3.2.
-Berkeley-based copyrights:
-
-o
-3.2.1. General
-
-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 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 
-
-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 
-
-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@urwpp.de or design@bigelowandholmes.com
-
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-  version 1.2.5, 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@gzip.org          madler@alumni.caltech.edu
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
-  Apache Jakarta BCEL 5.2 
-  Apache Jakarta Regexp 1.4 
-  Apache Santuario XML Security for Java 1.5.4
-  Apache Xalan-Java 2.7.1 
-  Apache Xerces Java 2.10.0 
-  Apache XML Resolver 1.1 
-  Dynalink 0.5
-
-
---- 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 ---
-
--------------------------------------------------------------------------------
-
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index cbf7f29bf22..623719169d3 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -278,7 +278,6 @@
       
       
       
-      
       
     
   
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 9b61ea87688..da1c640a5d6 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -356,6 +356,7 @@ run.test.jvmargs.common=\
   -server \
   ${test.module.imports} \
   ${run.test.jvmargs.external} \
+  --add-modules jdk.scripting.nashorn.shell \
   ${nashorn.override.option} \
   -Dfile.encoding=UTF-8 \
   -Duser.language=${run.test.user.language} \
diff --git a/nashorn/src/jdk.dynalink/share/legal/dynalink.md b/nashorn/src/jdk.dynalink/share/legal/dynalink.md
new file mode 100644
index 00000000000..b8ee7cb698e
--- /dev/null
+++ b/nashorn/src/jdk.dynalink/share/legal/dynalink.md
@@ -0,0 +1,31 @@
+## Dynalink v.5
+
+### Dynalink License
+
            +
+Copyright (c) 2009-2013, Attila Szegedi
+
+All rights reserved.Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+* 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 Attila Szegedi nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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 THEPOSSIBILITY OF SUCH DAMAGE.
+
+
            
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
index c40943b60fe..a40ed5f22ce 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
@@ -39,7 +39,6 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.UncheckedIOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -49,6 +48,7 @@ import java.lang.ref.SoftReference;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReader;
 import java.lang.module.ModuleReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Layer;
@@ -1349,10 +1349,12 @@ public final class Context {
     static Module createModuleTrusted(final Layer parent, final ModuleDescriptor descriptor, final ClassLoader loader) {
         final String mn = descriptor.name();
 
-        final ModuleReference mref = new ModuleReference(descriptor, null, () -> {
-            IOException ioe = new IOException("");
-            throw new UncheckedIOException(ioe);
-        });
+        final ModuleReference mref = new ModuleReference(descriptor, null) {
+            @Override
+            public ModuleReader open() {
+                throw new UnsupportedOperationException();
+            }
+        };
 
         final ModuleFinder finder = new ModuleFinder() {
             @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
index e04167d87fe..250dbe58df9 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
@@ -107,14 +107,13 @@ public abstract class ArrayData {
 
         @Override
         public ArrayData ensure(final long safeIndex) {
-            if (safeIndex > 0L) {
-                if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH) {
-                    return new SparseArrayData(this, safeIndex + 1);
-                }
-                //known to fit in int
-                return toRealArrayData((int)safeIndex);
-           }
-           return this;
+            assert safeIndex >= 0L;
+            if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH) {
+                return new SparseArrayData(this, safeIndex + 1);
+            }
+            //known to fit in int
+            return toRealArrayData((int)safeIndex);
+
         }
 
         @Override
@@ -133,8 +132,8 @@ public abstract class ArrayData {
         }
 
         @Override
-        public void shiftLeft(final int by) {
-            //nop, always empty or we wouldn't be of this class
+        public ArrayData shiftLeft(final int by) {
+            return this; //nop, always empty or we wouldn't be of this class
         }
 
         @Override
@@ -451,13 +450,13 @@ public abstract class ArrayData {
     /**
      * Shift the array data left
      *
-     * TODO: explore start at an index and not at zero, to make these operations
-     * even faster. Offset everything from the index. Costs memory but is probably
-     * worth it
+     * TODO: This is used for Array.prototype.shift() which only shifts by 1,
+     * so we might consider dropping the offset parameter.
      *
      * @param by offset to shift
+     * @return New arraydata (or same)
      */
-    public abstract void shiftLeft(final int by);
+    public abstract ArrayData shiftLeft(final int by);
 
     /**
      * Shift the array right
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
index 19ecec2e72b..47e64549ee6 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
@@ -68,9 +68,10 @@ abstract class ArrayFilter extends ArrayData {
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         underlying.shiftLeft(by);
         setLength(underlying.length());
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
index f18b4a44ff3..2b032657790 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
@@ -82,7 +82,7 @@ final class ByteBufferArrayData extends ArrayData {
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         throw unsupported("shiftLeft");
     }
 
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
index bd706c7e456..62e1ced8727 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
@@ -76,9 +76,10 @@ final class DeletedArrayFilter extends ArrayFilter {
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         super.shiftLeft(by);
         deleted.shiftLeft(by, length());
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
index 7a6f098c415..d4710318d8f 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
@@ -101,10 +101,12 @@ final class DeletedRangeArrayFilter extends ArrayFilter {
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         super.shiftLeft(by);
         lo = Math.max(0, lo - by);
         hi = Math.max(-1, hi - by);
+
+        return isEmpty() ? getUnderlying() : this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
index ef899fc691c..03a6545f032 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
@@ -176,8 +176,15 @@ final class IntArrayData extends ContinuousArrayData implements IntElements {
     }
 
     @Override
-    public void shiftLeft(final int by) {
-        System.arraycopy(array, by, array, 0, array.length - by);
+    public ArrayData shiftLeft(final int by) {
+        if (by >= length()) {
+            shrink(0);
+        } else {
+            System.arraycopy(array, by, array, 0, array.length - by);
+        }
+        setLength(Math.max(0, length() - by));
+
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
index 73fcb083d72..3804e320e4b 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
@@ -121,8 +121,14 @@ final class NumberArrayData extends ContinuousArrayData implements NumericElemen
     }
 
     @Override
-    public void shiftLeft(final int by) {
-        System.arraycopy(array, by, array, 0, array.length - by);
+    public ArrayData shiftLeft(final int by) {
+        if (by >= length()) {
+            shrink(0);
+        } else {
+            System.arraycopy(array, by, array, 0, array.length - by);
+        }
+        setLength(Math.max(0, length() - by));
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
index cb99de829f4..027bd6b0acf 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
@@ -98,8 +98,14 @@ final class ObjectArrayData extends ContinuousArrayData implements AnyElements {
     }
 
     @Override
-    public void shiftLeft(final int by) {
-        System.arraycopy(array, by, array, 0, array.length - by);
+    public ArrayData shiftLeft(final int by) {
+        if (by >= length()) {
+            shrink(0);
+        } else {
+            System.arraycopy(array, by, array, 0, array.length - by);
+        }
+        setLength(Math.max(0, length() - by));
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
index 4cb04e312ab..5be96e8ca55 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
@@ -36,6 +36,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
  * Handle arrays where the index is very large.
  */
 class SparseArrayData extends ArrayData {
+    /** Maximum size for dense arrays */
     static final int MAX_DENSE_LENGTH = 1024 * 1024;
 
     /** Underlying array. */
@@ -51,7 +52,7 @@ class SparseArrayData extends ArrayData {
         this(underlying, length, new TreeMap<>());
     }
 
-    SparseArrayData(final ArrayData underlying, final long length, final TreeMap sparseMap) {
+    private SparseArrayData(final ArrayData underlying, final long length, final TreeMap sparseMap) {
         super(length);
         assert underlying.length() <= length;
         this.underlying = underlying;
@@ -89,38 +90,49 @@ class SparseArrayData extends ArrayData {
     }
 
     @Override
-    public void shiftLeft(final int by) {
-        underlying.shiftLeft(by);
+    public ArrayData shiftLeft(final int by) {
+        underlying = underlying.shiftLeft(by);
 
         final TreeMap newSparseMap = new TreeMap<>();
 
         for (final Map.Entry entry : sparseMap.entrySet()) {
             final long newIndex = entry.getKey() - by;
-            if (newIndex < maxDenseLength) {
-                underlying = underlying.set((int) newIndex, entry.getValue(), false);
-            } else if (newIndex >= 0) {
-                newSparseMap.put(newIndex, entry.getValue());
+            if (newIndex >= 0) {
+                if (newIndex < maxDenseLength) {
+                    final long oldLength = underlying.length();
+                    underlying = underlying.ensure(newIndex)
+                            .set((int) newIndex, entry.getValue(), false)
+                            .safeDelete(oldLength, newIndex - 1, false);
+                } else {
+                    newSparseMap.put(newIndex, entry.getValue());
+                }
             }
         }
 
         sparseMap = newSparseMap;
         setLength(Math.max(length() - by, 0));
+
+        return sparseMap.isEmpty() ? underlying : this;
     }
 
     @Override
     public ArrayData shiftRight(final int by) {
         final TreeMap newSparseMap = new TreeMap<>();
+        // Move elements from underlying to sparse map if necessary
         final long len = underlying.length();
         if (len + by > maxDenseLength) {
-            for (long i = maxDenseLength - by; i < len; i++) {
+            // Length of underlying array after shrinking, before right-shifting
+            final long tempLength = Math.max(0, maxDenseLength - by);
+            for (long i = tempLength; i < len; i++) {
                 if (underlying.has((int) i)) {
                     newSparseMap.put(i + by, underlying.getObject((int) i));
                 }
             }
-            underlying = underlying.shrink((int) (maxDenseLength - by));
+            underlying = underlying.shrink((int) tempLength);
+            underlying.setLength(tempLength);
         }
 
-        underlying.shiftRight(by);
+        underlying = underlying.shiftRight(by);
 
         for (final Map.Entry entry : sparseMap.entrySet()) {
             final long newIndex = entry.getKey() + by;
@@ -135,14 +147,6 @@ class SparseArrayData extends ArrayData {
 
     @Override
     public ArrayData ensure(final long safeIndex) {
-        // Usually #ensure only needs to be called if safeIndex is greater or equal current length.
-        // SparseArrayData is an exception as an index smaller than our current length may still
-        // exceed the underlying ArrayData's capacity. Because of this, SparseArrayData invokes
-        // its ensure method internally in various places where other ArrayData subclasses don't,
-        // making it safe for outside uses to only call ensure(safeIndex) if safeIndex >= length.
-        if (safeIndex < maxDenseLength && underlying.length() <= safeIndex) {
-            underlying = underlying.ensure(safeIndex);
-        }
         if (safeIndex >= length()) {
             setLength(safeIndex + 1);
         }
@@ -167,8 +171,7 @@ class SparseArrayData extends ArrayData {
     public ArrayData set(final int index, final Object value, final boolean strict) {
         if (index >= 0 && index < maxDenseLength) {
             final long oldLength = underlying.length();
-            ensure(index);
-            underlying = underlying.set(index, value, strict).safeDelete(oldLength, index - 1, strict);
+            underlying = underlying.ensure(index).set(index, value, strict).safeDelete(oldLength, index - 1, strict);
             setLength(Math.max(underlying.length(), length()));
         } else {
             final Long longIndex = indexToKey(index);
@@ -183,8 +186,7 @@ class SparseArrayData extends ArrayData {
     public ArrayData set(final int index, final int value, final boolean strict) {
         if (index >= 0 && index < maxDenseLength) {
             final long oldLength = underlying.length();
-            ensure(index);
-            underlying = underlying.set(index, value, strict).safeDelete(oldLength, index - 1, strict);
+            underlying = underlying.ensure(index).set(index, value, strict).safeDelete(oldLength, index - 1, strict);
             setLength(Math.max(underlying.length(), length()));
         } else {
             final Long longIndex = indexToKey(index);
@@ -198,8 +200,7 @@ class SparseArrayData extends ArrayData {
     public ArrayData set(final int index, final double value, final boolean strict) {
         if (index >= 0 && index < maxDenseLength) {
             final long oldLength = underlying.length();
-            ensure(index);
-            underlying = underlying.set(index, value, strict).safeDelete(oldLength, index - 1, strict);
+            underlying = underlying.ensure(index).set(index, value, strict).safeDelete(oldLength, index - 1, strict);
             setLength(Math.max(underlying.length(), length()));
         } else {
             final Long longIndex = indexToKey(index);
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
index 2eaf61e7e47..60a5b93129b 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
@@ -98,7 +98,7 @@ public abstract class TypedArrayData extends ContinuousArrayDa
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
index 977b9e99c1d..c6b1bd9db58 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
@@ -77,9 +77,10 @@ final class UndefinedArrayFilter extends ArrayFilter {
     }
 
     @Override
-    public void shiftLeft(final int by) {
+    public ArrayData shiftLeft(final int by) {
         super.shiftLeft(by);
         undefined.shiftLeft(by, length());
+        return this;
     }
 
     @Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/legal/double-conversion.md b/nashorn/src/jdk.scripting.nashorn/share/legal/double-conversion.md
new file mode 100644
index 00000000000..b66234617f9
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn/share/legal/double-conversion.md
@@ -0,0 +1,36 @@
+## Double-conversion v1.1.5
+
+### Double-conversion License
+
+https://raw.githubusercontent.com/google/double-conversion/master/LICENSE
+
+
            +
+Copyright 2006-2011, the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* 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 Google Inc. nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
            
diff --git a/nashorn/src/jdk.scripting.nashorn/share/legal/joni.md b/nashorn/src/jdk.scripting.nashorn/share/legal/joni.md
new file mode 100644
index 00000000000..d13f1e60181
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn/share/legal/joni.md
@@ -0,0 +1,26 @@
+## JRuby Joni v1.1.9
+
+### JRuby License
+
            +
+Jruby 2012
+
+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.
+
+
            
diff --git a/nashorn/test/script/basic/JDK-8171219.js b/nashorn/test/script/basic/JDK-8171219.js
new file mode 100644
index 00000000000..6c1cf729574
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8171219.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8171219: Missing checks in sparse array shift() implementation
+ *
+ * @test
+ * @run
+ */
+
+var a = [];
+a[1048577] = 1;
+a.shift();
+a[1] = 2;
+a.shift();
+var ka = Object.keys(a);
+Assert.assertTrue(ka.length === 2);
+Assert.assertTrue(ka[0] === '0');
+Assert.assertTrue(ka[1] === '1048575');
+Assert.assertTrue(a.length === 1048576);
+Assert.assertTrue(a[0] === 2);
+Assert.assertTrue(a[1048575] = 1);
+
+var b = [];
+b[1048577] = 1;
+b.unshift(2);
+b.shift();
+b[1] = 3;
+b.shift();
+var kb = Object.keys(b);
+Assert.assertTrue(kb.length === 2);
+Assert.assertTrue(kb[0] === '0');
+Assert.assertTrue(kb[1] === '1048576');
+Assert.assertTrue(b.length === 1048577);
+Assert.assertTrue(b[0] === 3);
+Assert.assertTrue(b[1048576] = 1);
+
diff --git a/test/failure_handler/src/share/conf/mac.properties b/test/failure_handler/src/share/conf/mac.properties
index e2b1ac21b25..0e962f63c8d 100644
--- a/test/failure_handler/src/share/conf/mac.properties
+++ b/test/failure_handler/src/share/conf/mac.properties
@@ -29,6 +29,7 @@ config.getChildren.args=-P %p
 # process info to gather
 ################################################################################
 onTimeout=\
+  native.DevToolsSecurity \
   native.vmmap native.heap native.leaks native.spindump \
   native.stack native.core
 ################################################################################
@@ -36,22 +37,34 @@ native.pattern=%p
 native.javaOnly=false
 native.args=%p
 
-# Some of them require root privileges
-native.vmmap.app=vmmap
-native.heap.app=heap
-native.leaks.app=leaks
+native.DevToolsSecurity.app=DevToolsSecurity
+native.DevToolsSecurity.args=--status
+
+# spindump requires root privileges
 native.spindump.app=spindump
 native.spindump.args=%p -stdout
 
-native.stack.app=lldb
+native.vmmap.app=bash
+native.vmmap.delimiter=\0
+native.vmmap.args=-c\0DevToolsSecurity --status | grep -q enabled && vmmap %p
+
+native.leaks.app=bash
+native.leaks.delimiter=\0
+native.leaks.args=-c\0DevToolsSecurity --status | grep -q enabled && leaks %p
+
+native.heap.app=bash
+native.heap.delimiter=\0
+native.heap.args=-c\0DevToolsSecurity --status | grep -q enabled && heap %p
+
+native.stack.app=bash
 native.stack.delimiter=\0
 native.stack.params.repeat=6
-native.stack.args=-o\0attach %p\0-o\0thread backtrace all\0-o\0detach\0-o\0quit
+native.stack.args=-c\0DevToolsSecurity --status | grep -q enabled && lldb -o 'attach %p' -o 'thread backtrace all' -o 'detach' -o 'quit'
 
 native.core.app=bash
 native.core.delimiter=\0
 native.core.args=-c\0gcore -o ./core.%p %p || \
-  lldb -o 'attach %p' -o 'process save-core core.%p' -o 'detach' -o 'quit'
+  (DevToolsSecurity --status | grep -q enabled && lldb -o 'attach %p' -o 'process save-core core.%p' -o 'detach' -o 'quit')
 native.core.params.timeout=3600000
 ################################################################################
 # environment info to gather
@@ -89,7 +102,6 @@ process.top.args=-l 1
 memory.vmstat.app=vm_stat
 memory.vmstat.args=-c 3 3
 
-
 netstat.app=netstat
 netstat.av.args=-av
 netstat.aL.args=-aL
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 5c088b6008a..06299e7ecd5 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -25,6 +25,7 @@ package requires;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -60,9 +61,10 @@ public class VMProps implements Callable> {
         map.put("vm.flightRecorder", vmFlightRecorder());
         map.put("vm.simpleArch", vmArch());
         map.put("vm.debug", vmDebug());
+        map.put("vm.jvmci", vmJvmci());
         vmGC(map); // vm.gc.X = true/false
 
-        dump(map);
+        VMProps.dump(map);
         return map;
     }
 
@@ -155,6 +157,14 @@ public class VMProps implements Callable> {
         return "" + System.getProperty("jdk.debug").contains("debug");
     }
 
+    /**
+     * @return true if VM supports JVMCI and false otherwise
+     */
+    protected String vmJvmci() {
+        // builds with jvmci have this flag
+        return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
+    }
+
     /**
      * For all existing GC sets vm.gc.X property.
      * Example vm.gc.G1=true means:
@@ -180,7 +190,7 @@ public class VMProps implements Callable> {
      *
      * @param map
      */
-    protected void dump(Map map) {
+    protected static void dump(Map map) {
         String dumpFileName = System.getProperty("vmprops.dump");
         if (dumpFileName == null) {
             return;
@@ -188,7 +198,7 @@ public class VMProps implements Callable> {
         List lines = new ArrayList<>();
         map.forEach((k, v) -> lines.add(k + ":" + v));
         try {
-            Files.write(Paths.get(dumpFileName), lines);
+            Files.write(Paths.get(dumpFileName), lines, StandardOpenOption.APPEND);
         } catch (IOException e) {
             throw new RuntimeException("Failed to dump properties into '"
                     + dumpFileName + "'", e);
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index f648bfb670b..3f924371c43 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -160,9 +160,8 @@ public class Platform {
         return vmVersion;
     }
 
-    // Returns true for sparc and sparcv9.
-    public static boolean isSparc() {
-        return isArch("sparc.*");
+    public static boolean isAArch64() {
+        return isArch("aarch64");
     }
 
     public static boolean isARM() {
@@ -173,9 +172,14 @@ public class Platform {
         return isArch("ppc.*");
     }
 
-    public static boolean isX86() {
-        // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
-        return isArch("(i386)|(x86(?!_64))");
+    // Returns true for IBM z System running linux.
+    public static boolean isS390x() {
+        return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
+    }
+
+    // Returns true for sparc and sparcv9.
+    public static boolean isSparc() {
+        return isArch("sparc.*");
     }
 
     public static boolean isX64() {
@@ -183,8 +187,9 @@ public class Platform {
         return isArch("(amd64)|(x86_64)");
     }
 
-    public static boolean isAArch64() {
-        return isArch("aarch64");
+    public static boolean isX86() {
+        // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
+        return isArch("(i386)|(x86(?!_64))");
     }
 
     public static String getOsArch() {
@@ -200,6 +205,7 @@ public class Platform {
         if (isAix()) {
             return false;   // SA not implemented.
         } else if (isLinux()) {
+            if (isS390x()) { return false; }   // SA not implemented.
             return canPtraceAttachLinux();
         } else if (isOSX()) {
             return canAttachOSX();
diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index c01657f020e..5a2b5078d4f 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -229,7 +229,7 @@ public class WhiteBox {
     return isMethodCompiled0(method, isOsr);
   }
   public        boolean isMethodCompilable(Executable method) {
-    return isMethodCompilable(method, -1 /*any*/);
+    return isMethodCompilable(method, -2 /*any*/);
   }
   public        boolean isMethodCompilable(Executable method, int compLevel) {
     return isMethodCompilable(method, compLevel, false /*not osr*/);
@@ -277,7 +277,7 @@ public class WhiteBox {
     return deoptimizeMethod0(method, isOsr);
   }
   public        void    makeMethodNotCompilable(Executable method) {
-    makeMethodNotCompilable(method, -1 /*any*/);
+    makeMethodNotCompilable(method, -2 /*any*/);
   }
   public        void    makeMethodNotCompilable(Executable method, int compLevel) {
     makeMethodNotCompilable(method, compLevel, false /*not osr*/);
@@ -301,7 +301,7 @@ public class WhiteBox {
     return testSetDontInlineMethod0(method, value);
   }
   public        int     getCompileQueuesSize() {
-    return getCompileQueueSize(-1 /*any*/);
+    return getCompileQueueSize(-2 /*any*/);
   }
   public native int     getCompileQueueSize(int compLevel);
   private native boolean testSetForceInlineMethod0(Executable method, boolean value);
diff --git a/test/lib/sun/hotspot/code/CodeBlob.java b/test/lib/sun/hotspot/code/CodeBlob.java
index e303cada1d2..2c90729427e 100644
--- a/test/lib/sun/hotspot/code/CodeBlob.java
+++ b/test/lib/sun/hotspot/code/CodeBlob.java
@@ -49,8 +49,13 @@ public class CodeBlob {
     assert obj.length == 4;
     name = (String) obj[0];
     size = (Integer) obj[1];
-    code_blob_type = BlobType.values()[(Integer) obj[2]];
-    assert code_blob_type.id == (Integer) obj[2];
+    int blob_type_index = (Integer) obj[2];
+    if (blob_type_index == -1) { // AOT
+      code_blob_type = null;
+    } else {
+      code_blob_type = BlobType.values()[blob_type_index];
+      assert code_blob_type.id == (Integer) obj[2];
+    }
     address = (Long) obj[3];
   }
   public final String name;