Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
7016023: Enable building ARM and PPC from src/closed repository
Wed, 02 Feb 2011 11:35:26 -0500
- author
- bobv
- date
- Wed, 02 Feb 2011 11:35:26 -0500
- changeset 2508
- b92c45f2bc75
- parent 2497
- 3582bf76420e
- child 2509
- 9cd8a2c2d584
7016023: Enable building ARM and PPC from src/closed repository
Reviewed-by: dholmes, bdelsart
1.1 --- a/make/Makefile Thu Jan 27 16:11:27 2011 -0800 1.2 +++ b/make/Makefile Wed Feb 02 11:35:26 2011 -0500 1.3 @@ -73,6 +73,7 @@ 1.4 include defs.make 1.5 endif 1.6 1.7 +include $(GAMMADIR)/make/closed.make 1.8 1.9 ifneq ($(ALT_OUTPUTDIR),) 1.10 ALT_OUT=ALT_OUTPUTDIR=$(ALT_OUTPUTDIR) 1.11 @@ -361,7 +362,7 @@ 1.12 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/% 1.13 $(install-file) 1.14 1.15 -$(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_SRC_DIR)/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h 1.16 +$(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_JNI_ARCH_SRC) 1.17 $(install-file) 1.18 1.19 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/%
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/make/closed.make Wed Feb 02 11:35:26 2011 -0500 2.3 @@ -0,0 +1,59 @@ 2.4 +# 2.5 +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. 2.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 +# 2.8 +# This code is free software; you can redistribute it and/or modify it 2.9 +# under the terms of the GNU General Public License version 2 only, as 2.10 +# published by the Free Software Foundation. 2.11 +# 2.12 +# This code is distributed in the hope that it will be useful, but WITHOUT 2.13 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 +# version 2 for more details (a copy is included in the LICENSE file that 2.16 +# accompanied this code). 2.17 +# 2.18 +# You should have received a copy of the GNU General Public License version 2.19 +# 2 along with this work; if not, write to the Free Software Foundation, 2.20 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 +# 2.22 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 +# or visit www.oracle.com if you need additional information or have any 2.24 +# questions. 2.25 +# 2.26 +# 2.27 + 2.28 +# Support for setting HS_CLOSED_PATH, required GAMMADIR and SRCARCH 2.29 + 2.30 +CLOSED_DIR_EXISTS := $(shell \ 2.31 + if [ -d $(GAMMADIR)/src/closed ] ; then \ 2.32 + echo true; \ 2.33 + else \ 2.34 + echo false; \ 2.35 + fi) 2.36 + 2.37 +CLOSED_SRCARCH_DIR_EXISTS := $(shell \ 2.38 + if [ -d $(GAMMADIR)/src/closed/cpu/$(SRCARCH)/vm ] ; then \ 2.39 + echo true; \ 2.40 + else \ 2.41 + echo false; \ 2.42 + fi) 2.43 + 2.44 +ifeq ($(CLOSED_SRCARCH_DIR_EXISTS), true) 2.45 + HS_CLOSED_PATH=closed/ 2.46 +endif 2.47 + 2.48 +# Support for setting HS_JNI_ARCH_SRC, requires HS_SRC_DIR and HS_ARCH 2.49 + 2.50 +CLOSED_HS_ARCH_DIR_EXISTS := $(shell \ 2.51 + if [ -d $(HS_SRC_DIR)/closed/cpu/$(HS_ARCH)/vm ] ; then \ 2.52 + echo true; \ 2.53 + else \ 2.54 + echo false; \ 2.55 + fi) 2.56 + 2.57 +ifeq ($(CLOSED_HS_ARCH_DIR_EXISTS), true) 2.58 + HS_JNI_ARCH_SRC=$(HS_SRC_DIR)/closed/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h 2.59 +else 2.60 + HS_JNI_ARCH_SRC=$(HS_SRC_DIR)/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h 2.61 +endif 2.62 +
3.1 --- a/make/jprt.properties Thu Jan 27 16:11:27 2011 -0800 3.2 +++ b/make/jprt.properties Wed Feb 02 11:35:26 2011 -0500 3.3 @@ -44,6 +44,11 @@ 3.4 3.5 jprt.sync.push=false 3.6 3.7 +# Note: we want both embedded releases and regular releases to build and test 3.8 +# all platforms so that regressions are not introduced (eg. change to 3.9 +# common code by SE breaks PPC/ARM; change to common code by SE-E breaks 3.10 +# sparc etc. 3.11 + 3.12 # Define the Solaris platforms we want for the various releases 3.13 3.14 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 3.15 @@ -55,6 +60,8 @@ 3.16 jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8 3.17 jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8 3.18 jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8 3.19 +jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7} 3.20 +jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6} 3.21 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} 3.22 3.23 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 3.24 @@ -66,6 +73,8 @@ 3.25 jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8 3.26 jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8 3.27 jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8 3.28 +jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7} 3.29 +jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6} 3.30 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} 3.31 3.32 jprt.my.solaris.i586.jdk7=solaris_i586_5.10 3.33 @@ -77,6 +86,8 @@ 3.34 jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8 3.35 jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8 3.36 jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8 3.37 +jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7} 3.38 +jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6} 3.39 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} 3.40 3.41 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 3.42 @@ -88,6 +99,8 @@ 3.43 jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 3.44 jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10 3.45 jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10 3.46 +jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7} 3.47 +jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6} 3.48 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} 3.49 3.50 jprt.my.linux.i586.jdk7=linux_i586_2.6 3.51 @@ -99,6 +112,8 @@ 3.52 jprt.my.linux.i586.jdk6u14=linux_i586_2.4 3.53 jprt.my.linux.i586.jdk6u18=linux_i586_2.4 3.54 jprt.my.linux.i586.jdk6u20=linux_i586_2.4 3.55 +jprt.my.linux.i586.ejdk7=linux_i586_2.6 3.56 +jprt.my.linux.i586.ejdk6=linux_i586_2.6 3.57 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} 3.58 3.59 jprt.my.linux.x64.jdk7=linux_x64_2.6 3.60 @@ -110,8 +125,45 @@ 3.61 jprt.my.linux.x64.jdk6u14=linux_x64_2.4 3.62 jprt.my.linux.x64.jdk6u18=linux_x64_2.4 3.63 jprt.my.linux.x64.jdk6u20=linux_x64_2.4 3.64 +jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7} 3.65 +jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6} 3.66 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} 3.67 3.68 +jprt.my.linux.ppc.jdk7=linux_ppc_2.6 3.69 +jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6 3.70 +jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6 3.71 +jprt.my.linux.ppc.ejdk6=linux_ppc_2.6 3.72 +jprt.my.linux.ppc.ejdk7=linux_ppc_2.6 3.73 +jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} 3.74 + 3.75 +jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 3.76 +jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6 3.77 +jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6 3.78 +jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6 3.79 +jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6 3.80 +jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} 3.81 + 3.82 +jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 3.83 +jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6 3.84 +jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6 3.85 +jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6 3.86 +jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6 3.87 +jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} 3.88 + 3.89 +jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 3.90 +jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6 3.91 +jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6 3.92 +jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6 3.93 +jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6 3.94 +jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} 3.95 + 3.96 +jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 3.97 +jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6 3.98 +jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6 3.99 +jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6 3.100 +jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6 3.101 +jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 3.102 + 3.103 jprt.my.windows.i586.jdk7=windows_i586_5.1 3.104 jprt.my.windows.i586.jdk7b107=windows_i586_5.0 3.105 jprt.my.windows.i586.jdk7temp=windows_i586_5.0 3.106 @@ -121,6 +173,8 @@ 3.107 jprt.my.windows.i586.jdk6u14=windows_i586_5.0 3.108 jprt.my.windows.i586.jdk6u18=windows_i586_5.0 3.109 jprt.my.windows.i586.jdk6u20=windows_i586_5.0 3.110 +jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7} 3.111 +jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6} 3.112 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 3.113 3.114 jprt.my.windows.x64.jdk7=windows_x64_5.2 3.115 @@ -132,11 +186,13 @@ 3.116 jprt.my.windows.x64.jdk6u14=windows_x64_5.2 3.117 jprt.my.windows.x64.jdk6u18=windows_x64_5.2 3.118 jprt.my.windows.x64.jdk6u20=windows_x64_5.2 3.119 +jprt.my.windows.x64.ejdk7=${jprt.my.windows.x64.jdk7} 3.120 +jprt.my.windows.x64.ejdk6=${jprt.my.windows.x64.jdk6} 3.121 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} 3.122 3.123 # Standard list of jprt build targets for this source tree 3.124 3.125 -jprt.build.targets= \ 3.126 +jprt.build.targets.standard= \ 3.127 ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \ 3.128 ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \ 3.129 ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \ 3.130 @@ -146,6 +202,30 @@ 3.131 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ 3.132 ${jprt.my.windows.x64}-{product|fastdebug|debug} 3.133 3.134 +jprt.build.targets.embedded= \ 3.135 + ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ 3.136 + ${jprt.my.linux.ppc}-{product|fastdebug}, \ 3.137 + ${jprt.my.linux.ppcv2}-{product|fastdebug}, \ 3.138 + ${jprt.my.linux.ppcsflt}-{product|fastdebug}, \ 3.139 + ${jprt.my.linux.armvfp}-{product|fastdebug}, \ 3.140 + ${jprt.my.linux.armsflt}-{product|fastdebug} 3.141 + 3.142 +jprt.build.targets.all=${jprt.build.targets.standard}, \ 3.143 + ${jprt.build.targets.embedded} 3.144 + 3.145 +jprt.build.targets.jdk7=${jprt.build.targets.all} 3.146 +jprt.build.targets.jdk7temp=${jprt.build.targets.all} 3.147 +jprt.build.targets.jdk7b107=${jprt.build.targets.all} 3.148 +jprt.build.targets.jdk6=${jprt.build.targets.standard} 3.149 +jprt.build.targets.jdk6perf=${jprt.build.targets.standard} 3.150 +jprt.build.targets.jdk6u10=${jprt.build.targets.standard} 3.151 +jprt.build.targets.jdk6u14=${jprt.build.targets.standard} 3.152 +jprt.build.targets.jdk6u18=${jprt.build.targets.standard} 3.153 +jprt.build.targets.jdk6u20=${jprt.build.targets.standard} 3.154 +jprt.build.targets.ejdk6=${jprt.build.targets.all} 3.155 +jprt.build.targets.ejdk7=${jprt.build.targets.all} 3.156 +jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} 3.157 + 3.158 # Subset lists of test targets for this source tree 3.159 3.160 jprt.my.solaris.sparc.test.targets= \ 3.161 @@ -372,9 +452,14 @@ 3.162 ${jprt.my.windows.x64}-product-c2-jbb_G1, \ 3.163 ${jprt.my.windows.x64}-product-c2-jbb_ParOldGC 3.164 3.165 +# Testing for actual embedded builds is different to standard 3.166 +jprt.my.linux.i586.test.targets.embedded = \ 3.167 + linux_i586_2.6-product-c1-scimark 3.168 + 3.169 # The complete list of test targets for jprt 3.170 +# Note: no PPC or ARM tests at this stage 3.171 3.172 -jprt.test.targets = \ 3.173 +jprt.test.targets.standard = \ 3.174 ${jprt.my.solaris.sparc.test.targets}, \ 3.175 ${jprt.my.solaris.sparcv9.test.targets}, \ 3.176 ${jprt.my.solaris.i586.test.targets}, \ 3.177 @@ -384,15 +469,41 @@ 3.178 ${jprt.my.windows.i586.test.targets}, \ 3.179 ${jprt.my.windows.x64.test.targets} 3.180 3.181 +jprt.test.targets.embedded= \ 3.182 + ${jprt.my.linux.i586.test.targets.embedded}, \ 3.183 + ${jprt.my.solaris.sparc.test.targets}, \ 3.184 + ${jprt.my.solaris.sparcv9.test.targets}, \ 3.185 + ${jprt.my.solaris.i586.test.targets}, \ 3.186 + ${jprt.my.solaris.x64.test.targets}, \ 3.187 + ${jprt.my.linux.x64.test.targets}, \ 3.188 + ${jprt.my.windows.i586.test.targets}, \ 3.189 + ${jprt.my.windows.x64.test.targets} 3.190 + 3.191 + 3.192 +jprt.test.targets.jdk7=${jprt.test.targets.standard} 3.193 +jprt.test.targets.jdk7temp=${jprt.test.targets.standard} 3.194 +jprt.test.targets.jdk7b105=${jprt.test.targets.standard} 3.195 +jprt.test.targets.jdk6=${jprt.test.targets.standard} 3.196 +jprt.test.targets.jdk6perf=${jprt.test.targets.standard} 3.197 +jprt.test.targets.jdk6u10=${jprt.test.targets.standard} 3.198 +jprt.test.targets.jdk6u14=${jprt.test.targets.standard} 3.199 +jprt.test.targets.jdk6u18=${jprt.test.targets.standard} 3.200 +jprt.test.targets.jdk6u20=${jprt.test.targets.standard} 3.201 +jprt.test.targets.ejdk6=${jprt.test.targets.embedded} 3.202 +jprt.test.targets.ejdk7=${jprt.test.targets.embedded} 3.203 +jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} 3.204 + 3.205 # The default test/Makefile targets that should be run 3.206 3.207 #jprt.make.rule.test.targets=*-product-*-packtest 3.208 3.209 -jprt.make.rule.test.targets = \ 3.210 +jprt.make.rule.test.targets.standard.client = \ 3.211 ${jprt.my.solaris.sparc}-*-c1-clienttest, \ 3.212 ${jprt.my.solaris.i586}-*-c1-clienttest, \ 3.213 ${jprt.my.linux.i586}-*-c1-clienttest, \ 3.214 - ${jprt.my.windows.i586}-*-c1-clienttest, \ 3.215 + ${jprt.my.windows.i586}-*-c1-clienttest 3.216 + 3.217 +jprt.make.rule.test.targets.standard.server = \ 3.218 ${jprt.my.solaris.sparc}-*-c2-servertest, \ 3.219 ${jprt.my.solaris.sparcv9}-*-c2-servertest, \ 3.220 ${jprt.my.solaris.i586}-*-c2-servertest, \ 3.221 @@ -402,3 +513,23 @@ 3.222 ${jprt.my.windows.i586}-*-c2-servertest, \ 3.223 ${jprt.my.windows.x64}-*-c2-servertest 3.224 3.225 +jprt.make.rule.test.targets.standard = \ 3.226 + ${jprt.make.rule.test.targets.standard.client}, \ 3.227 + ${jprt.make.rule.test.targets.standard.server} 3.228 + 3.229 +jprt.make.rule.test.targets.embedded = \ 3.230 + ${jprt.make.rule.test.targets.standard.client} 3.231 + 3.232 +jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} 3.233 +jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard} 3.234 +jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard} 3.235 +jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard} 3.236 +jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard} 3.237 +jprt.make.rule.test.targets.jdk6u10=${jprt.make.rule.test.targets.standard} 3.238 +jprt.make.rule.test.targets.jdk6u14=${jprt.make.rule.test.targets.standard} 3.239 +jprt.make.rule.test.targets.jdk6u18=${jprt.make.rule.test.targets.standard} 3.240 +jprt.make.rule.test.targets.jdk6u20=${jprt.make.rule.test.targets.standard} 3.241 +jprt.make.rule.test.targets.ejdk6=${jprt.make.rule.test.targets.embedded} 3.242 +jprt.make.rule.test.targets.ejdk7=${jprt.make.rule.test.targets.embedded} 3.243 +jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} 3.244 +
4.1 --- a/make/linux/Makefile Thu Jan 27 16:11:27 2011 -0800 4.2 +++ b/make/linux/Makefile Wed Feb 02 11:35:26 2011 -0500 4.3 @@ -208,7 +208,7 @@ 4.4 TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) 4.5 4.6 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 4.7 -BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 4.8 +BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 4.9 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 4.10 4.11 BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
5.1 --- a/make/linux/makefiles/adlc.make Thu Jan 27 16:11:27 2011 -0800 5.2 +++ b/make/linux/makefiles/adlc.make Wed Feb 02 11:35:26 2011 -0500 5.3 @@ -39,8 +39,8 @@ 5.4 5.5 SOURCE.AD = $(OUTDIR)/$(OS)_$(Platform_arch_model).ad 5.6 5.7 -SOURCES.AD = $(GAMMADIR)/src/cpu/$(ARCH)/vm/$(Platform_arch_model).ad \ 5.8 - $(GAMMADIR)/src/os_cpu/$(OS)_$(ARCH)/vm/$(OS)_$(Platform_arch_model).ad 5.9 +SOURCES.AD = $(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(ARCH)/vm/$(Platform_arch_model).ad \ 5.10 + $(GAMMADIR)/src/$(HS_CLOSED_PATH)os_cpu/$(OS)_$(ARCH)/vm/$(OS)_$(Platform_arch_model).ad 5.11 5.12 EXEC = $(OUTDIR)/adlc 5.13
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/make/linux/makefiles/arm.make Wed Feb 02 11:35:26 2011 -0500 6.3 @@ -0,0 +1,10 @@ 6.4 +# 6.5 +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. 6.6 +# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. 6.7 +# 6.8 + 6.9 +Obj_Files += linux_arm.o 6.10 + 6.11 +LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 6.12 + 6.13 +CFLAGS += -DVM_LITTLE_ENDIAN
7.1 --- a/make/linux/makefiles/buildtree.make Thu Jan 27 16:11:27 2011 -0800 7.2 +++ b/make/linux/makefiles/buildtree.make Wed Feb 02 11:35:26 2011 -0500 7.3 @@ -24,7 +24,7 @@ 7.4 7.5 # Usage: 7.6 # 7.7 -# $(MAKE) -f buildtree.make ARCH=arch BUILDARCH=buildarch LIBARCH=libarch 7.8 +# $(MAKE) -f buildtree.make SRCARCH=srcarch BUILDARCH=buildarch LIBARCH=libarch 7.9 # GAMMADIR=dir OS_FAMILY=os VARIANT=variant 7.10 # 7.11 # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the 7.12 @@ -56,6 +56,8 @@ 7.13 # having to read the dependency files for the vm. 7.14 7.15 include $(GAMMADIR)/make/scm.make 7.16 +include $(GAMMADIR)/make/closed.make 7.17 + 7.18 7.19 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 7.20 QUIETLY$(MAKE_VERBOSE) = @ 7.21 @@ -127,7 +129,7 @@ 7.22 env.sh env.csh jdkpath.sh .dbxrc test_gamma 7.23 7.24 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 7.25 - ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 7.26 + SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 7.27 7.28 # Define variables to be set in flags.make. 7.29 # Default values are set in make/defs.make. 7.30 @@ -146,12 +148,6 @@ 7.31 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro 7.32 # or make/hotspot_distro. 7.33 ifndef HOTSPOT_VM_DISTRO 7.34 - CLOSED_DIR_EXISTS := $(shell \ 7.35 - if [ -d $(GAMMADIR)/src/closed ] ; then \ 7.36 - echo true; \ 7.37 - else \ 7.38 - echo false; \ 7.39 - fi) 7.40 ifeq ($(CLOSED_DIR_EXISTS), true) 7.41 include $(GAMMADIR)/make/hotspot_distro 7.42 else 7.43 @@ -187,7 +183,7 @@ 7.44 echo; \ 7.45 echo "GAMMADIR = $(GAMMADIR)"; \ 7.46 echo "SYSDEFS = \$$(Platform_sysdefs)"; \ 7.47 - echo "SRCARCH = $(ARCH)"; \ 7.48 + echo "SRCARCH = $(SRCARCH)"; \ 7.49 echo "BUILDARCH = $(BUILDARCH)"; \ 7.50 echo "LIBARCH = $(LIBARCH)"; \ 7.51 echo "TARGET = $(TARGET)"; \ 7.52 @@ -208,16 +204,16 @@ 7.53 echo; \ 7.54 echo "Src_Dirs_V = \\"; \ 7.55 sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \ 7.56 - echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ 7.57 + echo "\$$(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(SRCARCH)/vm \\"; \ 7.58 echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ 7.59 - echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ 7.60 + echo "\$$(GAMMADIR)/src/$(HS_CLOSED_PATH)os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm"; \ 7.61 echo; \ 7.62 echo "Src_Dirs_I = \\"; \ 7.63 echo "\$$(GAMMADIR)/src/share/vm \\"; \ 7.64 echo "\$$(GAMMADIR)/src/share/vm/prims \\"; \ 7.65 - echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ 7.66 + echo "\$$(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(SRCARCH)/vm \\"; \ 7.67 echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ 7.68 - echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ 7.69 + echo "\$$(GAMMADIR)/src/$(HS_CLOSED_PATH)os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm"; \ 7.70 [ -n "$(CFLAGS_BROWSE)" ] && \ 7.71 echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \ 7.72 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/make/linux/makefiles/ppc.make Wed Feb 02 11:35:26 2011 -0500 8.3 @@ -0,0 +1,11 @@ 8.4 +# 8.5 +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 8.6 +# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. 8.7 +# 8.8 + 8.9 +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized 8.10 +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) 8.11 + 8.12 +# Must also specify if CPU is big endian 8.13 +CFLAGS += -DVM_BIG_ENDIAN 8.14 +
9.1 --- a/make/linux/makefiles/rules.make Thu Jan 27 16:11:27 2011 -0800 9.2 +++ b/make/linux/makefiles/rules.make Wed Feb 02 11:35:26 2011 -0500 9.3 @@ -146,6 +146,8 @@ 9.4 include $(GAMMADIR)/make/pic.make 9.5 endif 9.6 9.7 +include $(GAMMADIR)/make/closed.make 9.8 + 9.9 # The non-PIC object files are only generated for 32 bit platforms. 9.10 ifdef LP64 9.11 %.o: %.cpp
10.1 --- a/make/linux/makefiles/top.make Thu Jan 27 16:11:27 2011 -0800 10.2 +++ b/make/linux/makefiles/top.make Wed Feb 02 11:35:26 2011 -0500 10.3 @@ -39,6 +39,8 @@ 10.4 # Instead, use "gmake" (or "gnumake") from the command line. --Rose 10.5 #MAKE = gmake 10.6 10.7 +include $(GAMMADIR)/make/closed.make 10.8 + 10.9 TOPDIR = $(shell echo `pwd`) 10.10 GENERATED = $(TOPDIR)/../generated 10.11 VM = $(GAMMADIR)/src/share/vm 10.12 @@ -57,7 +59,7 @@ 10.13 10.14 AD_Dir = $(GENERATED)/adfiles 10.15 ADLC = $(AD_Dir)/adlc 10.16 -AD_Spec = $(GAMMADIR)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad 10.17 +AD_Spec = $(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad 10.18 AD_Src = $(GAMMADIR)/src/share/vm/adlc 10.19 AD_Names = ad_$(Platform_arch_model).hpp ad_$(Platform_arch_model).cpp 10.20 AD_Files = $(AD_Names:%=$(AD_Dir)/%)
11.1 --- a/make/linux/makefiles/vm.make Thu Jan 27 16:11:27 2011 -0800 11.2 +++ b/make/linux/makefiles/vm.make Wed Feb 02 11:35:26 2011 -0500 11.3 @@ -121,8 +121,8 @@ 11.4 11.5 CORE_PATHS := $(shell find $(GAMMADIR)/src/share/vm/* -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)) 11.6 CORE_PATHS += $(GAMMADIR)/src/os/$(Platform_os_family)/vm 11.7 -CORE_PATHS += $(GAMMADIR)/src/cpu/$(Platform_arch)/vm 11.8 -CORE_PATHS += $(GAMMADIR)/src/os_cpu/$(Platform_os_arch)/vm 11.9 +CORE_PATHS += $(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(Platform_arch)/vm 11.10 +CORE_PATHS += $(GAMMADIR)/src/$(HS_CLOSED_PATH)os_cpu/$(Platform_os_arch)/vm 11.11 CORE_PATHS += $(GENERATED)/jvmtifiles 11.12 11.13 COMPILER1_PATHS := $(GAMMADIR)/src/share/vm/c1
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/make/linux/platform_arm Wed Feb 02 11:35:26 2011 -0500 12.3 @@ -0,0 +1,17 @@ 12.4 +os_family = linux 12.5 + 12.6 +arch = arm 12.7 + 12.8 +arch_model = arm 12.9 + 12.10 +os_arch = linux_arm 12.11 + 12.12 +os_arch_model = linux_arm 12.13 + 12.14 +lib_arch = arm 12.15 + 12.16 +compiler = gcc 12.17 + 12.18 +gnu_dis_arch = arm 12.19 + 12.20 +sysdefs = -DLINUX -D_GNU_SOURCE -DARM
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/make/linux/platform_ppc Wed Feb 02 11:35:26 2011 -0500 13.3 @@ -0,0 +1,17 @@ 13.4 +os_family = linux 13.5 + 13.6 +arch = ppc 13.7 + 13.8 +arch_model = ppc 13.9 + 13.10 +os_arch = linux_ppc 13.11 + 13.12 +os_arch_model = linux_ppc 13.13 + 13.14 +lib_arch = ppc 13.15 + 13.16 +compiler = gcc 13.17 + 13.18 +gnu_dis_arch = ppc 13.19 + 13.20 +sysdefs = -DLINUX -D_GNU_SOURCE -DPPC
14.1 --- a/src/os/linux/vm/osThread_linux.cpp Thu Jan 27 16:11:27 2011 -0800 14.2 +++ b/src/os/linux/vm/osThread_linux.cpp Wed Feb 02 11:35:26 2011 -0500 14.3 @@ -39,6 +39,12 @@ 14.4 #ifdef TARGET_ARCH_zero 14.5 # include "assembler_zero.inline.hpp" 14.6 #endif 14.7 +#ifdef TARGET_ARCH_arm 14.8 +# include "assembler_arm.inline.hpp" 14.9 +#endif 14.10 +#ifdef TARGET_ARCH_ppc 14.11 +# include "assembler_ppc.inline.hpp" 14.12 +#endif 14.13 14.14 14.15 void OSThread::pd_initialize() {
15.1 --- a/src/os/linux/vm/os_linux.cpp Thu Jan 27 16:11:27 2011 -0800 15.2 +++ b/src/os/linux/vm/os_linux.cpp Wed Feb 02 11:35:26 2011 -0500 15.3 @@ -76,6 +76,14 @@ 15.4 # include "assembler_zero.inline.hpp" 15.5 # include "nativeInst_zero.hpp" 15.6 #endif 15.7 +#ifdef TARGET_ARCH_arm 15.8 +# include "assembler_arm.inline.hpp" 15.9 +# include "nativeInst_arm.hpp" 15.10 +#endif 15.11 +#ifdef TARGET_ARCH_ppc 15.12 +# include "assembler_ppc.inline.hpp" 15.13 +# include "nativeInst_ppc.hpp" 15.14 +#endif 15.15 #ifdef COMPILER1 15.16 #include "c1/c1_Runtime1.hpp" 15.17 #endif
16.1 --- a/src/os/linux/vm/os_linux.inline.hpp Thu Jan 27 16:11:27 2011 -0800 16.2 +++ b/src/os/linux/vm/os_linux.inline.hpp Wed Feb 02 11:35:26 2011 -0500 16.3 @@ -39,6 +39,14 @@ 16.4 # include "atomic_linux_zero.inline.hpp" 16.5 # include "orderAccess_linux_zero.inline.hpp" 16.6 #endif 16.7 +#ifdef TARGET_OS_ARCH_linux_arm 16.8 +# include "atomic_linux_arm.inline.hpp" 16.9 +# include "orderAccess_linux_arm.inline.hpp" 16.10 +#endif 16.11 +#ifdef TARGET_OS_ARCH_linux_ppc 16.12 +# include "atomic_linux_ppc.inline.hpp" 16.13 +# include "orderAccess_linux_ppc.inline.hpp" 16.14 +#endif 16.15 16.16 // System includes 16.17
17.1 --- a/src/os/linux/vm/thread_linux.inline.hpp Thu Jan 27 16:11:27 2011 -0800 17.2 +++ b/src/os/linux/vm/thread_linux.inline.hpp Wed Feb 02 11:35:26 2011 -0500 17.3 @@ -44,6 +44,16 @@ 17.4 # include "orderAccess_linux_zero.inline.hpp" 17.5 # include "prefetch_linux_zero.inline.hpp" 17.6 #endif 17.7 +#ifdef TARGET_OS_ARCH_linux_arm 17.8 +# include "atomic_linux_arm.inline.hpp" 17.9 +# include "orderAccess_linux_arm.inline.hpp" 17.10 +# include "prefetch_linux_arm.inline.hpp" 17.11 +#endif 17.12 +#ifdef TARGET_OS_ARCH_linux_ppc 17.13 +# include "atomic_linux_ppc.inline.hpp" 17.14 +# include "orderAccess_linux_ppc.inline.hpp" 17.15 +# include "prefetch_linux_ppc.inline.hpp" 17.16 +#endif 17.17 17.18 // Contains inlined functions for class Thread and ThreadLocalStorage 17.19
18.1 --- a/src/share/vm/asm/assembler.cpp Thu Jan 27 16:11:27 2011 -0800 18.2 +++ b/src/share/vm/asm/assembler.cpp Wed Feb 02 11:35:26 2011 -0500 18.3 @@ -37,6 +37,12 @@ 18.4 #ifdef TARGET_ARCH_zero 18.5 # include "assembler_zero.inline.hpp" 18.6 #endif 18.7 +#ifdef TARGET_ARCH_arm 18.8 +# include "assembler_arm.inline.hpp" 18.9 +#endif 18.10 +#ifdef TARGET_ARCH_ppc 18.11 +# include "assembler_ppc.inline.hpp" 18.12 +#endif 18.13 18.14 18.15 // Implementation of AbstractAssembler
19.1 --- a/src/share/vm/asm/assembler.hpp Thu Jan 27 16:11:27 2011 -0800 19.2 +++ b/src/share/vm/asm/assembler.hpp Wed Feb 02 11:35:26 2011 -0500 19.3 @@ -43,6 +43,14 @@ 19.4 # include "register_zero.hpp" 19.5 # include "vm_version_zero.hpp" 19.6 #endif 19.7 +#ifdef TARGET_ARCH_arm 19.8 +# include "register_arm.hpp" 19.9 +# include "vm_version_arm.hpp" 19.10 +#endif 19.11 +#ifdef TARGET_ARCH_ppc 19.12 +# include "register_ppc.hpp" 19.13 +# include "vm_version_ppc.hpp" 19.14 +#endif 19.15 19.16 // This file contains platform-independent assembler declarations. 19.17 19.18 @@ -395,6 +403,12 @@ 19.19 #ifdef TARGET_ARCH_zero 19.20 # include "assembler_zero.hpp" 19.21 #endif 19.22 +#ifdef TARGET_ARCH_arm 19.23 +# include "assembler_arm.hpp" 19.24 +#endif 19.25 +#ifdef TARGET_ARCH_ppc 19.26 +# include "assembler_ppc.hpp" 19.27 +#endif 19.28 19.29 19.30 #endif // SHARE_VM_ASM_ASSEMBLER_HPP
20.1 --- a/src/share/vm/asm/codeBuffer.hpp Thu Jan 27 16:11:27 2011 -0800 20.2 +++ b/src/share/vm/asm/codeBuffer.hpp Wed Feb 02 11:35:26 2011 -0500 20.3 @@ -566,6 +566,12 @@ 20.4 #ifdef TARGET_ARCH_zero 20.5 # include "codeBuffer_zero.hpp" 20.6 #endif 20.7 +#ifdef TARGET_ARCH_arm 20.8 +# include "codeBuffer_arm.hpp" 20.9 +#endif 20.10 +#ifdef TARGET_ARCH_ppc 20.11 +# include "codeBuffer_ppc.hpp" 20.12 +#endif 20.13 20.14 }; 20.15
21.1 --- a/src/share/vm/c1/c1_Defs.hpp Thu Jan 27 16:11:27 2011 -0800 21.2 +++ b/src/share/vm/c1/c1_Defs.hpp Wed Feb 02 11:35:26 2011 -0500 21.3 @@ -35,6 +35,12 @@ 21.4 #ifdef TARGET_ARCH_zero 21.5 # include "register_zero.hpp" 21.6 #endif 21.7 +#ifdef TARGET_ARCH_arm 21.8 +# include "register_arm.hpp" 21.9 +#endif 21.10 +#ifdef TARGET_ARCH_ppc 21.11 +# include "register_ppc.hpp" 21.12 +#endif 21.13 21.14 // set frame size and return address offset to these values in blobs 21.15 // (if the compiled frame uses ebp as link pointer on IA; otherwise, 21.16 @@ -50,6 +56,12 @@ 21.17 #ifdef TARGET_ARCH_sparc 21.18 # include "c1_Defs_sparc.hpp" 21.19 #endif 21.20 +#ifdef TARGET_ARCH_arm 21.21 +# include "c1_Defs_arm.hpp" 21.22 +#endif 21.23 +#ifdef TARGET_ARCH_ppc 21.24 +# include "c1_Defs_ppc.hpp" 21.25 +#endif 21.26 21.27 21.28 // native word offsets from memory address
22.1 --- a/src/share/vm/c1/c1_FpuStackSim.hpp Thu Jan 27 16:11:27 2011 -0800 22.2 +++ b/src/share/vm/c1/c1_FpuStackSim.hpp Wed Feb 02 11:35:26 2011 -0500 22.3 @@ -38,6 +38,12 @@ 22.4 #ifdef TARGET_ARCH_sparc 22.5 # include "c1_FpuStackSim_sparc.hpp" 22.6 #endif 22.7 +#ifdef TARGET_ARCH_arm 22.8 +# include "c1_FpuStackSim_arm.hpp" 22.9 +#endif 22.10 +#ifdef TARGET_ARCH_ppc 22.11 +# include "c1_FpuStackSim_ppc.hpp" 22.12 +#endif 22.13 22.14 22.15 #endif // SHARE_VM_C1_C1_FPUSTACKSIM_HPP
23.1 --- a/src/share/vm/c1/c1_FrameMap.cpp Thu Jan 27 16:11:27 2011 -0800 23.2 +++ b/src/share/vm/c1/c1_FrameMap.cpp Wed Feb 02 11:35:26 2011 -0500 23.3 @@ -35,6 +35,12 @@ 23.4 #ifdef TARGET_ARCH_zero 23.5 # include "vmreg_zero.inline.hpp" 23.6 #endif 23.7 +#ifdef TARGET_ARCH_arm 23.8 +# include "vmreg_arm.inline.hpp" 23.9 +#endif 23.10 +#ifdef TARGET_ARCH_ppc 23.11 +# include "vmreg_ppc.inline.hpp" 23.12 +#endif 23.13 23.14 23.15
24.1 --- a/src/share/vm/c1/c1_FrameMap.hpp Thu Jan 27 16:11:27 2011 -0800 24.2 +++ b/src/share/vm/c1/c1_FrameMap.hpp Wed Feb 02 11:35:26 2011 -0500 24.3 @@ -88,6 +88,12 @@ 24.4 #ifdef TARGET_ARCH_sparc 24.5 # include "c1_FrameMap_sparc.hpp" 24.6 #endif 24.7 +#ifdef TARGET_ARCH_arm 24.8 +# include "c1_FrameMap_arm.hpp" 24.9 +#endif 24.10 +#ifdef TARGET_ARCH_ppc 24.11 +# include "c1_FrameMap_ppc.hpp" 24.12 +#endif 24.13 24.14 24.15 friend class LIR_OprDesc;
25.1 --- a/src/share/vm/c1/c1_Instruction.hpp Thu Jan 27 16:11:27 2011 -0800 25.2 +++ b/src/share/vm/c1/c1_Instruction.hpp Wed Feb 02 11:35:26 2011 -0500 25.3 @@ -316,6 +316,8 @@ 25.4 return res; 25.5 } 25.6 25.7 + static const int no_bci = -99; 25.8 + 25.9 enum InstructionFlag { 25.10 NeedsNullCheckFlag = 0, 25.11 CanTrapFlag,
26.1 --- a/src/share/vm/c1/c1_LIRAssembler.cpp Thu Jan 27 16:11:27 2011 -0800 26.2 +++ b/src/share/vm/c1/c1_LIRAssembler.cpp Wed Feb 02 11:35:26 2011 -0500 26.3 @@ -42,6 +42,14 @@ 26.4 # include "nativeInst_zero.hpp" 26.5 # include "vmreg_zero.inline.hpp" 26.6 #endif 26.7 +#ifdef TARGET_ARCH_arm 26.8 +# include "nativeInst_arm.hpp" 26.9 +# include "vmreg_arm.inline.hpp" 26.10 +#endif 26.11 +#ifdef TARGET_ARCH_ppc 26.12 +# include "nativeInst_ppc.hpp" 26.13 +# include "vmreg_ppc.inline.hpp" 26.14 +#endif 26.15 26.16 26.17 void LIR_Assembler::patching_epilog(PatchingStub* patch, LIR_PatchCode patch_code, Register obj, CodeEmitInfo* info) {
27.1 --- a/src/share/vm/c1/c1_LIRAssembler.hpp Thu Jan 27 16:11:27 2011 -0800 27.2 +++ b/src/share/vm/c1/c1_LIRAssembler.hpp Wed Feb 02 11:35:26 2011 -0500 27.3 @@ -252,6 +252,12 @@ 27.4 #ifdef TARGET_ARCH_sparc 27.5 # include "c1_LIRAssembler_sparc.hpp" 27.6 #endif 27.7 +#ifdef TARGET_ARCH_arm 27.8 +# include "c1_LIRAssembler_arm.hpp" 27.9 +#endif 27.10 +#ifdef TARGET_ARCH_ppc 27.11 +# include "c1_LIRAssembler_ppc.hpp" 27.12 +#endif 27.13 27.14 }; 27.15
28.1 --- a/src/share/vm/c1/c1_LinearScan.cpp Thu Jan 27 16:11:27 2011 -0800 28.2 +++ b/src/share/vm/c1/c1_LinearScan.cpp Wed Feb 02 11:35:26 2011 -0500 28.3 @@ -41,6 +41,12 @@ 28.4 #ifdef TARGET_ARCH_zero 28.5 # include "vmreg_zero.inline.hpp" 28.6 #endif 28.7 +#ifdef TARGET_ARCH_arm 28.8 +# include "vmreg_arm.inline.hpp" 28.9 +#endif 28.10 +#ifdef TARGET_ARCH_ppc 28.11 +# include "vmreg_ppc.inline.hpp" 28.12 +#endif 28.13 28.14 28.15 #ifndef PRODUCT
29.1 --- a/src/share/vm/c1/c1_LinearScan.hpp Thu Jan 27 16:11:27 2011 -0800 29.2 +++ b/src/share/vm/c1/c1_LinearScan.hpp Wed Feb 02 11:35:26 2011 -0500 29.3 @@ -972,6 +972,12 @@ 29.4 #ifdef TARGET_ARCH_sparc 29.5 # include "c1_LinearScan_sparc.hpp" 29.6 #endif 29.7 +#ifdef TARGET_ARCH_arm 29.8 +# include "c1_LinearScan_arm.hpp" 29.9 +#endif 29.10 +#ifdef TARGET_ARCH_ppc 29.11 +# include "c1_LinearScan_ppc.hpp" 29.12 +#endif 29.13 29.14 29.15 #endif // SHARE_VM_C1_C1_LINEARSCAN_HPP
30.1 --- a/src/share/vm/c1/c1_MacroAssembler.hpp Thu Jan 27 16:11:27 2011 -0800 30.2 +++ b/src/share/vm/c1/c1_MacroAssembler.hpp Wed Feb 02 11:35:26 2011 -0500 30.3 @@ -35,6 +35,12 @@ 30.4 #ifdef TARGET_ARCH_zero 30.5 # include "assembler_zero.inline.hpp" 30.6 #endif 30.7 +#ifdef TARGET_ARCH_arm 30.8 +# include "assembler_arm.inline.hpp" 30.9 +#endif 30.10 +#ifdef TARGET_ARCH_ppc 30.11 +# include "assembler_ppc.inline.hpp" 30.12 +#endif 30.13 30.14 class CodeEmitInfo; 30.15 30.16 @@ -61,6 +67,12 @@ 30.17 #ifdef TARGET_ARCH_sparc 30.18 # include "c1_MacroAssembler_sparc.hpp" 30.19 #endif 30.20 +#ifdef TARGET_ARCH_arm 30.21 +# include "c1_MacroAssembler_arm.hpp" 30.22 +#endif 30.23 +#ifdef TARGET_ARCH_ppc 30.24 +# include "c1_MacroAssembler_ppc.hpp" 30.25 +#endif 30.26 30.27 }; 30.28
31.1 --- a/src/share/vm/c1/c1_globals.hpp Thu Jan 27 16:11:27 2011 -0800 31.2 +++ b/src/share/vm/c1/c1_globals.hpp Wed Feb 02 11:35:26 2011 -0500 31.3 @@ -32,6 +32,12 @@ 31.4 #ifdef TARGET_ARCH_sparc 31.5 # include "c1_globals_sparc.hpp" 31.6 #endif 31.7 +#ifdef TARGET_ARCH_arm 31.8 +# include "c1_globals_arm.hpp" 31.9 +#endif 31.10 +#ifdef TARGET_ARCH_ppc 31.11 +# include "c1_globals_ppc.hpp" 31.12 +#endif 31.13 #ifdef TARGET_OS_FAMILY_linux 31.14 # include "c1_globals_linux.hpp" 31.15 #endif
32.1 --- a/src/share/vm/classfile/classFileStream.hpp Thu Jan 27 16:11:27 2011 -0800 32.2 +++ b/src/share/vm/classfile/classFileStream.hpp Wed Feb 02 11:35:26 2011 -0500 32.3 @@ -35,6 +35,12 @@ 32.4 #ifdef TARGET_ARCH_zero 32.5 # include "bytes_zero.hpp" 32.6 #endif 32.7 +#ifdef TARGET_ARCH_arm 32.8 +# include "bytes_arm.hpp" 32.9 +#endif 32.10 +#ifdef TARGET_ARCH_ppc 32.11 +# include "bytes_ppc.hpp" 32.12 +#endif 32.13 32.14 // Input stream for reading .class file 32.15 //
33.1 --- a/src/share/vm/classfile/stackMapTable.hpp Thu Jan 27 16:11:27 2011 -0800 33.2 +++ b/src/share/vm/classfile/stackMapTable.hpp Wed Feb 02 11:35:26 2011 -0500 33.3 @@ -39,6 +39,12 @@ 33.4 #ifdef TARGET_ARCH_zero 33.5 # include "bytes_zero.hpp" 33.6 #endif 33.7 +#ifdef TARGET_ARCH_arm 33.8 +# include "bytes_arm.hpp" 33.9 +#endif 33.10 +#ifdef TARGET_ARCH_ppc 33.11 +# include "bytes_ppc.hpp" 33.12 +#endif 33.13 33.14 class StackMapReader; 33.15
34.1 --- a/src/share/vm/classfile/verifier.cpp Thu Jan 27 16:11:27 2011 -0800 34.2 +++ b/src/share/vm/classfile/verifier.cpp Wed Feb 02 11:35:26 2011 -0500 34.3 @@ -51,6 +51,12 @@ 34.4 #ifdef TARGET_ARCH_zero 34.5 # include "bytes_zero.hpp" 34.6 #endif 34.7 +#ifdef TARGET_ARCH_arm 34.8 +# include "bytes_arm.hpp" 34.9 +#endif 34.10 +#ifdef TARGET_ARCH_ppc 34.11 +# include "bytes_ppc.hpp" 34.12 +#endif 34.13 34.14 #define NOFAILOVER_MAJOR_VERSION 51 34.15
35.1 --- a/src/share/vm/code/codeBlob.cpp Thu Jan 27 16:11:27 2011 -0800 35.2 +++ b/src/share/vm/code/codeBlob.cpp Wed Feb 02 11:35:26 2011 -0500 35.3 @@ -48,6 +48,12 @@ 35.4 #ifdef TARGET_ARCH_zero 35.5 # include "nativeInst_zero.hpp" 35.6 #endif 35.7 +#ifdef TARGET_ARCH_arm 35.8 +# include "nativeInst_arm.hpp" 35.9 +#endif 35.10 +#ifdef TARGET_ARCH_ppc 35.11 +# include "nativeInst_ppc.hpp" 35.12 +#endif 35.13 #ifdef COMPILER1 35.14 #include "c1/c1_Runtime1.hpp" 35.15 #endif
36.1 --- a/src/share/vm/code/compiledIC.hpp Thu Jan 27 16:11:27 2011 -0800 36.2 +++ b/src/share/vm/code/compiledIC.hpp Wed Feb 02 11:35:26 2011 -0500 36.3 @@ -38,6 +38,12 @@ 36.4 #ifdef TARGET_ARCH_zero 36.5 # include "nativeInst_zero.hpp" 36.6 #endif 36.7 +#ifdef TARGET_ARCH_arm 36.8 +# include "nativeInst_arm.hpp" 36.9 +#endif 36.10 +#ifdef TARGET_ARCH_ppc 36.11 +# include "nativeInst_ppc.hpp" 36.12 +#endif 36.13 36.14 //----------------------------------------------------------------------------- 36.15 // The CompiledIC represents a compiled inline cache.
37.1 --- a/src/share/vm/code/icBuffer.cpp Thu Jan 27 16:11:27 2011 -0800 37.2 +++ b/src/share/vm/code/icBuffer.cpp Wed Feb 02 11:35:26 2011 -0500 37.3 @@ -46,6 +46,12 @@ 37.4 #ifdef TARGET_ARCH_zero 37.5 # include "assembler_zero.inline.hpp" 37.6 #endif 37.7 +#ifdef TARGET_ARCH_arm 37.8 +# include "assembler_arm.inline.hpp" 37.9 +#endif 37.10 +#ifdef TARGET_ARCH_ppc 37.11 +# include "assembler_ppc.inline.hpp" 37.12 +#endif 37.13 37.14 37.15 DEF_STUB_INTERFACE(ICStub);
38.1 --- a/src/share/vm/code/relocInfo.cpp Thu Jan 27 16:11:27 2011 -0800 38.2 +++ b/src/share/vm/code/relocInfo.cpp Wed Feb 02 11:35:26 2011 -0500 38.3 @@ -41,6 +41,14 @@ 38.4 # include "assembler_zero.inline.hpp" 38.5 # include "nativeInst_zero.hpp" 38.6 #endif 38.7 +#ifdef TARGET_ARCH_arm 38.8 +# include "assembler_arm.inline.hpp" 38.9 +# include "nativeInst_arm.hpp" 38.10 +#endif 38.11 +#ifdef TARGET_ARCH_ppc 38.12 +# include "assembler_ppc.inline.hpp" 38.13 +# include "nativeInst_ppc.hpp" 38.14 +#endif 38.15 38.16 38.17 const RelocationHolder RelocationHolder::none; // its type is relocInfo::none
39.1 --- a/src/share/vm/code/relocInfo.hpp Thu Jan 27 16:11:27 2011 -0800 39.2 +++ b/src/share/vm/code/relocInfo.hpp Wed Feb 02 11:35:26 2011 -0500 39.3 @@ -430,6 +430,12 @@ 39.4 #ifdef TARGET_ARCH_zero 39.5 # include "relocInfo_zero.hpp" 39.6 #endif 39.7 +#ifdef TARGET_ARCH_arm 39.8 +# include "relocInfo_arm.hpp" 39.9 +#endif 39.10 +#ifdef TARGET_ARCH_ppc 39.11 +# include "relocInfo_ppc.hpp" 39.12 +#endif 39.13 39.14 39.15 protected:
40.1 --- a/src/share/vm/code/vmreg.hpp Thu Jan 27 16:11:27 2011 -0800 40.2 +++ b/src/share/vm/code/vmreg.hpp Wed Feb 02 11:35:26 2011 -0500 40.3 @@ -36,6 +36,12 @@ 40.4 #ifdef TARGET_ARCH_zero 40.5 # include "register_zero.hpp" 40.6 #endif 40.7 +#ifdef TARGET_ARCH_arm 40.8 +# include "register_arm.hpp" 40.9 +#endif 40.10 +#ifdef TARGET_ARCH_ppc 40.11 +# include "register_ppc.hpp" 40.12 +#endif 40.13 #ifdef COMPILER2 40.14 #include "opto/adlcVMDeps.hpp" 40.15 #include "utilities/ostream.hpp" 40.16 @@ -51,6 +57,12 @@ 40.17 #ifdef TARGET_ARCH_MODEL_zero 40.18 # include "adfiles/adGlobals_zero.hpp" 40.19 #endif 40.20 +#ifdef TARGET_ARCH_MODEL_arm 40.21 +# include "adfiles/adGlobals_arm.hpp" 40.22 +#endif 40.23 +#ifdef TARGET_ARCH_MODEL_ppc 40.24 +# include "adfiles/adGlobals_ppc.hpp" 40.25 +#endif 40.26 #endif 40.27 40.28 //------------------------------VMReg------------------------------------------ 40.29 @@ -164,6 +176,12 @@ 40.30 #ifdef TARGET_ARCH_zero 40.31 # include "vmreg_zero.hpp" 40.32 #endif 40.33 +#ifdef TARGET_ARCH_arm 40.34 +# include "vmreg_arm.hpp" 40.35 +#endif 40.36 +#ifdef TARGET_ARCH_ppc 40.37 +# include "vmreg_ppc.hpp" 40.38 +#endif 40.39 40.40 40.41 };
41.1 --- a/src/share/vm/compiler/disassembler.cpp Thu Jan 27 16:11:27 2011 -0800 41.2 +++ b/src/share/vm/compiler/disassembler.cpp Wed Feb 02 11:35:26 2011 -0500 41.3 @@ -41,6 +41,12 @@ 41.4 #ifdef TARGET_ARCH_zero 41.5 # include "depChecker_zero.hpp" 41.6 #endif 41.7 +#ifdef TARGET_ARCH_arm 41.8 +# include "depChecker_arm.hpp" 41.9 +#endif 41.10 +#ifdef TARGET_ARCH_ppc 41.11 +# include "depChecker_ppc.hpp" 41.12 +#endif 41.13 #ifdef SHARK 41.14 #include "shark/sharkEntry.hpp" 41.15 #endif
42.1 --- a/src/share/vm/compiler/disassembler.hpp Thu Jan 27 16:11:27 2011 -0800 42.2 +++ b/src/share/vm/compiler/disassembler.hpp Wed Feb 02 11:35:26 2011 -0500 42.3 @@ -70,6 +70,12 @@ 42.4 #ifdef TARGET_ARCH_zero 42.5 # include "disassembler_zero.hpp" 42.6 #endif 42.7 +#ifdef TARGET_ARCH_arm 42.8 +# include "disassembler_arm.hpp" 42.9 +#endif 42.10 +#ifdef TARGET_ARCH_ppc 42.11 +# include "disassembler_ppc.hpp" 42.12 +#endif 42.13 42.14 42.15 public:
43.1 --- a/src/share/vm/interpreter/abstractInterpreter.hpp Thu Jan 27 16:11:27 2011 -0800 43.2 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp Wed Feb 02 11:35:26 2011 -0500 43.3 @@ -41,6 +41,12 @@ 43.4 #ifdef TARGET_ARCH_MODEL_zero 43.5 # include "interp_masm_zero.hpp" 43.6 #endif 43.7 +#ifdef TARGET_ARCH_MODEL_arm 43.8 +# include "interp_masm_arm.hpp" 43.9 +#endif 43.10 +#ifdef TARGET_ARCH_MODEL_ppc 43.11 +# include "interp_masm_ppc.hpp" 43.12 +#endif 43.13 #ifdef TARGET_OS_FAMILY_linux 43.14 # include "thread_linux.inline.hpp" 43.15 #endif
44.1 --- a/src/share/vm/interpreter/bytecode.hpp Thu Jan 27 16:11:27 2011 -0800 44.2 +++ b/src/share/vm/interpreter/bytecode.hpp Wed Feb 02 11:35:26 2011 -0500 44.3 @@ -37,6 +37,12 @@ 44.4 #ifdef TARGET_ARCH_zero 44.5 # include "bytes_zero.hpp" 44.6 #endif 44.7 +#ifdef TARGET_ARCH_arm 44.8 +# include "bytes_arm.hpp" 44.9 +#endif 44.10 +#ifdef TARGET_ARCH_ppc 44.11 +# include "bytes_ppc.hpp" 44.12 +#endif 44.13 44.14 class ciBytecodeStream; 44.15
45.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Thu Jan 27 16:11:27 2011 -0800 45.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Feb 02 11:35:26 2011 -0500 45.3 @@ -59,6 +59,12 @@ 45.4 #ifdef TARGET_OS_ARCH_windows_x86 45.5 # include "orderAccess_windows_x86.inline.hpp" 45.6 #endif 45.7 +#ifdef TARGET_OS_ARCH_linux_arm 45.8 +# include "orderAccess_linux_arm.inline.hpp" 45.9 +#endif 45.10 +#ifdef TARGET_OS_ARCH_linux_ppc 45.11 +# include "orderAccess_linux_ppc.inline.hpp" 45.12 +#endif 45.13 45.14 45.15 // no precompiled headers
46.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.hpp Thu Jan 27 16:11:27 2011 -0800 46.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.hpp Wed Feb 02 11:35:26 2011 -0500 46.3 @@ -41,6 +41,12 @@ 46.4 #ifdef TARGET_ARCH_zero 46.5 # include "bytes_zero.hpp" 46.6 #endif 46.7 +#ifdef TARGET_ARCH_arm 46.8 +# include "bytes_arm.hpp" 46.9 +#endif 46.10 +#ifdef TARGET_ARCH_ppc 46.11 +# include "bytes_ppc.hpp" 46.12 +#endif 46.13 46.14 #ifdef CC_INTERP 46.15 46.16 @@ -587,6 +593,12 @@ 46.17 #ifdef TARGET_ARCH_zero 46.18 # include "bytecodeInterpreter_zero.hpp" 46.19 #endif 46.20 +#ifdef TARGET_ARCH_arm 46.21 +# include "bytecodeInterpreter_arm.hpp" 46.22 +#endif 46.23 +#ifdef TARGET_ARCH_ppc 46.24 +# include "bytecodeInterpreter_ppc.hpp" 46.25 +#endif 46.26 46.27 46.28 }; // BytecodeInterpreter
47.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp Thu Jan 27 16:11:27 2011 -0800 47.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp Wed Feb 02 11:35:26 2011 -0500 47.3 @@ -52,6 +52,12 @@ 47.4 #ifdef TARGET_ARCH_zero 47.5 # include "bytecodeInterpreter_zero.inline.hpp" 47.6 #endif 47.7 +#ifdef TARGET_ARCH_arm 47.8 +# include "bytecodeInterpreter_arm.inline.hpp" 47.9 +#endif 47.10 +#ifdef TARGET_ARCH_ppc 47.11 +# include "bytecodeInterpreter_ppc.inline.hpp" 47.12 +#endif 47.13 47.14 #endif // CC_INTERP 47.15
48.1 --- a/src/share/vm/interpreter/bytecodeStream.hpp Thu Jan 27 16:11:27 2011 -0800 48.2 +++ b/src/share/vm/interpreter/bytecodeStream.hpp Wed Feb 02 11:35:26 2011 -0500 48.3 @@ -37,6 +37,12 @@ 48.4 #ifdef TARGET_ARCH_zero 48.5 # include "bytes_zero.hpp" 48.6 #endif 48.7 +#ifdef TARGET_ARCH_arm 48.8 +# include "bytes_arm.hpp" 48.9 +#endif 48.10 +#ifdef TARGET_ARCH_ppc 48.11 +# include "bytes_ppc.hpp" 48.12 +#endif 48.13 48.14 // A BytecodeStream is used for fast iteration over the bytecodes 48.15 // of a methodOop.
49.1 --- a/src/share/vm/interpreter/bytecodes.cpp Thu Jan 27 16:11:27 2011 -0800 49.2 +++ b/src/share/vm/interpreter/bytecodes.cpp Wed Feb 02 11:35:26 2011 -0500 49.3 @@ -35,6 +35,12 @@ 49.4 #ifdef TARGET_ARCH_zero 49.5 # include "bytes_zero.hpp" 49.6 #endif 49.7 +#ifdef TARGET_ARCH_arm 49.8 +# include "bytes_arm.hpp" 49.9 +#endif 49.10 +#ifdef TARGET_ARCH_ppc 49.11 +# include "bytes_ppc.hpp" 49.12 +#endif 49.13 49.14 49.15 #if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER < 1600))
50.1 --- a/src/share/vm/interpreter/bytecodes.hpp Thu Jan 27 16:11:27 2011 -0800 50.2 +++ b/src/share/vm/interpreter/bytecodes.hpp Wed Feb 02 11:35:26 2011 -0500 50.3 @@ -294,6 +294,12 @@ 50.4 #ifdef TARGET_ARCH_zero 50.5 # include "bytecodes_zero.hpp" 50.6 #endif 50.7 +#ifdef TARGET_ARCH_arm 50.8 +# include "bytecodes_arm.hpp" 50.9 +#endif 50.10 +#ifdef TARGET_ARCH_ppc 50.11 +# include "bytecodes_ppc.hpp" 50.12 +#endif 50.13 50.14 50.15 number_of_codes
51.1 --- a/src/share/vm/interpreter/cppInterpreter.hpp Thu Jan 27 16:11:27 2011 -0800 51.2 +++ b/src/share/vm/interpreter/cppInterpreter.hpp Wed Feb 02 11:35:26 2011 -0500 51.3 @@ -90,6 +90,12 @@ 51.4 #ifdef TARGET_ARCH_zero 51.5 # include "cppInterpreter_zero.hpp" 51.6 #endif 51.7 +#ifdef TARGET_ARCH_arm 51.8 +# include "cppInterpreter_arm.hpp" 51.9 +#endif 51.10 +#ifdef TARGET_ARCH_ppc 51.11 +# include "cppInterpreter_ppc.hpp" 51.12 +#endif 51.13 51.14 51.15 };
52.1 --- a/src/share/vm/interpreter/cppInterpreterGenerator.hpp Thu Jan 27 16:11:27 2011 -0800 52.2 +++ b/src/share/vm/interpreter/cppInterpreterGenerator.hpp Wed Feb 02 11:35:26 2011 -0500 52.3 @@ -53,6 +53,12 @@ 52.4 #ifdef TARGET_ARCH_zero 52.5 # include "cppInterpreterGenerator_zero.hpp" 52.6 #endif 52.7 +#ifdef TARGET_ARCH_arm 52.8 +# include "cppInterpreterGenerator_arm.hpp" 52.9 +#endif 52.10 +#ifdef TARGET_ARCH_ppc 52.11 +# include "cppInterpreterGenerator_ppc.hpp" 52.12 +#endif 52.13 52.14 }; 52.15
53.1 --- a/src/share/vm/interpreter/interpreter.hpp Thu Jan 27 16:11:27 2011 -0800 53.2 +++ b/src/share/vm/interpreter/interpreter.hpp Wed Feb 02 11:35:26 2011 -0500 53.3 @@ -152,6 +152,12 @@ 53.4 #ifdef TARGET_ARCH_zero 53.5 # include "interpreter_zero.hpp" 53.6 #endif 53.7 +#ifdef TARGET_ARCH_arm 53.8 +# include "interpreter_arm.hpp" 53.9 +#endif 53.10 +#ifdef TARGET_ARCH_ppc 53.11 +# include "interpreter_ppc.hpp" 53.12 +#endif 53.13 53.14 }; 53.15
54.1 --- a/src/share/vm/interpreter/interpreterGenerator.hpp Thu Jan 27 16:11:27 2011 -0800 54.2 +++ b/src/share/vm/interpreter/interpreterGenerator.hpp Wed Feb 02 11:35:26 2011 -0500 54.3 @@ -50,6 +50,12 @@ 54.4 #ifdef TARGET_ARCH_zero 54.5 # include "interpreterGenerator_zero.hpp" 54.6 #endif 54.7 +#ifdef TARGET_ARCH_arm 54.8 +# include "interpreterGenerator_arm.hpp" 54.9 +#endif 54.10 +#ifdef TARGET_ARCH_ppc 54.11 +# include "interpreterGenerator_ppc.hpp" 54.12 +#endif 54.13 54.14 54.15 };
55.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jan 27 16:11:27 2011 -0800 55.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Feb 02 11:35:26 2011 -0500 55.3 @@ -65,6 +65,12 @@ 55.4 #ifdef TARGET_ARCH_zero 55.5 # include "vm_version_zero.hpp" 55.6 #endif 55.7 +#ifdef TARGET_ARCH_arm 55.8 +# include "vm_version_arm.hpp" 55.9 +#endif 55.10 +#ifdef TARGET_ARCH_ppc 55.11 +# include "vm_version_ppc.hpp" 55.12 +#endif 55.13 #ifdef COMPILER2 55.14 #include "opto/runtime.hpp" 55.15 #endif
56.1 --- a/src/share/vm/interpreter/interpreterRuntime.hpp Thu Jan 27 16:11:27 2011 -0800 56.2 +++ b/src/share/vm/interpreter/interpreterRuntime.hpp Wed Feb 02 11:35:26 2011 -0500 56.3 @@ -157,6 +157,12 @@ 56.4 #ifdef TARGET_ARCH_zero 56.5 # include "interpreterRT_zero.hpp" 56.6 #endif 56.7 +#ifdef TARGET_ARCH_arm 56.8 +# include "interpreterRT_arm.hpp" 56.9 +#endif 56.10 +#ifdef TARGET_ARCH_ppc 56.11 +# include "interpreterRT_ppc.hpp" 56.12 +#endif 56.13 56.14 56.15 // Interpreter's frequency counter overflow
57.1 --- a/src/share/vm/interpreter/templateInterpreter.hpp Thu Jan 27 16:11:27 2011 -0800 57.2 +++ b/src/share/vm/interpreter/templateInterpreter.hpp Wed Feb 02 11:35:26 2011 -0500 57.3 @@ -192,6 +192,12 @@ 57.4 #ifdef TARGET_ARCH_zero 57.5 # include "templateInterpreter_zero.hpp" 57.6 #endif 57.7 +#ifdef TARGET_ARCH_arm 57.8 +# include "templateInterpreter_arm.hpp" 57.9 +#endif 57.10 +#ifdef TARGET_ARCH_ppc 57.11 +# include "templateInterpreter_ppc.hpp" 57.12 +#endif 57.13 57.14 57.15 };
58.1 --- a/src/share/vm/interpreter/templateInterpreterGenerator.hpp Thu Jan 27 16:11:27 2011 -0800 58.2 +++ b/src/share/vm/interpreter/templateInterpreterGenerator.hpp Wed Feb 02 11:35:26 2011 -0500 58.3 @@ -96,6 +96,12 @@ 58.4 #ifdef TARGET_ARCH_zero 58.5 # include "templateInterpreterGenerator_zero.hpp" 58.6 #endif 58.7 +#ifdef TARGET_ARCH_arm 58.8 +# include "templateInterpreterGenerator_arm.hpp" 58.9 +#endif 58.10 +#ifdef TARGET_ARCH_ppc 58.11 +# include "templateInterpreterGenerator_ppc.hpp" 58.12 +#endif 58.13 58.14 58.15 };
59.1 --- a/src/share/vm/interpreter/templateTable.hpp Thu Jan 27 16:11:27 2011 -0800 59.2 +++ b/src/share/vm/interpreter/templateTable.hpp Wed Feb 02 11:35:26 2011 -0500 59.3 @@ -40,6 +40,12 @@ 59.4 #ifdef TARGET_ARCH_MODEL_zero 59.5 # include "interp_masm_zero.hpp" 59.6 #endif 59.7 +#ifdef TARGET_ARCH_MODEL_arm 59.8 +# include "interp_masm_arm.hpp" 59.9 +#endif 59.10 +#ifdef TARGET_ARCH_MODEL_ppc 59.11 +# include "interp_masm_ppc.hpp" 59.12 +#endif 59.13 59.14 #ifndef CC_INTERP 59.15 // All the necessary definitions used for (bytecode) template generation. Instead of 59.16 @@ -364,6 +370,12 @@ 59.17 #ifdef TARGET_ARCH_MODEL_zero 59.18 # include "templateTable_zero.hpp" 59.19 #endif 59.20 +#ifdef TARGET_ARCH_MODEL_arm 59.21 +# include "templateTable_arm.hpp" 59.22 +#endif 59.23 +#ifdef TARGET_ARCH_MODEL_ppc 59.24 +# include "templateTable_ppc.hpp" 59.25 +#endif 59.26 59.27 }; 59.28 #endif /* !CC_INTERP */
60.1 --- a/src/share/vm/oops/constantPoolOop.hpp Thu Jan 27 16:11:27 2011 -0800 60.2 +++ b/src/share/vm/oops/constantPoolOop.hpp Wed Feb 02 11:35:26 2011 -0500 60.3 @@ -39,6 +39,12 @@ 60.4 #ifdef TARGET_ARCH_zero 60.5 # include "bytes_zero.hpp" 60.6 #endif 60.7 +#ifdef TARGET_ARCH_arm 60.8 +# include "bytes_arm.hpp" 60.9 +#endif 60.10 +#ifdef TARGET_ARCH_ppc 60.11 +# include "bytes_ppc.hpp" 60.12 +#endif 60.13 60.14 // A constantPool is an array containing class constants as described in the 60.15 // class file.
61.1 --- a/src/share/vm/oops/oop.inline.hpp Thu Jan 27 16:11:27 2011 -0800 61.2 +++ b/src/share/vm/oops/oop.inline.hpp Wed Feb 02 11:35:26 2011 -0500 61.3 @@ -52,6 +52,12 @@ 61.4 #ifdef TARGET_ARCH_zero 61.5 # include "bytes_zero.hpp" 61.6 #endif 61.7 +#ifdef TARGET_ARCH_arm 61.8 +# include "bytes_arm.hpp" 61.9 +#endif 61.10 +#ifdef TARGET_ARCH_ppc 61.11 +# include "bytes_ppc.hpp" 61.12 +#endif 61.13 61.14 // Implementation of all inlined member functions defined in oop.hpp 61.15 // We need a separate file to avoid circular references
62.1 --- a/src/share/vm/oops/typeArrayOop.hpp Thu Jan 27 16:11:27 2011 -0800 62.2 +++ b/src/share/vm/oops/typeArrayOop.hpp Wed Feb 02 11:35:26 2011 -0500 62.3 @@ -45,6 +45,12 @@ 62.4 #ifdef TARGET_OS_ARCH_windows_x86 62.5 # include "orderAccess_windows_x86.inline.hpp" 62.6 #endif 62.7 +#ifdef TARGET_OS_ARCH_linux_arm 62.8 +# include "orderAccess_linux_arm.inline.hpp" 62.9 +#endif 62.10 +#ifdef TARGET_OS_ARCH_linux_ppc 62.11 +# include "orderAccess_linux_ppc.inline.hpp" 62.12 +#endif 62.13 62.14 // A typeArrayOop is an array containing basic types (non oop elements). 62.15 // It is used for arrays of {characters, singles, doubles, bytes, shorts, integers, longs}
63.1 --- a/src/share/vm/opto/buildOopMap.cpp Thu Jan 27 16:11:27 2011 -0800 63.2 +++ b/src/share/vm/opto/buildOopMap.cpp Wed Feb 02 11:35:26 2011 -0500 63.3 @@ -41,6 +41,12 @@ 63.4 #ifdef TARGET_ARCH_zero 63.5 # include "vmreg_zero.inline.hpp" 63.6 #endif 63.7 +#ifdef TARGET_ARCH_arm 63.8 +# include "vmreg_arm.inline.hpp" 63.9 +#endif 63.10 +#ifdef TARGET_ARCH_ppc 63.11 +# include "vmreg_ppc.inline.hpp" 63.12 +#endif 63.13 63.14 // The functions in this file builds OopMaps after all scheduling is done. 63.15 //
64.1 --- a/src/share/vm/opto/c2_globals.hpp Thu Jan 27 16:11:27 2011 -0800 64.2 +++ b/src/share/vm/opto/c2_globals.hpp Wed Feb 02 11:35:26 2011 -0500 64.3 @@ -32,6 +32,9 @@ 64.4 #ifdef TARGET_ARCH_sparc 64.5 # include "c2_globals_sparc.hpp" 64.6 #endif 64.7 +#ifdef TARGET_ARCH_arm 64.8 +# include "c2_globals_arm.hpp" 64.9 +#endif 64.10 #ifdef TARGET_OS_FAMILY_linux 64.11 # include "c2_globals_linux.hpp" 64.12 #endif
65.1 --- a/src/share/vm/opto/c2compiler.cpp Thu Jan 27 16:11:27 2011 -0800 65.2 +++ b/src/share/vm/opto/c2compiler.cpp Wed Feb 02 11:35:26 2011 -0500 65.3 @@ -37,6 +37,12 @@ 65.4 #ifdef TARGET_ARCH_MODEL_zero 65.5 # include "adfiles/ad_zero.hpp" 65.6 #endif 65.7 +#ifdef TARGET_ARCH_MODEL_arm 65.8 +# include "adfiles/ad_arm.hpp" 65.9 +#endif 65.10 +#ifdef TARGET_ARCH_MODEL_ppc 65.11 +# include "adfiles/ad_ppc.hpp" 65.12 +#endif 65.13 65.14 65.15 volatile int C2Compiler::_runtimes = uninitialized;
66.1 --- a/src/share/vm/opto/compile.cpp Thu Jan 27 16:11:27 2011 -0800 66.2 +++ b/src/share/vm/opto/compile.cpp Wed Feb 02 11:35:26 2011 -0500 66.3 @@ -74,6 +74,12 @@ 66.4 #ifdef TARGET_ARCH_MODEL_zero 66.5 # include "adfiles/ad_zero.hpp" 66.6 #endif 66.7 +#ifdef TARGET_ARCH_MODEL_arm 66.8 +# include "adfiles/ad_arm.hpp" 66.9 +#endif 66.10 +#ifdef TARGET_ARCH_MODEL_ppc 66.11 +# include "adfiles/ad_ppc.hpp" 66.12 +#endif 66.13 66.14 66.15 // -------------------- Compile::mach_constant_base_node -----------------------
67.1 --- a/src/share/vm/opto/gcm.cpp Thu Jan 27 16:11:27 2011 -0800 67.2 +++ b/src/share/vm/opto/gcm.cpp Wed Feb 02 11:35:26 2011 -0500 67.3 @@ -47,6 +47,12 @@ 67.4 #ifdef TARGET_ARCH_MODEL_zero 67.5 # include "adfiles/ad_zero.hpp" 67.6 #endif 67.7 +#ifdef TARGET_ARCH_MODEL_arm 67.8 +# include "adfiles/ad_arm.hpp" 67.9 +#endif 67.10 +#ifdef TARGET_ARCH_MODEL_ppc 67.11 +# include "adfiles/ad_ppc.hpp" 67.12 +#endif 67.13 67.14 // Portions of code courtesy of Clifford Click 67.15
68.1 --- a/src/share/vm/opto/locknode.hpp Thu Jan 27 16:11:27 2011 -0800 68.2 +++ b/src/share/vm/opto/locknode.hpp Wed Feb 02 11:35:26 2011 -0500 68.3 @@ -40,6 +40,12 @@ 68.4 #ifdef TARGET_ARCH_MODEL_zero 68.5 # include "adfiles/ad_zero.hpp" 68.6 #endif 68.7 +#ifdef TARGET_ARCH_MODEL_arm 68.8 +# include "adfiles/ad_arm.hpp" 68.9 +#endif 68.10 +#ifdef TARGET_ARCH_MODEL_ppc 68.11 +# include "adfiles/ad_ppc.hpp" 68.12 +#endif 68.13 68.14 //------------------------------BoxLockNode------------------------------------ 68.15 class BoxLockNode : public Node {
69.1 --- a/src/share/vm/opto/output.hpp Thu Jan 27 16:11:27 2011 -0800 69.2 +++ b/src/share/vm/opto/output.hpp Wed Feb 02 11:35:26 2011 -0500 69.3 @@ -39,6 +39,12 @@ 69.4 #ifdef TARGET_ARCH_MODEL_zero 69.5 # include "adfiles/ad_zero.hpp" 69.6 #endif 69.7 +#ifdef TARGET_ARCH_MODEL_arm 69.8 +# include "adfiles/ad_arm.hpp" 69.9 +#endif 69.10 +#ifdef TARGET_ARCH_MODEL_ppc 69.11 +# include "adfiles/ad_ppc.hpp" 69.12 +#endif 69.13 69.14 class Arena; 69.15 class Bundle;
70.1 --- a/src/share/vm/opto/regmask.cpp Thu Jan 27 16:11:27 2011 -0800 70.2 +++ b/src/share/vm/opto/regmask.cpp Wed Feb 02 11:35:26 2011 -0500 70.3 @@ -37,6 +37,12 @@ 70.4 #ifdef TARGET_ARCH_MODEL_zero 70.5 # include "adfiles/ad_zero.hpp" 70.6 #endif 70.7 +#ifdef TARGET_ARCH_MODEL_arm 70.8 +# include "adfiles/ad_arm.hpp" 70.9 +#endif 70.10 +#ifdef TARGET_ARCH_MODEL_ppc 70.11 +# include "adfiles/ad_ppc.hpp" 70.12 +#endif 70.13 70.14 #define RM_SIZE _RM_SIZE /* a constant private to the class RegMask */ 70.15
71.1 --- a/src/share/vm/opto/regmask.hpp Thu Jan 27 16:11:27 2011 -0800 71.2 +++ b/src/share/vm/opto/regmask.hpp Wed Feb 02 11:35:26 2011 -0500 71.3 @@ -40,6 +40,12 @@ 71.4 #ifdef TARGET_ARCH_MODEL_zero 71.5 # include "adfiles/adGlobals_zero.hpp" 71.6 #endif 71.7 +#ifdef TARGET_ARCH_MODEL_arm 71.8 +# include "adfiles/adGlobals_arm.hpp" 71.9 +#endif 71.10 +#ifdef TARGET_ARCH_MODEL_ppc 71.11 +# include "adfiles/adGlobals_ppc.hpp" 71.12 +#endif 71.13 71.14 // Some fun naming (textual) substitutions: 71.15 //
72.1 --- a/src/share/vm/opto/runtime.cpp Thu Jan 27 16:11:27 2011 -0800 72.2 +++ b/src/share/vm/opto/runtime.cpp Wed Feb 02 11:35:26 2011 -0500 72.3 @@ -80,6 +80,12 @@ 72.4 #ifdef TARGET_ARCH_MODEL_zero 72.5 # include "adfiles/ad_zero.hpp" 72.6 #endif 72.7 +#ifdef TARGET_ARCH_MODEL_arm 72.8 +# include "adfiles/ad_arm.hpp" 72.9 +#endif 72.10 +#ifdef TARGET_ARCH_MODEL_ppc 72.11 +# include "adfiles/ad_ppc.hpp" 72.12 +#endif 72.13 72.14 72.15 // For debugging purposes:
73.1 --- a/src/share/vm/prims/jniCheck.cpp Thu Jan 27 16:11:27 2011 -0800 73.2 +++ b/src/share/vm/prims/jniCheck.cpp Wed Feb 02 11:35:26 2011 -0500 73.3 @@ -45,6 +45,12 @@ 73.4 #ifdef TARGET_ARCH_zero 73.5 # include "jniTypes_zero.hpp" 73.6 #endif 73.7 +#ifdef TARGET_ARCH_arm 73.8 +# include "jniTypes_arm.hpp" 73.9 +#endif 73.10 +#ifdef TARGET_ARCH_ppc 73.11 +# include "jniTypes_ppc.hpp" 73.12 +#endif 73.13 73.14 73.15 // Heap objects are allowed to be directly referenced only in VM code,
74.1 --- a/src/share/vm/prims/jni_md.h Thu Jan 27 16:11:27 2011 -0800 74.2 +++ b/src/share/vm/prims/jni_md.h Wed Feb 02 11:35:26 2011 -0500 74.3 @@ -33,6 +33,12 @@ 74.4 #ifdef TARGET_ARCH_zero 74.5 # include "jni_zero.h" 74.6 #endif 74.7 +#ifdef TARGET_ARCH_arm 74.8 +# include "jni_arm.h" 74.9 +#endif 74.10 +#ifdef TARGET_ARCH_ppc 74.11 +# include "jni_ppc.h" 74.12 +#endif 74.13 74.14 74.15 /*
75.1 --- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Thu Jan 27 16:11:27 2011 -0800 75.2 +++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Wed Feb 02 11:35:26 2011 -0500 75.3 @@ -36,6 +36,12 @@ 75.4 #ifdef TARGET_ARCH_zero 75.5 # include "bytes_zero.hpp" 75.6 #endif 75.7 +#ifdef TARGET_ARCH_arm 75.8 +# include "bytes_arm.hpp" 75.9 +#endif 75.10 +#ifdef TARGET_ARCH_ppc 75.11 +# include "bytes_ppc.hpp" 75.12 +#endif 75.13 // FIXME: add Deprecated, LVT, LVTT attributes 75.14 // FIXME: fix Synthetic attribute 75.15 // FIXME: per Serguei, add error return handling for constantPoolOopDesc::copy_cpool_bytes()
76.1 --- a/src/share/vm/runtime/deoptimization.cpp Thu Jan 27 16:11:27 2011 -0800 76.2 +++ b/src/share/vm/runtime/deoptimization.cpp Wed Feb 02 11:35:26 2011 -0500 76.3 @@ -59,6 +59,12 @@ 76.4 #ifdef TARGET_ARCH_zero 76.5 # include "vmreg_zero.inline.hpp" 76.6 #endif 76.7 +#ifdef TARGET_ARCH_arm 76.8 +# include "vmreg_arm.inline.hpp" 76.9 +#endif 76.10 +#ifdef TARGET_ARCH_ppc 76.11 +# include "vmreg_ppc.inline.hpp" 76.12 +#endif 76.13 #ifdef COMPILER2 76.14 #ifdef TARGET_ARCH_MODEL_x86_32 76.15 # include "adfiles/ad_x86_32.hpp" 76.16 @@ -72,6 +78,12 @@ 76.17 #ifdef TARGET_ARCH_MODEL_zero 76.18 # include "adfiles/ad_zero.hpp" 76.19 #endif 76.20 +#ifdef TARGET_ARCH_MODEL_arm 76.21 +# include "adfiles/ad_arm.hpp" 76.22 +#endif 76.23 +#ifdef TARGET_ARCH_MODEL_ppc 76.24 +# include "adfiles/ad_ppc.hpp" 76.25 +#endif 76.26 #endif 76.27 76.28 bool DeoptimizationMarker::_is_active = false;
77.1 --- a/src/share/vm/runtime/dtraceJSDT.hpp Thu Jan 27 16:11:27 2011 -0800 77.2 +++ b/src/share/vm/runtime/dtraceJSDT.hpp Wed Feb 02 11:35:26 2011 -0500 77.3 @@ -35,6 +35,12 @@ 77.4 #ifdef TARGET_ARCH_zero 77.5 # include "nativeInst_zero.hpp" 77.6 #endif 77.7 +#ifdef TARGET_ARCH_arm 77.8 +# include "nativeInst_arm.hpp" 77.9 +#endif 77.10 +#ifdef TARGET_ARCH_ppc 77.11 +# include "nativeInst_ppc.hpp" 77.12 +#endif 77.13 77.14 class RegisteredProbes; 77.15 typedef jlong OpaqueProbes;
78.1 --- a/src/share/vm/runtime/frame.cpp Thu Jan 27 16:11:27 2011 -0800 78.2 +++ b/src/share/vm/runtime/frame.cpp Wed Feb 02 11:35:26 2011 -0500 78.3 @@ -52,6 +52,12 @@ 78.4 #ifdef TARGET_ARCH_zero 78.5 # include "nativeInst_zero.hpp" 78.6 #endif 78.7 +#ifdef TARGET_ARCH_arm 78.8 +# include "nativeInst_arm.hpp" 78.9 +#endif 78.10 +#ifdef TARGET_ARCH_ppc 78.11 +# include "nativeInst_ppc.hpp" 78.12 +#endif 78.13 78.14 RegisterMap::RegisterMap(JavaThread *thread, bool update_map) { 78.15 _thread = thread;
79.1 --- a/src/share/vm/runtime/frame.hpp Thu Jan 27 16:11:27 2011 -0800 79.2 +++ b/src/share/vm/runtime/frame.hpp Wed Feb 02 11:35:26 2011 -0500 79.3 @@ -44,6 +44,12 @@ 79.4 #ifdef TARGET_ARCH_MODEL_zero 79.5 # include "adfiles/adGlobals_zero.hpp" 79.6 #endif 79.7 +#ifdef TARGET_ARCH_MODEL_arm 79.8 +# include "adfiles/adGlobals_arm.hpp" 79.9 +#endif 79.10 +#ifdef TARGET_ARCH_MODEL_ppc 79.11 +# include "adfiles/adGlobals_ppc.hpp" 79.12 +#endif 79.13 #endif 79.14 #ifdef ZERO 79.15 #ifdef TARGET_ARCH_zero 79.16 @@ -457,6 +463,12 @@ 79.17 #ifdef TARGET_ARCH_zero 79.18 # include "frame_zero.hpp" 79.19 #endif 79.20 +#ifdef TARGET_ARCH_arm 79.21 +# include "frame_arm.hpp" 79.22 +#endif 79.23 +#ifdef TARGET_ARCH_ppc 79.24 +# include "frame_ppc.hpp" 79.25 +#endif 79.26 79.27 }; 79.28
80.1 --- a/src/share/vm/runtime/frame.inline.hpp Thu Jan 27 16:11:27 2011 -0800 80.2 +++ b/src/share/vm/runtime/frame.inline.hpp Wed Feb 02 11:35:26 2011 -0500 80.3 @@ -40,6 +40,12 @@ 80.4 #ifdef TARGET_ARCH_zero 80.5 # include "jniTypes_zero.hpp" 80.6 #endif 80.7 +#ifdef TARGET_ARCH_arm 80.8 +# include "jniTypes_arm.hpp" 80.9 +#endif 80.10 +#ifdef TARGET_ARCH_ppc 80.11 +# include "jniTypes_ppc.hpp" 80.12 +#endif 80.13 #ifdef ZERO 80.14 #ifdef TARGET_ARCH_zero 80.15 # include "entryFrame_zero.hpp" 80.16 @@ -88,6 +94,12 @@ 80.17 #ifdef TARGET_ARCH_zero 80.18 # include "frame_zero.inline.hpp" 80.19 #endif 80.20 +#ifdef TARGET_ARCH_arm 80.21 +# include "frame_arm.inline.hpp" 80.22 +#endif 80.23 +#ifdef TARGET_ARCH_ppc 80.24 +# include "frame_ppc.inline.hpp" 80.25 +#endif 80.26 80.27 80.28 #endif // SHARE_VM_RUNTIME_FRAME_INLINE_HPP
81.1 --- a/src/share/vm/runtime/globals.hpp Thu Jan 27 16:11:27 2011 -0800 81.2 +++ b/src/share/vm/runtime/globals.hpp Wed Feb 02 11:35:26 2011 -0500 81.3 @@ -35,6 +35,12 @@ 81.4 #ifdef TARGET_ARCH_zero 81.5 # include "globals_zero.hpp" 81.6 #endif 81.7 +#ifdef TARGET_ARCH_arm 81.8 +# include "globals_arm.hpp" 81.9 +#endif 81.10 +#ifdef TARGET_ARCH_ppc 81.11 +# include "globals_ppc.hpp" 81.12 +#endif 81.13 #ifdef TARGET_OS_FAMILY_linux 81.14 # include "globals_linux.hpp" 81.15 #endif 81.16 @@ -62,6 +68,12 @@ 81.17 #ifdef TARGET_OS_ARCH_windows_x86 81.18 # include "globals_windows_x86.hpp" 81.19 #endif 81.20 +#ifdef TARGET_OS_ARCH_linux_arm 81.21 +# include "globals_linux_arm.hpp" 81.22 +#endif 81.23 +#ifdef TARGET_OS_ARCH_linux_ppc 81.24 +# include "globals_linux_ppc.hpp" 81.25 +#endif 81.26 #ifdef COMPILER1 81.27 #ifdef TARGET_ARCH_x86 81.28 # include "c1_globals_x86.hpp" 81.29 @@ -69,6 +81,12 @@ 81.30 #ifdef TARGET_ARCH_sparc 81.31 # include "c1_globals_sparc.hpp" 81.32 #endif 81.33 +#ifdef TARGET_ARCH_arm 81.34 +# include "c1_globals_arm.hpp" 81.35 +#endif 81.36 +#ifdef TARGET_ARCH_ppc 81.37 +# include "c1_globals_ppc.hpp" 81.38 +#endif 81.39 #ifdef TARGET_OS_FAMILY_linux 81.40 # include "c1_globals_linux.hpp" 81.41 #endif 81.42 @@ -86,6 +104,9 @@ 81.43 #ifdef TARGET_ARCH_sparc 81.44 # include "c2_globals_sparc.hpp" 81.45 #endif 81.46 +#ifdef TARGET_ARCH_arm 81.47 +# include "c2_globals_arm.hpp" 81.48 +#endif 81.49 #ifdef TARGET_OS_FAMILY_linux 81.50 # include "c2_globals_linux.hpp" 81.51 #endif 81.52 @@ -410,7 +431,14 @@ 81.53 product_pd(bool, UseMembar, \ 81.54 "(Unstable) Issues membars on thread state transitions") \ 81.55 \ 81.56 - /* Temporary: See 6948537 */ \ 81.57 + /* Temp PPC Flag to allow disabling the use of lwsync on ppc platforms \ 81.58 + * that don't support it. This will be replaced by processor detection \ 81.59 + * logic. \ 81.60 + */ \ 81.61 + product(bool, UsePPCLWSYNC, true, \ 81.62 + "Use lwsync instruction if true, else use slower sync") \ 81.63 + \ 81.64 + /* Temporary: See 6948537 */ \ 81.65 experimental(bool, UseMemSetInBOT, true, \ 81.66 "(Unstable) uses memset in BOT updates in GC code") \ 81.67 \ 81.68 @@ -1926,6 +1954,9 @@ 81.69 product(bool, PrintRevisitStats, false, \ 81.70 "Print revisit (klass and MDO) stack related information") \ 81.71 \ 81.72 + EMBEDDED_ONLY(product(bool, LowMemoryProtection, true, \ 81.73 + "Enable LowMemoryProtection")) \ 81.74 + \ 81.75 product_pd(bool, NeverActAsServerClassMachine, \ 81.76 "Never act like a server-class machine") \ 81.77 \ 81.78 @@ -2630,6 +2661,25 @@ 81.79 product(bool, UseStringCache, false, \ 81.80 "Enable String cache capabilities on String.java") \ 81.81 \ 81.82 + /* byte strings */ \ 81.83 + product(bool, UseCompressedStrings, false, \ 81.84 + "Enable byte-valued strings") \ 81.85 + \ 81.86 + product(bool, SpecialStringCompress, true, \ 81.87 + "special version of string compress") \ 81.88 + \ 81.89 + product(bool, SpecialStringInflate, true, \ 81.90 + "special version of string inflate") \ 81.91 + \ 81.92 + product(bool, SpecialStringCompareToCC, true, \ 81.93 + "special version of string compareToCC") \ 81.94 + \ 81.95 + product(bool, SpecialStringIndexOfCC, true, \ 81.96 + "special version of string indexOfCC") \ 81.97 + \ 81.98 + product(bool, SpecialStringEqualsCC, true, \ 81.99 + "special version of string equalsCC") \ 81.100 + \ 81.101 /* statistics */ \ 81.102 develop(bool, CountCompiledCalls, false, \ 81.103 "counts method invocations") \ 81.104 @@ -2851,9 +2901,13 @@ 81.105 "Max. no. of lines in the stack trace for Java exceptions " \ 81.106 "(0 means all)") \ 81.107 \ 81.108 - develop(intx, GuaranteedSafepointInterval, 1000, \ 81.109 + NOT_EMBEDDED(develop(intx, GuaranteedSafepointInterval, 1000, \ 81.110 "Guarantee a safepoint (at least) every so many milliseconds " \ 81.111 - "(0 means none)") \ 81.112 + "(0 means none)")) \ 81.113 + \ 81.114 + EMBEDDED_ONLY(product(intx, GuaranteedSafepointInterval, 0, \ 81.115 + "Guarantee a safepoint (at least) every so many milliseconds " \ 81.116 + "(0 means none)")) \ 81.117 \ 81.118 product(intx, SafepointTimeoutDelay, 10000, \ 81.119 "Delay in milliseconds for option SafepointTimeout") \ 81.120 @@ -3543,9 +3597,13 @@ 81.121 \ 81.122 /* flags for performance data collection */ \ 81.123 \ 81.124 - product(bool, UsePerfData, true, \ 81.125 + NOT_EMBEDDED(product(bool, UsePerfData, true, \ 81.126 "Flag to disable jvmstat instrumentation for performance testing" \ 81.127 - "and problem isolation purposes.") \ 81.128 + "and problem isolation purposes.")) \ 81.129 + \ 81.130 + EMBEDDED_ONLY(product(bool, UsePerfData, false, \ 81.131 + "Flag to disable jvmstat instrumentation for performance testing" \ 81.132 + "and problem isolation purposes.")) \ 81.133 \ 81.134 product(bool, PerfDataSaveToFile, false, \ 81.135 "Save PerfData memory to hsperfdata_<pid> file on exit") \
82.1 --- a/src/share/vm/runtime/icache.hpp Thu Jan 27 16:11:27 2011 -0800 82.2 +++ b/src/share/vm/runtime/icache.hpp Wed Feb 02 11:35:26 2011 -0500 82.3 @@ -77,6 +77,12 @@ 82.4 #ifdef TARGET_ARCH_zero 82.5 # include "icache_zero.hpp" 82.6 #endif 82.7 +#ifdef TARGET_ARCH_arm 82.8 +# include "icache_arm.hpp" 82.9 +#endif 82.10 +#ifdef TARGET_ARCH_ppc 82.11 +# include "icache_ppc.hpp" 82.12 +#endif 82.13 82.14 82.15
83.1 --- a/src/share/vm/runtime/java.cpp Thu Jan 27 16:11:27 2011 -0800 83.2 +++ b/src/share/vm/runtime/java.cpp Wed Feb 02 11:35:26 2011 -0500 83.3 @@ -70,6 +70,12 @@ 83.4 #ifdef TARGET_ARCH_zero 83.5 # include "vm_version_zero.hpp" 83.6 #endif 83.7 +#ifdef TARGET_ARCH_arm 83.8 +# include "vm_version_arm.hpp" 83.9 +#endif 83.10 +#ifdef TARGET_ARCH_ppc 83.11 +# include "vm_version_ppc.hpp" 83.12 +#endif 83.13 #ifdef TARGET_OS_FAMILY_linux 83.14 # include "thread_linux.inline.hpp" 83.15 #endif
84.1 --- a/src/share/vm/runtime/javaCalls.hpp Thu Jan 27 16:11:27 2011 -0800 84.2 +++ b/src/share/vm/runtime/javaCalls.hpp Wed Feb 02 11:35:26 2011 -0500 84.3 @@ -39,6 +39,12 @@ 84.4 #ifdef TARGET_ARCH_zero 84.5 # include "jniTypes_zero.hpp" 84.6 #endif 84.7 +#ifdef TARGET_ARCH_arm 84.8 +# include "jniTypes_arm.hpp" 84.9 +#endif 84.10 +#ifdef TARGET_ARCH_ppc 84.11 +# include "jniTypes_ppc.hpp" 84.12 +#endif 84.13 #ifdef TARGET_OS_FAMILY_linux 84.14 # include "thread_linux.inline.hpp" 84.15 #endif
85.1 --- a/src/share/vm/runtime/javaFrameAnchor.hpp Thu Jan 27 16:11:27 2011 -0800 85.2 +++ b/src/share/vm/runtime/javaFrameAnchor.hpp Wed Feb 02 11:35:26 2011 -0500 85.3 @@ -44,6 +44,12 @@ 85.4 #ifdef TARGET_OS_ARCH_windows_x86 85.5 # include "orderAccess_windows_x86.inline.hpp" 85.6 #endif 85.7 +#ifdef TARGET_OS_ARCH_linux_arm 85.8 +# include "orderAccess_linux_arm.inline.hpp" 85.9 +#endif 85.10 +#ifdef TARGET_OS_ARCH_linux_ppc 85.11 +# include "orderAccess_linux_ppc.inline.hpp" 85.12 +#endif 85.13 // 85.14 // An object for encapsulating the machine/os dependent part of a JavaThread frame state 85.15 // 85.16 @@ -102,6 +108,12 @@ 85.17 #ifdef TARGET_ARCH_zero 85.18 # include "javaFrameAnchor_zero.hpp" 85.19 #endif 85.20 +#ifdef TARGET_ARCH_arm 85.21 +# include "javaFrameAnchor_arm.hpp" 85.22 +#endif 85.23 +#ifdef TARGET_ARCH_ppc 85.24 +# include "javaFrameAnchor_ppc.hpp" 85.25 +#endif 85.26 85.27 85.28 public:
86.1 --- a/src/share/vm/runtime/os.hpp Thu Jan 27 16:11:27 2011 -0800 86.2 +++ b/src/share/vm/runtime/os.hpp Wed Feb 02 11:35:26 2011 -0500 86.3 @@ -676,6 +676,12 @@ 86.4 #ifdef TARGET_OS_ARCH_windows_x86 86.5 # include "os_windows_x86.hpp" 86.6 #endif 86.7 +#ifdef TARGET_OS_ARCH_linux_arm 86.8 +# include "os_linux_arm.hpp" 86.9 +#endif 86.10 +#ifdef TARGET_OS_ARCH_linux_ppc 86.11 +# include "os_linux_ppc.hpp" 86.12 +#endif 86.13 86.14 86.15 // debugging support (mostly used by debug.cpp but also fatal error handler)
87.1 --- a/src/share/vm/runtime/registerMap.hpp Thu Jan 27 16:11:27 2011 -0800 87.2 +++ b/src/share/vm/runtime/registerMap.hpp Wed Feb 02 11:35:26 2011 -0500 87.3 @@ -36,6 +36,12 @@ 87.4 #ifdef TARGET_ARCH_zero 87.5 # include "register_zero.hpp" 87.6 #endif 87.7 +#ifdef TARGET_ARCH_arm 87.8 +# include "register_arm.hpp" 87.9 +#endif 87.10 +#ifdef TARGET_ARCH_ppc 87.11 +# include "register_ppc.hpp" 87.12 +#endif 87.13 87.14 class JavaThread; 87.15 87.16 @@ -138,6 +144,12 @@ 87.17 #ifdef TARGET_ARCH_zero 87.18 # include "registerMap_zero.hpp" 87.19 #endif 87.20 +#ifdef TARGET_ARCH_arm 87.21 +# include "registerMap_arm.hpp" 87.22 +#endif 87.23 +#ifdef TARGET_ARCH_ppc 87.24 +# include "registerMap_ppc.hpp" 87.25 +#endif 87.26 87.27 }; 87.28
88.1 --- a/src/share/vm/runtime/relocator.hpp Thu Jan 27 16:11:27 2011 -0800 88.2 +++ b/src/share/vm/runtime/relocator.hpp Wed Feb 02 11:35:26 2011 -0500 88.3 @@ -36,6 +36,12 @@ 88.4 #ifdef TARGET_ARCH_zero 88.5 # include "bytes_zero.hpp" 88.6 #endif 88.7 +#ifdef TARGET_ARCH_arm 88.8 +# include "bytes_arm.hpp" 88.9 +#endif 88.10 +#ifdef TARGET_ARCH_ppc 88.11 +# include "bytes_ppc.hpp" 88.12 +#endif 88.13 88.14 // This code has been converted from the 1.1E java virtual machine 88.15 // Thanks to the JavaTopics group for using the code
89.1 --- a/src/share/vm/runtime/safepoint.cpp Thu Jan 27 16:11:27 2011 -0800 89.2 +++ b/src/share/vm/runtime/safepoint.cpp Wed Feb 02 11:35:26 2011 -0500 89.3 @@ -61,6 +61,14 @@ 89.4 # include "nativeInst_zero.hpp" 89.5 # include "vmreg_zero.inline.hpp" 89.6 #endif 89.7 +#ifdef TARGET_ARCH_arm 89.8 +# include "nativeInst_arm.hpp" 89.9 +# include "vmreg_arm.inline.hpp" 89.10 +#endif 89.11 +#ifdef TARGET_ARCH_ppc 89.12 +# include "nativeInst_ppc.hpp" 89.13 +# include "vmreg_ppc.inline.hpp" 89.14 +#endif 89.15 #ifdef TARGET_OS_FAMILY_linux 89.16 # include "thread_linux.inline.hpp" 89.17 #endif
90.1 --- a/src/share/vm/runtime/sharedRuntime.cpp Thu Jan 27 16:11:27 2011 -0800 90.2 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Feb 02 11:35:26 2011 -0500 90.3 @@ -68,6 +68,14 @@ 90.4 # include "nativeInst_zero.hpp" 90.5 # include "vmreg_zero.inline.hpp" 90.6 #endif 90.7 +#ifdef TARGET_ARCH_arm 90.8 +# include "nativeInst_arm.hpp" 90.9 +# include "vmreg_arm.inline.hpp" 90.10 +#endif 90.11 +#ifdef TARGET_ARCH_ppc 90.12 +# include "nativeInst_ppc.hpp" 90.13 +# include "vmreg_ppc.inline.hpp" 90.14 +#endif 90.15 #ifdef COMPILER1 90.16 #include "c1/c1_Runtime1.hpp" 90.17 #endif 90.18 @@ -2618,6 +2626,7 @@ 90.19 int jlsLen = java_lang_String::length(src); 90.20 jchar* jlsPos = (jlsLen == 0) ? NULL : 90.21 jlsValue->char_at_addr(jlsOffset); 90.22 + assert(typeArrayKlass::cast(jlsValue->klass())->element_type() == T_CHAR, "compressed string"); 90.23 (void) UNICODE::as_utf8(jlsPos, jlsLen, (char *)dst, max_dtrace_string_size); 90.24 } 90.25 #endif // ndef HAVE_DTRACE_H
91.1 --- a/src/share/vm/runtime/stackValueCollection.cpp Thu Jan 27 16:11:27 2011 -0800 91.2 +++ b/src/share/vm/runtime/stackValueCollection.cpp Wed Feb 02 11:35:26 2011 -0500 91.3 @@ -33,6 +33,12 @@ 91.4 #ifdef TARGET_ARCH_zero 91.5 # include "jniTypes_zero.hpp" 91.6 #endif 91.7 +#ifdef TARGET_ARCH_arm 91.8 +# include "jniTypes_arm.hpp" 91.9 +#endif 91.10 +#ifdef TARGET_ARCH_ppc 91.11 +# include "jniTypes_ppc.hpp" 91.12 +#endif 91.13 91.14 jint StackValueCollection::int_at(int slot) const { 91.15 intptr_t val = at(slot)->get_int();
92.1 --- a/src/share/vm/runtime/statSampler.cpp Thu Jan 27 16:11:27 2011 -0800 92.2 +++ b/src/share/vm/runtime/statSampler.cpp Wed Feb 02 11:35:26 2011 -0500 92.3 @@ -42,6 +42,12 @@ 92.4 #ifdef TARGET_ARCH_zero 92.5 # include "vm_version_zero.hpp" 92.6 #endif 92.7 +#ifdef TARGET_ARCH_arm 92.8 +# include "vm_version_arm.hpp" 92.9 +#endif 92.10 +#ifdef TARGET_ARCH_ppc 92.11 +# include "vm_version_ppc.hpp" 92.12 +#endif 92.13 92.14 // -------------------------------------------------------- 92.15 // StatSamplerTask
93.1 --- a/src/share/vm/runtime/stubCodeGenerator.cpp Thu Jan 27 16:11:27 2011 -0800 93.2 +++ b/src/share/vm/runtime/stubCodeGenerator.cpp Wed Feb 02 11:35:26 2011 -0500 93.3 @@ -36,6 +36,12 @@ 93.4 #ifdef TARGET_ARCH_zero 93.5 # include "assembler_zero.inline.hpp" 93.6 #endif 93.7 +#ifdef TARGET_ARCH_arm 93.8 +# include "assembler_arm.inline.hpp" 93.9 +#endif 93.10 +#ifdef TARGET_ARCH_ppc 93.11 +# include "assembler_ppc.inline.hpp" 93.12 +#endif 93.13 93.14 93.15 // Implementation of StubCodeDesc
94.1 --- a/src/share/vm/runtime/stubRoutines.hpp Thu Jan 27 16:11:27 2011 -0800 94.2 +++ b/src/share/vm/runtime/stubRoutines.hpp Wed Feb 02 11:35:26 2011 -0500 94.3 @@ -40,6 +40,12 @@ 94.4 #ifdef TARGET_ARCH_zero 94.5 # include "nativeInst_zero.hpp" 94.6 #endif 94.7 +#ifdef TARGET_ARCH_arm 94.8 +# include "nativeInst_arm.hpp" 94.9 +#endif 94.10 +#ifdef TARGET_ARCH_ppc 94.11 +# include "nativeInst_ppc.hpp" 94.12 +#endif 94.13 94.14 // StubRoutines provides entry points to assembly routines used by 94.15 // compiled code and the run-time system. Platform-specific entry 94.16 @@ -105,6 +111,12 @@ 94.17 #ifdef TARGET_ARCH_MODEL_zero 94.18 # include "stubRoutines_zero.hpp" 94.19 #endif 94.20 +#ifdef TARGET_ARCH_MODEL_arm 94.21 +# include "stubRoutines_arm.hpp" 94.22 +#endif 94.23 +#ifdef TARGET_ARCH_MODEL_ppc 94.24 +# include "stubRoutines_ppc.hpp" 94.25 +#endif 94.26 94.27 94.28 static jint _verify_oop_count;
95.1 --- a/src/share/vm/runtime/thread.hpp Thu Jan 27 16:11:27 2011 -0800 95.2 +++ b/src/share/vm/runtime/thread.hpp Wed Feb 02 11:35:26 2011 -0500 95.3 @@ -1598,6 +1598,12 @@ 95.4 #ifdef TARGET_OS_ARCH_windows_x86 95.5 # include "thread_windows_x86.hpp" 95.6 #endif 95.7 +#ifdef TARGET_OS_ARCH_linux_arm 95.8 +# include "thread_linux_arm.hpp" 95.9 +#endif 95.10 +#ifdef TARGET_OS_ARCH_linux_ppc 95.11 +# include "thread_linux_ppc.hpp" 95.12 +#endif 95.13 95.14 95.15 public:
96.1 --- a/src/share/vm/runtime/threadLocalStorage.hpp Thu Jan 27 16:11:27 2011 -0800 96.2 +++ b/src/share/vm/runtime/threadLocalStorage.hpp Wed Feb 02 11:35:26 2011 -0500 96.3 @@ -62,6 +62,12 @@ 96.4 #ifdef TARGET_OS_ARCH_windows_x86 96.5 # include "threadLS_windows_x86.hpp" 96.6 #endif 96.7 +#ifdef TARGET_OS_ARCH_linux_arm 96.8 +# include "threadLS_linux_arm.hpp" 96.9 +#endif 96.10 +#ifdef TARGET_OS_ARCH_linux_ppc 96.11 +# include "threadLS_linux_ppc.hpp" 96.12 +#endif 96.13 96.14 96.15 public:
97.1 --- a/src/share/vm/runtime/vmStructs.cpp Thu Jan 27 16:11:27 2011 -0800 97.2 +++ b/src/share/vm/runtime/vmStructs.cpp Wed Feb 02 11:35:26 2011 -0500 97.3 @@ -108,6 +108,12 @@ 97.4 #ifdef TARGET_ARCH_zero 97.5 # include "vmStructs_zero.hpp" 97.6 #endif 97.7 +#ifdef TARGET_ARCH_arm 97.8 +# include "vmStructs_arm.hpp" 97.9 +#endif 97.10 +#ifdef TARGET_ARCH_ppc 97.11 +# include "vmStructs_ppc.hpp" 97.12 +#endif 97.13 #ifdef TARGET_OS_FAMILY_linux 97.14 # include "thread_linux.inline.hpp" 97.15 #endif 97.16 @@ -135,6 +141,12 @@ 97.17 #ifdef TARGET_OS_ARCH_windows_x86 97.18 # include "vmStructs_windows_x86.hpp" 97.19 #endif 97.20 +#ifdef TARGET_OS_ARCH_linux_arm 97.21 +# include "vmStructs_linux_arm.hpp" 97.22 +#endif 97.23 +#ifdef TARGET_OS_ARCH_linux_ppc 97.24 +# include "vmStructs_linux_ppc.hpp" 97.25 +#endif 97.26 #ifndef SERIALGC 97.27 #include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp" 97.28 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" 97.29 @@ -166,6 +178,12 @@ 97.30 #ifdef TARGET_ARCH_MODEL_zero 97.31 # include "adfiles/adGlobals_zero.hpp" 97.32 #endif 97.33 +#ifdef TARGET_ARCH_MODEL_arm 97.34 +# include "adfiles/adGlobals_arm.hpp" 97.35 +#endif 97.36 +#ifdef TARGET_ARCH_MODEL_ppc 97.37 +# include "adfiles/adGlobals_ppc.hpp" 97.38 +#endif 97.39 #endif 97.40 97.41 // Note: the cross-product of (c1, c2, product, nonproduct, ...),
98.1 --- a/src/share/vm/runtime/vm_version.cpp Thu Jan 27 16:11:27 2011 -0800 98.2 +++ b/src/share/vm/runtime/vm_version.cpp Wed Feb 02 11:35:26 2011 -0500 98.3 @@ -35,6 +35,12 @@ 98.4 #ifdef TARGET_ARCH_zero 98.5 # include "vm_version_zero.hpp" 98.6 #endif 98.7 +#ifdef TARGET_ARCH_arm 98.8 +# include "vm_version_arm.hpp" 98.9 +#endif 98.10 +#ifdef TARGET_ARCH_ppc 98.11 +# include "vm_version_ppc.hpp" 98.12 +#endif 98.13 98.14 const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release(); 98.15 const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string(); 98.16 @@ -220,8 +226,21 @@ 98.17 #endif 98.18 #endif 98.19 98.20 + #ifndef FLOAT_ARCH 98.21 + #if defined(__SOFTFP__) 98.22 + #define FLOAT_ARCH "-sflt" 98.23 + #elif defined(E500V2) 98.24 + #define FLOAT_ARCH "-e500v2" 98.25 + #elif defined(ARM) 98.26 + #define FLOAT_ARCH "-vfp" 98.27 + #elif defined(PPC) 98.28 + #define FLOAT_ARCH "-hflt" 98.29 + #else 98.30 + #define FLOAT_ARCH "" 98.31 + #endif 98.32 + #endif 98.33 98.34 - return VMNAME " (" VM_RELEASE ") for " OS "-" CPU 98.35 + return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH 98.36 " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__ 98.37 " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; 98.38 }
99.1 --- a/src/share/vm/utilities/copy.hpp Thu Jan 27 16:11:27 2011 -0800 99.2 +++ b/src/share/vm/utilities/copy.hpp Wed Feb 02 11:35:26 2011 -0500 99.3 @@ -331,6 +331,12 @@ 99.4 #ifdef TARGET_ARCH_zero 99.5 # include "copy_zero.hpp" 99.6 #endif 99.7 +#ifdef TARGET_ARCH_arm 99.8 +# include "copy_arm.hpp" 99.9 +#endif 99.10 +#ifdef TARGET_ARCH_ppc 99.11 +# include "copy_ppc.hpp" 99.12 +#endif 99.13 99.14 }; 99.15
100.1 --- a/src/share/vm/utilities/globalDefinitions.hpp Thu Jan 27 16:11:27 2011 -0800 100.2 +++ b/src/share/vm/utilities/globalDefinitions.hpp Wed Feb 02 11:35:26 2011 -0500 100.3 @@ -328,6 +328,12 @@ 100.4 #ifdef TARGET_ARCH_zero 100.5 # include "globalDefinitions_zero.hpp" 100.6 #endif 100.7 +#ifdef TARGET_ARCH_arm 100.8 +# include "globalDefinitions_arm.hpp" 100.9 +#endif 100.10 +#ifdef TARGET_ARCH_ppc 100.11 +# include "globalDefinitions_ppc.hpp" 100.12 +#endif 100.13 100.14 100.15 // The byte alignment to be used by Arena::Amalloc. See bugid 4169348.
101.1 --- a/src/share/vm/utilities/taskqueue.hpp Thu Jan 27 16:11:27 2011 -0800 101.2 +++ b/src/share/vm/utilities/taskqueue.hpp Wed Feb 02 11:35:26 2011 -0500 101.3 @@ -47,6 +47,12 @@ 101.4 #ifdef TARGET_OS_ARCH_windows_x86 101.5 # include "orderAccess_windows_x86.inline.hpp" 101.6 #endif 101.7 +#ifdef TARGET_OS_ARCH_linux_arm 101.8 +# include "orderAccess_linux_arm.inline.hpp" 101.9 +#endif 101.10 +#ifdef TARGET_OS_ARCH_linux_ppc 101.11 +# include "orderAccess_linux_ppc.inline.hpp" 101.12 +#endif 101.13 101.14 // Simple TaskQueue stats that are collected by default in debug builds. 101.15
