mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 06:45:07 +02:00
Merge
This commit is contained in:
Antonios Printezis
commit
e57cedc5ed
1434 changed files with 52173 additions and 36751 deletions
3
.hgtags
3
.hgtags
|
|
@ -45,3 +45,6 @@ eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
|
|||
bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
|
||||
1b662b1ed14eb4ae31d5138a36c433b13d941dc5 jdk7-b69
|
||||
207f694795c448c17753eff1a2f50363106960c2 jdk7-b70
|
||||
c5d39b6be65cba0effb5f466ea48fe43764d0e0c jdk7-b71
|
||||
df4bcd06e1d0ab306efa5a44f24a409dc0c0c742 jdk7-b72
|
||||
ce74bd35ce948d629a356e168797f44b593b1578 jdk7-b73
|
||||
|
|
|
|||
|
|
@ -45,3 +45,6 @@ c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
|
|||
e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
|
||||
82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
|
||||
175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
|
||||
4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
|
||||
0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
|
||||
3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
|
||||
|
|
|
|||
|
|
@ -38,12 +38,17 @@
|
|||
<ul>
|
||||
<li><a href="#introduction">Introduction</a></li>
|
||||
<li><a href="#MBE">Minimum Build Environments</a></li>
|
||||
<li><a href="#SDBE">Specific Developer Build Environments</a></li>
|
||||
<li><a href="#SDBE">Specific Developer Build Environments</a>
|
||||
<ul>
|
||||
<li><a href="#fedora">Fedora Linux</a> </li>
|
||||
<li><a href="#centos">CentOS Linux</a> </li>
|
||||
<li><a href="#debian">Debian GNU/Linux</a></li>
|
||||
<li><a href="#ubuntu">Ubuntu Linux</a> </li>
|
||||
<li><a href="#opensuse">OpenSUSE</a></li>
|
||||
<li><a href="#mandriva">Mandriva</a></li>
|
||||
<li><a href="#opensolaris">OpenSolaris</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="#directories">Source Directory Structure</a> </li>
|
||||
<li><a href="#building">Build Information</a>
|
||||
<ul>
|
||||
|
|
@ -68,7 +73,6 @@
|
|||
</li>
|
||||
<li><a href="#zip">Zip and Unzip</a> </li>
|
||||
<li><a href="#freetype">FreeType2 Fonts</a> </li>
|
||||
<li><a href="#jibx">JIBX Libraries</a> </li>
|
||||
<li>Linux and Solaris:
|
||||
<ul>
|
||||
<li><a href="#cups">CUPS Include files</a> </li>
|
||||
|
|
@ -210,24 +214,59 @@
|
|||
we will try to provide what information we have available to us.
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h3><a name="fedora">Fedora 9</a></h3>
|
||||
<h3><a name="fedora">Fedora</a></h3>
|
||||
<blockquote>
|
||||
After installing
|
||||
<a href="http://www.fedoraproject.org/">Fedora 9</a>
|
||||
you need to make sure you have
|
||||
the "Software Development" bundle installed, plus the
|
||||
following packages:
|
||||
<blockquote>
|
||||
<ul>
|
||||
<li>cups devel: Cups Development Package</li>
|
||||
<li>freetype 2.3+ devel: Freetype 2.3 Development Package</li>
|
||||
<li>hg: Mercurial, if you need to clone or manage source repositories</li>
|
||||
<li>ksh: May be needed when using <tt>webrev</tt></li>
|
||||
</ul>
|
||||
</blockquote>
|
||||
<h4>Fedora 9</h4>
|
||||
<p>
|
||||
Always a good idea to do a complete Software Update/Refresh
|
||||
after you get all the packages installed.
|
||||
<blockquote>
|
||||
After installing <a href="http://fedoraproject.org">Fedora</a> 9
|
||||
you need to install several build dependencies. The simplest
|
||||
way to do it is to execute the following commands as user
|
||||
<tt>root</tt>:
|
||||
<p/>
|
||||
<code>yum-builddep java-openjdk</code>
|
||||
<p/>
|
||||
<code>yum install gcc gcc-c++</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
|
||||
</blockquote>
|
||||
<h4>Fedora 10</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://fedoraproject.org">Fedora</a> 10
|
||||
you need to install several build dependencies. The simplest
|
||||
way to do it is to execute the following commands as user
|
||||
<tt>root</tt>:
|
||||
<p/>
|
||||
<code>yum-builddep java-1.6.0-openjdk</code>
|
||||
<p/>
|
||||
<code>yum install gcc gcc-c++</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
|
||||
</blockquote>
|
||||
<h4>Fedora 11</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://fedoraproject.org">Fedora</a> 11
|
||||
you need to install several build dependencies. The simplest
|
||||
way to do it is to execute the following commands as user
|
||||
<tt>root</tt>:
|
||||
<p/>
|
||||
<code>yum-builddep java-1.6.0-openjdk</code>
|
||||
<p/>
|
||||
<code>yum install gcc gcc-c++</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h3><a name="centos">CentOS 5.2</a></h3>
|
||||
|
|
@ -270,142 +309,143 @@
|
|||
it's needed.
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h3><a name="debian">Debian</a></h3>
|
||||
<blockquote>
|
||||
<h4>Debian 5.0 (Lenny)</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://debian.org">Debian</a> 5
|
||||
you need to install several build dependencies.
|
||||
The simplest way to install the build dependencies is to
|
||||
execute the following commands as user <tt>root</tt>:
|
||||
<p/>
|
||||
<code>aptitude build-dep openjdk-6</code>
|
||||
<p/>
|
||||
<code>aptitude install openjdk-6-jdk libmotif-dev</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ====================================================== -->
|
||||
<h3><a name="ubuntu">Ubuntu</a></h3>
|
||||
<blockquote>
|
||||
In addition to needing the Bootstrap JDK and the Binary Plugs,
|
||||
when building on Ubuntu you will need to
|
||||
make sure certain packages are installed.
|
||||
In particular, certain X11 packages, make, m4, gawk, gcc 4,
|
||||
binutils, cups, freetype
|
||||
and alsa.
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h4>Ubuntu 6.06</h4>
|
||||
<h4>Ubuntu 8.04</h4>
|
||||
<p>
|
||||
The following list of packages for Ubuntu 6.06 is a working set that
|
||||
does appear to work.
|
||||
<p>
|
||||
<b>Note that it's quite possible that some of these
|
||||
packages are not required, so anyone discovering that some of the
|
||||
packages listed below are NOT required,
|
||||
please let the
|
||||
OpenJDK
|
||||
team know.</b>
|
||||
<p>
|
||||
All the packages below can be installed with the
|
||||
Synaptic Package manager provided with the base Ubuntu 6.06 release.
|
||||
<blockquote>
|
||||
<ul>
|
||||
<li>binutils (2.16.1cvs20060117-1ubuntu2.1)</li>
|
||||
<li>cpp (4:4.0.3-1)</li>
|
||||
<li>cpp-4.0 (4.0.3-1ubuntu5)</li>
|
||||
<li>libfreetype6-dev</li>
|
||||
<li>g++ (4:4.0.3-1)</li>
|
||||
<li>g++-4.0 (4.0.3-1ubuntu5)</li>
|
||||
<li>gawk (1:3.1.5-2build1)</li>
|
||||
<li>gcc (4:4.0.3-1)</li>
|
||||
<li>gcc-4.0 (4.0.3-1ubuntu5)</li>
|
||||
<li>libasound2-dev (1.0.10-2ubuntu4)</li>
|
||||
<li>libc6 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li>
|
||||
<li>libc6-dev (2.3.6-0ubuntu20.4)</li>
|
||||
<li>libc6-i686 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li>
|
||||
<li>libcupsys2-dev (1.2.2-0ubuntu0.6.06)</li>
|
||||
<li>libgcrypt11-dev (1.2.2-1)</li>
|
||||
<li>libgnutls-dev (1.2.9-2ubuntu1.1)</li>
|
||||
<li>libgnutls12 (1.2.9-2ubuntu1) to 1.2.9-2ubuntu1.1</li>
|
||||
<li>libgpg-error-dev (1.1-4)</li>
|
||||
<li>libice-dev (2:1.0.0-0ubuntu2)</li>
|
||||
<li>liblockfile1 (1.06.1)</li>
|
||||
<li>libopencdk8-dev (0.5.7-2)</li>
|
||||
<li>libpopt-dev (1.7-5)</li>
|
||||
<li>libsm-dev (2:1.0.0-0ubuntu2)</li>
|
||||
<li>libstdc++6-4.0-dev (4.0.3-1ubuntu5)</li>
|
||||
<li>libtasn1-2-dev (0.2.17-1ubuntu1)</li>
|
||||
<li>libx11-dev (2:1.0.0-0ubuntu9)</li>
|
||||
<li>libxau-dev (1:1.0.0-0ubuntu4)</li>
|
||||
<li>libxaw-headers (2:1.0.1-0ubuntu3)</li>
|
||||
<li>libxaw7-dev (2:1.0.1-0ubuntu3)</li>
|
||||
<li>libxdmcp-dev (1:1.0.0-0ubuntu2)</li>
|
||||
<li>libxext-dev (2:1.0.0-0ubuntu4)</li>
|
||||
<li>libxi-dev (2:1.0.0-0ubuntu3) </li>
|
||||
<li>libxmu-dev (2:1.0.0-0ubuntu3)</li>
|
||||
<li>libxmu-headers (2:1.0.0-0ubuntu3)</li>
|
||||
<li>libxmuu-dev (2:1.0.0-0ubuntu3)</li>
|
||||
<li>libxp-dev (6.8.2-11ubuntu2)</li>
|
||||
<li>libxpm-dev (1:3.5.4.2-0ubuntu3)</li>
|
||||
<li>libxrandr-dev (1:1.1.0.2-0ubuntu4)</li>
|
||||
<li>libxt-dev (1:1.0.0-0ubuntu3)</li>
|
||||
<li>libxtrap-dev (2:1.0.0-0ubuntu2)</li>
|
||||
<li>libxtst-dev (2:1.0.1-0ubuntu2)</li>
|
||||
<li>libxv-dev (2:1.0.1-0ubuntu3)</li>
|
||||
<li>linux-kernel-headers (2.6.11.2-0ubuntu18)</li>
|
||||
<li>m4 (1.4.4-1)</li>
|
||||
<li>make (3.80+3.81.b4-1)</li>
|
||||
<li>ssl-cert (1.0.13)</li>
|
||||
<li>x-dev (7.0.4-0ubuntu2)</li>
|
||||
<li>x11proto-core-dev (7.0.4-0ubuntu2)</li>
|
||||
<li>x11proto-input-dev (1.3.2-0ubuntu2)</li>
|
||||
<li>x11proto-kb-dev (1.0.2-0ubuntu2)</li>
|
||||
<li>x11proto-randr-dev (1.1.2-0ubuntu2)</li>
|
||||
<li>x11proto-record-dev (1.13.2-0ubuntu2)</li>
|
||||
<li>x11proto-trap-dev (3.4.3-0ubuntu2)</li>
|
||||
<li>x11proto-video-dev (2.2.2-0ubuntu2)</li>
|
||||
<li>x11proto-xext-dev (7.0.2-0ubuntu2)</li>
|
||||
<li>xlibs-dev (7.0.0-0ubuntu45)</li>
|
||||
<li>zlib1g-dev (1:1.2.3-6ubuntu4)</li>
|
||||
</ul>
|
||||
After installing <a href="http://ubuntu.org">Ubuntu</a> 8.04
|
||||
you need to install several build dependencies.
|
||||
<p/>
|
||||
First, you need to enable the universe repository in the
|
||||
Software Sources application and reload the repository
|
||||
information. The Software Sources application is available
|
||||
under the System/Administration menu.
|
||||
<p/>
|
||||
The simplest way to install the build dependencies is to
|
||||
execute the following commands:
|
||||
<p/>
|
||||
<code>sudo aptitude build-dep openjdk-6</code>
|
||||
<p/>
|
||||
<code>sudo aptitude install openjdk-6-jdk</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h4>Ubuntu 7.04</h4>
|
||||
<h4>Ubuntu 8.10</h4>
|
||||
<p>
|
||||
Using the Synaptic Package Manager, download the following
|
||||
packages (double indented packages are automatically aquired
|
||||
due to package dependencies):
|
||||
<blockquote>
|
||||
<ul>
|
||||
<li>build-essential</li>
|
||||
<ul>
|
||||
<li>dpkg-dev</li>
|
||||
<li>g++</li>
|
||||
<li>g++-4.1</li>
|
||||
<li>libc6-dev</li>
|
||||
<li>libstdc++6.4.1-dev</li>
|
||||
<li>linux-libc-dev</li>
|
||||
</ul>
|
||||
<li>gawk</li>
|
||||
<li>m4</li>
|
||||
<li>libasound2-dev</li>
|
||||
<li>libcupsys2-dev</li>
|
||||
<ul>
|
||||
<li>libgcrypt11-dev</li>
|
||||
<li>lgnutls-dev</li>
|
||||
<li>libgpg-error-dev</li>
|
||||
<li>liblzo-dev</li>
|
||||
<li>libopencdk8-dev</li>
|
||||
<li>libpopt-dev</li>
|
||||
<li>libtasn1-3-dev</li>
|
||||
<li>zlib1g-dev</li>
|
||||
</ul>
|
||||
<li>sun-java6-jdk</li>
|
||||
<ul>
|
||||
<li>java-common</li>
|
||||
<li>libltdl3</li>
|
||||
<li>odbcinst1debian1</li>
|
||||
<li>sun-java6-bin</li>
|
||||
<li>sun-java6-jre</li>
|
||||
<li>unixodbc</li>
|
||||
</ul>
|
||||
<li>xlibs-dev</li>
|
||||
<ul>
|
||||
<li>(many)</li>
|
||||
</ul>
|
||||
<li>x11proto-print-dev</li>
|
||||
<li>libxaw7-dev</li>
|
||||
<ul>
|
||||
<li>libxaw-headers</li>
|
||||
</ul>
|
||||
<li>libxp-dev</li>
|
||||
<li>libfreetype6-dev</li>
|
||||
</ul>
|
||||
After installing <a href="http://ubuntu.org">Ubuntu</a> 8.10
|
||||
you need to install several build dependencies. The simplest
|
||||
way to do it is to execute the following commands:
|
||||
<p/>
|
||||
<code>sudo aptitude build-dep openjdk-6</code>
|
||||
<p/>
|
||||
<code>sudo aptitude install openjdk-6-jdk</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
|
||||
</blockquote>
|
||||
<h4>Ubuntu 9.04</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://ubuntu.org">Ubuntu</a> 9.04
|
||||
you need to install several build dependencies. The simplest
|
||||
way to do it is to execute the following commands:
|
||||
<p/>
|
||||
<code>sudo aptitude build-dep openjdk-6</code>
|
||||
<p/>
|
||||
<code>sudo aptitude install openjdk-6-jdk</code>
|
||||
<p/>
|
||||
In addition, it's necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ====================================================== -->
|
||||
<h3><a name="opensuse">OpenSUSE</a></h3>
|
||||
<blockquote>
|
||||
<h4>OpenSUSE 11.1</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1
|
||||
you need to install several build dependencies.
|
||||
The simplest way to install the build dependencies is to
|
||||
execute the following commands:
|
||||
<p/>
|
||||
<code>sudo zypper source-install -d java-1_6_0-openjdk</code>
|
||||
<p/>
|
||||
<code>sudo zypper install make</code>
|
||||
<p/>
|
||||
In addition, it is necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
|
||||
<p/>
|
||||
Finally, you need to unset the <code>JAVA_HOME</code> environment variable:
|
||||
<p/>
|
||||
<code>export -n JAVA_HOME</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ====================================================== -->
|
||||
<h3><a name="mandriva">Mandriva</a></h3>
|
||||
<blockquote>
|
||||
<h4>Mandriva Linux One 2009 Spring</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring
|
||||
you need to install several build dependencies.
|
||||
The simplest way to install the build dependencies is to
|
||||
execute the following commands as user <tt>root</tt>:
|
||||
<p/>
|
||||
<code>urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel</code>
|
||||
<p/>
|
||||
In addition, it is necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ====================================================== -->
|
||||
<h3><a name="opensolaris">OpenSolaris</a></h3>
|
||||
<blockquote>
|
||||
<h4>OpenSolaris 2009.06</h4>
|
||||
<p>
|
||||
<blockquote>
|
||||
After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06
|
||||
you need to install several build dependencies.
|
||||
The simplest way to install the build dependencies is to
|
||||
execute the following commands:
|
||||
<p/>
|
||||
<code>pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code>
|
||||
<p/>
|
||||
In addition, it is necessary to set a few environment variables for the build:
|
||||
<p/>
|
||||
<code>export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/</code>
|
||||
<p/>
|
||||
Finally, you need to make sure that the build process can find the Sun Studio compilers:
|
||||
<p/>
|
||||
<code>export PATH=$PATH:/opt/SunStudioExpress/bin/</code>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
|
|
@ -596,11 +636,6 @@
|
|||
Install or upgrade the <a href="#freetype">FreeType development
|
||||
package</a>.
|
||||
</li>
|
||||
<li>
|
||||
Install the
|
||||
<a href="#jibx">JIBX Libraries</a>, set
|
||||
<tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
|
||||
</li>
|
||||
<li>
|
||||
Install
|
||||
<a href="#ant">Ant</a>,
|
||||
|
|
@ -669,11 +704,6 @@
|
|||
<li>
|
||||
Install the <a href="#xrender">XRender Include files</a>.
|
||||
</li>
|
||||
<li>
|
||||
Install the
|
||||
<a href="#jibx">JIBX Libraries</a>, set
|
||||
<tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
|
||||
</li>
|
||||
<li>
|
||||
Install
|
||||
<a href="#ant">Ant</a>,
|
||||
|
|
@ -769,11 +799,6 @@
|
|||
Install
|
||||
<a href="#dxsdk">Microsoft DirectX SDK</a>.
|
||||
</li>
|
||||
<li>
|
||||
Install the
|
||||
<a href="#jibx">JIBX Libraries</a>, set
|
||||
<tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
|
||||
</li>
|
||||
<li>
|
||||
Install
|
||||
<a href="#ant">Ant</a>,
|
||||
|
|
@ -903,27 +928,6 @@
|
|||
fine for most JDK developers.
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h4><a name="jibx">JIBX</a></h4>
|
||||
<blockquote>
|
||||
JIBX libraries version 1.1.5 is required for building the OpenJDK.
|
||||
Namely, the following JAR files from the JIBX distribution package
|
||||
are required:
|
||||
<ul>
|
||||
<li>bcel.jar
|
||||
<li>jibx-bind.jar
|
||||
<li>jibx-run.jar
|
||||
<li>xpp3.jar
|
||||
</ul>
|
||||
<p>
|
||||
You can download the package from the
|
||||
<a href="http://jibx.sourceforge.net" target="_blank">JIBX site</a>.
|
||||
<p>
|
||||
You will need to set the
|
||||
<tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>
|
||||
environment variable to refer to place where the JAR files,
|
||||
above, are located.
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h4><a name="compilers">Compilers</a></h4>
|
||||
<blockquote>
|
||||
<strong><a name="gcc">Linux gcc/binutils</a></strong>
|
||||
|
|
@ -1496,12 +1500,6 @@
|
|||
The default will refer to
|
||||
<tt>jdk/src/share/lib/security/cacerts</tt>.
|
||||
</dd>
|
||||
<dt><tt><a name="ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt></dt>
|
||||
<dd>
|
||||
The location of the <a href="#jibx">JIBX libraries</a> file.
|
||||
The default value is
|
||||
<tt>$(ALT_SLASH_JAVA)/devtools/share/jibx/lib</tt>.
|
||||
</dd>
|
||||
<dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt>
|
||||
<dd>
|
||||
The location of the CUPS header files.
|
||||
|
|
|
|||
|
|
@ -45,3 +45,6 @@ a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
|
|||
5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68
|
||||
8120d308ec4e805c5588b8d9372844d781c4112d jdk7-b69
|
||||
175bd68779546078dbdb6dacd7f0aced79ed22b1 jdk7-b70
|
||||
3f1ef7f899ea2aec189c4fb67e5c8fa374437c50 jdk7-b71
|
||||
c793a31209263fbb867c23c752599d85c21abb73 jdk7-b72
|
||||
b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
|
||||
|
|
|
|||
|
|
@ -141,12 +141,12 @@ $(CLASSES_JAR):
|
|||
|
||||
#----- src.zip
|
||||
|
||||
SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name SCCS -o -name \*-template \) -prune -o -type f -print )
|
||||
SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name \*-template \) -prune -o -type f -print )
|
||||
|
||||
SRC_ZIP = $(LIB_DIR)/src.zip
|
||||
$(SRC_ZIP): $(SRC_ZIP_FILES)
|
||||
abs_src_zip=`cd $(@D) ; pwd`/$(@F) ; \
|
||||
( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name SCCS -o -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
|
||||
( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
|
||||
( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
|
||||
|
||||
#----- bin.zip
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -25,21 +25,28 @@
|
|||
|
||||
# Input: BUILDDIR PACKAGE PKGDIR PROGRAM BUILDTOOL_SOURCE_ROOT BUILDTOOL_MAIN
|
||||
|
||||
# All subdirectories under the package root for the tool (max depth 4)
|
||||
_WC_DIRS = * */* */*/* */*/*/*
|
||||
|
||||
BUILDTOOL_MAIN_SOURCE_FILE = $(BUILDTOOL_SOURCE_ROOT)/$(BUILDTOOL_MAIN)
|
||||
BUILDTOOL_MANIFEST_FILE = $(BUILDTOOLCLASSDIR)/$(PROGRAM)_manifest.mf
|
||||
BUILDTOOL_JAR_FILE = $(BUILDTOOLJARDIR)/$(PROGRAM).jar
|
||||
BUILDTOOL_ALL_FILES := $(shell $(CD) $(BUILDTOOL_SOURCE_ROOT) \
|
||||
&& $(FIND) $(PKGDIR) $(SCM_DIRS_prune) -o -type f -print)
|
||||
BUILTTOOL_MAINCLASS = $(subst /,.,$(BUILDTOOL_MAIN:%.java=%))
|
||||
|
||||
all build: $(BUILDTOOL_JAR_FILE) tool_info
|
||||
# Wildcard patterns that find all the sources for this build tool
|
||||
BUILDTOOL_WC_PATTERNS = $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/*.java \
|
||||
$(patsubst %, $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/%/*.java, $(_WC_DIRS))
|
||||
|
||||
# Wildcard expansion that finds all the files
|
||||
BUILDTOOL_SRC_FILES := $(wildcard $(BUILDTOOL_WC_PATTERNS))
|
||||
|
||||
all build: $(BUILDTOOL_JAR_FILE)
|
||||
|
||||
$(BUILDTOOL_MANIFEST_FILE): $(BUILDTOOL_MAIN_SOURCE_FILE)
|
||||
@$(prep-target)
|
||||
$(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
|
||||
|
||||
$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) \
|
||||
$(BUILDTOOL_ALL_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/%)
|
||||
$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(BUILDTOOL_SRC_FILES)
|
||||
@$(prep-target)
|
||||
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
|
||||
$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
|
||||
|
|
@ -49,23 +56,8 @@ $(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) \
|
|||
$(JAR_JFLAGS) || $(RM) $@
|
||||
@$(java-vm-cleanup)
|
||||
|
||||
# Printing out a build tool information line
|
||||
define printBuildToolSetting
|
||||
if [ "$2" != "" ] ; then $(PRINTF) "%-25s %s\n" "$1:" "$2"; fi
|
||||
endef
|
||||
|
||||
# Print out the build tool information
|
||||
tool_info:
|
||||
@$(ECHO) "========================================================="
|
||||
@$(call printBuildToolSetting,BUILDTOOL,$(PROGRAM))
|
||||
@$(call printBuildToolSetting,PACKAGE,$(PACKAGE))
|
||||
@$(call printBuildToolSetting,BUILDTOOL_SOURCE_ROOT,$(BUILDTOOL_SOURCE_ROOT))
|
||||
@$(call printBuildToolSetting,BUILTTOOL_MAINCLASS,$(BUILTTOOL_MAINCLASS))
|
||||
@$(call printBuildToolSetting,BUILDTOOL_JAR_FILE,$(BUILDTOOL_JAR_FILE))
|
||||
@$(ECHO) "========================================================="
|
||||
|
||||
clean clobber::
|
||||
$(RM) -r $(BUILDTOOLCLASSDIR)/$(PKGDIR)
|
||||
$(RM) $(BUILDTOOL_MANIFEST_FILE)
|
||||
$(RM) $(BUILDTOOL_JAR_FILE)
|
||||
$(RM) -r $(BUILDTOOLCLASSDIR)/$(PKGDIR) \
|
||||
$(BUILDTOOL_MANIFEST_FILE) \
|
||||
$(BUILDTOOL_JAR_FILE)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -56,11 +56,3 @@ ifndef USE_IMPLICITS
|
|||
%: %.sh
|
||||
endif
|
||||
|
||||
#
|
||||
# If you are using RCS, you must set the variable USE_RCS at the make
|
||||
# command line. Otherwise we disable RCS.
|
||||
#
|
||||
ifndef USE_RCS
|
||||
%:: %,v
|
||||
%:: RCS/%,v
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -310,125 +310,32 @@ endef
|
|||
SUBDIRS_MAKEFLAGS-clobber = INCREMENTAL_BUILD=false
|
||||
SUBDIRS_MAKEFLAGS-clean = INCREMENTAL_BUILD=false
|
||||
|
||||
# Current directory
|
||||
CURRENT_DIRECTORY := $(shell $(PWD))
|
||||
|
||||
# If no timing wanted, we need to define these as empty
|
||||
ifdef NO_TIMING
|
||||
|
||||
TIMING_ID:=NA
|
||||
|
||||
define TIMING_start
|
||||
t=0:0:0:0
|
||||
endef
|
||||
|
||||
define TIMING_end
|
||||
time_used=0
|
||||
endef
|
||||
|
||||
else # NO_TIMING
|
||||
|
||||
# Default timing id
|
||||
TIMING_ID:=$(shell $(BASENAME) $(CURRENT_DIRECTORY))
|
||||
|
||||
# Timing start (must be used in same shell, e.g. same command line)
|
||||
# Defines the shell variable $1 to have the start time.
|
||||
define TIMING_start
|
||||
$1=`$(DATE) +%j:%H:%M:%S`
|
||||
endef
|
||||
|
||||
# Timing end (must be used in same shell, e.g. same command line)
|
||||
# Expects shell variable $1 to have been defined as the start time.
|
||||
# Expects shell variable $2 to have timing id string
|
||||
# Sets total_seconds shell variable as the total seconds used.
|
||||
# Sets time_used shell variable to contain format "%dh%dm%ds"
|
||||
define TIMING_end
|
||||
begTime="$${$1}"; \
|
||||
timing_id="$${$2}"; \
|
||||
endTime=`$(DATE) +%j:%H:%M:%S`; \
|
||||
d1=`$(ECHO) $${begTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${d1}" = "" ] ; then d1=0; fi; \
|
||||
h1=`$(ECHO) $${begTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${h1}" = "" ] ; then h1=0; fi; \
|
||||
m1=`$(ECHO) $${begTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${m1}" = "" ] ; then m1=0; fi; \
|
||||
s1=`$(ECHO) $${begTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${s1}" = "" ] ; then s1=0; fi; \
|
||||
d2=`$(ECHO) $${endTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${d2}" = "" ] ; then d2=0; fi; \
|
||||
h2=`$(ECHO) $${endTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${h2}" = "" ] ; then h2=0; fi; \
|
||||
m2=`$(ECHO) $${endTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${m2}" = "" ] ; then m2=0; fi; \
|
||||
s2=`$(ECHO) $${endTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
|
||||
if [ "$${s2}" = "" ] ; then s2=0; fi; \
|
||||
t1_secs=`$(EXPR) $${d1} '*' 60 '*' 60 '*' 24 '+' $${h1} '*' 60 '*' 60 \
|
||||
'+' $${m1} '*' 60 '+' $${s1}`; \
|
||||
t2_secs=`$(EXPR) $${d2} '*' 60 '*' 60 '*' 24 '+' $${h2} '*' 60 '*' 60 \
|
||||
'+' $${m2} '*' 60 '+' $${s2}`; \
|
||||
total_seconds=`$(EXPR) $${t2_secs} '-' $${t1_secs}`; \
|
||||
if [ "$${total_seconds}" -lt 0 ] ; then total_seconds=0; fi; \
|
||||
t_hour=`$(EXPR) $${total_seconds} '/' '(' 60 '*' 60 ')'`h; \
|
||||
t_min=`$(EXPR) '(' $${total_seconds} '%' '(' 60 '*' 60 ')' ')' '/' 60`m; \
|
||||
t_sec=`$(EXPR) $${total_seconds} '%' 60`s; \
|
||||
time_used=$${t_sec}; \
|
||||
if [ "$${t_hour}" != "0h" ] ; then \
|
||||
time_used=$${t_hour}$${t_min}$${t_sec}; \
|
||||
elif [ "$${t_min}" != "0m" ] ; then \
|
||||
time_used=$${t_min}$${t_sec}; \
|
||||
else \
|
||||
time_used=$${t_sec}; \
|
||||
fi; \
|
||||
$(PRINTF) " Timing: %05d seconds or %s for %s\n" \
|
||||
$${total_seconds} $${time_used} $${timing_id}
|
||||
endef
|
||||
|
||||
endif # NO_TIMING
|
||||
|
||||
# Given a SUBDIRS list, cd into them and make them
|
||||
# SUBDIRS_MAKEFLAGS Make settings for a subdir make
|
||||
# SUBDIRS_MAKEFLAGS-$@ Make settings specific to this target
|
||||
define SUBDIRS-loop
|
||||
@$(ECHO) "Begin Processing SUBDIRS: $(SUBDIRS)"
|
||||
@for i in DUMMY $(SUBDIRS) ; do \
|
||||
if [ "$$i" != "DUMMY" ] ; then \
|
||||
$(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
|
||||
timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
|
||||
$(call TIMING_start,startTime); \
|
||||
curDir=$(CURRENT_DIRECTORY); \
|
||||
$(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
|
||||
$(MAKE) -C $${i} $@ \
|
||||
$(SUBDIRS_MAKEFLAGS) \
|
||||
$(SUBDIRS_MAKEFLAGS-$@) \
|
||||
FULL_VERSION=$(FULL_VERSION) \
|
||||
RELEASE=$(RELEASE) || exit 1; \
|
||||
$(CD) $${curDir}; \
|
||||
$(call TIMING_end,startTime,timing_id); \
|
||||
$(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
|
||||
fi ; \
|
||||
done
|
||||
@$(ECHO) "Done Processing SUBDIRS: $(SUBDIRS)"
|
||||
endef
|
||||
|
||||
# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
|
||||
# OTHERSUBDIRS_MAKEFLAGS Make settings for a subdir make
|
||||
define OTHERSUBDIRS-loop
|
||||
@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
|
||||
@for i in DUMMY $(OTHERSUBDIRS) ; do \
|
||||
if [ "$$i" != "DUMMY" ] ; then \
|
||||
$(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
|
||||
timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
|
||||
$(call TIMING_start,startTime); \
|
||||
curDir=$(CURRENT_DIRECTORY); \
|
||||
$(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
|
||||
$(MAKE) -C $${i} $@ \
|
||||
$(OTHERSUBDIRS_MAKEFLAGS) \
|
||||
FULL_VERSION=$(FULL_VERSION) \
|
||||
RELEASE=$(RELEASE) || exit 1; \
|
||||
$(CD) $${curDir}; \
|
||||
$(call TIMING_end,startTime,timing_id); \
|
||||
$(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
|
||||
fi ; \
|
||||
done
|
||||
@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
|
||||
endef
|
||||
|
||||
#
|
||||
|
|
@ -460,46 +367,23 @@ else
|
|||
VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
|
||||
endif
|
||||
|
||||
# Note: As a rule, GNU Make rules should not appear in any of the
|
||||
# Defs*.gmk files. These were added for Kestrel-Solaris and do address
|
||||
# a TeamWare bug. They should be moved elsewhere for Merlin.
|
||||
#
|
||||
# Override gnumake built-in rules which do sccs get operations badly.
|
||||
# (They put the checked out code in the current directory, not in the
|
||||
# directory of the original file.)
|
||||
# Since this is a symptom of a teamware failure, complain and die on the spot.
|
||||
|
||||
# This message immediately goes to stdout and the build terminates.
|
||||
define SCCS-trouble
|
||||
$(error \
|
||||
"ERROR: File $@ referenced while building in $(CURRENT_DIRECTORY) \
|
||||
is out of date with respect to its SCCS file $<. \
|
||||
This can happen from an unresolved Teamware conflict, a file movement, or \
|
||||
a failure in which SCCS files are updated but the 'sccs get' was not done. \
|
||||
You should double check for other out of date files in your workspace. \
|
||||
Or run: cd $(TOPDIR) && $(MAKE) sccs_get")
|
||||
endef
|
||||
|
||||
%:: s.%
|
||||
@$(SCCS-trouble)
|
||||
%:: SCCS/s.%
|
||||
@$(SCCS-trouble)
|
||||
@$(ECHO) " is out of date with respect to its SCCS file." >> $(WARNING_FILE)
|
||||
@$(ECHO) " This file may be from an unresolved Teamware conflict." >> $(WARNING_FILE)
|
||||
@$(ECHO) " This is also a symptom of a Teamware bringover/putback failure" >> $(WARNING_FILE)
|
||||
@$(ECHO) " in which SCCS files are updated but not checked out." >> $(WARNING_FILE)
|
||||
@$(ECHO) " Check for other out of date files in your workspace." >> $(WARNING_FILE)
|
||||
@$(ECHO) "" >> $(WARNING_FILE)
|
||||
@#exit 666
|
||||
# Prevent the use of many default suffix rules we do not need
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .h .obj .cpp .hpp .java .class
|
||||
|
||||
# Make sure we are all insane
|
||||
ifdef INSANE
|
||||
export INSANE
|
||||
endif
|
||||
|
||||
ifdef ALT_COPYRIGHT_YEAR
|
||||
COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
|
||||
else
|
||||
COPYRIGHT_YEAR = $(shell $(DATE) '+%Y')
|
||||
# Make sure we have the current year
|
||||
ifndef COPYRIGHT_YEAR
|
||||
ifdef ALT_COPYRIGHT_YEAR
|
||||
COPYRIGHT_YEAR := $(ALT_COPYRIGHT_YEAR)
|
||||
else
|
||||
COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
|
||||
endif
|
||||
export COPYRIGHT_YEAR
|
||||
endif
|
||||
|
||||
# Install of imported file (JDK_IMPORT_PATH, or some other external location)
|
||||
|
|
|
|||
|
|
@ -27,17 +27,6 @@
|
|||
#
|
||||
# Rules shared by all Java makefiles.
|
||||
#
|
||||
# Used to apply to source file $<, checks code conventions, issues warnings.
|
||||
define check-conventions
|
||||
if [ "$(CONVENTION_WATCH)" = "true" ] ; then \
|
||||
if [ "`$(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]'`" != "" ] ; then \
|
||||
$(ECHO) "WARNING: File contains tabs, ^M, or ^L characters: $<"; \
|
||||
if [ "$(CONVENTION_DETAILS)" = "true" ] ; then \
|
||||
$(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]' ; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi
|
||||
endef
|
||||
|
||||
# Make sure the default rule is all
|
||||
rules_default_rule: all
|
||||
|
|
@ -162,7 +151,6 @@ JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
|
|||
# Add a java source to the list
|
||||
define add-java-file
|
||||
$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
|
||||
$(check-conventions)
|
||||
endef
|
||||
|
||||
$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
|
||||
|
|
@ -197,11 +185,8 @@ JAVAC_PREFER_SOURCE = -Xprefer:source
|
|||
|
||||
.compile.classlist : $(JAVA_SOURCE_LIST)
|
||||
@$(MKDIR) -p $(CLASSDESTDIR)
|
||||
@if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \
|
||||
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
|
||||
if [ -s $(JAVA_SOURCE_LIST) ] ; then \
|
||||
$(CAT) $(JAVA_SOURCE_LIST); \
|
||||
$(ECHO) "# Running javac:"; \
|
||||
$(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
|
||||
$(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
|
||||
fi
|
||||
@$(java-vm-cleanup)
|
||||
|
|
@ -220,10 +205,7 @@ endif
|
|||
packages.clean:
|
||||
ifeq ($(DONT_CLOBBER_CLASSES),false)
|
||||
ifdef AUTO_FILES_JAVA_DIRS
|
||||
@for sdir in $(AUTO_FILES_JAVA_DIRS); do \
|
||||
$(ECHO) "$(RM) -r $(CLASSDESTDIR)/$$sdir"; \
|
||||
$(RM) -r $(CLASSDESTDIR)/$$sdir; \
|
||||
done
|
||||
$(RM) -r $(patsubst %, $(CLASSDESTDIR)/%, $(AUTO_FILES_JAVA_DIRS))
|
||||
else
|
||||
$(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
|
||||
endif
|
||||
|
|
@ -259,15 +241,13 @@ classheaders: classes $(CLASSHDR_DOTFILE)
|
|||
|
||||
$(CLASSHDR_DOTFILE): $(CLASSES_export)
|
||||
$(prep-target)
|
||||
@$(ECHO) "# Running javah:"
|
||||
$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
|
||||
$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
|
||||
@$(java-vm-cleanup)
|
||||
@$(TOUCH) $@
|
||||
|
||||
classheaders.clean:
|
||||
$(RM) $(CLASSHDR_DOTFILE)
|
||||
$(RM) -r $(CLASSHDRDIR)
|
||||
$(RM) -r $(CLASSHDRDIR) $(CLASSHDR_DOTFILE)
|
||||
|
||||
else # FILES_export
|
||||
|
||||
|
|
|
|||
|
|
@ -48,11 +48,17 @@ ifeq ($(PLATFORM), windows)
|
|||
NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
|
||||
|
||||
# Compiler version and type (Always get word after "Version")
|
||||
ifndef CC_VER
|
||||
CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
|
||||
export CC_VER
|
||||
endif
|
||||
|
||||
# SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifndef LINK_VER
|
||||
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
|
||||
export LINK_VER
|
||||
endif
|
||||
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
|
||||
ifeq ($(CC_MAJORVER), 13)
|
||||
# This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
|
||||
|
|
@ -93,7 +99,10 @@ ifeq ($(PLATFORM), windows)
|
|||
endif
|
||||
else
|
||||
# else ARCH_DATA_MODEL is 64
|
||||
ifndef LINK_VER
|
||||
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
|
||||
export LINK_VER
|
||||
endif
|
||||
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
|
||||
CC_MINORVER :=$(call MinorVersion,$(CC_VER))
|
||||
CC_MICROVER :=$(call MicroVersion,$(CC_VER))
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ RC = $(UTILS_COMMAND_PATH)rc
|
|||
RMDIR = $(UTILS_COMMAND_PATH)rmdir
|
||||
RPM = $(UTILS_COMMAND_PATH)rpm
|
||||
RPMBUILD = $(UTILS_COMMAND_PATH)rpmbuild
|
||||
SCCS = $(UTILS_CCS_BIN_PATH)sccs
|
||||
SED = $(UTILS_COMMAND_PATH)sed
|
||||
SH = $(UTILS_COMMAND_PATH)sh
|
||||
SHOWREV = $(UTILS_USR_BIN_PATH)showrev
|
||||
|
|
|
|||
|
|
@ -113,11 +113,12 @@ _system_drive:=$(call CheckValue,_system_drive,C:)
|
|||
|
||||
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
|
||||
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
|
||||
ifdef ALT_UNIXCOMMAND_PATH
|
||||
ifndef UNIXCOMMAND_PATH
|
||||
ifdef ALT_UNIXCOMMAND_PATH
|
||||
xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
|
||||
fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
|
||||
UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
|
||||
else
|
||||
else
|
||||
ifdef USING_CYGWIN
|
||||
UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
|
||||
else
|
||||
|
|
@ -132,13 +133,18 @@ else
|
|||
UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
|
||||
export UNIXCOMMAND_PATH
|
||||
endif
|
||||
UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
|
||||
|
||||
# Get version of MKS or CYGWIN
|
||||
ifdef USING_CYGWIN
|
||||
_CYGWIN_VER :=$(shell $(UNAME))
|
||||
CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
|
||||
ifndef CYGWIN_VER
|
||||
_CYGWIN_VER :=$(shell $(UNAME))
|
||||
CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
|
||||
export CYGWIN_VER
|
||||
endif
|
||||
else # MKS
|
||||
_MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
|
||||
MKS_VER :=$(call GetVersion,$(_MKS_VER))
|
||||
|
|
@ -168,194 +174,188 @@ endif # MKS
|
|||
|
||||
# Process Windows values into FullPath values, these paths may have \ chars
|
||||
|
||||
# System root
|
||||
ifdef SYSTEMROOT
|
||||
xSYSTEMROOT :="$(subst \,/,$(SYSTEMROOT))"
|
||||
_system_root :=$(call FullPath,$(xSYSTEMROOT))
|
||||
else
|
||||
ifdef SystemRoot
|
||||
xSYSTEMROOT :="$(subst \,/,$(SystemRoot))"
|
||||
_system_root :=$(call FullPath,$(xSYSTEMROOT))
|
||||
else
|
||||
ifdef WINDIR
|
||||
xWINDIR :="$(subst \,/,$(WINDIR))"
|
||||
_system_root :=$(call FullPath,$(xWINDIR))
|
||||
else
|
||||
ifdef windir
|
||||
xWINDIR :="$(subst \,/,$(windir))"
|
||||
_system_root :=$(call FullPath,$(xWINDIR))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
_system_root:=$(call CheckValue,_system_root,$(_system_drive)/WINNT)
|
||||
|
||||
# Program Files directory
|
||||
ifdef PROGRAMFILES
|
||||
ifndef SHORTPROGRAMFILES
|
||||
ifdef PROGRAMFILES
|
||||
xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))"
|
||||
else
|
||||
else
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
xPROGRAMFILES :="$(_system_drive)/Program Files"
|
||||
else
|
||||
xPROGRAMFILES :="$(_system_drive)/Program Files (x86)"
|
||||
endif
|
||||
endif
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
_program_files :=$(call FullPath,$(xPROGRAMFILES))
|
||||
else
|
||||
endif
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMFILES))
|
||||
else
|
||||
ifdef PROGRAMW6432
|
||||
xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
|
||||
else
|
||||
xPROGRAMW6432 :="$(_system_drive)/Program Files"
|
||||
endif
|
||||
_program_files :=$(call FullPath,$(xPROGRAMW6432))
|
||||
_program_files32 :=$(call FullPath,$(xPROGRAMFILES))
|
||||
ifneq ($(word 1,$(_program_files32)),$(_program_files32))
|
||||
_program_files32:=
|
||||
SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMW6432))
|
||||
endif
|
||||
endif
|
||||
ifneq ($(word 1,$(_program_files)),$(_program_files))
|
||||
_program_files:=
|
||||
ifneq ($(word 1,$(SHORTPROGRAMFILES)),$(SHORTPROGRAMFILES))
|
||||
SHORTPROGRAMFILES :=
|
||||
endif
|
||||
export SHORTPROGRAMFILES
|
||||
endif
|
||||
|
||||
# Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifndef SHORTMSVCDIR
|
||||
# Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
|
||||
ifdef MSVCDIR
|
||||
xMSVCDIR :="$(subst \,/,$(MSVCDIR))"
|
||||
_msvc_dir :=$(call FullPath,$(xMSVCDIR))
|
||||
SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
|
||||
else
|
||||
ifdef MSVCDir
|
||||
xMSVCDIR :="$(subst \,/,$(MSVCDir))"
|
||||
_msvc_dir :=$(call FullPath,$(xMSVCDIR))
|
||||
SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
|
||||
else
|
||||
ifneq ($(_program_files),)
|
||||
xMSVCDIR :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7"
|
||||
_msvc_dir :=$(call FullPath,$(xMSVCDIR))
|
||||
ifneq ($(SHORTPROGRAMFILES),)
|
||||
xMSVCDIR :="$(SHORTPROGRAMFILES)/Microsoft Visual Studio .NET 2003/Vc7"
|
||||
SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifneq ($(subst MSDev98,OLDOLDOLD,$(_msvc_dir)),$(_msvc_dir))
|
||||
_msvc_dir :=
|
||||
ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR))
|
||||
SHORTMSVCDIR :=
|
||||
endif
|
||||
# If we still don't have it, look for VS71COMNTOOLS, setup by installer?
|
||||
ifeq ($(_msvc_dir),)
|
||||
ifeq ($(SHORTMSVCDIR),)
|
||||
ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
|
||||
xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
|
||||
_vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs71tools),)
|
||||
_msvc_dir :=$(_vs71tools)/../../Vc7
|
||||
SHORTMSVCDIR :=$(_vs71tools)/../../Vc7
|
||||
endif
|
||||
endif
|
||||
ifneq ($(_msvc_dir),)
|
||||
_compiler_bin :=$(_msvc_dir)/Bin
|
||||
_redist_sdk :=$(_msvc_dir)/../SDK/v1.1/Bin
|
||||
_ms_sdk :=$(_msvc_dir)/PlatformSDK
|
||||
export SHORTMSVCDIR
|
||||
endif
|
||||
ifneq ($(SHORTMSVCDIR),)
|
||||
SHORTCOMPILERBIN :=$(SHORTMSVCDIR)/Bin
|
||||
SHORTPSDK :=$(SHORTMSVCDIR)/PlatformSDK
|
||||
export SHORTCOMPILERBIN
|
||||
export SHORTPSDK
|
||||
endif
|
||||
endif
|
||||
|
||||
# The Microsoft Platform SDK installed by itself
|
||||
ifneq ($(_program_files),)
|
||||
xPSDK :="$(_program_files)/Microsoft Platform SDK"
|
||||
_psdk :=$(call FullPath,$(xPSDK))
|
||||
ifeq ($(_psdk),)
|
||||
xPSDK :="$(_program_files)/Microsoft SDK"
|
||||
_psdk :=$(call FullPath,$(xMSSDK))
|
||||
ifneq ($(SHORTPROGRAMFILES),)
|
||||
ifndef SHORTPSDK
|
||||
xPSDK :="$(SHORTPROGRAMFILES)/Microsoft Platform SDK"
|
||||
SHORTPSDK :=$(call FullPath,$(xPSDK))
|
||||
ifeq ($(SHORTPSDK),)
|
||||
xPSDK :="$(SHORTPROGRAMFILES)/Microsoft SDK"
|
||||
SHORTPSDK :=$(call FullPath,$(xMSSDK))
|
||||
endif
|
||||
export SHORTPSDK
|
||||
endif
|
||||
endif
|
||||
|
||||
# If no SDK found yet, look in other places
|
||||
ifeq ($(_ms_sdk),)
|
||||
ifndef SHORTPSDK
|
||||
ifdef MSSDK
|
||||
xMSSDK :="$(subst \,/,$(MSSDK))"
|
||||
_ms_sdk :=$(call FullPath,$(xMSSDK))
|
||||
SHORTPSDK :=$(call FullPath,$(xMSSDK))
|
||||
else
|
||||
ifdef MSSdk
|
||||
xMSSDK :="$(subst \,/,$(MSSdk))"
|
||||
_ms_sdk :=$(call FullPath,$(xMSSDK))
|
||||
else
|
||||
_ms_sdk :=$(_psdk)
|
||||
SHORTPSDK :=$(call FullPath,$(xMSSDK))
|
||||
endif
|
||||
endif
|
||||
export SHORTPSDK
|
||||
endif
|
||||
|
||||
# Compilers for 64bit are from SDK
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifndef SHORTCOMPILERBIN
|
||||
xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
|
||||
MSSDK61 :=$(call FullPath,$(xMSSDK61))
|
||||
xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
|
||||
_vs2008 :=$(call FullPath,$(xVS2008))
|
||||
ifneq ($(_vs2008),)
|
||||
ifeq ($(ARCH), ia64)
|
||||
_compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
|
||||
SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
|
||||
endif
|
||||
ifeq ($(ARCH), amd64)
|
||||
_compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
|
||||
_redist_sdk :=$(MSSDK61)/VC/redist
|
||||
SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
|
||||
endif
|
||||
else
|
||||
ifneq ($(_ms_sdk),)
|
||||
ifneq ($(SHORTPSDK),)
|
||||
ifeq ($(ARCH), ia64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64
|
||||
SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
|
||||
endif
|
||||
ifeq ($(ARCH), amd64)
|
||||
_compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
|
||||
_redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
|
||||
SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
export SHORTCOMPILERBIN
|
||||
endif
|
||||
endif
|
||||
|
||||
# Location on system where jdk installs might be
|
||||
ifneq ($(_program_files),)
|
||||
USRJDKINSTANCES_PATH =$(_program_files)/Java
|
||||
ifneq ($(SHORTPROGRAMFILES),)
|
||||
USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
|
||||
else
|
||||
USRJDKINSTANCES_PATH =$(_system_drive)/
|
||||
endif
|
||||
|
||||
# SLASH_JAVA: location of all network accessable files
|
||||
ifdef ALT_SLASH_JAVA
|
||||
ifndef SLASH_JAVA
|
||||
ifdef ALT_SLASH_JAVA
|
||||
xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
|
||||
SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA))
|
||||
else
|
||||
else
|
||||
ifdef ALT_JDK_JAVA_DRIVE
|
||||
SLASH_JAVA =$(JDK_JAVA_DRIVE)
|
||||
else
|
||||
SLASH_JAVA =J:
|
||||
endif
|
||||
endif
|
||||
SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
|
||||
SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
|
||||
export SLASH_JAVA
|
||||
endif
|
||||
SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
|
||||
SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
|
||||
|
||||
# JDK_DEVTOOLS_DIR: common path for all the java devtools
|
||||
ifdef ALT_JDK_DEVTOOLS_DIR
|
||||
ifndef JDK_DEVTOOLS_DIR
|
||||
ifdef ALT_JDK_DEVTOOLS_DIR
|
||||
xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
|
||||
JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
|
||||
else
|
||||
else
|
||||
JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
|
||||
endif
|
||||
JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
|
||||
JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
|
||||
export JDK_DEVTOOLS_DIR
|
||||
endif
|
||||
JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
|
||||
JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
|
||||
|
||||
# COMPILER_PATH: path to where the compiler and tools are installed.
|
||||
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
|
||||
ifdef ALT_COMPILER_PATH
|
||||
ifndef COMPILER_PATH
|
||||
ifdef ALT_COMPILER_PATH
|
||||
xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
|
||||
fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
|
||||
COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
|
||||
else
|
||||
COMPILER_PATH :=$(call PrefixPath,$(_compiler_bin))
|
||||
else
|
||||
COMPILER_PATH :=$(call PrefixPath,$(SHORTCOMPILERBIN))
|
||||
endif
|
||||
COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
|
||||
export COMPILER_PATH
|
||||
endif
|
||||
COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
|
||||
|
||||
# MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are.
|
||||
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
|
||||
ifdef ALT_MSDEVTOOLS_PATH
|
||||
ifndef MSDEVTOOLS_PATH
|
||||
ifdef ALT_MSDEVTOOLS_PATH
|
||||
xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
|
||||
fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
|
||||
MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
|
||||
else
|
||||
else
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifdef MSTOOLS
|
||||
xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
|
||||
|
|
@ -372,22 +372,25 @@ else
|
|||
_ms_tools_bin :=$(_ms_tools)/Bin
|
||||
else
|
||||
# Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
|
||||
_ms_tools_bin :=$(_compiler_bin)/../../..
|
||||
_ms_tools_bin :=$(SHORTCOMPILERBIN)/../../..
|
||||
endif
|
||||
else
|
||||
_ms_tools_bin :=$(_compiler_bin)
|
||||
_ms_tools_bin :=$(SHORTCOMPILERBIN)
|
||||
endif
|
||||
MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
|
||||
endif
|
||||
MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
|
||||
export MSDEVTOOLS_PATH
|
||||
endif
|
||||
MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
|
||||
|
||||
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
|
||||
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
|
||||
ifdef ALT_DEVTOOLS_PATH
|
||||
ifndef DEVTOOLS_PATH
|
||||
ifdef ALT_DEVTOOLS_PATH
|
||||
xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
|
||||
fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
|
||||
DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
|
||||
else
|
||||
else
|
||||
ifdef USING_CYGWIN
|
||||
DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
|
||||
else
|
||||
|
|
@ -395,8 +398,10 @@ else
|
|||
fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
|
||||
DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
|
||||
endif
|
||||
endif
|
||||
DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
|
||||
export DEVTOOLS_PATH
|
||||
endif
|
||||
DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
|
||||
|
||||
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
|
||||
# _BOOTDIR2: Second choice
|
||||
|
|
@ -410,20 +415,26 @@ endif
|
|||
|
||||
# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
|
||||
# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
|
||||
ifdef ALT_BUILD_JDK_IMPORT_PATH
|
||||
ifndef BUILD_JDK_IMPORT_PATH
|
||||
ifdef ALT_BUILD_JDK_IMPORT_PATH
|
||||
BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
|
||||
else
|
||||
else
|
||||
BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
|
||||
endif
|
||||
BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
|
||||
BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
|
||||
export BUILD_JDK_IMPORT_PATH
|
||||
endif
|
||||
BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
|
||||
BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
|
||||
|
||||
# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
|
||||
ifdef ALT_JDK_IMPORT_PATH
|
||||
ifndef JDK_IMPORT_PATH
|
||||
ifdef ALT_JDK_IMPORT_PATH
|
||||
JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
|
||||
else
|
||||
else
|
||||
JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
|
||||
endif
|
||||
JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
|
||||
JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
|
||||
export JDK_IMPORT_PATH
|
||||
endif
|
||||
JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
|
||||
JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
|
||||
|
||||
|
|
|
|||
|
|
@ -228,12 +228,15 @@ else
|
|||
endif
|
||||
|
||||
# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
|
||||
ifdef BUILD_NUMBER
|
||||
ifndef FULL_VERSION
|
||||
ifdef BUILD_NUMBER
|
||||
FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
|
||||
else
|
||||
else
|
||||
BUILD_NUMBER = b00
|
||||
USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`)
|
||||
FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
|
||||
endif
|
||||
export FULL_VERSION
|
||||
endif
|
||||
|
||||
# Promoted build location
|
||||
|
|
|
|||
|
|
@ -84,21 +84,14 @@ PLATFORM_SHARED=done
|
|||
# REQUIRED_LINUX_VER linux only: required version of linux
|
||||
# REQUIRED_LINUX_FULLVER linux only: required full version of linux
|
||||
|
||||
SYSTEM_UNAME := $(shell uname)
|
||||
ifndef SYSTEM_UNAME
|
||||
SYSTEM_UNAME := $(shell uname)
|
||||
export SYSTEM_UNAME
|
||||
endif
|
||||
|
||||
# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot
|
||||
REQUIRED_BOOT_VER = 1.5
|
||||
|
||||
#
|
||||
# Prune out all known SCM (Source Code Management) directories
|
||||
# so they will not be included when copying directory trees
|
||||
# or packaging up .jar files, etc. This applies to all workspaces.
|
||||
#
|
||||
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files
|
||||
# When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
|
||||
SCM_DIRS_rexp = ".hg|.svn|CVS|RCS|SCCS|Codemgr_wsdata|deleted_files"
|
||||
SCM_DIRS_prune = \( -name .hg -o -name .svn -o -name CVS -o -name RCS -o -name SCCS -o -name Codemgr_wsdata -o -name deleted_files \) -prune
|
||||
|
||||
# Don't define this unless it's not defined
|
||||
ifndef VARIANT
|
||||
VARIANT=OPT
|
||||
|
|
@ -372,6 +365,7 @@ ifeq ($(PLATFORM), windows)
|
|||
REQUIRED_FREE_SPACE=500000
|
||||
OS_VENDOR = Microsoft
|
||||
# How much RAM does this machine have:
|
||||
ifndef MB_OF_MEMORY
|
||||
MB_OF_MEMORY := $(shell \
|
||||
if [ -f "C:/cygwin/bin/free.exe" ] ; then \
|
||||
( C:/cygwin/bin/bash.exe -c "C:/cygwin/bin/free.exe -m" ) | \
|
||||
|
|
@ -380,6 +374,8 @@ ifeq ($(PLATFORM), windows)
|
|||
else \
|
||||
echo "512"; \
|
||||
fi)
|
||||
export MB_OF_MEMORY
|
||||
endif
|
||||
endif
|
||||
|
||||
# Machines with 512Mb or less of real memory are considered low memory
|
||||
|
|
@ -387,7 +383,8 @@ endif
|
|||
# system swapping during the build.
|
||||
# If we don't know, assume 512. Subtract 128 from MB for VM MAX.
|
||||
# Don't set VM max over 1024-128=896.
|
||||
ifneq ($(MB_OF_MEMORY),)
|
||||
ifndef MAX_VM_MEMORY
|
||||
ifneq ($(MB_OF_MEMORY),)
|
||||
LOW_MEMORY_MACHINE := $(shell \
|
||||
if [ $(MB_OF_MEMORY) -le 512 ] ; then \
|
||||
echo "true"; \
|
||||
|
|
@ -406,11 +403,16 @@ ifneq ($(MB_OF_MEMORY),)
|
|||
else \
|
||||
echo "128"; \
|
||||
fi)
|
||||
else
|
||||
else
|
||||
MB_OF_MEMORY := unknown
|
||||
LOW_MEMORY_MACHINE := true
|
||||
MAX_VM_MEMORY := 384
|
||||
MIN_VM_MEMORY := 128
|
||||
endif
|
||||
export MAX_VM_MEMORY
|
||||
export MIN_VM_MEMORY
|
||||
export LOW_MEMORY_MACHINE
|
||||
export MAX_VM_MEMORY
|
||||
endif
|
||||
|
||||
REQUIRED_ZIP_VER = 2.2
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ solaris_i586_5.10,\
|
|||
solaris_x64_5.10,\
|
||||
linux_i586_2.6,\
|
||||
linux_x64_2.6,\
|
||||
windows_i586,\
|
||||
windows_x64
|
||||
windows_i586_5.0,\
|
||||
windows_x64_5.2
|
||||
|
||||
# The different build flavors we want
|
||||
jprt.build.flavors=product,fastdebug
|
||||
|
|
|
|||
|
|
@ -45,3 +45,6 @@ ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
|
|||
d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
|
||||
54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
|
||||
0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70
|
||||
50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
|
||||
a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
|
||||
faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
|
||||
#
|
||||
# Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ endif
|
|||
C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
|
||||
C2_VM_TARGETS=product fastdebug optimized jvmg
|
||||
KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
|
||||
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
|
||||
|
||||
# JDK directory list
|
||||
JDK_DIRS=bin include jre lib demo
|
||||
|
|
@ -94,6 +95,12 @@ all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
|
|||
all_debug: jvmg jvmg1 jvmgkernel docs export_debug
|
||||
all_optimized: optimized optimized1 optimizedkernel docs export_optimized
|
||||
|
||||
allzero: all_productzero all_fastdebugzero
|
||||
all_productzero: productzero docs export_product
|
||||
all_fastdebugzero: fastdebugzero docs export_fastdebug
|
||||
all_debugzero: jvmgzero docs export_debug
|
||||
all_optimizedzero: optimizedzero docs export_optimized
|
||||
|
||||
# Do everything
|
||||
world: all create_jdk
|
||||
|
||||
|
|
@ -120,6 +127,10 @@ $(KERNEL_VM_TARGETS):
|
|||
$(CD) $(GAMMADIR)/make; \
|
||||
$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
|
||||
|
||||
$(ZERO_VM_TARGETS):
|
||||
$(CD) $(GAMMADIR)/make; \
|
||||
$(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
|
||||
|
||||
# Build compiler1 (client) rule, different for platforms
|
||||
generic_build1:
|
||||
$(MKDIR) -p $(OUTPUTDIR)
|
||||
|
|
@ -180,6 +191,12 @@ else
|
|||
@$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
|
||||
endif
|
||||
|
||||
generic_buildzero:
|
||||
$(MKDIR) -p $(OUTPUTDIR)
|
||||
$(CD) $(OUTPUTDIR); \
|
||||
$(MAKE) -f $(ABS_OS_MAKEFILE) \
|
||||
$(MAKE_ARGS) $(VM_TARGET)
|
||||
|
||||
# Export file rule
|
||||
generic_export: $(EXPORT_LIST)
|
||||
export_product:
|
||||
|
|
@ -210,11 +227,17 @@ DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
|
|||
C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
|
||||
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
|
||||
KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
|
||||
ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
|
||||
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
|
||||
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
|
||||
KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
|
||||
ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
|
||||
|
||||
# Misc files and generated files need to come from C1 or C2 area
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
MISC_DIR=$(ZERO_DIR)
|
||||
GEN_DIR=$(ZERO_BASE_DIR)/generated
|
||||
else
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
MISC_DIR=$(C1_DIR)
|
||||
GEN_DIR=$(C1_BASE_DIR)/generated
|
||||
|
|
@ -222,6 +245,7 @@ else
|
|||
MISC_DIR=$(C2_DIR)
|
||||
GEN_DIR=$(C2_BASE_DIR)/generated
|
||||
endif
|
||||
endif
|
||||
|
||||
# Bin files (windows)
|
||||
ifeq ($(OSNAME),windows)
|
||||
|
|
@ -265,6 +289,12 @@ endif
|
|||
|
||||
# Shared Library
|
||||
ifneq ($(OSNAME),windows)
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
|
||||
$(install-file)
|
||||
$(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
|
||||
$(install-file)
|
||||
else
|
||||
$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
|
||||
$(install-file)
|
||||
$(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
|
||||
|
|
@ -275,6 +305,7 @@ $(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so
|
|||
$(install-file)
|
||||
$(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
|
||||
$(install-file)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Jar file (sa-jdi.jar)
|
||||
|
|
@ -313,6 +344,7 @@ clean_build:
|
|||
$(RM) -r $(C1_DIR)
|
||||
$(RM) -r $(C2_DIR)
|
||||
$(RM) -r $(KERNEL_DIR)
|
||||
$(RM) -r $(ZERO_DIR)
|
||||
clean_export:
|
||||
$(RM) -r $(EXPORT_PATH)
|
||||
clean_jdk:
|
||||
|
|
@ -335,8 +367,10 @@ $(JDK_IMAGE_DIR)/jre/lib/rt.jar:
|
|||
($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
|
||||
|
||||
test_jdk:
|
||||
ifneq ($(ZERO_BUILD), true)
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
$(JDK_IMAGE_DIR)/bin/java -client -version
|
||||
endif
|
||||
endif
|
||||
$(JDK_IMAGE_DIR)/bin/java -server -version
|
||||
|
||||
|
|
|
|||
|
|
@ -192,13 +192,14 @@ ifneq ($(OSNAME),windows)
|
|||
|
||||
# Use uname output for SRCARCH, but deal with platform differences. If ARCH
|
||||
# is not explicitly listed below, it is treated as x86.
|
||||
SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
|
||||
SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
|
||||
ARCH/ = x86
|
||||
ARCH/sparc = sparc
|
||||
ARCH/sparc64= sparc
|
||||
ARCH/ia64 = ia64
|
||||
ARCH/amd64 = x86
|
||||
ARCH/x86_64 = x86
|
||||
ARCH/zero = zero
|
||||
|
||||
# BUILDARCH is usually the same as SRCARCH, except for sparcv9
|
||||
BUILDARCH = $(SRCARCH)
|
||||
|
|
@ -222,8 +223,9 @@ ifneq ($(OSNAME),windows)
|
|||
LIBARCH/sparc = sparc
|
||||
LIBARCH/sparcv9 = sparcv9
|
||||
LIBARCH/ia64 = ia64
|
||||
LIBARCH/zero = $(ZERO_LIBARCH)
|
||||
|
||||
LP64_ARCH = sparcv9 amd64 ia64
|
||||
LP64_ARCH = sparcv9 amd64 ia64 zero
|
||||
endif
|
||||
|
||||
# Required make macro settings for all platforms
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2009
|
|||
|
||||
HS_MAJOR_VER=17
|
||||
HS_MINOR_VER=0
|
||||
HS_BUILD_NUMBER=01
|
||||
HS_BUILD_NUMBER=03
|
||||
|
||||
JDK_MAJOR_VER=1
|
||||
JDK_MINOR_VER=7
|
||||
|
|
|
|||
|
|
@ -29,17 +29,24 @@ ifdef JPRT_BUILD_VERSION
|
|||
MILESTONE=$(JPRT_BUILD_VERSION)
|
||||
endif
|
||||
|
||||
ifeq ($(OSNAME),windows)
|
||||
ZIPFLAGS=-q
|
||||
else
|
||||
# store symbolic links as the link
|
||||
ZIPFLAGS=-q -y
|
||||
endif
|
||||
|
||||
jprt_build_product: all_product copy_product_jdk export_product_jdk
|
||||
( $(CD) $(JDK_IMAGE_DIR) && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
jprt_build_fastdebug: all_fastdebug copy_fastdebug_jdk export_fastdebug_jdk
|
||||
( $(CD) $(JDK_IMAGE_DIR)/fastdebug && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
jprt_build_debug: all_debug copy_debug_jdk export_debug_jdk
|
||||
( $(CD) $(JDK_IMAGE_DIR)/debug && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
|
||||
|
||||
|
|
|
|||
|
|
@ -132,6 +132,9 @@ ifeq ($(OSNAME),solaris)
|
|||
|
||||
endif
|
||||
|
||||
# BUILDARCH is set to "zero" for Zero builds. VARIANTARCH
|
||||
# is used to give the build directories meaningful names.
|
||||
VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
|
||||
|
||||
# There is a (semi-) regular correspondence between make targets and actions:
|
||||
#
|
||||
|
|
@ -158,6 +161,13 @@ endif
|
|||
# profiledcore core <os>_<arch>_core/profiled
|
||||
# productcore core <os>_<arch>_core/product
|
||||
#
|
||||
# debugzero zero <os>_<arch>_zero/debug
|
||||
# fastdebugzero zero <os>_<arch>_zero/fastdebug
|
||||
# jvmgzero zero <os>_<arch>_zero/jvmg
|
||||
# optimizedzero zero <os>_<arch>_zero/optimized
|
||||
# profiledzero zero <os>_<arch>_zero/profiled
|
||||
# productzero zero <os>_<arch>_zero/product
|
||||
#
|
||||
# What you get with each target:
|
||||
#
|
||||
# debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
|
||||
|
|
@ -171,16 +181,22 @@ endif
|
|||
# in the build.sh script:
|
||||
TARGETS = debug jvmg fastdebug optimized profiled product
|
||||
|
||||
SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
|
||||
else
|
||||
SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
|
||||
endif
|
||||
SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
|
||||
SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
|
||||
SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
|
||||
SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
|
||||
SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
|
||||
|
||||
TARGETS_C2 = $(TARGETS)
|
||||
TARGETS_C1 = $(addsuffix 1,$(TARGETS))
|
||||
TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
|
||||
TARGETS_CORE = $(addsuffix core,$(TARGETS))
|
||||
TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
|
||||
|
||||
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
|
||||
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
|
||||
|
|
@ -196,6 +212,7 @@ all:
|
|||
@echo " $(TARGETS_C2)"
|
||||
@echo " $(TARGETS_C1)"
|
||||
@echo " $(TARGETS_CORE)"
|
||||
@echo " $(TARGETS_ZERO)"
|
||||
|
||||
checks: check_os_version check_j2se_version
|
||||
|
||||
|
|
@ -245,6 +262,13 @@ $(SUBDIRS_CORE): $(BUILDTREE_MAKE)
|
|||
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
||||
$(BUILDTREE) VARIANT=core
|
||||
|
||||
$(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero
|
||||
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
||||
$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
|
||||
|
||||
platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
|
||||
$(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
|
||||
|
||||
# Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
|
||||
|
||||
$(TARGETS_C2): $(SUBDIRS_C2)
|
||||
|
|
@ -275,10 +299,18 @@ ifdef INSTALL
|
|||
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
|
||||
endif
|
||||
|
||||
$(TARGETS_ZERO): $(SUBDIRS_ZERO)
|
||||
cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
|
||||
cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
|
||||
ifdef INSTALL
|
||||
cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
|
||||
endif
|
||||
|
||||
# Just build the tree, and nothing else:
|
||||
tree: $(SUBDIRS_C2)
|
||||
tree1: $(SUBDIRS_C1)
|
||||
treecore: $(SUBDIRS_CORE)
|
||||
treezero: $(SUBDIRS_ZERO)
|
||||
|
||||
# Doc target. This is the same for all build options.
|
||||
# Hence create a docs directory beside ...$(ARCH)_[...]
|
||||
|
|
@ -293,20 +325,22 @@ compiler1: jvmg1 product1
|
|||
|
||||
core: jvmgcore productcore
|
||||
|
||||
zero: jvmgzero productzero
|
||||
|
||||
clean_docs:
|
||||
rm -rf $(SUBDIR_DOCS)
|
||||
|
||||
clean_compiler1 clean_compiler2 clean_core:
|
||||
clean_compiler1 clean_compiler2 clean_core clean_zero:
|
||||
rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
|
||||
|
||||
clean: clean_compiler2 clean_compiler1 clean_core clean_docs
|
||||
clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
|
||||
|
||||
include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
|
||||
.PHONY: tree tree1 treecore
|
||||
.PHONY: all compiler1 compiler2 core
|
||||
.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
|
||||
.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
|
||||
.PHONY: tree tree1 treecore treezero
|
||||
.PHONY: all compiler1 compiler2 core zero
|
||||
.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
|
||||
.PHONY: checks check_os_version check_j2se_version
|
||||
|
|
|
|||
|
|
@ -63,20 +63,30 @@ QUIETLY$(MAKE_VERBOSE) = @
|
|||
# For now, until the compiler is less wobbly:
|
||||
TESTFLAGS = -Xbatch -showversion
|
||||
|
||||
ifdef USE_SUNCC
|
||||
PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
|
||||
else
|
||||
PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
|
||||
ifdef USE_SUNCC
|
||||
PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
|
||||
else
|
||||
PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Allow overriding of the arch part of the directory but default
|
||||
# to BUILDARCH if nothing is specified
|
||||
ifeq ($(VARIANTARCH),)
|
||||
VARIANTARCH=$(BUILDARCH)
|
||||
endif
|
||||
|
||||
ifdef FORCE_TIERED
|
||||
ifeq ($(VARIANT),tiered)
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_compiler2
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_compiler2
|
||||
else
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
|
||||
endif
|
||||
else
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
|
||||
PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -321,6 +331,7 @@ DATA_MODE/sparc = 32
|
|||
DATA_MODE/sparcv9 = 64
|
||||
DATA_MODE/amd64 = 64
|
||||
DATA_MODE/ia64 = 64
|
||||
DATA_MODE/zero = $(ARCH_DATA_MODEL)
|
||||
|
||||
JAVA_FLAG/32 = -d32
|
||||
JAVA_FLAG/64 = -d64
|
||||
|
|
|
|||
|
|
@ -37,6 +37,17 @@ else
|
|||
ARCH_DATA_MODEL ?= 32
|
||||
endif
|
||||
|
||||
# zero
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
MAKE_ARGS += LP64=1
|
||||
endif
|
||||
PLATFORM = linux-zero
|
||||
VM_PLATFORM = linux_$(subst i386,i486,$(ZERO_LIBARCH))
|
||||
HS_ARCH = zero
|
||||
ARCH = zero
|
||||
endif
|
||||
|
||||
# ia64
|
||||
ifeq ($(ARCH), ia64)
|
||||
ARCH_DATA_MODEL = 64
|
||||
|
|
@ -93,21 +104,25 @@ JDK_INCLUDE_SUBDIR=linux
|
|||
VM_DEBUG=jvmg
|
||||
|
||||
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
|
||||
|
||||
# client and server subdirectories have symbolic links to ../libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
|
||||
|
||||
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifneq ($(ZERO_BUILD), true)
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
|
||||
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
|
||||
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
|
||||
else
|
||||
else
|
||||
ifeq ($(ARCH),ia64)
|
||||
else
|
||||
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
|
||||
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -52,6 +52,9 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
|
|||
VM_PICFLAG/AOUT =
|
||||
VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
|
||||
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
CFLAGS += $(LIBFFI_CFLAGS)
|
||||
endif
|
||||
CFLAGS += $(VM_PICFLAG)
|
||||
CFLAGS += -fno-rtti
|
||||
CFLAGS += -fno-exceptions
|
||||
|
|
@ -64,6 +67,7 @@ ARCHFLAG/amd64 = -m64
|
|||
ARCHFLAG/ia64 =
|
||||
ARCHFLAG/sparc = -m32 -mcpu=v9
|
||||
ARCHFLAG/sparcv9 = -m64 -mcpu=v9
|
||||
ARCHFLAG/zero = $(ZERO_ARCHFLAG)
|
||||
|
||||
CFLAGS += $(ARCHFLAG)
|
||||
AOUT_FLAGS += $(ARCHFLAG)
|
||||
|
|
|
|||
|
|
@ -52,10 +52,10 @@ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VE
|
|||
SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
|
||||
|
||||
# if $(AGENT_DIR) does not exist, we don't build SA
|
||||
# also, we don't build SA on Itanium.
|
||||
# also, we don't build SA on Itanium or zero.
|
||||
|
||||
all:
|
||||
if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
|
||||
if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
|
||||
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ ifeq ($(DEBUG_BINARIES), true)
|
|||
endif
|
||||
|
||||
# if $(AGENT_DIR) does not exist, we don't build SA
|
||||
# also, we don't build SA on Itanium.
|
||||
# also, we don't build SA on Itanium or zero.
|
||||
|
||||
checkAndBuildSA:
|
||||
$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
|
||||
$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
|
||||
$(MAKE) -f vm.make $(LIBSAPROC); \
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \
|
|||
Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
|
||||
Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
|
||||
Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
|
||||
Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
|
||||
Include_DBs = $(Include_DBs/$(TYPE))
|
||||
|
||||
Cached_plat = $(GENERATED)/platform.current
|
||||
|
|
|
|||
|
|
@ -40,7 +40,11 @@ GENERATED = ../generated
|
|||
include $(GENERATED)/Dependencies
|
||||
|
||||
# read machine-specific adjustments (%%% should do this via buildtree.make?)
|
||||
include $(MAKEFILES_DIR)/$(BUILDARCH).make
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
include $(MAKEFILES_DIR)/zeroshark.make
|
||||
else
|
||||
include $(MAKEFILES_DIR)/$(BUILDARCH).make
|
||||
endif
|
||||
|
||||
# set VPATH so make knows where to look for source files
|
||||
# Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
|
||||
|
|
@ -124,7 +128,11 @@ mapfile_reorder : mapfile $(REORDERFILE)
|
|||
rm -f $@
|
||||
cat $^ > $@
|
||||
|
||||
STATIC_CXX = true
|
||||
ifeq ($(ZERO_LIBARCH), ppc64)
|
||||
STATIC_CXX = false
|
||||
else
|
||||
STATIC_CXX = true
|
||||
endif
|
||||
|
||||
ifeq ($(LINK_INTO),AOUT)
|
||||
LIBJVM.o =
|
||||
|
|
@ -148,6 +156,9 @@ else
|
|||
|
||||
LIBS_VM += $(LIBS)
|
||||
endif
|
||||
ifeq ($(ZERO_BUILD), true)
|
||||
LIBS_VM += $(LIBFFI_LIBS)
|
||||
endif
|
||||
|
||||
LINK_VM = $(LINK_LIB.c)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
#
|
||||
# Copyright 1998 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2009 Red Hat, Inc.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Sun designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Sun in the LICENSE file that accompanied this code.
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
|
|
@ -22,6 +21,12 @@
|
|||
# CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
# have any questions.
|
||||
#
|
||||
#
|
||||
|
||||
pack.pragma.start=\#pragma pack(4)\n
|
||||
pack.pragma.end=\#pragma pack()\n
|
||||
# Setup for Zero (non-Shark) version of VM
|
||||
|
||||
# Select which includeDB files to use (in top.make)
|
||||
TYPE = ZERO
|
||||
|
||||
# Install libjvm.so, etc in in server directory.
|
||||
VM_SUBDIR = server
|
||||
43
hotspot/make/linux/makefiles/zeroshark.make
Normal file
43
hotspot/make/linux/makefiles/zeroshark.make
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
# Copyright 2007, 2008 Red Hat, Inc.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
# CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
# have any questions.
|
||||
#
|
||||
#
|
||||
|
||||
# Setup common to Zero (non-Shark) and Shark versions of VM
|
||||
|
||||
# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
|
||||
OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
|
||||
# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
|
||||
OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
|
||||
|
||||
# Specify that the CPU is little endian, if necessary
|
||||
ifeq ($(ZERO_ENDIANNESS), little)
|
||||
CFLAGS += -DVM_LITTLE_ENDIAN
|
||||
endif
|
||||
|
||||
# Specify that the CPU is 64 bit, if necessary
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
CFLAGS += -D_LP64=1
|
||||
endif
|
||||
|
||||
OPT_CFLAGS/compactingPermGenGen.o = -O1
|
||||
17
hotspot/make/linux/platform_zero.in
Normal file
17
hotspot/make/linux/platform_zero.in
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
os_family = linux
|
||||
|
||||
arch = zero
|
||||
|
||||
arch_model = zero
|
||||
|
||||
os_arch = linux_zero
|
||||
|
||||
os_arch_model = linux_zero
|
||||
|
||||
lib_arch = zero
|
||||
|
||||
compiler = gcc
|
||||
|
||||
gnu_dis_arch = zero
|
||||
|
||||
sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
|
||||
|
|
@ -65,16 +65,18 @@ JDK_INCLUDE_SUBDIR=solaris
|
|||
VM_DEBUG=jvmg
|
||||
|
||||
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
|
||||
|
||||
# client and server subdirectories have symbolic links to ../libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
|
||||
|
||||
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
|
||||
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
|
||||
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so
|
||||
|
|
|
|||
|
|
@ -2631,13 +2631,13 @@ void MacroAssembler::regcon_inc_ptr( RegisterOrConstant& dest, RegisterOrConstan
|
|||
(src.is_register() && src.as_register() == G0)) {
|
||||
// do nothing
|
||||
} else if (dest.is_register()) {
|
||||
add(dest.as_register(), ensure_rs2(src, temp), dest.as_register());
|
||||
add(dest.as_register(), ensure_simm13_or_reg(src, temp), dest.as_register());
|
||||
} else if (src.is_constant()) {
|
||||
intptr_t res = dest.as_constant() + src.as_constant();
|
||||
dest = RegisterOrConstant(res); // side effect seen by caller
|
||||
} else {
|
||||
assert(temp != noreg, "cannot handle constant += register");
|
||||
add(src.as_register(), ensure_rs2(dest, temp), temp);
|
||||
add(src.as_register(), ensure_simm13_or_reg(dest, temp), temp);
|
||||
dest = RegisterOrConstant(temp); // side effect seen by caller
|
||||
}
|
||||
}
|
||||
|
|
@ -2710,7 +2710,7 @@ void MacroAssembler::lookup_interface_method(Register recv_klass,
|
|||
RegisterOrConstant itable_offset = itable_index;
|
||||
regcon_sll_ptr(itable_offset, exact_log2(itableMethodEntry::size() * wordSize));
|
||||
regcon_inc_ptr(itable_offset, itableMethodEntry::method_offset_in_bytes());
|
||||
add(recv_klass, ensure_rs2(itable_offset, sethi_temp), recv_klass);
|
||||
add(recv_klass, ensure_simm13_or_reg(itable_offset, sethi_temp), recv_klass);
|
||||
|
||||
// for (scan = klass->itable(); scan->interface() != NULL; scan += scan_step) {
|
||||
// if (scan->interface() == intf) {
|
||||
|
|
|
|||
|
|
@ -1279,6 +1279,7 @@ public:
|
|||
|
||||
// 171
|
||||
|
||||
inline void ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d);
|
||||
inline void ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d);
|
||||
inline void ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec = RelocationHolder());
|
||||
|
||||
|
|
@ -1535,7 +1536,8 @@ public:
|
|||
|
||||
// pp 222
|
||||
|
||||
inline void stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2 );
|
||||
inline void stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, RegisterOrConstant s2);
|
||||
inline void stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2);
|
||||
inline void stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a);
|
||||
inline void stf( FloatRegisterImpl::Width w, FloatRegister d, const Address& a, int offset = 0);
|
||||
|
||||
|
|
@ -2049,12 +2051,13 @@ public:
|
|||
Register temp = noreg );
|
||||
void regcon_sll_ptr( RegisterOrConstant& dest, RegisterOrConstant src,
|
||||
Register temp = noreg );
|
||||
RegisterOrConstant ensure_rs2(RegisterOrConstant rs2, Register sethi_temp) {
|
||||
guarantee(sethi_temp != noreg, "constant offset overflow");
|
||||
if (is_simm13(rs2.constant_or_zero()))
|
||||
return rs2; // register or short constant
|
||||
set(rs2.as_constant(), sethi_temp);
|
||||
return sethi_temp;
|
||||
|
||||
RegisterOrConstant ensure_simm13_or_reg(RegisterOrConstant roc, Register Rtemp) {
|
||||
guarantee(Rtemp != noreg, "constant offset overflow");
|
||||
if (is_simm13(roc.constant_or_zero()))
|
||||
return roc; // register or short constant
|
||||
set(roc.as_constant(), Rtemp);
|
||||
return RegisterOrConstant(Rtemp);
|
||||
}
|
||||
|
||||
// --------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -99,6 +99,11 @@ inline void Assembler::flush( Register s1, int simm13a) { emit_data( op(arith_op
|
|||
inline void Assembler::jmpl( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
|
||||
inline void Assembler::jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { emit_data( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); has_delay_slot(); }
|
||||
|
||||
inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d) {
|
||||
if (s2.is_register()) ldf(w, s1, s2.as_register(), d);
|
||||
else ldf(w, s1, s2.as_constant(), d);
|
||||
}
|
||||
|
||||
inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
|
||||
inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); }
|
||||
|
||||
|
|
@ -224,6 +229,11 @@ inline void Assembler::sethi( int imm22a, Register d, RelocationHolder const& rs
|
|||
|
||||
// pp 222
|
||||
|
||||
inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, RegisterOrConstant s2) {
|
||||
if (s2.is_register()) stf(w, d, s1, s2.as_register());
|
||||
else stf(w, d, s1, s2.as_constant());
|
||||
}
|
||||
|
||||
inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | rs2(s2) ); }
|
||||
inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
|
||||
|
||||
|
|
@ -284,6 +294,7 @@ inline void Assembler::stx(Register d, const Address& a, int offset) {
|
|||
|
||||
inline void Assembler::stb(Register d, Register s1, RegisterOrConstant s2) { stb(d, Address(s1, s2)); }
|
||||
inline void Assembler::sth(Register d, Register s1, RegisterOrConstant s2) { sth(d, Address(s1, s2)); }
|
||||
inline void Assembler::stw(Register d, Register s1, RegisterOrConstant s2) { stw(d, Address(s1, s2)); }
|
||||
inline void Assembler::stx(Register d, Register s1, RegisterOrConstant s2) { stx(d, Address(s1, s2)); }
|
||||
inline void Assembler::std(Register d, Register s1, RegisterOrConstant s2) { std(d, Address(s1, s2)); }
|
||||
inline void Assembler::st( Register d, Register s1, RegisterOrConstant s2) { st( d, Address(s1, s2)); }
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
|||
// are saved in register windows - I's and L's in the caller's frame and O's in the stub frame
|
||||
// (as the stub's I's) when the runtime routine called by the stub creates its frame.
|
||||
int i;
|
||||
// Always make the frame size 16 bytr aligned.
|
||||
// Always make the frame size 16 byte aligned.
|
||||
int frame_size = round_to(additional_frame_words + register_save_size, 16);
|
||||
// OopMap frame size is in c2 stack slots (sizeof(jint)) not bytes or words
|
||||
int frame_size_in_slots = frame_size / sizeof(jint);
|
||||
|
|
@ -201,15 +201,14 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
|||
__ stx(G5, SP, ccr_offset+STACK_BIAS);
|
||||
__ stxfsr(SP, fsr_offset+STACK_BIAS);
|
||||
|
||||
// Save all the FP registers
|
||||
// Save all the FP registers: 32 doubles (32 floats correspond to the 2 halves of the first 16 doubles)
|
||||
int offset = d00_offset;
|
||||
for( int i=0; i<64; i+=2 ) {
|
||||
for( int i=0; i<FloatRegisterImpl::number_of_registers; i+=2 ) {
|
||||
FloatRegister f = as_FloatRegister(i);
|
||||
__ stf(FloatRegisterImpl::D, f, SP, offset+STACK_BIAS);
|
||||
// Record as callee saved both halves of double registers (2 float registers).
|
||||
map->set_callee_saved(VMRegImpl::stack2reg(offset>>2), f->as_VMReg());
|
||||
if (true) {
|
||||
map->set_callee_saved(VMRegImpl::stack2reg((offset + sizeof(float))>>2), f->as_VMReg()->next());
|
||||
}
|
||||
offset += sizeof(double);
|
||||
}
|
||||
|
||||
|
|
@ -224,7 +223,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
|
|||
void RegisterSaver::restore_live_registers(MacroAssembler* masm) {
|
||||
|
||||
// Restore all the FP registers
|
||||
for( int i=0; i<64; i+=2 ) {
|
||||
for( int i=0; i<FloatRegisterImpl::number_of_registers; i+=2 ) {
|
||||
__ ldf(FloatRegisterImpl::D, SP, d00_offset+i*sizeof(float)+STACK_BIAS, as_FloatRegister(i));
|
||||
}
|
||||
|
||||
|
|
@ -540,14 +539,12 @@ int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
|
|||
|
||||
}
|
||||
|
||||
// Helper class mostly to avoid passing masm everywhere, and handle store
|
||||
// displacement overflow logic for LP64
|
||||
// Helper class mostly to avoid passing masm everywhere, and handle
|
||||
// store displacement overflow logic.
|
||||
class AdapterGenerator {
|
||||
MacroAssembler *masm;
|
||||
#ifdef _LP64
|
||||
Register Rdisp;
|
||||
void set_Rdisp(Register r) { Rdisp = r; }
|
||||
#endif // _LP64
|
||||
|
||||
void patch_callers_callsite();
|
||||
void tag_c2i_arg(frame::Tag t, Register base, int st_off, Register scratch);
|
||||
|
|
@ -558,15 +555,18 @@ class AdapterGenerator {
|
|||
return st_off - Interpreter::stackElementSize() + Interpreter::value_offset_in_bytes();
|
||||
}
|
||||
|
||||
#ifdef _LP64
|
||||
// On _LP64 argument slot values are loaded first into a register
|
||||
// because they might not fit into displacement.
|
||||
Register arg_slot(const int st_off);
|
||||
Register next_arg_slot(const int st_off);
|
||||
#else
|
||||
int arg_slot(const int st_off) { return arg_offset(st_off); }
|
||||
int next_arg_slot(const int st_off) { return next_arg_offset(st_off); }
|
||||
#endif // _LP64
|
||||
int tag_offset(const int st_off) { return st_off + Interpreter::tag_offset_in_bytes(); }
|
||||
int next_tag_offset(const int st_off) {
|
||||
return st_off - Interpreter::stackElementSize() + Interpreter::tag_offset_in_bytes();
|
||||
}
|
||||
|
||||
// Argument slot values may be loaded first into a register because
|
||||
// they might not fit into displacement.
|
||||
RegisterOrConstant arg_slot(const int st_off);
|
||||
RegisterOrConstant next_arg_slot(const int st_off);
|
||||
|
||||
RegisterOrConstant tag_slot(const int st_off);
|
||||
RegisterOrConstant next_tag_slot(const int st_off);
|
||||
|
||||
// Stores long into offset pointed to by base
|
||||
void store_c2i_long(Register r, Register base,
|
||||
|
|
@ -656,44 +656,42 @@ void AdapterGenerator::patch_callers_callsite() {
|
|||
void AdapterGenerator::tag_c2i_arg(frame::Tag t, Register base, int st_off,
|
||||
Register scratch) {
|
||||
if (TaggedStackInterpreter) {
|
||||
int tag_off = st_off + Interpreter::tag_offset_in_bytes();
|
||||
#ifdef _LP64
|
||||
Register tag_slot = Rdisp;
|
||||
__ set(tag_off, tag_slot);
|
||||
#else
|
||||
int tag_slot = tag_off;
|
||||
#endif // _LP64
|
||||
RegisterOrConstant slot = tag_slot(st_off);
|
||||
// have to store zero because local slots can be reused (rats!)
|
||||
if (t == frame::TagValue) {
|
||||
__ st_ptr(G0, base, tag_slot);
|
||||
__ st_ptr(G0, base, slot);
|
||||
} else if (t == frame::TagCategory2) {
|
||||
__ st_ptr(G0, base, tag_slot);
|
||||
int next_tag_off = st_off - Interpreter::stackElementSize() +
|
||||
Interpreter::tag_offset_in_bytes();
|
||||
#ifdef _LP64
|
||||
__ set(next_tag_off, tag_slot);
|
||||
#else
|
||||
tag_slot = next_tag_off;
|
||||
#endif // _LP64
|
||||
__ st_ptr(G0, base, tag_slot);
|
||||
__ st_ptr(G0, base, slot);
|
||||
__ st_ptr(G0, base, next_tag_slot(st_off));
|
||||
} else {
|
||||
__ mov(t, scratch);
|
||||
__ st_ptr(scratch, base, tag_slot);
|
||||
__ st_ptr(scratch, base, slot);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef _LP64
|
||||
Register AdapterGenerator::arg_slot(const int st_off) {
|
||||
__ set( arg_offset(st_off), Rdisp);
|
||||
return Rdisp;
|
||||
|
||||
RegisterOrConstant AdapterGenerator::arg_slot(const int st_off) {
|
||||
RegisterOrConstant roc(arg_offset(st_off));
|
||||
return __ ensure_simm13_or_reg(roc, Rdisp);
|
||||
}
|
||||
|
||||
Register AdapterGenerator::next_arg_slot(const int st_off){
|
||||
__ set( next_arg_offset(st_off), Rdisp);
|
||||
return Rdisp;
|
||||
RegisterOrConstant AdapterGenerator::next_arg_slot(const int st_off) {
|
||||
RegisterOrConstant roc(next_arg_offset(st_off));
|
||||
return __ ensure_simm13_or_reg(roc, Rdisp);
|
||||
}
|
||||
#endif // _LP64
|
||||
|
||||
|
||||
RegisterOrConstant AdapterGenerator::tag_slot(const int st_off) {
|
||||
RegisterOrConstant roc(tag_offset(st_off));
|
||||
return __ ensure_simm13_or_reg(roc, Rdisp);
|
||||
}
|
||||
|
||||
RegisterOrConstant AdapterGenerator::next_tag_slot(const int st_off) {
|
||||
RegisterOrConstant roc(next_tag_offset(st_off));
|
||||
return __ ensure_simm13_or_reg(roc, Rdisp);
|
||||
}
|
||||
|
||||
|
||||
// Stores long into offset pointed to by base
|
||||
void AdapterGenerator::store_c2i_long(Register r, Register base,
|
||||
|
|
@ -1052,9 +1050,7 @@ void AdapterGenerator::gen_i2c_adapter(
|
|||
|
||||
// Load in argument order going down.
|
||||
const int ld_off = (total_args_passed-i)*Interpreter::stackElementSize();
|
||||
#ifdef _LP64
|
||||
set_Rdisp(G1_scratch);
|
||||
#endif // _LP64
|
||||
|
||||
VMReg r_1 = regs[i].first();
|
||||
VMReg r_2 = regs[i].second();
|
||||
|
|
@ -1074,7 +1070,7 @@ void AdapterGenerator::gen_i2c_adapter(
|
|||
#ifdef _LP64
|
||||
// In V9, longs are given 2 64-bit slots in the interpreter, but the
|
||||
// data is passed in only 1 slot.
|
||||
Register slot = (sig_bt[i]==T_LONG) ?
|
||||
RegisterOrConstant slot = (sig_bt[i] == T_LONG) ?
|
||||
next_arg_slot(ld_off) : arg_slot(ld_off);
|
||||
__ ldx(Gargs, slot, r);
|
||||
#else
|
||||
|
|
@ -1092,7 +1088,7 @@ void AdapterGenerator::gen_i2c_adapter(
|
|||
// data is passed in only 1 slot. This code also handles longs that
|
||||
// are passed on the stack, but need a stack-to-stack move through a
|
||||
// spare float register.
|
||||
Register slot = (sig_bt[i]==T_LONG || sig_bt[i] == T_DOUBLE) ?
|
||||
RegisterOrConstant slot = (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) ?
|
||||
next_arg_slot(ld_off) : arg_slot(ld_off);
|
||||
__ ldf(FloatRegisterImpl::D, Gargs, slot, r_1->as_FloatRegister());
|
||||
#else
|
||||
|
|
@ -1109,8 +1105,9 @@ void AdapterGenerator::gen_i2c_adapter(
|
|||
// Convert stack slot to an SP offset
|
||||
int st_off = reg2offset(regs[i].first()) + STACK_BIAS;
|
||||
// Store down the shuffled stack word. Target address _is_ aligned.
|
||||
if (!r_2->is_valid()) __ stf(FloatRegisterImpl::S, r_1->as_FloatRegister(), SP, st_off);
|
||||
else __ stf(FloatRegisterImpl::D, r_1->as_FloatRegister(), SP, st_off);
|
||||
RegisterOrConstant slot = __ ensure_simm13_or_reg(st_off, Rdisp);
|
||||
if (!r_2->is_valid()) __ stf(FloatRegisterImpl::S, r_1->as_FloatRegister(), SP, slot);
|
||||
else __ stf(FloatRegisterImpl::D, r_1->as_FloatRegister(), SP, slot);
|
||||
}
|
||||
}
|
||||
bool made_space = false;
|
||||
|
|
|
|||
|
|
@ -193,38 +193,38 @@ reg_def R_F31( SOC, SOC, Op_RegF, 31, F31->as_VMReg());
|
|||
// I believe we can't handle callee-save doubles D32 and up until
|
||||
// the place in the sparc stack crawler that asserts on the 255 is
|
||||
// fixed up.
|
||||
reg_def R_D32x(SOC, SOC, Op_RegD,255, F32->as_VMReg());
|
||||
reg_def R_D32 (SOC, SOC, Op_RegD, 1, F32->as_VMReg()->next());
|
||||
reg_def R_D34x(SOC, SOC, Op_RegD,255, F34->as_VMReg());
|
||||
reg_def R_D34 (SOC, SOC, Op_RegD, 3, F34->as_VMReg()->next());
|
||||
reg_def R_D36x(SOC, SOC, Op_RegD,255, F36->as_VMReg());
|
||||
reg_def R_D36 (SOC, SOC, Op_RegD, 5, F36->as_VMReg()->next());
|
||||
reg_def R_D38x(SOC, SOC, Op_RegD,255, F38->as_VMReg());
|
||||
reg_def R_D38 (SOC, SOC, Op_RegD, 7, F38->as_VMReg()->next());
|
||||
reg_def R_D40x(SOC, SOC, Op_RegD,255, F40->as_VMReg());
|
||||
reg_def R_D40 (SOC, SOC, Op_RegD, 9, F40->as_VMReg()->next());
|
||||
reg_def R_D42x(SOC, SOC, Op_RegD,255, F42->as_VMReg());
|
||||
reg_def R_D42 (SOC, SOC, Op_RegD, 11, F42->as_VMReg()->next());
|
||||
reg_def R_D44x(SOC, SOC, Op_RegD,255, F44->as_VMReg());
|
||||
reg_def R_D44 (SOC, SOC, Op_RegD, 13, F44->as_VMReg()->next());
|
||||
reg_def R_D46x(SOC, SOC, Op_RegD,255, F46->as_VMReg());
|
||||
reg_def R_D46 (SOC, SOC, Op_RegD, 15, F46->as_VMReg()->next());
|
||||
reg_def R_D48x(SOC, SOC, Op_RegD,255, F48->as_VMReg());
|
||||
reg_def R_D48 (SOC, SOC, Op_RegD, 17, F48->as_VMReg()->next());
|
||||
reg_def R_D50x(SOC, SOC, Op_RegD,255, F50->as_VMReg());
|
||||
reg_def R_D50 (SOC, SOC, Op_RegD, 19, F50->as_VMReg()->next());
|
||||
reg_def R_D52x(SOC, SOC, Op_RegD,255, F52->as_VMReg());
|
||||
reg_def R_D52 (SOC, SOC, Op_RegD, 21, F52->as_VMReg()->next());
|
||||
reg_def R_D54x(SOC, SOC, Op_RegD,255, F54->as_VMReg());
|
||||
reg_def R_D54 (SOC, SOC, Op_RegD, 23, F54->as_VMReg()->next());
|
||||
reg_def R_D56x(SOC, SOC, Op_RegD,255, F56->as_VMReg());
|
||||
reg_def R_D56 (SOC, SOC, Op_RegD, 25, F56->as_VMReg()->next());
|
||||
reg_def R_D58x(SOC, SOC, Op_RegD,255, F58->as_VMReg());
|
||||
reg_def R_D58 (SOC, SOC, Op_RegD, 27, F58->as_VMReg()->next());
|
||||
reg_def R_D60x(SOC, SOC, Op_RegD,255, F60->as_VMReg());
|
||||
reg_def R_D60 (SOC, SOC, Op_RegD, 29, F60->as_VMReg()->next());
|
||||
reg_def R_D62x(SOC, SOC, Op_RegD,255, F62->as_VMReg());
|
||||
reg_def R_D62 (SOC, SOC, Op_RegD, 31, F62->as_VMReg()->next());
|
||||
reg_def R_D32 (SOC, SOC, Op_RegD, 1, F32->as_VMReg());
|
||||
reg_def R_D32x(SOC, SOC, Op_RegD,255, F32->as_VMReg()->next());
|
||||
reg_def R_D34 (SOC, SOC, Op_RegD, 3, F34->as_VMReg());
|
||||
reg_def R_D34x(SOC, SOC, Op_RegD,255, F34->as_VMReg()->next());
|
||||
reg_def R_D36 (SOC, SOC, Op_RegD, 5, F36->as_VMReg());
|
||||
reg_def R_D36x(SOC, SOC, Op_RegD,255, F36->as_VMReg()->next());
|
||||
reg_def R_D38 (SOC, SOC, Op_RegD, 7, F38->as_VMReg());
|
||||
reg_def R_D38x(SOC, SOC, Op_RegD,255, F38->as_VMReg()->next());
|
||||
reg_def R_D40 (SOC, SOC, Op_RegD, 9, F40->as_VMReg());
|
||||
reg_def R_D40x(SOC, SOC, Op_RegD,255, F40->as_VMReg()->next());
|
||||
reg_def R_D42 (SOC, SOC, Op_RegD, 11, F42->as_VMReg());
|
||||
reg_def R_D42x(SOC, SOC, Op_RegD,255, F42->as_VMReg()->next());
|
||||
reg_def R_D44 (SOC, SOC, Op_RegD, 13, F44->as_VMReg());
|
||||
reg_def R_D44x(SOC, SOC, Op_RegD,255, F44->as_VMReg()->next());
|
||||
reg_def R_D46 (SOC, SOC, Op_RegD, 15, F46->as_VMReg());
|
||||
reg_def R_D46x(SOC, SOC, Op_RegD,255, F46->as_VMReg()->next());
|
||||
reg_def R_D48 (SOC, SOC, Op_RegD, 17, F48->as_VMReg());
|
||||
reg_def R_D48x(SOC, SOC, Op_RegD,255, F48->as_VMReg()->next());
|
||||
reg_def R_D50 (SOC, SOC, Op_RegD, 19, F50->as_VMReg());
|
||||
reg_def R_D50x(SOC, SOC, Op_RegD,255, F50->as_VMReg()->next());
|
||||
reg_def R_D52 (SOC, SOC, Op_RegD, 21, F52->as_VMReg());
|
||||
reg_def R_D52x(SOC, SOC, Op_RegD,255, F52->as_VMReg()->next());
|
||||
reg_def R_D54 (SOC, SOC, Op_RegD, 23, F54->as_VMReg());
|
||||
reg_def R_D54x(SOC, SOC, Op_RegD,255, F54->as_VMReg()->next());
|
||||
reg_def R_D56 (SOC, SOC, Op_RegD, 25, F56->as_VMReg());
|
||||
reg_def R_D56x(SOC, SOC, Op_RegD,255, F56->as_VMReg()->next());
|
||||
reg_def R_D58 (SOC, SOC, Op_RegD, 27, F58->as_VMReg());
|
||||
reg_def R_D58x(SOC, SOC, Op_RegD,255, F58->as_VMReg()->next());
|
||||
reg_def R_D60 (SOC, SOC, Op_RegD, 29, F60->as_VMReg());
|
||||
reg_def R_D60x(SOC, SOC, Op_RegD,255, F60->as_VMReg()->next());
|
||||
reg_def R_D62 (SOC, SOC, Op_RegD, 31, F62->as_VMReg());
|
||||
reg_def R_D62x(SOC, SOC, Op_RegD,255, F62->as_VMReg()->next());
|
||||
|
||||
|
||||
// ----------------------------
|
||||
|
|
@ -3016,7 +3016,7 @@ enc_class enc_Array_Equals(o0RegP ary1, o1RegP ary2, g3RegP tmp1, notemp_iRegI r
|
|||
|
||||
// return true if the same array
|
||||
__ cmp(ary1_reg, ary2_reg);
|
||||
__ br(Assembler::equal, true, Assembler::pn, Ldone);
|
||||
__ brx(Assembler::equal, true, Assembler::pn, Ldone);
|
||||
__ delayed()->add(G0, 1, result_reg); // equal
|
||||
|
||||
__ br_null(ary1_reg, true, Assembler::pn, Ldone);
|
||||
|
|
|
|||
|
|
@ -8634,8 +8634,10 @@ void MacroAssembler::char_arrays_equals(bool is_array_equ, Register ary1, Regist
|
|||
|
||||
if (is_array_equ) {
|
||||
// Need additional checks for arrays_equals.
|
||||
andptr(ary1, ary2);
|
||||
jcc(Assembler::zero, FALSE_LABEL); // One pointer is NULL
|
||||
testptr(ary1, ary1);
|
||||
jcc(Assembler::zero, FALSE_LABEL);
|
||||
testptr(ary2, ary2);
|
||||
jcc(Assembler::zero, FALSE_LABEL);
|
||||
|
||||
// Check the lengths
|
||||
movl(limit, Address(ary1, length_offset));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
|
|
|||
77
hotspot/src/cpu/zero/vm/assembler_zero.cpp
Normal file
77
hotspot/src/cpu/zero/vm/assembler_zero.cpp
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_assembler_zero.cpp.incl"
|
||||
|
||||
int AbstractAssembler::code_fill_byte() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Assembler::pd_patch_instruction(address branch, address target) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
#ifndef PRODUCT
|
||||
void Assembler::pd_print_patched_instruction(address branch) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
#endif // PRODUCT
|
||||
|
||||
void MacroAssembler::align(int modulus) {
|
||||
while (offset() % modulus != 0)
|
||||
emit_byte(AbstractAssembler::code_fill_byte());
|
||||
}
|
||||
|
||||
void MacroAssembler::bang_stack_with_offset(int offset) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void MacroAssembler::advance(int bytes) {
|
||||
_code_pos += bytes;
|
||||
sync();
|
||||
}
|
||||
|
||||
RegisterOrConstant MacroAssembler::delayed_value_impl(
|
||||
intptr_t* delayed_value_addr, Register tmpl, int offset) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void MacroAssembler::store_oop(jobject obj) {
|
||||
code_section()->relocate(pc(), oop_Relocation::spec_for_immediate());
|
||||
emit_address((address) obj);
|
||||
}
|
||||
|
||||
static void should_not_call() {
|
||||
report_should_not_call(__FILE__, __LINE__);
|
||||
}
|
||||
|
||||
address ShouldNotCallThisStub() {
|
||||
return (address) should_not_call;
|
||||
}
|
||||
|
||||
address ShouldNotCallThisEntry() {
|
||||
return (address) should_not_call;
|
||||
}
|
||||
64
hotspot/src/cpu/zero/vm/assembler_zero.hpp
Normal file
64
hotspot/src/cpu/zero/vm/assembler_zero.hpp
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// In normal, CPU-specific ports of HotSpot these two classes are used
|
||||
// for generating assembly language. We don't do any of this in zero,
|
||||
// of course, but we do sneak entry points around in CodeBuffers so we
|
||||
// generate those here.
|
||||
|
||||
class Assembler : public AbstractAssembler {
|
||||
public:
|
||||
Assembler(CodeBuffer* code) : AbstractAssembler(code) {}
|
||||
|
||||
public:
|
||||
void pd_patch_instruction(address branch, address target);
|
||||
#ifndef PRODUCT
|
||||
static void pd_print_patched_instruction(address branch);
|
||||
#endif // PRODUCT
|
||||
};
|
||||
|
||||
class MacroAssembler : public Assembler {
|
||||
public:
|
||||
MacroAssembler(CodeBuffer* code) : Assembler(code) {}
|
||||
|
||||
public:
|
||||
void align(int modulus);
|
||||
void bang_stack_with_offset(int offset);
|
||||
bool needs_explicit_null_check(intptr_t offset);
|
||||
RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
|
||||
Register tmp, int offset);
|
||||
public:
|
||||
void advance(int bytes);
|
||||
void store_oop(jobject obj);
|
||||
};
|
||||
|
||||
#ifdef ASSERT
|
||||
inline bool AbstractAssembler::pd_check_instruction_mark() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
#endif
|
||||
|
||||
address ShouldNotCallThisStub();
|
||||
address ShouldNotCallThisEntry();
|
||||
26
hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp
Normal file
26
hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
54
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp
Normal file
54
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_cppInterpreter_zero.cpp.incl"
|
||||
|
||||
#ifdef CC_INTERP
|
||||
|
||||
const char *BytecodeInterpreter::name_of_field_at_address(address addr) {
|
||||
#define DO(member) {if (addr == (address) &(member)) return XSTR(member);}
|
||||
DO(_thread);
|
||||
DO(_bcp);
|
||||
DO(_locals);
|
||||
DO(_constants);
|
||||
DO(_method);
|
||||
DO(_mdx);
|
||||
DO(_stack);
|
||||
DO(_msg);
|
||||
DO(_result);
|
||||
DO(_prev_link);
|
||||
DO(_oop_temp);
|
||||
DO(_stack_base);
|
||||
DO(_stack_limit);
|
||||
DO(_monitor_base);
|
||||
DO(_self_link);
|
||||
#undef DO
|
||||
if (addr > (address) &_result && addr < (address) (&_result + 1))
|
||||
return "_result)";
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif // CC_INTERP
|
||||
148
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
Normal file
148
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
/*
|
||||
* Copyright 2002 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Platform specific for C++ based Interpreter
|
||||
|
||||
#if defined(PPC) || defined(SPARC) || defined(IA64)
|
||||
#define LOTS_OF_REGS // Use plenty of registers
|
||||
#else
|
||||
#undef LOTS_OF_REGS // Loser platforms
|
||||
#endif
|
||||
|
||||
private:
|
||||
interpreterState _self_link;
|
||||
|
||||
public:
|
||||
inline void set_locals(intptr_t* new_locals) {
|
||||
_locals = new_locals;
|
||||
}
|
||||
inline void set_method(methodOop new_method) {
|
||||
_method = new_method;
|
||||
}
|
||||
inline interpreterState self_link() {
|
||||
return _self_link;
|
||||
}
|
||||
inline void set_self_link(interpreterState new_self_link) {
|
||||
_self_link = new_self_link;
|
||||
}
|
||||
inline interpreterState prev_link() {
|
||||
return _prev_link;
|
||||
}
|
||||
inline void set_prev_link(interpreterState new_prev_link) {
|
||||
_prev_link = new_prev_link;
|
||||
}
|
||||
inline void set_stack_limit(intptr_t* new_stack_limit) {
|
||||
_stack_limit = new_stack_limit;
|
||||
}
|
||||
inline void set_stack_base(intptr_t* new_stack_base) {
|
||||
_stack_base = new_stack_base;
|
||||
}
|
||||
inline void set_monitor_base(BasicObjectLock *new_monitor_base) {
|
||||
_monitor_base = new_monitor_base;
|
||||
}
|
||||
inline void set_thread(JavaThread* new_thread) {
|
||||
_thread = new_thread;
|
||||
}
|
||||
inline void set_constants(constantPoolCacheOop new_constants) {
|
||||
_constants = new_constants;
|
||||
}
|
||||
inline oop oop_temp() {
|
||||
return _oop_temp;
|
||||
}
|
||||
inline oop *oop_temp_addr() {
|
||||
return &_oop_temp;
|
||||
}
|
||||
inline void set_oop_temp(oop new_oop_temp) {
|
||||
_oop_temp = new_oop_temp;
|
||||
}
|
||||
inline address callee_entry_point() {
|
||||
return _result._to_call._callee_entry_point;
|
||||
}
|
||||
inline address osr_buf() {
|
||||
return _result._osr._osr_buf;
|
||||
}
|
||||
inline address osr_entry() {
|
||||
return _result._osr._osr_entry;
|
||||
}
|
||||
|
||||
public:
|
||||
const char *name_of_field_at_address(address addr);
|
||||
|
||||
// The frame manager handles this
|
||||
#define SET_LAST_JAVA_FRAME()
|
||||
#define RESET_LAST_JAVA_FRAME()
|
||||
|
||||
// ZeroStack Implementation
|
||||
|
||||
#undef STACK_INT
|
||||
#undef STACK_FLOAT
|
||||
#undef STACK_ADDR
|
||||
#undef STACK_OBJECT
|
||||
#undef STACK_DOUBLE
|
||||
#undef STACK_LONG
|
||||
|
||||
#define GET_STACK_SLOT(offset) (*((intptr_t*) &topOfStack[-(offset)]))
|
||||
#define STACK_SLOT(offset) ((address) &topOfStack[-(offset)])
|
||||
#define STACK_ADDR(offset) (*((address *) &topOfStack[-(offset)]))
|
||||
#define STACK_INT(offset) (*((jint*) &topOfStack[-(offset)]))
|
||||
#define STACK_FLOAT(offset) (*((jfloat *) &topOfStack[-(offset)]))
|
||||
#define STACK_OBJECT(offset) (*((oop *) &topOfStack [-(offset)]))
|
||||
#define STACK_DOUBLE(offset) (((VMJavaVal64*) &topOfStack[-(offset)])->d)
|
||||
#define STACK_LONG(offset) (((VMJavaVal64 *) &topOfStack[-(offset)])->l)
|
||||
|
||||
#define SET_STACK_SLOT(value, offset) (*(intptr_t*)&topOfStack[-(offset)] = *(intptr_t*)(value))
|
||||
#define SET_STACK_ADDR(value, offset) (*((address *)&topOfStack[-(offset)]) = (value))
|
||||
#define SET_STACK_INT(value, offset) (*((jint *)&topOfStack[-(offset)]) = (value))
|
||||
#define SET_STACK_FLOAT(value, offset) (*((jfloat *)&topOfStack[-(offset)]) = (value))
|
||||
#define SET_STACK_OBJECT(value, offset) (*((oop *)&topOfStack[-(offset)]) = (value))
|
||||
#define SET_STACK_DOUBLE(value, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->d = (value))
|
||||
#define SET_STACK_DOUBLE_FROM_ADDR(addr, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->d = \
|
||||
((VMJavaVal64*)(addr))->d)
|
||||
#define SET_STACK_LONG(value, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->l = (value))
|
||||
#define SET_STACK_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&topOfStack[-(offset)])->l = \
|
||||
((VMJavaVal64*)(addr))->l)
|
||||
// JavaLocals implementation
|
||||
|
||||
#define LOCALS_SLOT(offset) ((intptr_t*)&locals[-(offset)])
|
||||
#define LOCALS_ADDR(offset) ((address)locals[-(offset)])
|
||||
#define LOCALS_INT(offset) (*((jint*)&locals[-(offset)]))
|
||||
#define LOCALS_FLOAT(offset) (*((jfloat*)&locals[-(offset)]))
|
||||
#define LOCALS_OBJECT(offset) ((oop)locals[-(offset)])
|
||||
#define LOCALS_DOUBLE(offset) (((VMJavaVal64*)&locals[-((offset) + 1)])->d)
|
||||
#define LOCALS_LONG(offset) (((VMJavaVal64*)&locals[-((offset) + 1)])->l)
|
||||
#define LOCALS_LONG_AT(offset) (((address)&locals[-((offset) + 1)]))
|
||||
#define LOCALS_DOUBLE_AT(offset) (((address)&locals[-((offset) + 1)]))
|
||||
|
||||
#define SET_LOCALS_SLOT(value, offset) (*(intptr_t*)&locals[-(offset)] = *(intptr_t *)(value))
|
||||
#define SET_LOCALS_ADDR(value, offset) (*((address *)&locals[-(offset)]) = (value))
|
||||
#define SET_LOCALS_INT(value, offset) (*((jint *)&locals[-(offset)]) = (value))
|
||||
#define SET_LOCALS_FLOAT(value, offset) (*((jfloat *)&locals[-(offset)]) = (value))
|
||||
#define SET_LOCALS_OBJECT(value, offset) (*((oop *)&locals[-(offset)]) = (value))
|
||||
#define SET_LOCALS_DOUBLE(value, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->d = (value))
|
||||
#define SET_LOCALS_LONG(value, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = (value))
|
||||
#define SET_LOCALS_DOUBLE_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->d = \
|
||||
((VMJavaVal64*)(addr))->d)
|
||||
#define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
|
||||
((VMJavaVal64*)(addr))->l)
|
||||
301
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
Normal file
301
hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
Normal file
|
|
@ -0,0 +1,301 @@
|
|||
/*
|
||||
* Copyright 2002 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Inline interpreter functions for zero
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) {
|
||||
return op1 + op2;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatSub(jfloat op1, jfloat op2) {
|
||||
return op1 - op2;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) {
|
||||
return op1 * op2;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) {
|
||||
return op1 / op2;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatRem(jfloat op1, jfloat op2) {
|
||||
return fmod(op1, op2);
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMfloatNeg(jfloat op) {
|
||||
return -op;
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMfloatCompare(jfloat op1,
|
||||
jfloat op2,
|
||||
int32_t direction) {
|
||||
return ( op1 < op2 ? -1 :
|
||||
op1 > op2 ? 1 :
|
||||
op1 == op2 ? 0 :
|
||||
(direction == -1 || direction == 1) ? direction : 0);
|
||||
|
||||
}
|
||||
|
||||
inline void BytecodeInterpreter::VMmemCopy64(uint32_t to[2],
|
||||
const uint32_t from[2]) {
|
||||
*(uint64_t *) to = *(uint64_t *) from;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongAdd(jlong op1, jlong op2) {
|
||||
return op1 + op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongAnd(jlong op1, jlong op2) {
|
||||
return op1 & op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongDiv(jlong op1, jlong op2) {
|
||||
/* it's possible we could catch this special case implicitly */
|
||||
if (op1 == (jlong) 0x8000000000000000LL && op2 == -1) return op1;
|
||||
else return op1 / op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongMul(jlong op1, jlong op2) {
|
||||
return op1 * op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongOr(jlong op1, jlong op2) {
|
||||
return op1 | op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongSub(jlong op1, jlong op2) {
|
||||
return op1 - op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongXor(jlong op1, jlong op2) {
|
||||
return op1 ^ op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongRem(jlong op1, jlong op2) {
|
||||
/* it's possible we could catch this special case implicitly */
|
||||
if (op1 == (jlong) 0x8000000000000000LL && op2 == -1) return 0;
|
||||
else return op1 % op2;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongUshr(jlong op1, jint op2) {
|
||||
return ((unsigned long long) op1) >> (op2 & 0x3F);
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongShr(jlong op1, jint op2) {
|
||||
return op1 >> (op2 & 0x3F);
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongShl(jlong op1, jint op2) {
|
||||
return op1 << (op2 & 0x3F);
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongNeg(jlong op) {
|
||||
return -op;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMlongNot(jlong op) {
|
||||
return ~op;
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongLtz(jlong op) {
|
||||
return (op <= 0);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongGez(jlong op) {
|
||||
return (op >= 0);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongEqz(jlong op) {
|
||||
return (op == 0);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongEq(jlong op1, jlong op2) {
|
||||
return (op1 == op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongNe(jlong op1, jlong op2) {
|
||||
return (op1 != op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongGe(jlong op1, jlong op2) {
|
||||
return (op1 >= op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongLe(jlong op1, jlong op2) {
|
||||
return (op1 <= op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongLt(jlong op1, jlong op2) {
|
||||
return (op1 < op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongGt(jlong op1, jlong op2) {
|
||||
return (op1 > op2);
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMlongCompare(jlong op1, jlong op2) {
|
||||
return (VMlongLt(op1, op2) ? -1 : VMlongGt(op1, op2) ? 1 : 0);
|
||||
}
|
||||
|
||||
// Long conversions
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMlong2Double(jlong val) {
|
||||
return (jdouble) val;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMlong2Float(jlong val) {
|
||||
return (jfloat) val;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMlong2Int(jlong val) {
|
||||
return (jint) val;
|
||||
}
|
||||
|
||||
// Double Arithmetic
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleAdd(jdouble op1, jdouble op2) {
|
||||
return op1 + op2;
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleDiv(jdouble op1, jdouble op2) {
|
||||
// Divide by zero... QQQ
|
||||
return op1 / op2;
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleMul(jdouble op1, jdouble op2) {
|
||||
return op1 * op2;
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleNeg(jdouble op) {
|
||||
return -op;
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleRem(jdouble op1, jdouble op2) {
|
||||
return fmod(op1, op2);
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMdoubleSub(jdouble op1, jdouble op2) {
|
||||
return op1 - op2;
|
||||
}
|
||||
|
||||
inline int32_t BytecodeInterpreter::VMdoubleCompare(jdouble op1,
|
||||
jdouble op2,
|
||||
int32_t direction) {
|
||||
return ( op1 < op2 ? -1 :
|
||||
op1 > op2 ? 1 :
|
||||
op1 == op2 ? 0 :
|
||||
(direction == -1 || direction == 1) ? direction : 0);
|
||||
}
|
||||
|
||||
// Double Conversions
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMdouble2Float(jdouble val) {
|
||||
return (jfloat) val;
|
||||
}
|
||||
|
||||
// Float Conversions
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMfloat2Double(jfloat op) {
|
||||
return (jdouble) op;
|
||||
}
|
||||
|
||||
// Integer Arithmetic
|
||||
|
||||
inline jint BytecodeInterpreter::VMintAdd(jint op1, jint op2) {
|
||||
return op1 + op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintAnd(jint op1, jint op2) {
|
||||
return op1 & op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) {
|
||||
/* it's possible we could catch this special case implicitly */
|
||||
if (op1 == (jint) 0x80000000 && op2 == -1) return op1;
|
||||
else return op1 / op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintMul(jint op1, jint op2) {
|
||||
return op1 * op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintNeg(jint op) {
|
||||
return -op;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintOr(jint op1, jint op2) {
|
||||
return op1 | op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) {
|
||||
/* it's possible we could catch this special case implicitly */
|
||||
if (op1 == (jint) 0x80000000 && op2 == -1) return 0;
|
||||
else return op1 % op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintShl(jint op1, jint op2) {
|
||||
return op1 << (op2 & 0x1F);
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintShr(jint op1, jint op2) {
|
||||
return op1 >> (op2 & 0x1F);
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintSub(jint op1, jint op2) {
|
||||
return op1 - op2;
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
|
||||
return ((juint) op1) >> (op2 & 0x1F);
|
||||
}
|
||||
|
||||
inline jint BytecodeInterpreter::VMintXor(jint op1, jint op2) {
|
||||
return op1 ^ op2;
|
||||
}
|
||||
|
||||
inline jdouble BytecodeInterpreter::VMint2Double(jint val) {
|
||||
return (jdouble) val;
|
||||
}
|
||||
|
||||
inline jfloat BytecodeInterpreter::VMint2Float(jint val) {
|
||||
return (jfloat) val;
|
||||
}
|
||||
|
||||
inline jlong BytecodeInterpreter::VMint2Long(jint val) {
|
||||
return (jlong) val;
|
||||
}
|
||||
|
||||
inline jchar BytecodeInterpreter::VMint2Char(jint val) {
|
||||
return (jchar) val;
|
||||
}
|
||||
|
||||
inline jshort BytecodeInterpreter::VMint2Short(jint val) {
|
||||
return (jshort) val;
|
||||
}
|
||||
|
||||
inline jbyte BytecodeInterpreter::VMint2Byte(jint val) {
|
||||
return (jbyte) val;
|
||||
}
|
||||
31
hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
Normal file
31
hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_bytecodes_zero.cpp.incl"
|
||||
|
||||
void Bytecodes::pd_initialize() {
|
||||
// No zero specific initialization
|
||||
}
|
||||
26
hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
Normal file
26
hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
164
hotspot/src/cpu/zero/vm/bytes_zero.hpp
Normal file
164
hotspot/src/cpu/zero/vm/bytes_zero.hpp
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
/*
|
||||
* Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
typedef union unaligned {
|
||||
u4 u;
|
||||
u2 us;
|
||||
u8 ul;
|
||||
} __attribute__((packed)) unaligned;
|
||||
|
||||
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() {
|
||||
#ifdef VM_LITTLE_ENDIAN
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Efficient reading and writing of unaligned unsigned data in
|
||||
// platform-specific byte ordering.
|
||||
static inline u2 get_native_u2(address p){
|
||||
unaligned *up = (unaligned *) p;
|
||||
return up->us;
|
||||
}
|
||||
|
||||
static inline u4 get_native_u4(address p) {
|
||||
unaligned *up = (unaligned *) p;
|
||||
return up->u;
|
||||
}
|
||||
|
||||
static inline u8 get_native_u8(address p) {
|
||||
unaligned *up = (unaligned *) p;
|
||||
return up->ul;
|
||||
}
|
||||
|
||||
static inline void put_native_u2(address p, u2 x) {
|
||||
unaligned *up = (unaligned *) p;
|
||||
up->us = x;
|
||||
}
|
||||
|
||||
static inline void put_native_u4(address p, u4 x) {
|
||||
unaligned *up = (unaligned *) p;
|
||||
up->u = x;
|
||||
}
|
||||
|
||||
static inline void put_native_u8(address p, u8 x) {
|
||||
unaligned *up = (unaligned *) p;
|
||||
up->ul = x;
|
||||
}
|
||||
|
||||
// Efficient reading and writing of unaligned unsigned data in Java
|
||||
// byte ordering (i.e. big-endian ordering).
|
||||
#ifdef VM_LITTLE_ENDIAN
|
||||
// Byte-order reversal is needed
|
||||
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) {
|
||||
u4 hi, lo;
|
||||
hi = (u4(p[0]) << 24) |
|
||||
(u4(p[1]) << 16) |
|
||||
(u4(p[2]) << 8) |
|
||||
(u4(p[3]) );
|
||||
lo = (u4(p[4]) << 24) |
|
||||
(u4(p[5]) << 16) |
|
||||
(u4(p[6]) << 8) |
|
||||
(u4(p[7]) );
|
||||
return u8(lo) | (u8(hi) << 32);
|
||||
}
|
||||
|
||||
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) {
|
||||
p[0] = x >> 24;
|
||||
p[1] = x >> 16;
|
||||
p[2] = x >> 8;
|
||||
p[3] = x;
|
||||
}
|
||||
static inline void put_Java_u8(address p, u8 x) {
|
||||
u4 hi, lo;
|
||||
lo = x;
|
||||
hi = x >> 32;
|
||||
p[0] = hi >> 24;
|
||||
p[1] = hi >> 16;
|
||||
p[2] = hi >> 8;
|
||||
p[3] = hi;
|
||||
p[4] = lo >> 24;
|
||||
p[5] = lo >> 16;
|
||||
p[6] = lo >> 8;
|
||||
p[7] = lo;
|
||||
}
|
||||
|
||||
// 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);
|
||||
#else
|
||||
// No byte-order reversal is needed
|
||||
static inline u2 get_Java_u2(address p) {
|
||||
return get_native_u2(p);
|
||||
}
|
||||
static inline u4 get_Java_u4(address p) {
|
||||
return get_native_u4(p);
|
||||
}
|
||||
static inline u8 get_Java_u8(address p) {
|
||||
return get_native_u8(p);
|
||||
}
|
||||
|
||||
static inline void put_Java_u2(address p, u2 x) {
|
||||
put_native_u2(p, x);
|
||||
}
|
||||
static inline void put_Java_u4(address p, u4 x) {
|
||||
put_native_u4(p, x);
|
||||
}
|
||||
static inline void put_Java_u8(address p, u8 x) {
|
||||
put_native_u8(p, x);
|
||||
}
|
||||
|
||||
// No byte-order reversal is needed
|
||||
static inline u2 swap_u2(u2 x) { return x; }
|
||||
static inline u4 swap_u4(u4 x) { return x; }
|
||||
static inline u8 swap_u8(u8 x) { return x; }
|
||||
#endif // VM_LITTLE_ENDIAN
|
||||
};
|
||||
|
||||
#ifdef VM_LITTLE_ENDIAN
|
||||
// The following header contains the implementations of swap_u2,
|
||||
// swap_u4, and swap_u8
|
||||
#include "incls/_bytes_pd.inline.hpp.incl"
|
||||
#endif // VM_LITTLE_ENDIAN
|
||||
27
hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp
Normal file
27
hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
private:
|
||||
void pd_initialize() {}
|
||||
178
hotspot/src/cpu/zero/vm/copy_zero.hpp
Normal file
178
hotspot/src/cpu/zero/vm/copy_zero.hpp
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
/*
|
||||
* Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Inline functions for memory copy and fill.
|
||||
|
||||
static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
|
||||
memmove(to, from, count * HeapWordSize);
|
||||
}
|
||||
|
||||
static void pd_disjoint_words(HeapWord* from, HeapWord* to, size_t count) {
|
||||
switch (count) {
|
||||
case 8: to[7] = from[7];
|
||||
case 7: to[6] = from[6];
|
||||
case 6: to[5] = from[5];
|
||||
case 5: to[4] = from[4];
|
||||
case 4: to[3] = from[3];
|
||||
case 3: to[2] = from[2];
|
||||
case 2: to[1] = from[1];
|
||||
case 1: to[0] = from[0];
|
||||
case 0: break;
|
||||
default:
|
||||
memcpy(to, from, count * HeapWordSize);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void pd_disjoint_words_atomic(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
switch (count) {
|
||||
case 8: to[7] = from[7];
|
||||
case 7: to[6] = from[6];
|
||||
case 6: to[5] = from[5];
|
||||
case 5: to[4] = from[4];
|
||||
case 4: to[3] = from[3];
|
||||
case 3: to[2] = from[2];
|
||||
case 2: to[1] = from[1];
|
||||
case 1: to[0] = from[0];
|
||||
case 0: break;
|
||||
default:
|
||||
while (count-- > 0) {
|
||||
*to++ = *from++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void pd_aligned_conjoint_words(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
memmove(to, from, count * HeapWordSize);
|
||||
}
|
||||
|
||||
static void pd_aligned_disjoint_words(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
pd_disjoint_words(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_bytes(void* from, void* to, size_t count) {
|
||||
memmove(to, from, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_bytes_atomic(void* from, void* to, size_t count) {
|
||||
memmove(to, from, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
|
||||
_Copy_conjoint_jshorts_atomic(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
|
||||
_Copy_conjoint_jints_atomic(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
|
||||
_Copy_conjoint_jlongs_atomic(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_conjoint_oops_atomic(oop* from, oop* to, size_t count) {
|
||||
#ifdef _LP64
|
||||
assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
|
||||
_Copy_conjoint_jlongs_atomic((jlong*)from, (jlong*)to, count);
|
||||
#else
|
||||
assert(BytesPerInt == BytesPerOop, "jints and oops must be the same size");
|
||||
_Copy_conjoint_jints_atomic((jint*)from, (jint*)to, count);
|
||||
#endif // _LP64
|
||||
}
|
||||
|
||||
static void pd_arrayof_conjoint_bytes(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
_Copy_arrayof_conjoint_bytes(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_arrayof_conjoint_jshorts(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
_Copy_arrayof_conjoint_jshorts(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_arrayof_conjoint_jints(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
_Copy_arrayof_conjoint_jints(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_arrayof_conjoint_jlongs(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
_Copy_arrayof_conjoint_jlongs(from, to, count);
|
||||
}
|
||||
|
||||
static void pd_arrayof_conjoint_oops(HeapWord* from,
|
||||
HeapWord* to,
|
||||
size_t count) {
|
||||
#ifdef _LP64
|
||||
assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
|
||||
_Copy_arrayof_conjoint_jlongs(from, to, count);
|
||||
#else
|
||||
assert(BytesPerInt == BytesPerOop, "jints and oops must be the same size");
|
||||
_Copy_arrayof_conjoint_jints(from, to, count);
|
||||
#endif // _LP64
|
||||
}
|
||||
|
||||
static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
|
||||
#ifdef _LP64
|
||||
julong* to = (julong*) tohw;
|
||||
julong v = ((julong) value << 32) | value;
|
||||
#else
|
||||
juint* to = (juint*) tohw;
|
||||
juint v = value;
|
||||
#endif // _LP64
|
||||
|
||||
while (count-- > 0) {
|
||||
*to++ = v;
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
37
hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp
Normal file
37
hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
protected:
|
||||
MacroAssembler* assembler() const {
|
||||
return _masm;
|
||||
}
|
||||
|
||||
protected:
|
||||
address generate_entry(address entry_point) {
|
||||
ZeroEntry *entry = (ZeroEntry *) assembler()->pc();
|
||||
assembler()->advance(sizeof(ZeroEntry));
|
||||
entry->set_entry_point(entry_point);
|
||||
return (address) entry;
|
||||
}
|
||||
946
hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
Normal file
946
hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
Normal file
|
|
@ -0,0 +1,946 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_cppInterpreter_zero.cpp.incl"
|
||||
|
||||
#ifdef CC_INTERP
|
||||
|
||||
#define fixup_after_potential_safepoint() \
|
||||
method = istate->method()
|
||||
|
||||
#define CALL_VM_NOCHECK(func) \
|
||||
thread->set_last_Java_frame(); \
|
||||
func; \
|
||||
thread->reset_last_Java_frame(); \
|
||||
fixup_after_potential_safepoint()
|
||||
|
||||
void CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) {
|
||||
JavaThread *thread = (JavaThread *) THREAD;
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
|
||||
// Adjust the caller's stack frame to accomodate any additional
|
||||
// local variables we have contiguously with our parameters.
|
||||
int extra_locals = method->max_locals() - method->size_of_parameters();
|
||||
if (extra_locals > 0) {
|
||||
if (extra_locals > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
for (int i = 0; i < extra_locals; i++)
|
||||
stack->push(0);
|
||||
}
|
||||
|
||||
// Allocate and initialize our frame.
|
||||
InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
|
||||
thread->push_zero_frame(frame);
|
||||
|
||||
// Execute those bytecodes!
|
||||
main_loop(0, THREAD);
|
||||
}
|
||||
|
||||
void CppInterpreter::main_loop(int recurse, TRAPS) {
|
||||
JavaThread *thread = (JavaThread *) THREAD;
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
|
||||
// If we are entering from a deopt we may need to call
|
||||
// ourself a few times in order to get to our frame.
|
||||
if (recurse)
|
||||
main_loop(recurse - 1, THREAD);
|
||||
|
||||
InterpreterFrame *frame = thread->top_zero_frame()->as_interpreter_frame();
|
||||
interpreterState istate = frame->interpreter_state();
|
||||
methodOop method = istate->method();
|
||||
|
||||
intptr_t *result = NULL;
|
||||
int result_slots = 0;
|
||||
|
||||
// Check we're not about to run out of stack
|
||||
if (stack_overflow_imminent(thread)) {
|
||||
CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
|
||||
goto unwind_and_return;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
// We can set up the frame anchor with everything we want at
|
||||
// this point as we are thread_in_Java and no safepoints can
|
||||
// occur until we go to vm mode. We do have to clear flags
|
||||
// on return from vm but that is it.
|
||||
thread->set_last_Java_frame();
|
||||
|
||||
// Call the interpreter
|
||||
if (JvmtiExport::can_post_interpreter_events())
|
||||
BytecodeInterpreter::runWithChecks(istate);
|
||||
else
|
||||
BytecodeInterpreter::run(istate);
|
||||
fixup_after_potential_safepoint();
|
||||
|
||||
// Clear the frame anchor
|
||||
thread->reset_last_Java_frame();
|
||||
|
||||
// Examine the message from the interpreter to decide what to do
|
||||
if (istate->msg() == BytecodeInterpreter::call_method) {
|
||||
methodOop callee = istate->callee();
|
||||
|
||||
// Trim back the stack to put the parameters at the top
|
||||
stack->set_sp(istate->stack() + 1);
|
||||
|
||||
// Make the call
|
||||
Interpreter::invoke_method(callee, istate->callee_entry_point(), THREAD);
|
||||
fixup_after_potential_safepoint();
|
||||
|
||||
// Convert the result
|
||||
istate->set_stack(stack->sp() - 1);
|
||||
|
||||
// Restore the stack
|
||||
stack->set_sp(istate->stack_limit() + 1);
|
||||
|
||||
// Resume the interpreter
|
||||
istate->set_msg(BytecodeInterpreter::method_resume);
|
||||
}
|
||||
else if (istate->msg() == BytecodeInterpreter::more_monitors) {
|
||||
int monitor_words = frame::interpreter_frame_monitor_size();
|
||||
|
||||
// Allocate the space
|
||||
if (monitor_words > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
stack->alloc(monitor_words * wordSize);
|
||||
|
||||
// Move the expression stack contents
|
||||
for (intptr_t *p = istate->stack() + 1; p < istate->stack_base(); p++)
|
||||
*(p - monitor_words) = *p;
|
||||
|
||||
// Move the expression stack pointers
|
||||
istate->set_stack_limit(istate->stack_limit() - monitor_words);
|
||||
istate->set_stack(istate->stack() - monitor_words);
|
||||
istate->set_stack_base(istate->stack_base() - monitor_words);
|
||||
|
||||
// Zero the new monitor so the interpreter can find it.
|
||||
((BasicObjectLock *) istate->stack_base())->set_obj(NULL);
|
||||
|
||||
// Resume the interpreter
|
||||
istate->set_msg(BytecodeInterpreter::got_monitors);
|
||||
}
|
||||
else if (istate->msg() == BytecodeInterpreter::return_from_method) {
|
||||
// Copy the result into the caller's frame
|
||||
result_slots = type2size[method->result_type()];
|
||||
assert(result_slots >= 0 && result_slots <= 2, "what?");
|
||||
result = istate->stack() + result_slots;
|
||||
break;
|
||||
}
|
||||
else if (istate->msg() == BytecodeInterpreter::throwing_exception) {
|
||||
assert(HAS_PENDING_EXCEPTION, "should do");
|
||||
break;
|
||||
}
|
||||
else if (istate->msg() == BytecodeInterpreter::do_osr) {
|
||||
// Unwind the current frame
|
||||
thread->pop_zero_frame();
|
||||
|
||||
// Remove any extension of the previous frame
|
||||
int extra_locals = method->max_locals() - method->size_of_parameters();
|
||||
stack->set_sp(stack->sp() + extra_locals);
|
||||
|
||||
// Jump into the OSR method
|
||||
Interpreter::invoke_osr(
|
||||
method, istate->osr_entry(), istate->osr_buf(), THREAD);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
}
|
||||
|
||||
unwind_and_return:
|
||||
|
||||
// Unwind the current frame
|
||||
thread->pop_zero_frame();
|
||||
|
||||
// Pop our local variables
|
||||
stack->set_sp(stack->sp() + method->max_locals());
|
||||
|
||||
// Push our result
|
||||
for (int i = 0; i < result_slots; i++)
|
||||
stack->push(result[-i]);
|
||||
}
|
||||
|
||||
void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
|
||||
// Make sure method is native and not abstract
|
||||
assert(method->is_native() && !method->is_abstract(), "should be");
|
||||
|
||||
JavaThread *thread = (JavaThread *) THREAD;
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
|
||||
// Allocate and initialize our frame
|
||||
InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
|
||||
thread->push_zero_frame(frame);
|
||||
interpreterState istate = frame->interpreter_state();
|
||||
intptr_t *locals = istate->locals();
|
||||
|
||||
// Check we're not about to run out of stack
|
||||
if (stack_overflow_imminent(thread)) {
|
||||
CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
|
||||
goto unwind_and_return;
|
||||
}
|
||||
|
||||
// Lock if necessary
|
||||
BasicObjectLock *monitor;
|
||||
monitor = NULL;
|
||||
if (method->is_synchronized()) {
|
||||
monitor = (BasicObjectLock*) istate->stack_base();
|
||||
oop lockee = monitor->obj();
|
||||
markOop disp = lockee->mark()->set_unlocked();
|
||||
|
||||
monitor->lock()->set_displaced_header(disp);
|
||||
if (Atomic::cmpxchg_ptr(monitor, lockee->mark_addr(), disp) != disp) {
|
||||
if (thread->is_lock_owned((address) disp->clear_lock_bits())) {
|
||||
monitor->lock()->set_displaced_header(NULL);
|
||||
}
|
||||
else {
|
||||
CALL_VM_NOCHECK(InterpreterRuntime::monitorenter(thread, monitor));
|
||||
if (HAS_PENDING_EXCEPTION)
|
||||
goto unwind_and_return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Get the signature handler
|
||||
InterpreterRuntime::SignatureHandler *handler; {
|
||||
address handlerAddr = method->signature_handler();
|
||||
if (handlerAddr == NULL) {
|
||||
CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
|
||||
if (HAS_PENDING_EXCEPTION)
|
||||
goto unwind_and_return;
|
||||
|
||||
handlerAddr = method->signature_handler();
|
||||
assert(handlerAddr != NULL, "eh?");
|
||||
}
|
||||
if (handlerAddr == (address) InterpreterRuntime::slow_signature_handler) {
|
||||
CALL_VM_NOCHECK(handlerAddr =
|
||||
InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
|
||||
if (HAS_PENDING_EXCEPTION)
|
||||
goto unwind_and_return;
|
||||
}
|
||||
handler = \
|
||||
InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
|
||||
}
|
||||
|
||||
// Get the native function entry point
|
||||
address function;
|
||||
function = method->native_function();
|
||||
assert(function != NULL, "should be set if signature handler is");
|
||||
|
||||
// Build the argument list
|
||||
if (handler->argument_count() * 2 > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
void **arguments;
|
||||
void *mirror; {
|
||||
arguments =
|
||||
(void **) stack->alloc(handler->argument_count() * sizeof(void **));
|
||||
void **dst = arguments;
|
||||
|
||||
void *env = thread->jni_environment();
|
||||
*(dst++) = &env;
|
||||
|
||||
if (method->is_static()) {
|
||||
istate->set_oop_temp(
|
||||
method->constants()->pool_holder()->klass_part()->java_mirror());
|
||||
mirror = istate->oop_temp_addr();
|
||||
*(dst++) = &mirror;
|
||||
}
|
||||
|
||||
intptr_t *src = locals;
|
||||
for (int i = dst - arguments; i < handler->argument_count(); i++) {
|
||||
ffi_type *type = handler->argument_type(i);
|
||||
if (type == &ffi_type_pointer) {
|
||||
if (*src) {
|
||||
stack->push((intptr_t) src);
|
||||
*(dst++) = stack->sp();
|
||||
}
|
||||
else {
|
||||
*(dst++) = src;
|
||||
}
|
||||
src--;
|
||||
}
|
||||
else if (type->size == 4) {
|
||||
*(dst++) = src--;
|
||||
}
|
||||
else if (type->size == 8) {
|
||||
src--;
|
||||
*(dst++) = src--;
|
||||
}
|
||||
else {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set up the Java frame anchor
|
||||
thread->set_last_Java_frame();
|
||||
|
||||
// Change the thread state to _thread_in_native
|
||||
ThreadStateTransition::transition_from_java(thread, _thread_in_native);
|
||||
|
||||
// Make the call
|
||||
intptr_t result[4 - LogBytesPerWord];
|
||||
ffi_call(handler->cif(), (void (*)()) function, result, arguments);
|
||||
|
||||
// Change the thread state back to _thread_in_Java.
|
||||
// ThreadStateTransition::transition_from_native() cannot be used
|
||||
// here because it does not check for asynchronous exceptions.
|
||||
// We have to manage the transition ourself.
|
||||
thread->set_thread_state(_thread_in_native_trans);
|
||||
|
||||
// Make sure new state is visible in the GC thread
|
||||
if (os::is_MP()) {
|
||||
if (UseMembar) {
|
||||
OrderAccess::fence();
|
||||
}
|
||||
else {
|
||||
InterfaceSupport::serialize_memory(thread);
|
||||
}
|
||||
}
|
||||
|
||||
// Handle safepoint operations, pending suspend requests,
|
||||
// and pending asynchronous exceptions.
|
||||
if (SafepointSynchronize::do_call_back() ||
|
||||
thread->has_special_condition_for_native_trans()) {
|
||||
JavaThread::check_special_condition_for_native_trans(thread);
|
||||
CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops());
|
||||
}
|
||||
|
||||
// Finally we can change the thread state to _thread_in_Java.
|
||||
thread->set_thread_state(_thread_in_Java);
|
||||
fixup_after_potential_safepoint();
|
||||
|
||||
// Clear the frame anchor
|
||||
thread->reset_last_Java_frame();
|
||||
|
||||
// If the result was an oop then unbox it and store it in
|
||||
// oop_temp where the garbage collector can see it before
|
||||
// we release the handle it might be protected by.
|
||||
if (handler->result_type() == &ffi_type_pointer) {
|
||||
if (result[0])
|
||||
istate->set_oop_temp(*(oop *) result[0]);
|
||||
else
|
||||
istate->set_oop_temp(NULL);
|
||||
}
|
||||
|
||||
// Reset handle block
|
||||
thread->active_handles()->clear();
|
||||
|
||||
// Unlock if necessary. It seems totally wrong that this
|
||||
// is skipped in the event of an exception but apparently
|
||||
// the template interpreter does this so we do too.
|
||||
if (monitor && !HAS_PENDING_EXCEPTION) {
|
||||
BasicLock *lock = monitor->lock();
|
||||
markOop header = lock->displaced_header();
|
||||
oop rcvr = monitor->obj();
|
||||
monitor->set_obj(NULL);
|
||||
|
||||
if (header != NULL) {
|
||||
if (Atomic::cmpxchg_ptr(header, rcvr->mark_addr(), lock) != lock) {
|
||||
monitor->set_obj(rcvr); {
|
||||
HandleMark hm(thread);
|
||||
CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(thread, monitor));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unwind_and_return:
|
||||
|
||||
// Unwind the current activation
|
||||
thread->pop_zero_frame();
|
||||
|
||||
// Pop our parameters
|
||||
stack->set_sp(stack->sp() + method->size_of_parameters());
|
||||
|
||||
// Push our result
|
||||
if (!HAS_PENDING_EXCEPTION) {
|
||||
stack->set_sp(stack->sp() - type2size[method->result_type()]);
|
||||
|
||||
switch (method->result_type()) {
|
||||
case T_VOID:
|
||||
break;
|
||||
|
||||
case T_BOOLEAN:
|
||||
#ifndef VM_LITTLE_ENDIAN
|
||||
result[0] <<= (BitsPerWord - BitsPerByte);
|
||||
#endif
|
||||
SET_LOCALS_INT(*(jboolean *) result != 0, 0);
|
||||
break;
|
||||
|
||||
case T_CHAR:
|
||||
#ifndef VM_LITTLE_ENDIAN
|
||||
result[0] <<= (BitsPerWord - BitsPerShort);
|
||||
#endif
|
||||
SET_LOCALS_INT(*(jchar *) result, 0);
|
||||
break;
|
||||
|
||||
case T_BYTE:
|
||||
#ifndef VM_LITTLE_ENDIAN
|
||||
result[0] <<= (BitsPerWord - BitsPerByte);
|
||||
#endif
|
||||
SET_LOCALS_INT(*(jbyte *) result, 0);
|
||||
break;
|
||||
|
||||
case T_SHORT:
|
||||
#ifndef VM_LITTLE_ENDIAN
|
||||
result[0] <<= (BitsPerWord - BitsPerShort);
|
||||
#endif
|
||||
SET_LOCALS_INT(*(jshort *) result, 0);
|
||||
break;
|
||||
|
||||
case T_INT:
|
||||
#ifndef VM_LITTLE_ENDIAN
|
||||
result[0] <<= (BitsPerWord - BitsPerInt);
|
||||
#endif
|
||||
SET_LOCALS_INT(*(jint *) result, 0);
|
||||
break;
|
||||
|
||||
case T_LONG:
|
||||
SET_LOCALS_LONG(*(jlong *) result, 0);
|
||||
break;
|
||||
|
||||
case T_FLOAT:
|
||||
SET_LOCALS_FLOAT(*(jfloat *) result, 0);
|
||||
break;
|
||||
|
||||
case T_DOUBLE:
|
||||
SET_LOCALS_DOUBLE(*(jdouble *) result, 0);
|
||||
break;
|
||||
|
||||
case T_OBJECT:
|
||||
case T_ARRAY:
|
||||
SET_LOCALS_OBJECT(istate->oop_temp(), 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CppInterpreter::accessor_entry(methodOop method, intptr_t UNUSED, TRAPS) {
|
||||
JavaThread *thread = (JavaThread *) THREAD;
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
intptr_t *locals = stack->sp();
|
||||
|
||||
// Drop into the slow path if we need a safepoint check
|
||||
if (SafepointSynchronize::do_call_back()) {
|
||||
normal_entry(method, 0, THREAD);
|
||||
return;
|
||||
}
|
||||
|
||||
// Load the object pointer and drop into the slow path
|
||||
// if we have a NullPointerException
|
||||
oop object = LOCALS_OBJECT(0);
|
||||
if (object == NULL) {
|
||||
normal_entry(method, 0, THREAD);
|
||||
return;
|
||||
}
|
||||
|
||||
// Read the field index from the bytecode, which looks like this:
|
||||
// 0: aload_0
|
||||
// 1: getfield
|
||||
// 2: index
|
||||
// 3: index
|
||||
// 4: ireturn/areturn
|
||||
// NB this is not raw bytecode: index is in machine order
|
||||
u1 *code = method->code_base();
|
||||
assert(code[0] == Bytecodes::_aload_0 &&
|
||||
code[1] == Bytecodes::_getfield &&
|
||||
(code[4] == Bytecodes::_ireturn ||
|
||||
code[4] == Bytecodes::_areturn), "should do");
|
||||
u2 index = Bytes::get_native_u2(&code[2]);
|
||||
|
||||
// Get the entry from the constant pool cache, and drop into
|
||||
// the slow path if it has not been resolved
|
||||
constantPoolCacheOop cache = method->constants()->cache();
|
||||
ConstantPoolCacheEntry* entry = cache->entry_at(index);
|
||||
if (!entry->is_resolved(Bytecodes::_getfield)) {
|
||||
normal_entry(method, 0, THREAD);
|
||||
return;
|
||||
}
|
||||
|
||||
// Get the result and push it onto the stack
|
||||
switch (entry->flag_state()) {
|
||||
case ltos:
|
||||
case dtos:
|
||||
if (stack->available_words() < 1) {
|
||||
Unimplemented();
|
||||
}
|
||||
stack->alloc(wordSize);
|
||||
break;
|
||||
}
|
||||
if (entry->is_volatile()) {
|
||||
switch (entry->flag_state()) {
|
||||
case ctos:
|
||||
SET_LOCALS_INT(object->char_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case btos:
|
||||
SET_LOCALS_INT(object->byte_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case stos:
|
||||
SET_LOCALS_INT(object->short_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case itos:
|
||||
SET_LOCALS_INT(object->int_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case ltos:
|
||||
SET_LOCALS_LONG(object->long_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case ftos:
|
||||
SET_LOCALS_FLOAT(object->float_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case dtos:
|
||||
SET_LOCALS_DOUBLE(object->double_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case atos:
|
||||
SET_LOCALS_OBJECT(object->obj_field_acquire(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
}
|
||||
else {
|
||||
switch (entry->flag_state()) {
|
||||
case ctos:
|
||||
SET_LOCALS_INT(object->char_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case btos:
|
||||
SET_LOCALS_INT(object->byte_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case stos:
|
||||
SET_LOCALS_INT(object->short_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case itos:
|
||||
SET_LOCALS_INT(object->int_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case ltos:
|
||||
SET_LOCALS_LONG(object->long_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case ftos:
|
||||
SET_LOCALS_FLOAT(object->float_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case dtos:
|
||||
SET_LOCALS_DOUBLE(object->double_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
case atos:
|
||||
SET_LOCALS_OBJECT(object->obj_field(entry->f2()), 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CppInterpreter::empty_entry(methodOop method, intptr_t UNUSED, TRAPS) {
|
||||
JavaThread *thread = (JavaThread *) THREAD;
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
|
||||
// Drop into the slow path if we need a safepoint check
|
||||
if (SafepointSynchronize::do_call_back()) {
|
||||
normal_entry(method, 0, THREAD);
|
||||
return;
|
||||
}
|
||||
|
||||
// Pop our parameters
|
||||
stack->set_sp(stack->sp() + method->size_of_parameters());
|
||||
}
|
||||
|
||||
bool CppInterpreter::stack_overflow_imminent(JavaThread *thread) {
|
||||
// How is the ABI stack?
|
||||
address stack_top = thread->stack_base() - thread->stack_size();
|
||||
int free_stack = os::current_stack_pointer() - stack_top;
|
||||
if (free_stack < StackShadowPages * os::vm_page_size()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// How is the Zero stack?
|
||||
// Throwing a StackOverflowError involves a VM call, which means
|
||||
// we need a frame on the stack. We should be checking here to
|
||||
// ensure that methods we call have enough room to install the
|
||||
// largest possible frame, but that's more than twice the size
|
||||
// of the entire Zero stack we get by default, so we just check
|
||||
// we have *some* space instead...
|
||||
free_stack = thread->zero_stack()->available_words() * wordSize;
|
||||
if (free_stack < StackShadowPages * os::vm_page_size()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
InterpreterFrame *InterpreterFrame::build(ZeroStack* stack,
|
||||
const methodOop method,
|
||||
JavaThread* thread) {
|
||||
int monitor_words =
|
||||
method->is_synchronized() ? frame::interpreter_frame_monitor_size() : 0;
|
||||
int stack_words = method->is_native() ? 0 : method->max_stack();
|
||||
|
||||
if (header_words + monitor_words + stack_words > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
intptr_t *locals;
|
||||
if (method->is_native())
|
||||
locals = stack->sp() + (method->size_of_parameters() - 1);
|
||||
else
|
||||
locals = stack->sp() + (method->max_locals() - 1);
|
||||
|
||||
stack->push(0); // next_frame, filled in later
|
||||
intptr_t *fp = stack->sp();
|
||||
assert(fp - stack->sp() == next_frame_off, "should be");
|
||||
|
||||
stack->push(INTERPRETER_FRAME);
|
||||
assert(fp - stack->sp() == frame_type_off, "should be");
|
||||
|
||||
interpreterState istate =
|
||||
(interpreterState) stack->alloc(sizeof(BytecodeInterpreter));
|
||||
assert(fp - stack->sp() == istate_off, "should be");
|
||||
|
||||
istate->set_locals(locals);
|
||||
istate->set_method(method);
|
||||
istate->set_self_link(istate);
|
||||
istate->set_prev_link(NULL);
|
||||
istate->set_thread(thread);
|
||||
istate->set_bcp(method->is_native() ? NULL : method->code_base());
|
||||
istate->set_constants(method->constants()->cache());
|
||||
istate->set_msg(BytecodeInterpreter::method_entry);
|
||||
istate->set_oop_temp(NULL);
|
||||
istate->set_mdx(NULL);
|
||||
istate->set_callee(NULL);
|
||||
|
||||
istate->set_monitor_base((BasicObjectLock *) stack->sp());
|
||||
if (method->is_synchronized()) {
|
||||
BasicObjectLock *monitor =
|
||||
(BasicObjectLock *) stack->alloc(monitor_words * wordSize);
|
||||
oop object;
|
||||
if (method->is_static())
|
||||
object = method->constants()->pool_holder()->klass_part()->java_mirror();
|
||||
else
|
||||
object = (oop) locals[0];
|
||||
monitor->set_obj(object);
|
||||
}
|
||||
|
||||
istate->set_stack_base(stack->sp());
|
||||
istate->set_stack(stack->sp() - 1);
|
||||
if (stack_words)
|
||||
stack->alloc(stack_words * wordSize);
|
||||
istate->set_stack_limit(stack->sp() - 1);
|
||||
|
||||
return (InterpreterFrame *) fp;
|
||||
}
|
||||
|
||||
int AbstractInterpreter::BasicType_as_index(BasicType type) {
|
||||
int i = 0;
|
||||
switch (type) {
|
||||
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 : i = 4; break;
|
||||
case T_LONG : i = 5; break;
|
||||
case T_VOID : i = 6; break;
|
||||
case T_FLOAT : i = 7; break;
|
||||
case T_DOUBLE : i = 8; break;
|
||||
case T_OBJECT : i = 9; break;
|
||||
case T_ARRAY : i = 9; break;
|
||||
default : ShouldNotReachHere();
|
||||
}
|
||||
assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers,
|
||||
"index out of bounds");
|
||||
return i;
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_empty_entry() {
|
||||
if (!UseFastEmptyMethods)
|
||||
return NULL;
|
||||
|
||||
return generate_entry((address) CppInterpreter::empty_entry);
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_accessor_entry() {
|
||||
if (!UseFastAccessorMethods)
|
||||
return NULL;
|
||||
|
||||
return generate_entry((address) CppInterpreter::accessor_entry);
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_native_entry(bool synchronized) {
|
||||
assert(synchronized == false, "should be");
|
||||
|
||||
return generate_entry((address) CppInterpreter::native_entry);
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_normal_entry(bool synchronized) {
|
||||
assert(synchronized == false, "should be");
|
||||
|
||||
return generate_entry((address) CppInterpreter::normal_entry);
|
||||
}
|
||||
|
||||
address AbstractInterpreterGenerator::generate_method_entry(
|
||||
AbstractInterpreter::MethodKind kind) {
|
||||
address entry_point = NULL;
|
||||
|
||||
switch (kind) {
|
||||
case Interpreter::zerolocals:
|
||||
case Interpreter::zerolocals_synchronized:
|
||||
break;
|
||||
|
||||
case Interpreter::native:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
|
||||
break;
|
||||
|
||||
case Interpreter::native_synchronized:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
|
||||
break;
|
||||
|
||||
case Interpreter::empty:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_empty_entry();
|
||||
break;
|
||||
|
||||
case Interpreter::accessor:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry();
|
||||
break;
|
||||
|
||||
case Interpreter::abstract:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry();
|
||||
break;
|
||||
|
||||
case Interpreter::method_handle:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_method_handle_entry();
|
||||
break;
|
||||
|
||||
case Interpreter::java_lang_math_sin:
|
||||
case Interpreter::java_lang_math_cos:
|
||||
case Interpreter::java_lang_math_tan:
|
||||
case Interpreter::java_lang_math_abs:
|
||||
case Interpreter::java_lang_math_log:
|
||||
case Interpreter::java_lang_math_log10:
|
||||
case Interpreter::java_lang_math_sqrt:
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind);
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
|
||||
if (entry_point == NULL)
|
||||
entry_point = ((InterpreterGenerator*) this)->generate_normal_entry(false);
|
||||
|
||||
return entry_point;
|
||||
}
|
||||
|
||||
InterpreterGenerator::InterpreterGenerator(StubQueue* code)
|
||||
: CppInterpreterGenerator(code) {
|
||||
generate_all();
|
||||
}
|
||||
|
||||
// Deoptimization helpers
|
||||
|
||||
InterpreterFrame *InterpreterFrame::build(ZeroStack* stack, int size) {
|
||||
int size_in_words = size >> LogBytesPerWord;
|
||||
assert(size_in_words * wordSize == size, "unaligned");
|
||||
assert(size_in_words >= header_words, "too small");
|
||||
|
||||
if (size_in_words > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
stack->push(0); // next_frame, filled in later
|
||||
intptr_t *fp = stack->sp();
|
||||
assert(fp - stack->sp() == next_frame_off, "should be");
|
||||
|
||||
stack->push(INTERPRETER_FRAME);
|
||||
assert(fp - stack->sp() == frame_type_off, "should be");
|
||||
|
||||
interpreterState istate =
|
||||
(interpreterState) stack->alloc(sizeof(BytecodeInterpreter));
|
||||
assert(fp - stack->sp() == istate_off, "should be");
|
||||
istate->set_self_link(NULL); // mark invalid
|
||||
|
||||
stack->alloc((size_in_words - header_words) * wordSize);
|
||||
|
||||
return (InterpreterFrame *) fp;
|
||||
}
|
||||
|
||||
int AbstractInterpreter::layout_activation(methodOop method,
|
||||
int tempcount,
|
||||
int popframe_extra_args,
|
||||
int moncount,
|
||||
int callee_param_count,
|
||||
int callee_locals,
|
||||
frame* caller,
|
||||
frame* interpreter_frame,
|
||||
bool is_top_frame) {
|
||||
assert(popframe_extra_args == 0, "what to do?");
|
||||
assert(!is_top_frame || (!callee_locals && !callee_param_count),
|
||||
"top frame should have no caller")
|
||||
|
||||
// This code must exactly match what InterpreterFrame::build
|
||||
// does (the full InterpreterFrame::build, that is, not the
|
||||
// one that creates empty frames for the deoptimizer).
|
||||
//
|
||||
// If interpreter_frame is not NULL then it will be filled in.
|
||||
// It's size is determined by a previous call to this method,
|
||||
// so it should be correct.
|
||||
//
|
||||
// Note that tempcount is the current size of the expression
|
||||
// stack. For top most frames we will allocate a full sized
|
||||
// expression stack and not the trimmed version that non-top
|
||||
// frames have.
|
||||
|
||||
int header_words = InterpreterFrame::header_words;
|
||||
int monitor_words = moncount * frame::interpreter_frame_monitor_size();
|
||||
int stack_words = is_top_frame ? method->max_stack() : tempcount;
|
||||
int callee_extra_locals = callee_locals - callee_param_count;
|
||||
|
||||
if (interpreter_frame) {
|
||||
intptr_t *locals = interpreter_frame->sp() + method->max_locals();
|
||||
interpreterState istate = interpreter_frame->get_interpreterState();
|
||||
intptr_t *monitor_base = (intptr_t*) istate;
|
||||
intptr_t *stack_base = monitor_base - monitor_words;
|
||||
intptr_t *stack = stack_base - tempcount - 1;
|
||||
|
||||
BytecodeInterpreter::layout_interpreterState(istate,
|
||||
caller,
|
||||
NULL,
|
||||
method,
|
||||
locals,
|
||||
stack,
|
||||
stack_base,
|
||||
monitor_base,
|
||||
NULL,
|
||||
is_top_frame);
|
||||
}
|
||||
return header_words + monitor_words + stack_words + callee_extra_locals;
|
||||
}
|
||||
|
||||
void BytecodeInterpreter::layout_interpreterState(interpreterState istate,
|
||||
frame* caller,
|
||||
frame* current,
|
||||
methodOop method,
|
||||
intptr_t* locals,
|
||||
intptr_t* stack,
|
||||
intptr_t* stack_base,
|
||||
intptr_t* monitor_base,
|
||||
intptr_t* frame_bottom,
|
||||
bool is_top_frame) {
|
||||
istate->set_locals(locals);
|
||||
istate->set_method(method);
|
||||
istate->set_self_link(istate);
|
||||
istate->set_prev_link(NULL);
|
||||
// thread will be set by a hacky repurposing of frame::patch_pc()
|
||||
// bcp will be set by vframeArrayElement::unpack_on_stack()
|
||||
istate->set_constants(method->constants()->cache());
|
||||
istate->set_msg(BytecodeInterpreter::method_resume);
|
||||
istate->set_bcp_advance(0);
|
||||
istate->set_oop_temp(NULL);
|
||||
istate->set_mdx(NULL);
|
||||
if (caller->is_interpreted_frame()) {
|
||||
interpreterState prev = caller->get_interpreterState();
|
||||
prev->set_callee(method);
|
||||
if (*prev->bcp() == Bytecodes::_invokeinterface)
|
||||
prev->set_bcp_advance(5);
|
||||
else
|
||||
prev->set_bcp_advance(3);
|
||||
}
|
||||
istate->set_callee(NULL);
|
||||
istate->set_monitor_base((BasicObjectLock *) monitor_base);
|
||||
istate->set_stack_base(stack_base);
|
||||
istate->set_stack(stack);
|
||||
istate->set_stack_limit(stack_base - method->max_stack() - 1);
|
||||
}
|
||||
|
||||
address CppInterpreter::return_entry(TosState state, int length) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address CppInterpreter::deopt_entry(TosState state, int length) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Helper for (runtime) stack overflow checks
|
||||
|
||||
int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Helper for figuring out if frames are interpreter frames
|
||||
|
||||
bool CppInterpreter::contains(address pc) {
|
||||
#ifdef PRODUCT
|
||||
ShouldNotCallThis();
|
||||
#else
|
||||
return false; // make frame::print_value_on work
|
||||
#endif // !PRODUCT
|
||||
}
|
||||
|
||||
// Result handlers and convertors
|
||||
|
||||
address CppInterpreterGenerator::generate_result_handler_for(
|
||||
BasicType type) {
|
||||
assembler()->advance(1);
|
||||
return ShouldNotCallThisStub();
|
||||
}
|
||||
|
||||
address CppInterpreterGenerator::generate_tosca_to_stack_converter(
|
||||
BasicType type) {
|
||||
assembler()->advance(1);
|
||||
return ShouldNotCallThisStub();
|
||||
}
|
||||
|
||||
address CppInterpreterGenerator::generate_stack_to_stack_converter(
|
||||
BasicType type) {
|
||||
assembler()->advance(1);
|
||||
return ShouldNotCallThisStub();
|
||||
}
|
||||
|
||||
address CppInterpreterGenerator::generate_stack_to_native_abi_converter(
|
||||
BasicType type) {
|
||||
assembler()->advance(1);
|
||||
return ShouldNotCallThisStub();
|
||||
}
|
||||
|
||||
#endif // CC_INTERP
|
||||
43
hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
Normal file
43
hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
protected:
|
||||
// Size of interpreter code
|
||||
const static int InterpreterCodeSize = 6 * K;
|
||||
|
||||
public:
|
||||
// Method entries
|
||||
static void normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
|
||||
static void native_entry(methodOop method, intptr_t UNUSED, TRAPS);
|
||||
static void accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
|
||||
static void empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
|
||||
|
||||
public:
|
||||
// Main loop of normal_entry
|
||||
static void main_loop(int recurse, TRAPS);
|
||||
|
||||
private:
|
||||
// Stack overflow checks
|
||||
static bool stack_overflow_imminent(JavaThread *thread);
|
||||
31
hotspot/src/cpu/zero/vm/debug_zero.cpp
Normal file
31
hotspot/src/cpu/zero/vm/debug_zero.cpp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_debug_zero.cpp.incl"
|
||||
|
||||
void pd_ps(frame f) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
26
hotspot/src/cpu/zero/vm/depChecker_zero.cpp
Normal file
26
hotspot/src/cpu/zero/vm/depChecker_zero.cpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
26
hotspot/src/cpu/zero/vm/depChecker_zero.hpp
Normal file
26
hotspot/src/cpu/zero/vm/depChecker_zero.hpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
26
hotspot/src/cpu/zero/vm/disassembler_zero.cpp
Normal file
26
hotspot/src/cpu/zero/vm/disassembler_zero.cpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
35
hotspot/src/cpu/zero/vm/disassembler_zero.hpp
Normal file
35
hotspot/src/cpu/zero/vm/disassembler_zero.hpp
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
* Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// The disassembler prints out zero code annotated
|
||||
// with Java specific information.
|
||||
|
||||
static int pd_instruction_alignment() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static const char* pd_cpu_opts() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
36
hotspot/src/cpu/zero/vm/dump_zero.cpp
Normal file
36
hotspot/src/cpu/zero/vm/dump_zero.cpp
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_dump_zero.cpp.incl"
|
||||
|
||||
void CompactingPermGenGen::generate_vtable_methods(void** vtbl_list,
|
||||
void** vtable,
|
||||
char** md_top,
|
||||
char* md_end,
|
||||
char** mc_top,
|
||||
char* mc_end) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
65
hotspot/src/cpu/zero/vm/entryFrame_zero.hpp
Normal file
65
hotspot/src/cpu/zero/vm/entryFrame_zero.hpp
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// | ... |
|
||||
// +--------------------+ ------------------
|
||||
// | parameter n-1 | low addresses
|
||||
// | ... |
|
||||
// | parameter 0 |
|
||||
// | call_wrapper |
|
||||
// | frame_type |
|
||||
// | next_frame | high addresses
|
||||
// +--------------------+ ------------------
|
||||
// | ... |
|
||||
|
||||
class EntryFrame : public ZeroFrame {
|
||||
private:
|
||||
EntryFrame() : ZeroFrame() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
protected:
|
||||
enum Layout {
|
||||
call_wrapper_off = jf_header_words,
|
||||
header_words
|
||||
};
|
||||
|
||||
public:
|
||||
static EntryFrame *build(ZeroStack* stack,
|
||||
const intptr_t* parameters,
|
||||
int parameter_words,
|
||||
JavaCallWrapper* call_wrapper);
|
||||
public:
|
||||
JavaCallWrapper *call_wrapper() const {
|
||||
return (JavaCallWrapper *) value_of_word(call_wrapper_off);
|
||||
}
|
||||
|
||||
public:
|
||||
void identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const;
|
||||
};
|
||||
64
hotspot/src/cpu/zero/vm/entry_zero.hpp
Normal file
64
hotspot/src/cpu/zero/vm/entry_zero.hpp
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
class ZeroEntry {
|
||||
public:
|
||||
ZeroEntry() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
private:
|
||||
address _entry_point;
|
||||
|
||||
public:
|
||||
address entry_point() const {
|
||||
return _entry_point;
|
||||
}
|
||||
void set_entry_point(address entry_point) {
|
||||
_entry_point = entry_point;
|
||||
}
|
||||
|
||||
private:
|
||||
typedef void (*NormalEntryFunc)(methodOop method,
|
||||
intptr_t base_pc,
|
||||
TRAPS);
|
||||
typedef void (*OSREntryFunc)(methodOop method,
|
||||
address osr_buf,
|
||||
intptr_t base_pc,
|
||||
TRAPS);
|
||||
|
||||
public:
|
||||
void invoke(methodOop method, TRAPS) const {
|
||||
((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
|
||||
}
|
||||
void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
|
||||
((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
|
||||
}
|
||||
|
||||
public:
|
||||
static ByteSize entry_point_offset() {
|
||||
return byte_offset_of(ZeroEntry, _entry_point);
|
||||
}
|
||||
};
|
||||
53
hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp
Normal file
53
hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// | ... |
|
||||
// +--------------------+ ------------------
|
||||
// | frame_type | low addresses
|
||||
// | next_frame | high addresses
|
||||
// +--------------------+ ------------------
|
||||
// | ... |
|
||||
|
||||
class FakeStubFrame : public ZeroFrame {
|
||||
private:
|
||||
FakeStubFrame() : ZeroFrame() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
protected:
|
||||
enum Layout {
|
||||
header_words = jf_header_words
|
||||
};
|
||||
|
||||
public:
|
||||
static FakeStubFrame *build(ZeroStack* stack);
|
||||
|
||||
public:
|
||||
void identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const {}
|
||||
};
|
||||
414
hotspot/src/cpu/zero/vm/frame_zero.cpp
Normal file
414
hotspot/src/cpu/zero/vm/frame_zero.cpp
Normal file
|
|
@ -0,0 +1,414 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_frame_zero.cpp.incl"
|
||||
|
||||
#ifdef ASSERT
|
||||
void RegisterMap::check_location_valid() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
#endif
|
||||
|
||||
bool frame::is_interpreted_frame() const {
|
||||
return zeroframe()->is_interpreter_frame();
|
||||
}
|
||||
|
||||
bool frame::is_fake_stub_frame() const {
|
||||
return zeroframe()->is_fake_stub_frame();
|
||||
}
|
||||
|
||||
frame frame::sender_for_entry_frame(RegisterMap *map) const {
|
||||
assert(map != NULL, "map must be set");
|
||||
assert(!entry_frame_is_first(), "next Java fp must be non zero");
|
||||
assert(entry_frame_call_wrapper()->anchor()->last_Java_sp() == sender_sp(),
|
||||
"sender should be next Java frame");
|
||||
map->clear();
|
||||
assert(map->include_argument_oops(), "should be set by clear");
|
||||
return frame(sender_sp(), sp() + 1);
|
||||
}
|
||||
|
||||
frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
|
||||
return frame(sender_sp(), sp() + 1);
|
||||
}
|
||||
|
||||
frame frame::sender_for_compiled_frame(RegisterMap *map) const {
|
||||
return frame(sender_sp(), sp() + 1);
|
||||
}
|
||||
|
||||
frame frame::sender_for_fake_stub_frame(RegisterMap *map) const {
|
||||
return frame(sender_sp(), sp() + 1);
|
||||
}
|
||||
|
||||
frame frame::sender(RegisterMap* map) const {
|
||||
// Default is not to follow arguments; the various
|
||||
// sender_for_xxx methods update this 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);
|
||||
|
||||
if (is_compiled_frame())
|
||||
return sender_for_compiled_frame(map);
|
||||
|
||||
if (is_fake_stub_frame())
|
||||
return sender_for_fake_stub_frame(map);
|
||||
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
|
||||
#ifdef CC_INTERP
|
||||
BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
|
||||
return get_interpreterState()->monitor_base();
|
||||
}
|
||||
|
||||
BasicObjectLock* frame::interpreter_frame_monitor_end() const {
|
||||
return (BasicObjectLock*) get_interpreterState()->stack_base();
|
||||
}
|
||||
#endif // CC_INTERP
|
||||
|
||||
void frame::patch_pc(Thread* thread, address pc) {
|
||||
// We borrow this call to set the thread pointer in the interpreter
|
||||
// state; the hook to set up deoptimized frames isn't supplied it.
|
||||
assert(pc == NULL, "should be");
|
||||
get_interpreterState()->set_thread((JavaThread *) thread);
|
||||
}
|
||||
|
||||
bool frame::safe_for_sender(JavaThread *thread) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void frame::pd_gc_epilog() {
|
||||
}
|
||||
|
||||
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
BasicType frame::interpreter_frame_result(oop* oop_result,
|
||||
jvalue* value_result) {
|
||||
assert(is_interpreted_frame(), "interpreted frame expected");
|
||||
methodOop method = interpreter_frame_method();
|
||||
BasicType type = method->result_type();
|
||||
intptr_t* tos_addr = (intptr_t *) interpreter_frame_tos_address();
|
||||
oop obj;
|
||||
|
||||
switch (type) {
|
||||
case T_VOID:
|
||||
break;
|
||||
case T_BOOLEAN:
|
||||
value_result->z = *(jboolean *) tos_addr;
|
||||
break;
|
||||
case T_BYTE:
|
||||
value_result->b = *(jbyte *) tos_addr;
|
||||
break;
|
||||
case T_CHAR:
|
||||
value_result->c = *(jchar *) tos_addr;
|
||||
break;
|
||||
case T_SHORT:
|
||||
value_result->s = *(jshort *) tos_addr;
|
||||
break;
|
||||
case T_INT:
|
||||
value_result->i = *(jint *) tos_addr;
|
||||
break;
|
||||
case T_LONG:
|
||||
value_result->j = *(jlong *) tos_addr;
|
||||
break;
|
||||
case T_FLOAT:
|
||||
value_result->f = *(jfloat *) tos_addr;
|
||||
break;
|
||||
case T_DOUBLE:
|
||||
value_result->d = *(jdouble *) tos_addr;
|
||||
break;
|
||||
|
||||
case T_OBJECT:
|
||||
case T_ARRAY:
|
||||
if (method->is_native()) {
|
||||
obj = get_interpreterState()->oop_temp();
|
||||
}
|
||||
else {
|
||||
oop* obj_p = (oop *) tos_addr;
|
||||
obj = (obj_p == NULL) ? (oop) NULL : *obj_p;
|
||||
}
|
||||
assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check");
|
||||
*oop_result = obj;
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
int frame::frame_size(RegisterMap* map) const {
|
||||
#ifdef PRODUCT
|
||||
ShouldNotCallThis();
|
||||
#else
|
||||
return 0; // make javaVFrame::print_value work
|
||||
#endif // PRODUCT
|
||||
}
|
||||
|
||||
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];
|
||||
}
|
||||
|
||||
void frame::zero_print_on_error(int frame_index,
|
||||
outputStream* st,
|
||||
char* buf,
|
||||
int buflen) const {
|
||||
// Divide the buffer between the field and the value
|
||||
buflen >>= 1;
|
||||
char *fieldbuf = buf;
|
||||
char *valuebuf = buf + buflen;
|
||||
|
||||
// Print each word of the frame
|
||||
for (intptr_t *addr = fp(); addr <= sp(); addr++) {
|
||||
int offset = sp() - addr;
|
||||
|
||||
// Fill in default values, then try and improve them
|
||||
snprintf(fieldbuf, buflen, "word[%d]", offset);
|
||||
snprintf(valuebuf, buflen, PTR_FORMAT, *addr);
|
||||
zeroframe()->identify_word(frame_index, offset, fieldbuf, valuebuf, buflen);
|
||||
fieldbuf[buflen - 1] = '\0';
|
||||
valuebuf[buflen - 1] = '\0';
|
||||
|
||||
// Print the result
|
||||
st->print_cr(" " PTR_FORMAT ": %-21s = %s", addr, fieldbuf, valuebuf);
|
||||
}
|
||||
}
|
||||
|
||||
void ZeroFrame::identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const {
|
||||
switch (offset) {
|
||||
case next_frame_off:
|
||||
strncpy(fieldbuf, "next_frame", buflen);
|
||||
break;
|
||||
|
||||
case frame_type_off:
|
||||
strncpy(fieldbuf, "frame_type", buflen);
|
||||
if (is_entry_frame())
|
||||
strncpy(valuebuf, "ENTRY_FRAME", buflen);
|
||||
else if (is_interpreter_frame())
|
||||
strncpy(valuebuf, "INTERPRETER_FRAME", buflen);
|
||||
else if (is_shark_frame())
|
||||
strncpy(valuebuf, "SHARK_FRAME", buflen);
|
||||
else if (is_fake_stub_frame())
|
||||
strncpy(valuebuf, "FAKE_STUB_FRAME", buflen);
|
||||
break;
|
||||
|
||||
default:
|
||||
if (is_entry_frame()) {
|
||||
as_entry_frame()->identify_word(
|
||||
frame_index, offset, fieldbuf, valuebuf, buflen);
|
||||
}
|
||||
else if (is_interpreter_frame()) {
|
||||
as_interpreter_frame()->identify_word(
|
||||
frame_index, offset, fieldbuf, valuebuf, buflen);
|
||||
}
|
||||
else if (is_shark_frame()) {
|
||||
as_shark_frame()->identify_word(
|
||||
frame_index, offset, fieldbuf, valuebuf, buflen);
|
||||
}
|
||||
else if (is_fake_stub_frame()) {
|
||||
as_fake_stub_frame()->identify_word(
|
||||
frame_index, offset, fieldbuf, valuebuf, buflen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EntryFrame::identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const {
|
||||
switch (offset) {
|
||||
case call_wrapper_off:
|
||||
strncpy(fieldbuf, "call_wrapper", buflen);
|
||||
break;
|
||||
|
||||
default:
|
||||
snprintf(fieldbuf, buflen, "local[%d]", offset - 3);
|
||||
}
|
||||
}
|
||||
|
||||
void InterpreterFrame::identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const {
|
||||
interpreterState istate = interpreter_state();
|
||||
bool is_valid = istate->self_link() == istate;
|
||||
intptr_t *addr = addr_of_word(offset);
|
||||
|
||||
// Fixed part
|
||||
if (addr >= (intptr_t *) istate) {
|
||||
const char *field = istate->name_of_field_at_address((address) addr);
|
||||
if (field) {
|
||||
if (is_valid && !strcmp(field, "_method")) {
|
||||
istate->method()->name_and_sig_as_C_string(valuebuf, buflen);
|
||||
}
|
||||
else if (is_valid && !strcmp(field, "_bcp") && istate->bcp()) {
|
||||
snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
|
||||
(intptr_t) istate->bcp(),
|
||||
istate->method()->bci_from(istate->bcp()));
|
||||
}
|
||||
snprintf(fieldbuf, buflen, "%sistate->%s",
|
||||
field[strlen(field) - 1] == ')' ? "(": "", field);
|
||||
}
|
||||
else if (addr == (intptr_t *) istate) {
|
||||
strncpy(fieldbuf, "(vtable for istate)", buflen);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Variable part
|
||||
if (!is_valid)
|
||||
return;
|
||||
|
||||
// JNI stuff
|
||||
if (istate->method()->is_native() && addr < istate->stack_base()) {
|
||||
address hA = istate->method()->signature_handler();
|
||||
if (hA != NULL) {
|
||||
if (hA != (address) InterpreterRuntime::slow_signature_handler) {
|
||||
InterpreterRuntime::SignatureHandler *handler =
|
||||
InterpreterRuntime::SignatureHandler::from_handlerAddr(hA);
|
||||
|
||||
intptr_t *params = istate->stack_base() - handler->argument_count();
|
||||
if (addr >= params) {
|
||||
int param = addr - params;
|
||||
const char *desc = "";
|
||||
if (param == 0)
|
||||
desc = " (JNIEnv)";
|
||||
else if (param == 1) {
|
||||
if (istate->method()->is_static())
|
||||
desc = " (mirror)";
|
||||
else
|
||||
desc = " (this)";
|
||||
}
|
||||
snprintf(fieldbuf, buflen, "parameter[%d]%s", param, desc);
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < handler->argument_count(); i++) {
|
||||
if (params[i] == (intptr_t) addr) {
|
||||
snprintf(fieldbuf, buflen, "unboxed parameter[%d]", i);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Monitors and stack
|
||||
identify_vp_word(frame_index, addr,
|
||||
(intptr_t *) istate->monitor_base(),
|
||||
istate->stack_base(),
|
||||
fieldbuf, buflen);
|
||||
}
|
||||
|
||||
void SharkFrame::identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const {
|
||||
// Fixed part
|
||||
switch (offset) {
|
||||
case pc_off:
|
||||
strncpy(fieldbuf, "pc", buflen);
|
||||
if (method()->is_oop()) {
|
||||
nmethod *code = method()->code();
|
||||
if (code && code->pc_desc_at(pc())) {
|
||||
SimpleScopeDesc ssd(code, pc());
|
||||
snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",
|
||||
(intptr_t) pc(), ssd.bci());
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
||||
case unextended_sp_off:
|
||||
strncpy(fieldbuf, "unextended_sp", buflen);
|
||||
return;
|
||||
|
||||
case method_off:
|
||||
strncpy(fieldbuf, "method", buflen);
|
||||
if (method()->is_oop()) {
|
||||
method()->name_and_sig_as_C_string(valuebuf, buflen);
|
||||
}
|
||||
return;
|
||||
|
||||
case oop_tmp_off:
|
||||
strncpy(fieldbuf, "oop_tmp", buflen);
|
||||
return;
|
||||
}
|
||||
|
||||
// Variable part
|
||||
if (method()->is_oop()) {
|
||||
identify_vp_word(frame_index, addr_of_word(offset),
|
||||
addr_of_word(header_words + 1),
|
||||
unextended_sp() + method()->max_stack(),
|
||||
fieldbuf, buflen);
|
||||
}
|
||||
}
|
||||
|
||||
void ZeroFrame::identify_vp_word(int frame_index,
|
||||
intptr_t* addr,
|
||||
intptr_t* monitor_base,
|
||||
intptr_t* stack_base,
|
||||
char* fieldbuf,
|
||||
int buflen) const {
|
||||
// Monitors
|
||||
if (addr >= stack_base && addr < monitor_base) {
|
||||
int monitor_size = frame::interpreter_frame_monitor_size();
|
||||
int last_index = (monitor_base - stack_base) / monitor_size - 1;
|
||||
int index = last_index - (addr - stack_base) / monitor_size;
|
||||
intptr_t monitor = (intptr_t) (
|
||||
(BasicObjectLock *) monitor_base - 1 - index);
|
||||
intptr_t offset = (intptr_t) addr - monitor;
|
||||
|
||||
if (offset == BasicObjectLock::obj_offset_in_bytes())
|
||||
snprintf(fieldbuf, buflen, "monitor[%d]->_obj", index);
|
||||
else if (offset == BasicObjectLock::lock_offset_in_bytes())
|
||||
snprintf(fieldbuf, buflen, "monitor[%d]->_lock", index);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Expression stack
|
||||
if (addr < stack_base) {
|
||||
snprintf(fieldbuf, buflen, "%s[%d]",
|
||||
frame_index == 0 ? "stack_word" : "local",
|
||||
(int) (stack_base - addr - 1));
|
||||
return;
|
||||
}
|
||||
}
|
||||
77
hotspot/src/cpu/zero/vm/frame_zero.hpp
Normal file
77
hotspot/src/cpu/zero/vm/frame_zero.hpp
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// A frame represents a physical stack frame on the Zero stack.
|
||||
|
||||
public:
|
||||
enum {
|
||||
pc_return_offset = 0
|
||||
};
|
||||
|
||||
// Constructor
|
||||
public:
|
||||
frame(intptr_t* sp, intptr_t* fp);
|
||||
|
||||
// The sp of a Zero frame is the address of the highest word in
|
||||
// that frame. We keep track of the lowest address too, so the
|
||||
// boundaries of the frame are available for debug printing.
|
||||
private:
|
||||
intptr_t* _fp;
|
||||
|
||||
public:
|
||||
intptr_t* fp() const {
|
||||
return _fp;
|
||||
}
|
||||
|
||||
#ifdef CC_INTERP
|
||||
inline interpreterState get_interpreterState() const;
|
||||
#endif // CC_INTERP
|
||||
|
||||
public:
|
||||
const ZeroFrame *zeroframe() const {
|
||||
return (ZeroFrame *) sp();
|
||||
}
|
||||
|
||||
const EntryFrame *zero_entryframe() const {
|
||||
return zeroframe()->as_entry_frame();
|
||||
}
|
||||
const InterpreterFrame *zero_interpreterframe() const {
|
||||
return zeroframe()->as_interpreter_frame();
|
||||
}
|
||||
const SharkFrame *zero_sharkframe() const {
|
||||
return zeroframe()->as_shark_frame();
|
||||
}
|
||||
|
||||
public:
|
||||
bool is_fake_stub_frame() const;
|
||||
|
||||
public:
|
||||
frame sender_for_fake_stub_frame(RegisterMap* map) const;
|
||||
|
||||
public:
|
||||
void zero_print_on_error(int index,
|
||||
outputStream* st,
|
||||
char* buf,
|
||||
int buflen) const;
|
||||
151
hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
Normal file
151
hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Constructors
|
||||
|
||||
inline frame::frame() {
|
||||
_sp = NULL;
|
||||
_fp = NULL;
|
||||
_pc = NULL;
|
||||
_cb = NULL;
|
||||
_deopt_state = unknown;
|
||||
}
|
||||
|
||||
inline frame::frame(intptr_t* sp, intptr_t* fp) {
|
||||
_sp = sp;
|
||||
_fp = fp;
|
||||
switch (zeroframe()->type()) {
|
||||
case ZeroFrame::ENTRY_FRAME:
|
||||
_pc = StubRoutines::call_stub_return_pc();
|
||||
_cb = NULL;
|
||||
break;
|
||||
|
||||
case ZeroFrame::INTERPRETER_FRAME:
|
||||
_pc = NULL;
|
||||
_cb = NULL;
|
||||
break;
|
||||
|
||||
case ZeroFrame::SHARK_FRAME:
|
||||
_pc = zero_sharkframe()->pc();
|
||||
_cb = CodeCache::find_blob_unsafe(pc());
|
||||
break;
|
||||
|
||||
case ZeroFrame::FAKE_STUB_FRAME:
|
||||
_pc = NULL;
|
||||
_cb = NULL;
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
_deopt_state = not_deoptimized;
|
||||
}
|
||||
|
||||
// Accessors
|
||||
|
||||
inline intptr_t* frame::sender_sp() const {
|
||||
return (intptr_t *) zeroframe()->next();
|
||||
}
|
||||
|
||||
inline intptr_t* frame::link() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
#ifdef CC_INTERP
|
||||
inline interpreterState frame::get_interpreterState() const {
|
||||
return zero_interpreterframe()->interpreter_state();
|
||||
}
|
||||
|
||||
inline intptr_t** frame::interpreter_frame_locals_addr() const {
|
||||
return &(get_interpreterState()->_locals);
|
||||
}
|
||||
|
||||
inline intptr_t* frame::interpreter_frame_bcx_addr() const {
|
||||
return (intptr_t*) &(get_interpreterState()->_bcp);
|
||||
}
|
||||
|
||||
inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const {
|
||||
return &(get_interpreterState()->_constants);
|
||||
}
|
||||
|
||||
inline methodOop* frame::interpreter_frame_method_addr() const {
|
||||
return &(get_interpreterState()->_method);
|
||||
}
|
||||
|
||||
inline intptr_t* frame::interpreter_frame_mdx_addr() const {
|
||||
return (intptr_t*) &(get_interpreterState()->_mdx);
|
||||
}
|
||||
|
||||
inline intptr_t* frame::interpreter_frame_tos_address() const {
|
||||
return get_interpreterState()->_stack + 1;
|
||||
}
|
||||
#endif // CC_INTERP
|
||||
|
||||
inline int frame::interpreter_frame_monitor_size() {
|
||||
return BasicObjectLock::size();
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
// Return a 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() const {
|
||||
return sp();
|
||||
}
|
||||
|
||||
inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
|
||||
return zero_entryframe()->call_wrapper();
|
||||
}
|
||||
|
||||
inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
inline oop frame::saved_oop_result(RegisterMap* map) const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
inline bool frame::is_older(intptr_t* id) const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
inline intptr_t* frame::unextended_sp() const {
|
||||
if (zeroframe()->is_shark_frame())
|
||||
return zero_sharkframe()->unextended_sp();
|
||||
else
|
||||
return (intptr_t *) -1;
|
||||
}
|
||||
26
hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp
Normal file
26
hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <ffi.h>
|
||||
55
hotspot/src/cpu/zero/vm/globals_zero.hpp
Normal file
55
hotspot/src/cpu/zero/vm/globals_zero.hpp
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
* Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
//
|
||||
// Set the default values for platform dependent flags used by the
|
||||
// runtime system. See globals.hpp for details of what they do.
|
||||
//
|
||||
|
||||
define_pd_global(bool, ConvertSleepToYield, true);
|
||||
define_pd_global(bool, ShareVtableStubs, true);
|
||||
define_pd_global(bool, CountInterpCalls, true);
|
||||
define_pd_global(bool, NeedsDeoptSuspend, false);
|
||||
|
||||
define_pd_global(bool, ImplicitNullChecks, true);
|
||||
define_pd_global(bool, UncommonNullCast, true);
|
||||
|
||||
define_pd_global(intx, CodeEntryAlignment, 32);
|
||||
define_pd_global(uintx, TLABSize, 0);
|
||||
#ifdef _LP64
|
||||
define_pd_global(uintx, NewSize, ScaleForWordSize(2048 * K));
|
||||
#else
|
||||
define_pd_global(uintx, NewSize, ScaleForWordSize(1024 * K));
|
||||
#endif // _LP64
|
||||
define_pd_global(intx, InlineFrequencyCount, 100);
|
||||
define_pd_global(intx, InlineSmallCode, 1000);
|
||||
define_pd_global(intx, PreInflateSpin, 10);
|
||||
|
||||
define_pd_global(intx, StackYellowPages, 2);
|
||||
define_pd_global(intx, StackRedPages, 1);
|
||||
define_pd_global(intx, StackShadowPages, 3 LP64_ONLY(+3) DEBUG_ONLY(+3));
|
||||
|
||||
define_pd_global(bool, RewriteBytecodes, true);
|
||||
define_pd_global(bool, RewriteFrequentPairs, true);
|
||||
49
hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
Normal file
49
hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_icBuffer_zero.cpp.incl"
|
||||
|
||||
int InlineCacheBuffer::ic_stub_code_size() {
|
||||
// NB set this once the functions below are implemented
|
||||
return 4;
|
||||
}
|
||||
|
||||
void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin,
|
||||
oop cached_oop,
|
||||
address entry_point) {
|
||||
// NB ic_stub_code_size() must return the size of the code we generate
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
|
||||
// NB ic_stub_code_size() must return the size of the code we generate
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
|
||||
// NB ic_stub_code_size() must return the size of the code we generate
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
32
hotspot/src/cpu/zero/vm/icache_zero.cpp
Normal file
32
hotspot/src/cpu/zero/vm/icache_zero.cpp
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_icache_zero.cpp.incl"
|
||||
|
||||
void ICacheStubGenerator::generate_icache_flush(
|
||||
ICache::flush_icache_stub_t* flush_icache_stub) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
36
hotspot/src/cpu/zero/vm/icache_zero.hpp
Normal file
36
hotspot/src/cpu/zero/vm/icache_zero.hpp
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Interface for updating the instruction cache. Whenever the VM
|
||||
// modifies code, part of the processor instruction cache potentially
|
||||
// has to be flushed. This implementation is empty: Zero never deals
|
||||
// with code, and LLVM handles cache flushing for Shark.
|
||||
|
||||
class ICache : public AbstractICache {
|
||||
public:
|
||||
static void initialize() {}
|
||||
static void invalidate_word(address addr) {}
|
||||
static void invalidate_range(address start, int nbytes) {}
|
||||
};
|
||||
26
hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
Normal file
26
hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
38
hotspot/src/cpu/zero/vm/interp_masm_zero.hpp
Normal file
38
hotspot/src/cpu/zero/vm/interp_masm_zero.hpp
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file specializes the assember with interpreter-specific macros
|
||||
|
||||
class InterpreterMacroAssembler : public MacroAssembler {
|
||||
public:
|
||||
InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
|
||||
|
||||
public:
|
||||
RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
|
||||
Register tmp,
|
||||
int offset) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
75
hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp
Normal file
75
hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef CC_INTERP
|
||||
// | ... |
|
||||
// +--------------------+ ------------------
|
||||
// | stack slot n-1 | low addresses
|
||||
// | ... |
|
||||
// | stack slot 0 |
|
||||
// | monitor 0 (maybe) |
|
||||
// | ... |
|
||||
// | interpreter state |
|
||||
// | ... |
|
||||
// | frame_type |
|
||||
// | next_frame | high addresses
|
||||
// +--------------------+ ------------------
|
||||
// | ... |
|
||||
|
||||
class InterpreterFrame : public ZeroFrame {
|
||||
friend class AbstractInterpreter;
|
||||
|
||||
private:
|
||||
InterpreterFrame() : ZeroFrame() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
protected:
|
||||
enum Layout {
|
||||
istate_off = jf_header_words +
|
||||
(align_size_up_(sizeof(BytecodeInterpreter),
|
||||
wordSize) >> LogBytesPerWord) - 1,
|
||||
header_words
|
||||
};
|
||||
|
||||
public:
|
||||
static InterpreterFrame *build(ZeroStack* stack,
|
||||
const methodOop method,
|
||||
JavaThread* thread);
|
||||
static InterpreterFrame *build(ZeroStack* stack, int size);
|
||||
|
||||
public:
|
||||
interpreterState interpreter_state() const {
|
||||
return (interpreterState) addr_of_word(istate_off);
|
||||
}
|
||||
|
||||
public:
|
||||
void identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const;
|
||||
};
|
||||
#endif // CC_INTERP
|
||||
37
hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp
Normal file
37
hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// Generation of Interpreter
|
||||
//
|
||||
friend class AbstractInterpreterGenerator;
|
||||
|
||||
private:
|
||||
address generate_normal_entry(bool synchronized);
|
||||
address generate_native_entry(bool synchronized);
|
||||
address generate_abstract_entry();
|
||||
address generate_math_entry(AbstractInterpreter::MethodKind kind);
|
||||
address generate_empty_entry();
|
||||
address generate_accessor_entry();
|
||||
address generate_method_handle_entry();
|
||||
162
hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
Normal file
162
hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_interpreterRT_zero.cpp.incl"
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_int() {
|
||||
push(T_INT);
|
||||
_cif->nargs++;
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_long() {
|
||||
push(T_LONG);
|
||||
_cif->nargs++;
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_float() {
|
||||
push(T_FLOAT);
|
||||
_cif->nargs++;
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_double() {
|
||||
push(T_DOUBLE);
|
||||
_cif->nargs++;
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_object() {
|
||||
push(T_OBJECT);
|
||||
_cif->nargs++;
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
|
||||
ffi_type *ftype;
|
||||
switch (type) {
|
||||
case T_VOID:
|
||||
ftype = &ffi_type_void;
|
||||
break;
|
||||
|
||||
case T_BOOLEAN:
|
||||
ftype = &ffi_type_uint8;
|
||||
break;
|
||||
|
||||
case T_CHAR:
|
||||
ftype = &ffi_type_uint16;
|
||||
break;
|
||||
|
||||
case T_BYTE:
|
||||
ftype = &ffi_type_sint8;
|
||||
break;
|
||||
|
||||
case T_SHORT:
|
||||
ftype = &ffi_type_sint16;
|
||||
break;
|
||||
|
||||
case T_INT:
|
||||
ftype = &ffi_type_sint32;
|
||||
break;
|
||||
|
||||
case T_LONG:
|
||||
ftype = &ffi_type_sint64;
|
||||
break;
|
||||
|
||||
case T_FLOAT:
|
||||
ftype = &ffi_type_float;
|
||||
break;
|
||||
|
||||
case T_DOUBLE:
|
||||
ftype = &ffi_type_double;
|
||||
break;
|
||||
|
||||
case T_OBJECT:
|
||||
case T_ARRAY:
|
||||
ftype = &ffi_type_pointer;
|
||||
break;
|
||||
|
||||
default:
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
push((intptr_t) ftype);
|
||||
}
|
||||
|
||||
// For fast signature handlers the "signature handler" is generated
|
||||
// into a temporary buffer. It is then copied to its final location,
|
||||
// and pd_set_handler is called on it. We have this two stage thing
|
||||
// to accomodate this.
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::generate(
|
||||
uint64_t fingerprint) {
|
||||
|
||||
// Build the argument types list
|
||||
pass_object();
|
||||
if (method()->is_static())
|
||||
pass_object();
|
||||
iterate(fingerprint);
|
||||
|
||||
// Tack on the result type
|
||||
push(method()->result_type());
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandler::finalize() {
|
||||
ffi_status status =
|
||||
ffi_prep_cif(cif(),
|
||||
FFI_DEFAULT_ABI,
|
||||
argument_count(),
|
||||
result_type(),
|
||||
argument_types());
|
||||
|
||||
assert(status == FFI_OK, "should be");
|
||||
}
|
||||
|
||||
IRT_ENTRY(address,
|
||||
InterpreterRuntime::slow_signature_handler(JavaThread* thread,
|
||||
methodOop method,
|
||||
intptr_t* unused1,
|
||||
intptr_t* unused2))
|
||||
ZeroStack *stack = thread->zero_stack();
|
||||
|
||||
int required_words =
|
||||
(align_size_up(sizeof(ffi_cif), wordSize) >> LogBytesPerWord) +
|
||||
(method->is_static() ? 2 : 1) + method->size_of_parameters() + 1;
|
||||
if (required_words > stack->available_words()) {
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
intptr_t *buf = (intptr_t *) stack->alloc(required_words * wordSize);
|
||||
SlowSignatureHandlerGenerator sshg(methodHandle(thread, method), buf);
|
||||
sshg.generate(UCONST64(-1));
|
||||
|
||||
SignatureHandler *handler = sshg.handler();
|
||||
handler->finalize();
|
||||
|
||||
return (address) handler;
|
||||
IRT_END
|
||||
|
||||
void SignatureHandlerLibrary::pd_set_handler(address handlerAddr) {
|
||||
InterpreterRuntime::SignatureHandler *handler =
|
||||
InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
|
||||
|
||||
handler->finalize();
|
||||
}
|
||||
127
hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp
Normal file
127
hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
class SignatureHandler {
|
||||
public:
|
||||
static SignatureHandler *from_handlerAddr(address handlerAddr) {
|
||||
return (SignatureHandler *) handlerAddr;
|
||||
}
|
||||
|
||||
public:
|
||||
ffi_cif* cif() const {
|
||||
return (ffi_cif *) this;
|
||||
}
|
||||
|
||||
int argument_count() const {
|
||||
return cif()->nargs;
|
||||
}
|
||||
|
||||
ffi_type** argument_types() const {
|
||||
return (ffi_type**) (cif() + 1);
|
||||
}
|
||||
|
||||
ffi_type* argument_type(int i) const {
|
||||
return argument_types()[i];
|
||||
}
|
||||
|
||||
ffi_type* result_type() const {
|
||||
return *(argument_types() + argument_count());
|
||||
}
|
||||
|
||||
protected:
|
||||
friend class InterpreterRuntime;
|
||||
friend class SignatureHandlerLibrary;
|
||||
|
||||
void finalize();
|
||||
};
|
||||
|
||||
class SignatureHandlerGeneratorBase : public NativeSignatureIterator {
|
||||
private:
|
||||
ffi_cif* _cif;
|
||||
|
||||
protected:
|
||||
SignatureHandlerGeneratorBase(methodHandle method, ffi_cif *cif)
|
||||
: NativeSignatureIterator(method), _cif(cif) {
|
||||
_cif->nargs = 0;
|
||||
}
|
||||
|
||||
ffi_cif *cif() const {
|
||||
return _cif;
|
||||
}
|
||||
|
||||
public:
|
||||
void generate(uint64_t fingerprint);
|
||||
|
||||
private:
|
||||
void pass_int();
|
||||
void pass_long();
|
||||
void pass_float();
|
||||
void pass_double();
|
||||
void pass_object();
|
||||
|
||||
private:
|
||||
void push(BasicType type);
|
||||
virtual void push(intptr_t value) = 0;
|
||||
};
|
||||
|
||||
class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
|
||||
private:
|
||||
CodeBuffer* _cb;
|
||||
|
||||
public:
|
||||
SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
|
||||
: SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()),
|
||||
_cb(buffer) {
|
||||
_cb->set_code_end((address) (cif() + 1));
|
||||
}
|
||||
|
||||
private:
|
||||
void push(intptr_t value) {
|
||||
intptr_t *dst = (intptr_t *) _cb->code_end();
|
||||
_cb->set_code_end((address) (dst + 1));
|
||||
*dst = value;
|
||||
}
|
||||
};
|
||||
|
||||
class SlowSignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
|
||||
private:
|
||||
intptr_t *_dst;
|
||||
|
||||
public:
|
||||
SlowSignatureHandlerGenerator(methodHandle method, intptr_t* buf)
|
||||
: SignatureHandlerGeneratorBase(method, (ffi_cif *) buf) {
|
||||
_dst = (intptr_t *) (cif() + 1);
|
||||
}
|
||||
|
||||
private:
|
||||
void push(intptr_t value) {
|
||||
*(_dst++) = value;
|
||||
}
|
||||
|
||||
public:
|
||||
SignatureHandler *handler() const {
|
||||
return (SignatureHandler *) cif();
|
||||
}
|
||||
};
|
||||
70
hotspot/src/cpu/zero/vm/interpreter_zero.cpp
Normal file
70
hotspot/src/cpu/zero/vm/interpreter_zero.cpp
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_interpreter_zero.cpp.incl"
|
||||
|
||||
address AbstractInterpreterGenerator::generate_slow_signature_handler() {
|
||||
_masm->advance(1);
|
||||
return (address) InterpreterRuntime::slow_signature_handler;
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_math_entry(
|
||||
AbstractInterpreter::MethodKind kind) {
|
||||
if (!InlineIntrinsics)
|
||||
return NULL;
|
||||
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_abstract_entry() {
|
||||
return ShouldNotCallThisEntry();
|
||||
}
|
||||
|
||||
address InterpreterGenerator::generate_method_handle_entry() {
|
||||
return ShouldNotCallThisEntry();
|
||||
}
|
||||
|
||||
int AbstractInterpreter::size_activation(methodOop method,
|
||||
int tempcount,
|
||||
int popframe_extra_args,
|
||||
int moncount,
|
||||
int callee_param_count,
|
||||
int callee_locals,
|
||||
bool is_top_frame) {
|
||||
return layout_activation(method,
|
||||
tempcount,
|
||||
popframe_extra_args,
|
||||
moncount,
|
||||
callee_param_count,
|
||||
callee_locals,
|
||||
(frame*) NULL,
|
||||
(frame*) NULL,
|
||||
is_top_frame);
|
||||
}
|
||||
|
||||
void Deoptimization::unwind_callee_save_values(frame* f,
|
||||
vframeArray* vframe_array) {
|
||||
}
|
||||
61
hotspot/src/cpu/zero/vm/interpreter_zero.hpp
Normal file
61
hotspot/src/cpu/zero/vm/interpreter_zero.hpp
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
public:
|
||||
static void invoke_method(methodOop method, address entry_point, TRAPS) {
|
||||
((ZeroEntry *) entry_point)->invoke(method, THREAD);
|
||||
}
|
||||
static void invoke_osr(methodOop method,
|
||||
address entry_point,
|
||||
address osr_buf,
|
||||
TRAPS) {
|
||||
((ZeroEntry *) entry_point)->invoke_osr(method, osr_buf, THREAD);
|
||||
}
|
||||
|
||||
public:
|
||||
static int expr_index_at(int i) {
|
||||
return stackElementWords() * i;
|
||||
}
|
||||
static int expr_tag_index_at(int i) {
|
||||
assert(TaggedStackInterpreter, "should not call this");
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
static int expr_offset_in_bytes(int i) {
|
||||
return stackElementSize() * i;
|
||||
}
|
||||
static int expr_tag_offset_in_bytes(int i) {
|
||||
assert(TaggedStackInterpreter, "should not call this");
|
||||
Unimplemented();
|
||||
}
|
||||
|
||||
static int local_index_at(int i) {
|
||||
assert(i <= 0, "local direction already negated");
|
||||
return stackElementWords() * i + (value_offset_in_bytes() / wordSize);
|
||||
}
|
||||
static int local_tag_index_at(int i) {
|
||||
assert(TaggedStackInterpreter, "should not call this");
|
||||
Unimplemented();
|
||||
}
|
||||
72
hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp
Normal file
72
hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
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() {
|
||||
// clearing _last_Java_sp must be first
|
||||
_last_Java_sp = NULL;
|
||||
// fence?
|
||||
_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_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;
|
||||
}
|
||||
|
||||
bool walkable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void make_walkable(JavaThread* thread) {
|
||||
// nothing to do
|
||||
}
|
||||
|
||||
intptr_t* last_Java_sp() const {
|
||||
return _last_Java_sp;
|
||||
}
|
||||
|
||||
void set_last_Java_sp(intptr_t* sp) {
|
||||
_last_Java_sp = sp;
|
||||
}
|
||||
59
hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp
Normal file
59
hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
* Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_jniFastGetField_zero.cpp.incl"
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_boolean_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_byte_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_char_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_short_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_int_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_long_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_float_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
|
||||
address JNI_FastGetField::generate_fast_get_double_field() {
|
||||
return (address) -1;
|
||||
}
|
||||
108
hotspot/src/cpu/zero/vm/jniTypes_zero.hpp
Normal file
108
hotspot/src/cpu/zero/vm/jniTypes_zero.hpp
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
/*
|
||||
* Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// 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_zero.cpp)
|
||||
// reverse the argument list constructed by JavaCallArguments (see
|
||||
// javaCalls.hpp).
|
||||
|
||||
private:
|
||||
// Helper routines.
|
||||
static inline void put_int2 (jint *from, jint *to) { to[0] = from[0]; to[1] = from[1]; }
|
||||
static inline void put_int2 (jint *from, jint *to, int& pos) { put_int2 (from, (jint *)((intptr_t *)to + pos)); pos += 2; }
|
||||
static inline void put_int2r(jint *from, jint *to) { to[0] = from[1]; to[1] = from[0]; }
|
||||
static inline void put_int2r(jint *from, jint *to, int& pos) { put_int2r(from, (jint *)((intptr_t *)to + pos)); pos += 2; }
|
||||
|
||||
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 _LP64
|
||||
// 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 reversed native word format in two JavaCallArgument slots at *to.
|
||||
// The high half is in *(to+1) and the low half in *to.
|
||||
static inline void put_long(jlong from, intptr_t *to) { put_int2r((jint *)&from, (jint *)to); }
|
||||
static inline void put_long(jlong from, intptr_t *to, int& pos) { put_int2r((jint *)&from, (jint *)to, pos); }
|
||||
static inline void put_long(jlong *from, intptr_t *to, int& pos) { put_int2r((jint *) from, (jint *)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 _LP64
|
||||
// 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 reversed native word format in two JavaCallArgument slots at *to.
|
||||
static inline void put_double(jdouble from, intptr_t *to) { put_int2r((jint *)&from, (jint *)to); }
|
||||
static inline void put_double(jdouble from, intptr_t *to, int& pos) { put_int2r((jint *)&from, (jint *)to, pos); }
|
||||
static inline void put_double(jdouble *from, intptr_t *to, int& pos) { put_int2r((jint *) from, (jint *)to, pos); }
|
||||
#endif
|
||||
|
||||
// The get_xxx routines, on the other hand, actually _do_ fetch
|
||||
// java primitive types from the interpreter stack.
|
||||
static inline jint get_int(intptr_t *from) { return *(jint *)from; }
|
||||
|
||||
#ifdef _LP64
|
||||
static inline jlong get_long(intptr_t *from) { return *(jlong *)from; }
|
||||
#else
|
||||
static inline jlong get_long(intptr_t *from) { return ((jlong)(*( signed int *)((jint *)from )) << 32) |
|
||||
((jlong)(*(unsigned int *)((jint *)from + 1)) << 0); }
|
||||
#endif
|
||||
|
||||
static inline oop get_obj(intptr_t *from) { return *(oop *)from; }
|
||||
static inline jfloat get_float(intptr_t *from) { return *(jfloat *)from; }
|
||||
|
||||
#ifdef _LP64
|
||||
static inline jdouble get_double(intptr_t *from) { return *(jdouble *)from; }
|
||||
#else
|
||||
static inline jdouble get_double(intptr_t *from) { jlong jl = ((jlong)(*( signed int *)((jint *)from )) << 32) |
|
||||
((jlong)(*(unsigned int *)((jint *)from + 1)) << 0);
|
||||
return *(jdouble *)&jl; }
|
||||
#endif
|
||||
|
||||
};
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -22,15 +23,16 @@
|
|||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
package org.jdesktop.synthdesigner.synthmodel;
|
||||
|
||||
/**
|
||||
* HasUIStyle - A marker interface for all classes that have a UIStyle
|
||||
*
|
||||
* @author Richard Bair
|
||||
* @author Jasper Potts
|
||||
*/
|
||||
public interface HasUIStyle {
|
||||
#define JNIEXPORT
|
||||
#define JNIIMPORT
|
||||
#define JNICALL
|
||||
|
||||
public UIStyle getStyle();
|
||||
}
|
||||
typedef int jint;
|
||||
typedef signed char jbyte;
|
||||
|
||||
#ifdef _LP64
|
||||
typedef long jlong;
|
||||
#else
|
||||
typedef long long jlong;
|
||||
#endif
|
||||
26
hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
Normal file
26
hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
50
hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
Normal file
50
hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_nativeInst_zero.cpp.incl"
|
||||
|
||||
// This method is called by nmethod::make_not_entrant_or_zombie to
|
||||
// insert a jump to SharedRuntime::get_handle_wrong_method_stub()
|
||||
// (dest) at the start of a compiled method (verified_entry) to avoid
|
||||
// a race where a method is invoked while being made non-entrant.
|
||||
//
|
||||
// In Shark, verified_entry is a pointer to a SharkEntry. We can
|
||||
// handle this simply by changing it's entry point to point at the
|
||||
// interpreter. This only works because the interpreter and Shark
|
||||
// calling conventions are the same.
|
||||
|
||||
void NativeJump::patch_verified_entry(address entry,
|
||||
address verified_entry,
|
||||
address dest) {
|
||||
assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be");
|
||||
|
||||
#ifdef CC_INTERP
|
||||
((ZeroEntry*) verified_entry)->set_entry_point(
|
||||
(address) CppInterpreter::normal_entry);
|
||||
#else
|
||||
Unimplemented();
|
||||
#endif // CC_INTERP
|
||||
}
|
||||
185
hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
Normal file
185
hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
/*
|
||||
* Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// We have interfaces for the following instructions:
|
||||
// - NativeInstruction
|
||||
// - - NativeCall
|
||||
// - - NativeMovConstReg
|
||||
// - - NativeMovConstRegPatching
|
||||
// - - NativeJump
|
||||
// - - NativeIllegalOpCode
|
||||
// - - NativeReturn
|
||||
// - - NativeReturnX (return with argument)
|
||||
// - - NativePushConst
|
||||
// - - NativeTstRegMem
|
||||
|
||||
// The base class for different kinds of native instruction abstractions.
|
||||
// Provides the primitive operations to manipulate code relative to this.
|
||||
|
||||
class NativeInstruction VALUE_OBJ_CLASS_SPEC {
|
||||
public:
|
||||
bool is_jump() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
bool is_safepoint_poll() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
|
||||
inline NativeInstruction* nativeInstruction_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
class NativeCall : public NativeInstruction {
|
||||
public:
|
||||
enum zero_specific_constants {
|
||||
instruction_size = 0 // not used within the interpreter
|
||||
};
|
||||
|
||||
address instruction_address() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address next_instruction_address() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address return_address() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address destination() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void set_destination_mt_safe(address dest) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void verify_alignment() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void verify() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static bool is_call_before(address return_address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
|
||||
inline NativeCall* nativeCall_before(address return_address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
inline NativeCall* nativeCall_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
class NativeMovConstReg : public NativeInstruction {
|
||||
public:
|
||||
address next_instruction_address() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
intptr_t data() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void set_data(intptr_t x) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
|
||||
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
class NativeMovRegMem : public NativeInstruction {
|
||||
public:
|
||||
int offset() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void set_offset(intptr_t x) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void add_offset_in_bytes(int add_offset) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
|
||||
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
class NativeJump : public NativeInstruction {
|
||||
public:
|
||||
enum zero_specific_constants {
|
||||
instruction_size = 0 // not used within the interpreter
|
||||
};
|
||||
|
||||
address jump_destination() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void set_jump_destination(address dest) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static void check_verified_entry_alignment(address entry,
|
||||
address verified_entry) {
|
||||
}
|
||||
|
||||
static void patch_verified_entry(address entry,
|
||||
address verified_entry,
|
||||
address dest);
|
||||
};
|
||||
|
||||
inline NativeJump* nativeJump_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
class NativeGeneralJump : public NativeInstruction {
|
||||
public:
|
||||
address jump_destination() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static void insert_unconditional(address code_pos, address entry) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static void replace_mt_safe(address instr_addr, address code_buffer) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
};
|
||||
|
||||
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
39
hotspot/src/cpu/zero/vm/registerMap_zero.hpp
Normal file
39
hotspot/src/cpu/zero/vm/registerMap_zero.hpp
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// machine-dependent implemention for register maps
|
||||
friend class frame;
|
||||
|
||||
private:
|
||||
// This is the hook for finding a register in an "well-known" location,
|
||||
// such as a register block of a predetermined format.
|
||||
// Since there is none, we just return NULL.
|
||||
// See registerMap_sparc.hpp for an example of grabbing registers
|
||||
// from register save areas of a standard layout.
|
||||
address pd_location(VMReg reg) const { return NULL; }
|
||||
|
||||
// no PD state to clear or copy:
|
||||
void pd_clear() {}
|
||||
void pd_initialize() {}
|
||||
void pd_initialize_from(const RegisterMap* map) {}
|
||||
26
hotspot/src/cpu/zero/vm/register_definitions_zero.cpp
Normal file
26
hotspot/src/cpu/zero/vm/register_definitions_zero.cpp
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file is intentionally empty
|
||||
39
hotspot/src/cpu/zero/vm/register_zero.cpp
Normal file
39
hotspot/src/cpu/zero/vm/register_zero.cpp
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_register_zero.cpp.incl"
|
||||
|
||||
const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers;
|
||||
const int ConcreteRegisterImpl::max_fpr =
|
||||
ConcreteRegisterImpl::max_gpr + FloatRegisterImpl::number_of_registers;
|
||||
|
||||
const char* RegisterImpl::name() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
const char* FloatRegisterImpl::name() const {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
110
hotspot/src/cpu/zero/vm/register_zero.hpp
Normal file
110
hotspot/src/cpu/zero/vm/register_zero.hpp
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
/*
|
||||
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
class VMRegImpl;
|
||||
typedef VMRegImpl* VMReg;
|
||||
|
||||
// Use Register as shortcut
|
||||
class RegisterImpl;
|
||||
typedef RegisterImpl* Register;
|
||||
|
||||
inline Register as_Register(int encoding) {
|
||||
return (Register)(intptr_t) encoding;
|
||||
}
|
||||
|
||||
// The implementation of integer registers for the zero architecture
|
||||
class RegisterImpl : public AbstractRegisterImpl {
|
||||
public:
|
||||
enum {
|
||||
number_of_registers = 0
|
||||
};
|
||||
|
||||
// construction
|
||||
inline friend Register as_Register(int encoding);
|
||||
VMReg as_VMReg();
|
||||
|
||||
// derived registers, offsets, and addresses
|
||||
Register successor() const {
|
||||
return as_Register(encoding() + 1);
|
||||
}
|
||||
|
||||
// accessors
|
||||
int encoding() const {
|
||||
assert(is_valid(), "invalid register");
|
||||
return (intptr_t)this;
|
||||
}
|
||||
bool is_valid() const {
|
||||
return 0 <= (intptr_t) this && (intptr_t)this < number_of_registers;
|
||||
}
|
||||
const char* name() const;
|
||||
};
|
||||
|
||||
// Use FloatRegister as shortcut
|
||||
class FloatRegisterImpl;
|
||||
typedef FloatRegisterImpl* FloatRegister;
|
||||
|
||||
inline FloatRegister as_FloatRegister(int encoding) {
|
||||
return (FloatRegister)(intptr_t) encoding;
|
||||
}
|
||||
|
||||
// The implementation of floating point registers for the zero architecture
|
||||
class FloatRegisterImpl : public AbstractRegisterImpl {
|
||||
public:
|
||||
enum {
|
||||
number_of_registers = 0
|
||||
};
|
||||
|
||||
// construction
|
||||
inline friend FloatRegister as_FloatRegister(int encoding);
|
||||
VMReg as_VMReg();
|
||||
|
||||
// derived registers, offsets, and addresses
|
||||
FloatRegister successor() const {
|
||||
return as_FloatRegister(encoding() + 1);
|
||||
}
|
||||
|
||||
// accessors
|
||||
int encoding() const {
|
||||
assert(is_valid(), "invalid register");
|
||||
return (intptr_t)this;
|
||||
}
|
||||
bool is_valid() const {
|
||||
return 0 <= (intptr_t) this && (intptr_t)this < number_of_registers;
|
||||
}
|
||||
const char* name() const;
|
||||
};
|
||||
|
||||
class ConcreteRegisterImpl : public AbstractRegisterImpl {
|
||||
public:
|
||||
enum {
|
||||
number_of_registers = RegisterImpl::number_of_registers +
|
||||
FloatRegisterImpl::number_of_registers
|
||||
};
|
||||
|
||||
static const int max_gpr;
|
||||
static const int max_fpr;
|
||||
};
|
||||
|
||||
CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
|
||||
74
hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
Normal file
74
hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_relocInfo_zero.cpp.incl"
|
||||
|
||||
void Relocation::pd_set_data_value(address x, intptr_t o) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address Relocation::pd_call_destination(address orig_addr) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void Relocation::pd_set_call_destination(address x) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address Relocation::pd_get_address_from_code() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
address* Relocation::pd_address_in_code() {
|
||||
// Relocations in Shark are just stored directly
|
||||
return (address *) addr();
|
||||
}
|
||||
|
||||
int Relocation::pd_breakpoint_size() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void Relocation::pd_swap_in_breakpoint(address x,
|
||||
short* instrs,
|
||||
int instrlen) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void Relocation::pd_swap_out_breakpoint(address x,
|
||||
short* instrs,
|
||||
int instrlen) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src,
|
||||
CodeBuffer* dst) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src,
|
||||
CodeBuffer* dst) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
32
hotspot/src/cpu/zero/vm/relocInfo_zero.hpp
Normal file
32
hotspot/src/cpu/zero/vm/relocInfo_zero.hpp
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// machine-dependent parts of class relocInfo
|
||||
private:
|
||||
enum {
|
||||
// these constants mean nothing without an assembler
|
||||
offset_unit = 1,
|
||||
format_width = 1
|
||||
};
|
||||
108
hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
Normal file
108
hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2007, 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "incls/_precompiled.incl"
|
||||
#include "incls/_sharedRuntime_zero.cpp.incl"
|
||||
|
||||
DeoptimizationBlob *SharedRuntime::_deopt_blob;
|
||||
SafepointBlob *SharedRuntime::_polling_page_safepoint_handler_blob;
|
||||
SafepointBlob *SharedRuntime::_polling_page_return_handler_blob;
|
||||
RuntimeStub *SharedRuntime::_wrong_method_blob;
|
||||
RuntimeStub *SharedRuntime::_ic_miss_blob;
|
||||
RuntimeStub *SharedRuntime::_resolve_opt_virtual_call_blob;
|
||||
RuntimeStub *SharedRuntime::_resolve_virtual_call_blob;
|
||||
RuntimeStub *SharedRuntime::_resolve_static_call_blob;
|
||||
|
||||
int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
|
||||
VMRegPair *regs,
|
||||
int total_args_passed,
|
||||
int is_outgoing) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(
|
||||
MacroAssembler *masm,
|
||||
int total_args_passed,
|
||||
int comp_args_on_stack,
|
||||
const BasicType *sig_bt,
|
||||
const VMRegPair *regs) {
|
||||
return new AdapterHandlerEntry(
|
||||
ShouldNotCallThisStub(),
|
||||
ShouldNotCallThisStub(),
|
||||
ShouldNotCallThisStub());
|
||||
}
|
||||
|
||||
nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
|
||||
methodHandle method,
|
||||
int total_in_args,
|
||||
int comp_args_on_stack,
|
||||
BasicType *in_sig_bt,
|
||||
VMRegPair *in_regs,
|
||||
BasicType ret_type) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
int Deoptimization::last_frame_adjust(int callee_parameters,
|
||||
int callee_locals) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint SharedRuntime::out_preserve_stack_slots() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
static RuntimeStub* generate_empty_runtime_stub(const char* name) {
|
||||
CodeBuffer buffer(name, 0, 0);
|
||||
return RuntimeStub::new_runtime_stub(name, &buffer, 0, 0, NULL, false);
|
||||
}
|
||||
|
||||
static SafepointBlob* generate_empty_safepoint_blob() {
|
||||
CodeBuffer buffer("handler_blob", 0, 0);
|
||||
return SafepointBlob::create(&buffer, NULL, 0);
|
||||
}
|
||||
|
||||
void SharedRuntime::generate_stubs() {
|
||||
_wrong_method_blob =
|
||||
generate_empty_runtime_stub("wrong_method_stub");
|
||||
_ic_miss_blob =
|
||||
generate_empty_runtime_stub("ic_miss_stub");
|
||||
_resolve_opt_virtual_call_blob =
|
||||
generate_empty_runtime_stub("resolve_opt_virtual_call");
|
||||
_resolve_virtual_call_blob =
|
||||
generate_empty_runtime_stub("resolve_virtual_call");
|
||||
_resolve_static_call_blob =
|
||||
generate_empty_runtime_stub("resolve_static_call");
|
||||
|
||||
_polling_page_safepoint_handler_blob =
|
||||
generate_empty_safepoint_blob();
|
||||
_polling_page_return_handler_blob =
|
||||
generate_empty_safepoint_blob();
|
||||
}
|
||||
|
||||
int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
|
||||
VMRegPair *regs,
|
||||
int total_args_passed) {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
79
hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
Normal file
79
hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
// | ... |
|
||||
// +--------------------+ ------------------
|
||||
// | stack slot n-1 | low addresses
|
||||
// | ... |
|
||||
// | stack slot 0 |
|
||||
// | monitor m-1 |
|
||||
// | ... |
|
||||
// | monitor 0 |
|
||||
// | oop_tmp |
|
||||
// | method |
|
||||
// | unextended_sp |
|
||||
// | pc |
|
||||
// | frame_type |
|
||||
// | next_frame | high addresses
|
||||
// +--------------------+ ------------------
|
||||
// | ... |
|
||||
|
||||
class SharkFrame : public ZeroFrame {
|
||||
friend class SharkFunction;
|
||||
|
||||
private:
|
||||
SharkFrame() : ZeroFrame() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
protected:
|
||||
enum Layout {
|
||||
pc_off = jf_header_words,
|
||||
unextended_sp_off,
|
||||
method_off,
|
||||
oop_tmp_off,
|
||||
header_words
|
||||
};
|
||||
|
||||
public:
|
||||
address pc() const {
|
||||
return (address) value_of_word(pc_off);
|
||||
}
|
||||
|
||||
intptr_t* unextended_sp() const {
|
||||
return (intptr_t *) value_of_word(unextended_sp_off);
|
||||
}
|
||||
|
||||
methodOop method() const {
|
||||
return (methodOop) value_of_word(method_off);
|
||||
}
|
||||
|
||||
public:
|
||||
void identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const;
|
||||
};
|
||||
197
hotspot/src/cpu/zero/vm/stack_zero.hpp
Normal file
197
hotspot/src/cpu/zero/vm/stack_zero.hpp
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
/*
|
||||
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 2008, 2009 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
*/
|
||||
|
||||
class ZeroStack {
|
||||
private:
|
||||
intptr_t *_base; // the last available word
|
||||
intptr_t *_top; // the word past the end of the stack
|
||||
intptr_t *_sp; // the top word on the stack
|
||||
|
||||
public:
|
||||
ZeroStack()
|
||||
: _base(NULL), _top(NULL), _sp(NULL) {}
|
||||
|
||||
bool needs_setup() const {
|
||||
return _base == NULL;
|
||||
}
|
||||
|
||||
void setup(void *mem, size_t size) {
|
||||
assert(needs_setup(), "already set up");
|
||||
assert(!(size & WordAlignmentMask), "unaligned");
|
||||
|
||||
_base = (intptr_t *) mem;
|
||||
_top = _base + (size >> LogBytesPerWord);
|
||||
_sp = _top;
|
||||
}
|
||||
void teardown() {
|
||||
assert(!needs_setup(), "not set up");
|
||||
assert(_sp == _top, "stuff on stack at teardown");
|
||||
|
||||
_base = NULL;
|
||||
_top = NULL;
|
||||
_sp = NULL;
|
||||
}
|
||||
|
||||
intptr_t *sp() const {
|
||||
return _sp;
|
||||
}
|
||||
void set_sp(intptr_t *new_sp) {
|
||||
assert(_top >= new_sp && new_sp >= _base, "bad stack pointer");
|
||||
_sp = new_sp;
|
||||
}
|
||||
|
||||
int available_words() const {
|
||||
return _sp - _base;
|
||||
}
|
||||
|
||||
void push(intptr_t value) {
|
||||
assert(_sp > _base, "stack overflow");
|
||||
*(--_sp) = value;
|
||||
}
|
||||
intptr_t pop() {
|
||||
assert(_sp < _top, "stack underflow");
|
||||
return *(_sp++);
|
||||
}
|
||||
|
||||
void *alloc(size_t size) {
|
||||
int count = align_size_up(size, wordSize) >> LogBytesPerWord;
|
||||
assert(count <= available_words(), "stack overflow");
|
||||
return _sp -= count;
|
||||
}
|
||||
|
||||
public:
|
||||
static ByteSize base_offset() {
|
||||
return byte_offset_of(ZeroStack, _base);
|
||||
}
|
||||
static ByteSize top_offset() {
|
||||
return byte_offset_of(ZeroStack, _top);
|
||||
}
|
||||
static ByteSize sp_offset() {
|
||||
return byte_offset_of(ZeroStack, _sp);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class EntryFrame;
|
||||
class InterpreterFrame;
|
||||
class SharkFrame;
|
||||
class FakeStubFrame;
|
||||
|
||||
//
|
||||
// | ... |
|
||||
// +--------------------+ ------------------
|
||||
// | ... | low addresses
|
||||
// | frame_type |
|
||||
// | next_frame | high addresses
|
||||
// +--------------------+ ------------------
|
||||
// | ... |
|
||||
|
||||
class ZeroFrame {
|
||||
friend class frame;
|
||||
friend class ZeroStackPrinter;
|
||||
|
||||
protected:
|
||||
ZeroFrame() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
enum Layout {
|
||||
next_frame_off,
|
||||
frame_type_off,
|
||||
jf_header_words
|
||||
};
|
||||
|
||||
enum FrameType {
|
||||
ENTRY_FRAME = 1,
|
||||
INTERPRETER_FRAME,
|
||||
SHARK_FRAME,
|
||||
FAKE_STUB_FRAME
|
||||
};
|
||||
|
||||
protected:
|
||||
intptr_t *addr_of_word(int offset) const {
|
||||
return (intptr_t *) this - offset;
|
||||
}
|
||||
intptr_t value_of_word(int offset) const {
|
||||
return *addr_of_word(offset);
|
||||
}
|
||||
|
||||
public:
|
||||
ZeroFrame *next() const {
|
||||
return (ZeroFrame *) value_of_word(next_frame_off);
|
||||
}
|
||||
|
||||
protected:
|
||||
FrameType type() const {
|
||||
return (FrameType) value_of_word(frame_type_off);
|
||||
}
|
||||
|
||||
public:
|
||||
bool is_entry_frame() const {
|
||||
return type() == ENTRY_FRAME;
|
||||
}
|
||||
bool is_interpreter_frame() const {
|
||||
return type() == INTERPRETER_FRAME;
|
||||
}
|
||||
bool is_shark_frame() const {
|
||||
return type() == SHARK_FRAME;
|
||||
}
|
||||
bool is_fake_stub_frame() const {
|
||||
return type() == FAKE_STUB_FRAME;
|
||||
}
|
||||
|
||||
public:
|
||||
EntryFrame *as_entry_frame() const {
|
||||
assert(is_entry_frame(), "should be");
|
||||
return (EntryFrame *) this;
|
||||
}
|
||||
InterpreterFrame *as_interpreter_frame() const {
|
||||
assert(is_interpreter_frame(), "should be");
|
||||
return (InterpreterFrame *) this;
|
||||
}
|
||||
SharkFrame *as_shark_frame() const {
|
||||
assert(is_shark_frame(), "should be");
|
||||
return (SharkFrame *) this;
|
||||
}
|
||||
FakeStubFrame *as_fake_stub_frame() const {
|
||||
assert(is_fake_stub_frame(), "should be");
|
||||
return (FakeStubFrame *) this;
|
||||
}
|
||||
|
||||
public:
|
||||
void identify_word(int frame_index,
|
||||
int offset,
|
||||
char* fieldbuf,
|
||||
char* valuebuf,
|
||||
int buflen) const;
|
||||
|
||||
protected:
|
||||
void identify_vp_word(int frame_index,
|
||||
intptr_t* addr,
|
||||
intptr_t* monitor_base,
|
||||
intptr_t* stack_base,
|
||||
char* fieldbuf,
|
||||
int buflen) const;
|
||||
};
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue