Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Tue, 03 Mar 2015 13:06:16 -0800
- author
- amurillo
- date
- Tue, 03 Mar 2015 13:06:16 -0800
- changeset 7608
- 7619adc72abd
- parent 7607
- 0e25e3802086
- parent 7603
- b13f1890afb8
- child 7609
- db433ae5c123
- child 7661
- 407b168b3b3a
- child 7662
- 6d817035633c
Merge
| .hgtags | file | annotate | diff | comparison | revisions | |
| make/linux/makefiles/arm.make | file | annotate | diff | comparison | revisions | |
| make/linux/makefiles/ppc.make | file | annotate | diff | comparison | revisions | |
| make/linux/platform_arm | file | annotate | diff | comparison | revisions | |
| make/linux/platform_ppc | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Fri Feb 27 15:44:03 2015 -0800 1.2 +++ b/.hgtags Tue Mar 03 13:06:16 2015 -0800 1.3 @@ -598,3 +598,4 @@ 1.4 9d6eb2757167744a17ea71f8b860430d70941eda jdk8u60-b03 1.5 0fb1ac49ae7764c5d7c6dfb9fe046d0e1a4eb5aa hs25.60-b04 1.6 586a449cd30332dd53c0f74bf2ead6f3d4724bfc jdk8u60-b04 1.7 +74931e85352be8556eaa511ca0dd7c38fe272ec3 hs25.60-b05
2.1 --- a/agent/src/os/linux/libproc.h Fri Feb 27 15:44:03 2015 -0800 2.2 +++ b/agent/src/os/linux/libproc.h Tue Mar 03 13:06:16 2015 -0800 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -30,7 +30,7 @@ 2.11 #include <stdint.h> 2.12 #include "proc_service.h" 2.13 2.14 -#if defined(arm) || defined(ppc) 2.15 +#ifdef ALT_SASRCDIR 2.16 #include "libproc_md.h" 2.17 #endif 2.18
3.1 --- a/make/defs.make Fri Feb 27 15:44:03 2015 -0800 3.2 +++ b/make/defs.make Tue Mar 03 13:06:16 2015 -0800 3.3 @@ -1,5 +1,5 @@ 3.4 # 3.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. 3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 # 3.9 # This code is free software; you can redistribute it and/or modify it 3.10 @@ -273,7 +273,7 @@ 3.11 3.12 # Use uname output for SRCARCH, but deal with platform differences. If ARCH 3.13 # is not explicitly listed below, it is treated as x86. 3.14 - SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH))) 3.15 + SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 zero,$(ARCH))) 3.16 ARCH/ = x86 3.17 ARCH/sparc = sparc 3.18 ARCH/sparc64= sparc 3.19 @@ -281,12 +281,10 @@ 3.20 ARCH/amd64 = x86 3.21 ARCH/x86_64 = x86 3.22 ARCH/ppc64 = ppc 3.23 - ARCH/ppc = ppc 3.24 - ARCH/arm = arm 3.25 ARCH/zero = zero 3.26 3.27 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 3.28 - BUILDARCH = $(SRCARCH) 3.29 + BUILDARCH ?= $(SRCARCH) 3.30 ifeq ($(BUILDARCH), x86) 3.31 ifdef LP64 3.32 BUILDARCH = amd64 3.33 @@ -306,18 +304,16 @@ 3.34 endif 3.35 3.36 # LIBARCH is 1:1 mapping from BUILDARCH 3.37 - LIBARCH = $(LIBARCH/$(BUILDARCH)) 3.38 + LIBARCH ?= $(LIBARCH/$(BUILDARCH)) 3.39 LIBARCH/i486 = i386 3.40 LIBARCH/amd64 = amd64 3.41 LIBARCH/sparc = sparc 3.42 LIBARCH/sparcv9 = sparcv9 3.43 LIBARCH/ia64 = ia64 3.44 LIBARCH/ppc64 = ppc64 3.45 - LIBARCH/ppc = ppc 3.46 - LIBARCH/arm = arm 3.47 LIBARCH/zero = $(ZERO_LIBARCH) 3.48 3.49 - LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero 3.50 + LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero 3.51 endif 3.52 3.53 # Required make macro settings for all platforms
4.1 --- a/make/hotspot_version Fri Feb 27 15:44:03 2015 -0800 4.2 +++ b/make/hotspot_version Tue Mar 03 13:06:16 2015 -0800 4.3 @@ -35,7 +35,7 @@ 4.4 4.5 HS_MAJOR_VER=25 4.6 HS_MINOR_VER=60 4.7 -HS_BUILD_NUMBER=04 4.8 +HS_BUILD_NUMBER=05 4.9 4.10 JDK_MAJOR_VER=1 4.11 JDK_MINOR_VER=8
5.1 --- a/make/linux/makefiles/arm.make Fri Feb 27 15:44:03 2015 -0800 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,31 +0,0 @@ 5.4 -# 5.5 -# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 5.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 -# 5.8 -# This code is free software; you can redistribute it and/or modify it 5.9 -# under the terms of the GNU General Public License version 2 only, as 5.10 -# published by the Free Software Foundation. 5.11 -# 5.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 5.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.15 -# version 2 for more details (a copy is included in the LICENSE file that 5.16 -# accompanied this code). 5.17 -# 5.18 -# You should have received a copy of the GNU General Public License version 5.19 -# 2 along with this work; if not, write to the Free Software Foundation, 5.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.21 -# 5.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.23 -# or visit www.oracle.com if you need additional information or have any 5.24 -# questions. 5.25 -# 5.26 -# 5.27 - 5.28 -Obj_Files += linux_arm.o 5.29 - 5.30 -ifneq ($(EXT_LIBS_PATH),) 5.31 - LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 5.32 -endif 5.33 - 5.34 -CFLAGS += -DVM_LITTLE_ENDIAN
6.1 --- a/make/linux/makefiles/buildtree.make Fri Feb 27 15:44:03 2015 -0800 6.2 +++ b/make/linux/makefiles/buildtree.make Tue Mar 03 13:06:16 2015 -0800 6.3 @@ -1,5 +1,5 @@ 6.4 # 6.5 -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 6.6 +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 6.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 # 6.9 # This code is free software; you can redistribute it and/or modify it 6.10 @@ -70,6 +70,8 @@ 6.11 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc 6.12 else 6.13 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH) 6.14 + ALT_PLATFORM_FILE = $(HS_ALT_MAKE)/$(OS_FAMILY)/platform_$(BUILDARCH) 6.15 + PLATFORM_FILE := $(if $(wildcard $(ALT_PLATFORM_FILE)),$(ALT_PLATFORM_FILE),$(PLATFORM_FILE)) 6.16 endif 6.17 endif 6.18 6.19 @@ -202,7 +204,7 @@ 6.20 $(QUIETLY) ( \ 6.21 $(BUILDTREE_COMMENT); \ 6.22 echo; \ 6.23 - echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ 6.24 + echo "Platform_file = $(PLATFORM_FILE)" | sed -e 's|$(HS_ALT_MAKE)|$$(HS_ALT_MAKE)|' -e 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ 6.25 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ 6.26 echo; \ 6.27 echo "GAMMADIR = $(GAMMADIR)"; \
7.1 --- a/make/linux/makefiles/defs.make Fri Feb 27 15:44:03 2015 -0800 7.2 +++ b/make/linux/makefiles/defs.make Tue Mar 03 13:06:16 2015 -0800 7.3 @@ -1,5 +1,5 @@ 7.4 # 7.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 7.6 +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. 7.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 # 7.9 # This code is free software; you can redistribute it and/or modify it 7.10 @@ -109,22 +109,6 @@ 7.11 HS_ARCH = x86 7.12 endif 7.13 7.14 -# ARM 7.15 -ifeq ($(ARCH), arm) 7.16 - ARCH_DATA_MODEL = 32 7.17 - PLATFORM = linux-arm 7.18 - VM_PLATFORM = linux_arm 7.19 - HS_ARCH = arm 7.20 -endif 7.21 - 7.22 -# PPC 7.23 -ifeq ($(ARCH), ppc) 7.24 - ARCH_DATA_MODEL = 32 7.25 - PLATFORM = linux-ppc 7.26 - VM_PLATFORM = linux_ppc 7.27 - HS_ARCH = ppc 7.28 -endif 7.29 - 7.30 # PPC64 7.31 ifeq ($(ARCH), ppc64) 7.32 ARCH_DATA_MODEL = 64
8.1 --- a/make/linux/makefiles/gcc.make Fri Feb 27 15:44:03 2015 -0800 8.2 +++ b/make/linux/makefiles/gcc.make Tue Mar 03 13:06:16 2015 -0800 8.3 @@ -1,5 +1,5 @@ 8.4 # 8.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 8.6 +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 8.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 # 8.9 # This code is free software; you can redistribute it and/or modify it 8.10 @@ -176,11 +176,7 @@ 8.11 ARCHFLAG/ia64 = 8.12 ARCHFLAG/sparc = -m32 -mcpu=v9 8.13 ARCHFLAG/sparcv9 = -m64 -mcpu=v9 8.14 -ARCHFLAG/arm = -fsigned-char 8.15 ARCHFLAG/zero = $(ZERO_ARCHFLAG) 8.16 -ifndef E500V2 8.17 -ARCHFLAG/ppc = -mcpu=powerpc 8.18 -endif 8.19 ARCHFLAG/ppc64 = -m64 8.20 8.21 CFLAGS += $(ARCHFLAG) 8.22 @@ -188,10 +184,6 @@ 8.23 LFLAGS += $(ARCHFLAG) 8.24 ASFLAGS += $(ARCHFLAG) 8.25 8.26 -ifdef E500V2 8.27 -CFLAGS += -DE500V2 8.28 -endif 8.29 - 8.30 # Use C++ Interpreter 8.31 ifdef CC_INTERP 8.32 CFLAGS += -DCC_INTERP 8.33 @@ -409,3 +401,5 @@ 8.34 ifndef USE_SUNCC 8.35 CFLAGS += -fno-omit-frame-pointer 8.36 endif 8.37 + 8.38 +-include $(HS_ALT_MAKE)/linux/makefiles/gcc.make
9.1 --- a/make/linux/makefiles/ppc.make Fri Feb 27 15:44:03 2015 -0800 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,33 +0,0 @@ 9.4 -# 9.5 -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. 9.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.7 -# 9.8 -# This code is free software; you can redistribute it and/or modify it 9.9 -# under the terms of the GNU General Public License version 2 only, as 9.10 -# published by the Free Software Foundation. 9.11 -# 9.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 9.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.15 -# version 2 for more details (a copy is included in the LICENSE file that 9.16 -# accompanied this code). 9.17 -# 9.18 -# You should have received a copy of the GNU General Public License version 9.19 -# 2 along with this work; if not, write to the Free Software Foundation, 9.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.21 -# 9.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 9.23 -# or visit www.oracle.com if you need additional information or have any 9.24 -# questions. 9.25 -# 9.26 -# 9.27 - 9.28 -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized 9.29 -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) 9.30 - 9.31 -# Must also specify if CPU is big endian 9.32 -CFLAGS += -DVM_BIG_ENDIAN 9.33 - 9.34 -ifdef E500V2 9.35 -ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 9.36 -endif
10.1 --- a/make/linux/makefiles/saproc.make Fri Feb 27 15:44:03 2015 -0800 10.2 +++ b/make/linux/makefiles/saproc.make Tue Mar 03 13:06:16 2015 -0800 10.3 @@ -1,5 +1,5 @@ 10.4 # 10.5 -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 10.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.8 # 10.9 # This code is free software; you can redistribute it and/or modify it 10.10 @@ -69,19 +69,21 @@ 10.11 endif 10.12 10.13 ifneq ($(ALT_SASRCDIR),) 10.14 -ALT_SAINCDIR=-I$(ALT_SASRCDIR) 10.15 +ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR 10.16 else 10.17 ALT_SAINCDIR= 10.18 endif 10.19 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) 10.20 10.21 +SAARCH ?= $(BUILDARCH) 10.22 + 10.23 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) 10.24 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 10.25 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 10.26 exit 1; \ 10.27 fi 10.28 @echo Making SA debugger back-end... 10.29 - $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \ 10.30 + $(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE \ 10.31 -D_FILE_OFFSET_BITS=64 \ 10.32 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ 10.33 -I$(SASRCDIR) \
11.1 --- a/make/linux/makefiles/vm.make Fri Feb 27 15:44:03 2015 -0800 11.2 +++ b/make/linux/makefiles/vm.make Tue Mar 03 13:06:16 2015 -0800 11.3 @@ -1,5 +1,5 @@ 11.4 # 11.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 11.6 +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 11.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.8 # 11.9 # This code is free software; you can redistribute it and/or modify it 11.10 @@ -45,8 +45,9 @@ 11.11 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 11.12 include $(MAKEFILES_DIR)/zeroshark.make 11.13 else 11.14 - include $(MAKEFILES_DIR)/$(BUILDARCH).make 11.15 - -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make 11.16 + BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make 11.17 + ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make 11.18 + include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE)) 11.19 endif 11.20 11.21 # set VPATH so make knows where to look for source files
12.1 --- a/make/linux/platform_arm Fri Feb 27 15:44:03 2015 -0800 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,17 +0,0 @@ 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 --- a/make/linux/platform_ppc Fri Feb 27 15:44:03 2015 -0800 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,17 +0,0 @@ 13.4 -os_family = linux 13.5 - 13.6 -arch = ppc 13.7 - 13.8 -arch_model = ppc_32 13.9 - 13.10 -os_arch = linux_ppc 13.11 - 13.12 -os_arch_model = linux_ppc_32 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 -DPPC32
14.1 --- a/src/cpu/zero/vm/stack_zero.cpp Fri Feb 27 15:44:03 2015 -0800 14.2 +++ b/src/cpu/zero/vm/stack_zero.cpp Tue Mar 03 13:06:16 2015 -0800 14.3 @@ -30,7 +30,9 @@ 14.4 14.5 int ZeroStack::suggest_size(Thread *thread) const { 14.6 assert(needs_setup(), "already set up"); 14.7 - return align_size_down(abi_stack_available(thread) / 2, wordSize); 14.8 + int abi_available = abi_stack_available(thread); 14.9 + assert(abi_available >= 0, "available abi stack must be >= 0"); 14.10 + return align_size_down(abi_available / 2, wordSize); 14.11 } 14.12 14.13 void ZeroStack::handle_overflow(TRAPS) {
15.1 --- a/src/cpu/zero/vm/stack_zero.inline.hpp Fri Feb 27 15:44:03 2015 -0800 15.2 +++ b/src/cpu/zero/vm/stack_zero.inline.hpp Tue Mar 03 13:06:16 2015 -0800 15.3 @@ -48,9 +48,11 @@ 15.4 // to use under normal circumstances. Note that the returned 15.5 // value can be negative. 15.6 inline int ZeroStack::abi_stack_available(Thread *thread) const { 15.7 - int stack_used = thread->stack_base() - (address) &stack_used; 15.8 + guarantee(Thread::current() == thread, "should run in the same thread"); 15.9 + int stack_used = thread->stack_base() - (address) &stack_used 15.10 + + (StackYellowPages+StackRedPages+StackShadowPages) * os::vm_page_size(); 15.11 int stack_free = thread->stack_size() - stack_used; 15.12 - return stack_free - shadow_pages_size(); 15.13 + return stack_free; 15.14 } 15.15 15.16 #endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
16.1 --- a/src/os/linux/vm/os_linux.cpp Fri Feb 27 15:44:03 2015 -0800 16.2 +++ b/src/os/linux/vm/os_linux.cpp Tue Mar 03 13:06:16 2015 -0800 16.3 @@ -1,5 +1,5 @@ 16.4 /* 16.5 - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. 16.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 16.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 16.8 * 16.9 * This code is free software; you can redistribute it and/or modify it 16.10 @@ -252,30 +252,7 @@ 16.11 #endif 16.12 16.13 // Cpu architecture string 16.14 -#if defined(ZERO) 16.15 -static char cpu_arch[] = ZERO_LIBARCH; 16.16 -#elif defined(IA64) 16.17 -static char cpu_arch[] = "ia64"; 16.18 -#elif defined(IA32) 16.19 -static char cpu_arch[] = "i386"; 16.20 -#elif defined(AMD64) 16.21 -static char cpu_arch[] = "amd64"; 16.22 -#elif defined(ARM) 16.23 -static char cpu_arch[] = "arm"; 16.24 -#elif defined(PPC32) 16.25 -static char cpu_arch[] = "ppc"; 16.26 -#elif defined(PPC64) 16.27 -static char cpu_arch[] = "ppc64"; 16.28 -#elif defined(SPARC) 16.29 -# ifdef _LP64 16.30 -static char cpu_arch[] = "sparcv9"; 16.31 -# else 16.32 -static char cpu_arch[] = "sparc"; 16.33 -# endif 16.34 -#else 16.35 -#error Add appropriate cpu_arch setting 16.36 -#endif 16.37 - 16.38 +static char cpu_arch[] = HOTSPOT_LIB_ARCH; 16.39 16.40 // pid_t gettid() 16.41 //
17.1 --- a/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp Fri Feb 27 15:44:03 2015 -0800 17.2 +++ b/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp Tue Mar 03 13:06:16 2015 -0800 17.3 @@ -238,7 +238,13 @@ 17.4 // operation. Note that some platforms only support this with the 17.5 // limitation that the only valid value to store is the immediate 17.6 // constant 1. There is a test for this in JNI_CreateJavaVM(). 17.7 - return __sync_lock_test_and_set (dest, exchange_value); 17.8 + jint result = __sync_lock_test_and_set (dest, exchange_value); 17.9 + // All atomic operations are expected to be full memory barriers 17.10 + // (see atomic.hpp). However, __sync_lock_test_and_set is not 17.11 + // a full memory barrier, but an acquire barrier. Hence, this added 17.12 + // barrier. 17.13 + __sync_synchronize(); 17.14 + return result; 17.15 #endif // M68K 17.16 #endif // ARM 17.17 } 17.18 @@ -251,7 +257,9 @@ 17.19 #ifdef M68K 17.20 return m68k_lock_test_and_set(dest, exchange_value); 17.21 #else 17.22 - return __sync_lock_test_and_set (dest, exchange_value); 17.23 + intptr_t result = __sync_lock_test_and_set (dest, exchange_value); 17.24 + __sync_synchronize(); 17.25 + return result; 17.26 #endif // M68K 17.27 #endif // ARM 17.28 }
18.1 --- a/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Fri Feb 27 15:44:03 2015 -0800 18.2 +++ b/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Tue Mar 03 13:06:16 2015 -0800 18.3 @@ -1,6 +1,6 @@ 18.4 /* 18.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 18.6 - * Copyright 2007, 2008, 2011 Red Hat, Inc. 18.7 + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. 18.8 + * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc. 18.9 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 18.10 * 18.11 * This code is free software; you can redistribute it and/or modify it 18.12 @@ -232,7 +232,13 @@ 18.13 // operation. Note that some platforms only support this with the 18.14 // limitation that the only valid value to store is the immediate 18.15 // constant 1. There is a test for this in JNI_CreateJavaVM(). 18.16 - return __sync_lock_test_and_set (dest, exchange_value); 18.17 + jint result = __sync_lock_test_and_set (dest, exchange_value); 18.18 + // All atomic operations are expected to be full memory barriers 18.19 + // (see atomic.hpp). However, __sync_lock_test_and_set is not 18.20 + // a full memory barrier, but an acquire barrier. Hence, this added 18.21 + // barrier. 18.22 + __sync_synchronize(); 18.23 + return result; 18.24 #endif // M68K 18.25 #endif // ARM 18.26 } 18.27 @@ -245,7 +251,9 @@ 18.28 #ifdef M68K 18.29 return m68k_lock_test_and_set(dest, exchange_value); 18.30 #else 18.31 - return __sync_lock_test_and_set (dest, exchange_value); 18.32 + intptr_t result = __sync_lock_test_and_set (dest, exchange_value); 18.33 + __sync_synchronize(); 18.34 + return result; 18.35 #endif // M68K 18.36 #endif // ARM 18.37 }
19.1 --- a/src/share/vm/c1/c1_LIR.cpp Fri Feb 27 15:44:03 2015 -0800 19.2 +++ b/src/share/vm/c1/c1_LIR.cpp Tue Mar 03 13:06:16 2015 -0800 19.3 @@ -1,5 +1,5 @@ 19.4 /* 19.5 - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. 19.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 19.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 19.8 * 19.9 * This code is free software; you can redistribute it and/or modify it 19.10 @@ -142,16 +142,11 @@ 19.11 19.12 19.13 #ifndef PRODUCT 19.14 -void LIR_Address::verify() const { 19.15 +void LIR_Address::verify0() const { 19.16 #if defined(SPARC) || defined(PPC) 19.17 assert(scale() == times_1, "Scaled addressing mode not available on SPARC/PPC and should not be used"); 19.18 assert(disp() == 0 || index()->is_illegal(), "can't have both"); 19.19 #endif 19.20 -#ifdef ARM 19.21 - assert(disp() == 0 || index()->is_illegal(), "can't have both"); 19.22 - // Note: offsets higher than 4096 must not be rejected here. They can 19.23 - // be handled by the back-end or will be rejected if not. 19.24 -#endif 19.25 #ifdef _LP64 19.26 assert(base()->is_cpu_register(), "wrong base operand"); 19.27 assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand");
20.1 --- a/src/share/vm/c1/c1_LIR.hpp Fri Feb 27 15:44:03 2015 -0800 20.2 +++ b/src/share/vm/c1/c1_LIR.hpp Tue Mar 03 13:06:16 2015 -0800 20.3 @@ -1,5 +1,5 @@ 20.4 /* 20.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 20.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 20.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 20.8 * 20.9 * This code is free software; you can redistribute it and/or modify it 20.10 @@ -25,6 +25,7 @@ 20.11 #ifndef SHARE_VM_C1_C1_LIR_HPP 20.12 #define SHARE_VM_C1_C1_LIR_HPP 20.13 20.14 +#include "c1/c1_Defs.hpp" 20.15 #include "c1/c1_ValueType.hpp" 20.16 #include "oops/method.hpp" 20.17 20.18 @@ -561,7 +562,13 @@ 20.19 virtual BasicType type() const { return _type; } 20.20 virtual void print_value_on(outputStream* out) const PRODUCT_RETURN; 20.21 20.22 - void verify() const PRODUCT_RETURN; 20.23 + void verify0() const PRODUCT_RETURN; 20.24 +#if defined(LIR_ADDRESS_PD_VERIFY) && !defined(PRODUCT) 20.25 + void pd_verify() const; 20.26 + void verify() const { pd_verify(); } 20.27 +#else 20.28 + void verify() const { verify0(); } 20.29 +#endif 20.30 20.31 static Scale scale(BasicType type); 20.32 }; 20.33 @@ -610,19 +617,15 @@ 20.34 LIR_OprDesc::float_type | 20.35 LIR_OprDesc::fpu_register | 20.36 LIR_OprDesc::single_size); } 20.37 -#if defined(ARM) 20.38 - static LIR_Opr double_fpu(int reg1, int reg2) { return (LIR_Opr)((reg1 << LIR_OprDesc::reg1_shift) | (reg2 << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::fpu_register | LIR_OprDesc::double_size); } 20.39 - static LIR_Opr single_softfp(int reg) { return (LIR_Opr)((reg << LIR_OprDesc::reg1_shift) | LIR_OprDesc::float_type | LIR_OprDesc::cpu_register | LIR_OprDesc::single_size); } 20.40 - static LIR_Opr double_softfp(int reg1, int reg2) { return (LIR_Opr)((reg1 << LIR_OprDesc::reg1_shift) | (reg2 << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::cpu_register | LIR_OprDesc::double_size); } 20.41 -#endif 20.42 -#ifdef SPARC 20.43 +#if defined(C1_LIR_MD_HPP) 20.44 +# include C1_LIR_MD_HPP 20.45 +#elif defined(SPARC) 20.46 static LIR_Opr double_fpu(int reg1, int reg2) { return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) | 20.47 (reg2 << LIR_OprDesc::reg2_shift) | 20.48 LIR_OprDesc::double_type | 20.49 LIR_OprDesc::fpu_register | 20.50 LIR_OprDesc::double_size); } 20.51 -#endif 20.52 -#ifdef X86 20.53 +#elif defined(X86) 20.54 static LIR_Opr double_fpu(int reg) { return (LIR_Opr)(intptr_t)((reg << LIR_OprDesc::reg1_shift) | 20.55 (reg << LIR_OprDesc::reg2_shift) | 20.56 LIR_OprDesc::double_type | 20.57 @@ -640,8 +643,7 @@ 20.58 LIR_OprDesc::fpu_register | 20.59 LIR_OprDesc::double_size | 20.60 LIR_OprDesc::is_xmm_mask); } 20.61 -#endif // X86 20.62 -#ifdef PPC 20.63 +#elif defined(PPC) 20.64 static LIR_Opr double_fpu(int reg) { return (LIR_Opr)(intptr_t)((reg << LIR_OprDesc::reg1_shift) | 20.65 (reg << LIR_OprDesc::reg2_shift) | 20.66 LIR_OprDesc::double_type |
21.1 --- a/src/share/vm/c1/c1_LIRGenerator.cpp Fri Feb 27 15:44:03 2015 -0800 21.2 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp Tue Mar 03 13:06:16 2015 -0800 21.3 @@ -1,5 +1,5 @@ 21.4 /* 21.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 21.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 21.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 21.8 * 21.9 * This code is free software; you can redistribute it and/or modify it 21.10 @@ -23,6 +23,7 @@ 21.11 */ 21.12 21.13 #include "precompiled.hpp" 21.14 +#include "c1/c1_Defs.hpp" 21.15 #include "c1/c1_Compilation.hpp" 21.16 #include "c1/c1_FrameMap.hpp" 21.17 #include "c1/c1_Instruction.hpp" 21.18 @@ -46,10 +47,7 @@ 21.19 #define __ gen()->lir()-> 21.20 #endif 21.21 21.22 -// TODO: ARM - Use some recognizable constant which still fits architectural constraints 21.23 -#ifdef ARM 21.24 -#define PATCHED_ADDR (204) 21.25 -#else 21.26 +#ifndef PATCHED_ADDR 21.27 #define PATCHED_ADDR (max_jint) 21.28 #endif 21.29 21.30 @@ -1599,25 +1597,9 @@ 21.31 } 21.32 assert(addr->is_register(), "must be a register at this point"); 21.33 21.34 -#ifdef ARM 21.35 - // TODO: ARM - move to platform-dependent code 21.36 - LIR_Opr tmp = FrameMap::R14_opr; 21.37 - if (VM_Version::supports_movw()) { 21.38 - __ move((LIR_Opr)card_table_base, tmp); 21.39 - } else { 21.40 - __ move(new LIR_Address(FrameMap::Rthread_opr, in_bytes(JavaThread::card_table_base_offset()), T_ADDRESS), tmp); 21.41 - } 21.42 - 21.43 - CardTableModRefBS* ct = (CardTableModRefBS*)_bs; 21.44 - LIR_Address *card_addr = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTableModRefBS::card_shift, 0, T_BYTE); 21.45 - if(((int)ct->byte_map_base & 0xff) == 0) { 21.46 - __ move(tmp, card_addr); 21.47 - } else { 21.48 - LIR_Opr tmp_zero = new_register(T_INT); 21.49 - __ move(LIR_OprFact::intConst(0), tmp_zero); 21.50 - __ move(tmp_zero, card_addr); 21.51 - } 21.52 -#else // ARM 21.53 +#ifdef CARDTABLEMODREF_POST_BARRIER_HELPER 21.54 + CardTableModRef_post_barrier_helper(addr, card_table_base); 21.55 +#else 21.56 LIR_Opr tmp = new_pointer_register(); 21.57 if (TwoOperandLIRForm) { 21.58 __ move(addr, tmp); 21.59 @@ -1633,7 +1615,7 @@ 21.60 new LIR_Address(tmp, load_constant(card_table_base), 21.61 T_BYTE)); 21.62 } 21.63 -#endif // ARM 21.64 +#endif 21.65 } 21.66 21.67 21.68 @@ -2121,7 +2103,7 @@ 21.69 } else { 21.70 #ifdef X86 21.71 addr = new LIR_Address(base_op, index_op, LIR_Address::Scale(log2_scale), 0, dst_type); 21.72 -#elif defined(ARM) 21.73 +#elif defined(GENERATE_ADDRESS_IS_PREFERRED) 21.74 addr = generate_address(base_op, index_op, log2_scale, 0, dst_type); 21.75 #else 21.76 if (index_op->is_illegal() || log2_scale == 0) { 21.77 @@ -2175,6 +2157,9 @@ 21.78 LIR_Opr base_op = base.result(); 21.79 LIR_Opr index_op = idx.result(); 21.80 21.81 +#ifdef GENERATE_ADDRESS_IS_PREFERRED 21.82 + LIR_Address* addr = generate_address(base_op, index_op, log2_scale, 0, x->basic_type()); 21.83 +#else 21.84 #ifndef _LP64 21.85 if (base_op->type() == T_LONG) { 21.86 base_op = new_register(T_INT); 21.87 @@ -2208,6 +2193,7 @@ 21.88 } 21.89 21.90 LIR_Address* addr = new LIR_Address(base_op, index_op, x->basic_type()); 21.91 +#endif // !GENERATE_ADDRESS_IS_PREFERRED 21.92 __ move(value.result(), addr); 21.93 } 21.94
22.1 --- a/src/share/vm/c1/c1_LIRGenerator.hpp Fri Feb 27 15:44:03 2015 -0800 22.2 +++ b/src/share/vm/c1/c1_LIRGenerator.hpp Tue Mar 03 13:06:16 2015 -0800 22.3 @@ -1,5 +1,5 @@ 22.4 /* 22.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 22.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 22.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 22.8 * 22.9 * This code is free software; you can redistribute it and/or modify it 22.10 @@ -277,6 +277,9 @@ 22.11 22.12 void G1SATBCardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val); 22.13 void CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val); 22.14 +#ifdef CARDTABLEMODREF_POST_BARRIER_HELPER 22.15 + void CardTableModRef_post_barrier_helper(LIR_OprDesc* addr, LIR_Const* card_table_base); 22.16 +#endif 22.17 22.18 22.19 static LIR_Opr result_register_for(ValueType* type, bool callee = false); 22.20 @@ -550,6 +553,10 @@ 22.21 #ifdef ASSERT 22.22 virtual void do_Assert (Assert* x); 22.23 #endif 22.24 + 22.25 +#ifdef C1_LIRGENERATOR_MD_HPP 22.26 +#include C1_LIRGENERATOR_MD_HPP 22.27 +#endif 22.28 }; 22.29 22.30
23.1 --- a/src/share/vm/c1/c1_LinearScan.cpp Fri Feb 27 15:44:03 2015 -0800 23.2 +++ b/src/share/vm/c1/c1_LinearScan.cpp Tue Mar 03 13:06:16 2015 -0800 23.3 @@ -1,5 +1,5 @@ 23.4 /* 23.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 23.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 23.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 23.8 * 23.9 * This code is free software; you can redistribute it and/or modify it 23.10 @@ -2138,7 +2138,7 @@ 23.11 assert(interval->assigned_regHi() >= pd_first_fpu_reg && interval->assigned_regHi() <= pd_last_fpu_reg, "no fpu register"); 23.12 assert(assigned_reg % 2 == 0 && assigned_reg + 1 == interval->assigned_regHi(), "must be sequential and even"); 23.13 LIR_Opr result = LIR_OprFact::double_fpu(interval->assigned_regHi() - pd_first_fpu_reg, assigned_reg - pd_first_fpu_reg); 23.14 -#elif defined(ARM) 23.15 +#elif defined(ARM32) 23.16 assert(assigned_reg >= pd_first_fpu_reg && assigned_reg <= pd_last_fpu_reg, "no fpu register"); 23.17 assert(interval->assigned_regHi() >= pd_first_fpu_reg && interval->assigned_regHi() <= pd_last_fpu_reg, "no fpu register"); 23.18 assert(assigned_reg % 2 == 0 && assigned_reg + 1 == interval->assigned_regHi(), "must be sequential and even"); 23.19 @@ -2727,7 +2727,7 @@ 23.20 #ifdef SPARC 23.21 assert(opr->fpu_regnrLo() == opr->fpu_regnrHi() + 1, "assumed in calculation (only fpu_regnrHi is used)"); 23.22 #endif 23.23 -#ifdef ARM 23.24 +#ifdef ARM32 23.25 assert(opr->fpu_regnrHi() == opr->fpu_regnrLo() + 1, "assumed in calculation (only fpu_regnrLo is used)"); 23.26 #endif 23.27 #ifdef PPC
24.1 --- a/src/share/vm/c1/c1_Runtime1.cpp Fri Feb 27 15:44:03 2015 -0800 24.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp Tue Mar 03 13:06:16 2015 -0800 24.3 @@ -1,5 +1,5 @@ 24.4 /* 24.5 - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. 24.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 24.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 24.8 * 24.9 * This code is free software; you can redistribute it and/or modify it 24.10 @@ -1085,7 +1085,7 @@ 24.11 #ifdef ARM 24.12 if((load_klass_or_mirror_patch_id || 24.13 stub_id == Runtime1::load_appendix_patching_id) && 24.14 - !VM_Version::supports_movw()) { 24.15 + nativeMovConstReg_at(copy_buff)->is_pc_relative()) { 24.16 nmethod* nm = CodeCache::find_nmethod(instr_pc); 24.17 address addr = NULL; 24.18 assert(nm != NULL, "invalid nmethod_pc");
25.1 --- a/src/share/vm/classfile/verifier.cpp Fri Feb 27 15:44:03 2015 -0800 25.2 +++ b/src/share/vm/classfile/verifier.cpp Tue Mar 03 13:06:16 2015 -0800 25.3 @@ -1,5 +1,5 @@ 25.4 /* 25.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 25.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 25.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 25.8 * 25.9 * This code is free software; you can redistribute it and/or modify it 25.10 @@ -2488,8 +2488,7 @@ 25.11 // of the current class. 25.12 VerificationType objectref_type = new_class_type; 25.13 if (name_in_supers(ref_class_type.name(), current_class())) { 25.14 - Klass* ref_klass = load_class( 25.15 - ref_class_type.name(), CHECK_VERIFY(this)); 25.16 + Klass* ref_klass = load_class(ref_class_type.name(), CHECK); 25.17 Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method( 25.18 vmSymbols::object_initializer_name(), 25.19 cp->signature_ref_at(bcs->get_index_u2()), Klass::normal);
26.1 --- a/src/share/vm/code/vmreg.hpp Fri Feb 27 15:44:03 2015 -0800 26.2 +++ b/src/share/vm/code/vmreg.hpp Tue Mar 03 13:06:16 2015 -0800 26.3 @@ -1,5 +1,5 @@ 26.4 /* 26.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 26.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 26.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 26.8 * 26.9 * This code is free software; you can redistribute it and/or modify it 26.10 @@ -32,25 +32,17 @@ 26.11 #ifdef COMPILER2 26.12 #include "opto/adlcVMDeps.hpp" 26.13 #include "utilities/ostream.hpp" 26.14 -#ifdef TARGET_ARCH_MODEL_x86_32 26.15 +#if defined ADGLOBALS_MD_HPP 26.16 +# include ADGLOBALS_MD_HPP 26.17 +#elif defined TARGET_ARCH_MODEL_x86_32 26.18 # include "adfiles/adGlobals_x86_32.hpp" 26.19 -#endif 26.20 -#ifdef TARGET_ARCH_MODEL_x86_64 26.21 +#elif defined TARGET_ARCH_MODEL_x86_64 26.22 # include "adfiles/adGlobals_x86_64.hpp" 26.23 -#endif 26.24 -#ifdef TARGET_ARCH_MODEL_sparc 26.25 +#elif defined TARGET_ARCH_MODEL_sparc 26.26 # include "adfiles/adGlobals_sparc.hpp" 26.27 -#endif 26.28 -#ifdef TARGET_ARCH_MODEL_zero 26.29 +#elif defined TARGET_ARCH_MODEL_zero 26.30 # include "adfiles/adGlobals_zero.hpp" 26.31 -#endif 26.32 -#ifdef TARGET_ARCH_MODEL_arm 26.33 -# include "adfiles/adGlobals_arm.hpp" 26.34 -#endif 26.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 26.36 -# include "adfiles/adGlobals_ppc_32.hpp" 26.37 -#endif 26.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 26.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 26.40 # include "adfiles/adGlobals_ppc_64.hpp" 26.41 #endif 26.42 #endif
27.1 --- a/src/share/vm/interpreter/abstractInterpreter.hpp Fri Feb 27 15:44:03 2015 -0800 27.2 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp Tue Mar 03 13:06:16 2015 -0800 27.3 @@ -1,5 +1,5 @@ 27.4 /* 27.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 27.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 27.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 27.8 * 27.9 * This code is free software; you can redistribute it and/or modify it 27.10 @@ -30,22 +30,15 @@ 27.11 #include "runtime/thread.inline.hpp" 27.12 #include "runtime/vmThread.hpp" 27.13 #include "utilities/top.hpp" 27.14 -#ifdef TARGET_ARCH_x86 27.15 +#if defined INTERP_MASM_MD_HPP 27.16 +# include INTERP_MASM_MD_HPP 27.17 +#elif defined TARGET_ARCH_x86 27.18 # include "interp_masm_x86.hpp" 27.19 -#endif 27.20 -#ifdef TARGET_ARCH_MODEL_sparc 27.21 +#elif defined TARGET_ARCH_MODEL_sparc 27.22 # include "interp_masm_sparc.hpp" 27.23 -#endif 27.24 -#ifdef TARGET_ARCH_MODEL_zero 27.25 +#elif defined TARGET_ARCH_MODEL_zero 27.26 # include "interp_masm_zero.hpp" 27.27 -#endif 27.28 -#ifdef TARGET_ARCH_MODEL_arm 27.29 -# include "interp_masm_arm.hpp" 27.30 -#endif 27.31 -#ifdef TARGET_ARCH_MODEL_ppc_32 27.32 -# include "interp_masm_ppc_32.hpp" 27.33 -#endif 27.34 -#ifdef TARGET_ARCH_MODEL_ppc_64 27.35 +#elif defined TARGET_ARCH_MODEL_ppc_64 27.36 # include "interp_masm_ppc_64.hpp" 27.37 #endif 27.38
28.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Fri Feb 27 15:44:03 2015 -0800 28.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Tue Mar 03 13:06:16 2015 -0800 28.3 @@ -407,7 +407,11 @@ 28.4 // during deoptimization so the interpreter needs to skip it when 28.5 // the frame is popped. 28.6 thread->set_do_not_unlock_if_synchronized(true); 28.7 +#ifdef CC_INTERP 28.8 + return (address) -1; 28.9 +#else 28.10 return Interpreter::remove_activation_entry(); 28.11 +#endif 28.12 } 28.13 28.14 // Need to do this check first since when _do_not_unlock_if_synchronized
29.1 --- a/src/share/vm/interpreter/templateTable.hpp Fri Feb 27 15:44:03 2015 -0800 29.2 +++ b/src/share/vm/interpreter/templateTable.hpp Tue Mar 03 13:06:16 2015 -0800 29.3 @@ -1,5 +1,5 @@ 29.4 /* 29.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 29.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 29.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 29.8 * 29.9 * This code is free software; you can redistribute it and/or modify it 29.10 @@ -28,22 +28,15 @@ 29.11 #include "interpreter/bytecodes.hpp" 29.12 #include "memory/allocation.hpp" 29.13 #include "runtime/frame.hpp" 29.14 -#ifdef TARGET_ARCH_x86 29.15 +#if defined INTERP_MASM_MD_HPP 29.16 +# include INTERP_MASM_MD_HPP 29.17 +#elif defined TARGET_ARCH_x86 29.18 # include "interp_masm_x86.hpp" 29.19 -#endif 29.20 -#ifdef TARGET_ARCH_MODEL_sparc 29.21 +#elif defined TARGET_ARCH_MODEL_sparc 29.22 # include "interp_masm_sparc.hpp" 29.23 -#endif 29.24 -#ifdef TARGET_ARCH_MODEL_zero 29.25 +#elif defined TARGET_ARCH_MODEL_zero 29.26 # include "interp_masm_zero.hpp" 29.27 -#endif 29.28 -#ifdef TARGET_ARCH_MODEL_arm 29.29 -# include "interp_masm_arm.hpp" 29.30 -#endif 29.31 -#ifdef TARGET_ARCH_MODEL_ppc_32 29.32 -# include "interp_masm_ppc_32.hpp" 29.33 -#endif 29.34 -#ifdef TARGET_ARCH_MODEL_ppc_64 29.35 +#elif defined TARGET_ARCH_MODEL_ppc_64 29.36 # include "interp_masm_ppc_64.hpp" 29.37 #endif 29.38 29.39 @@ -358,25 +351,17 @@ 29.40 static Template* template_for_wide(Bytecodes::Code code) { Bytecodes::wide_check(code); return &_template_table_wide[code]; } 29.41 29.42 // Platform specifics 29.43 -#ifdef TARGET_ARCH_MODEL_x86_32 29.44 +#if defined TEMPLATETABLE_MD_HPP 29.45 +# include TEMPLATETABLE_MD_HPP 29.46 +#elif defined TARGET_ARCH_MODEL_x86_32 29.47 # include "templateTable_x86_32.hpp" 29.48 -#endif 29.49 -#ifdef TARGET_ARCH_MODEL_x86_64 29.50 +#elif defined TARGET_ARCH_MODEL_x86_64 29.51 # include "templateTable_x86_64.hpp" 29.52 -#endif 29.53 -#ifdef TARGET_ARCH_MODEL_sparc 29.54 +#elif defined TARGET_ARCH_MODEL_sparc 29.55 # include "templateTable_sparc.hpp" 29.56 -#endif 29.57 -#ifdef TARGET_ARCH_MODEL_zero 29.58 +#elif defined TARGET_ARCH_MODEL_zero 29.59 # include "templateTable_zero.hpp" 29.60 -#endif 29.61 -#ifdef TARGET_ARCH_MODEL_arm 29.62 -# include "templateTable_arm.hpp" 29.63 -#endif 29.64 -#ifdef TARGET_ARCH_MODEL_ppc_32 29.65 -# include "templateTable_ppc_32.hpp" 29.66 -#endif 29.67 -#ifdef TARGET_ARCH_MODEL_ppc_64 29.68 +#elif defined TARGET_ARCH_MODEL_ppc_64 29.69 # include "templateTable_ppc_64.hpp" 29.70 #endif 29.71
30.1 --- a/src/share/vm/memory/generation.hpp Fri Feb 27 15:44:03 2015 -0800 30.2 +++ b/src/share/vm/memory/generation.hpp Tue Mar 03 13:06:16 2015 -0800 30.3 @@ -1,5 +1,5 @@ 30.4 /* 30.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 30.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 30.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 30.8 * 30.9 * This code is free software; you can redistribute it and/or modify it 30.10 @@ -145,7 +145,7 @@ 30.11 // GenGrain. 30.12 // Note: on ARM we add 1 bit for card_table_base to be properly aligned 30.13 // (we expect its low byte to be zero - see implementation of post_barrier) 30.14 - LogOfGenGrain = 16 ARM_ONLY(+1), 30.15 + LogOfGenGrain = 16 ARM32_ONLY(+1), 30.16 GenGrain = 1 << LogOfGenGrain 30.17 }; 30.18
31.1 --- a/src/share/vm/opto/c2compiler.cpp Fri Feb 27 15:44:03 2015 -0800 31.2 +++ b/src/share/vm/opto/c2compiler.cpp Tue Mar 03 13:06:16 2015 -0800 31.3 @@ -1,5 +1,5 @@ 31.4 /* 31.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 31.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 31.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 31.8 * 31.9 * This code is free software; you can redistribute it and/or modify it 31.10 @@ -25,25 +25,17 @@ 31.11 #include "precompiled.hpp" 31.12 #include "opto/c2compiler.hpp" 31.13 #include "opto/runtime.hpp" 31.14 -#ifdef TARGET_ARCH_MODEL_x86_32 31.15 +#if defined AD_MD_HPP 31.16 +# include AD_MD_HPP 31.17 +#elif defined TARGET_ARCH_MODEL_x86_32 31.18 # include "adfiles/ad_x86_32.hpp" 31.19 -#endif 31.20 -#ifdef TARGET_ARCH_MODEL_x86_64 31.21 +#elif defined TARGET_ARCH_MODEL_x86_64 31.22 # include "adfiles/ad_x86_64.hpp" 31.23 -#endif 31.24 -#ifdef TARGET_ARCH_MODEL_sparc 31.25 +#elif defined TARGET_ARCH_MODEL_sparc 31.26 # include "adfiles/ad_sparc.hpp" 31.27 -#endif 31.28 -#ifdef TARGET_ARCH_MODEL_zero 31.29 +#elif defined TARGET_ARCH_MODEL_zero 31.30 # include "adfiles/ad_zero.hpp" 31.31 -#endif 31.32 -#ifdef TARGET_ARCH_MODEL_arm 31.33 -# include "adfiles/ad_arm.hpp" 31.34 -#endif 31.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 31.36 -# include "adfiles/ad_ppc_32.hpp" 31.37 -#endif 31.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 31.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 31.40 # include "adfiles/ad_ppc_64.hpp" 31.41 #endif 31.42
32.1 --- a/src/share/vm/opto/chaitin.cpp Fri Feb 27 15:44:03 2015 -0800 32.2 +++ b/src/share/vm/opto/chaitin.cpp Tue Mar 03 13:06:16 2015 -0800 32.3 @@ -1,5 +1,5 @@ 32.4 /* 32.5 - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. 32.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 32.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 32.8 * 32.9 * This code is free software; you can redistribute it and/or modify it 32.10 @@ -840,7 +840,7 @@ 32.11 case Op_RegD: 32.12 lrg.set_num_regs(2); 32.13 // Define platform specific register pressure 32.14 -#if defined(SPARC) || defined(ARM) 32.15 +#if defined(SPARC) || defined(ARM32) 32.16 lrg.set_reg_pressure(2); 32.17 #elif defined(IA32) 32.18 if( ireg == Op_RegL ) {
33.1 --- a/src/share/vm/opto/compile.cpp Fri Feb 27 15:44:03 2015 -0800 33.2 +++ b/src/share/vm/opto/compile.cpp Tue Mar 03 13:06:16 2015 -0800 33.3 @@ -1,5 +1,5 @@ 33.4 /* 33.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 33.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 33.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 33.8 * 33.9 * This code is free software; you can redistribute it and/or modify it 33.10 @@ -67,25 +67,17 @@ 33.11 #include "runtime/timer.hpp" 33.12 #include "trace/tracing.hpp" 33.13 #include "utilities/copy.hpp" 33.14 -#ifdef TARGET_ARCH_MODEL_x86_32 33.15 +#if defined AD_MD_HPP 33.16 +# include AD_MD_HPP 33.17 +#elif defined TARGET_ARCH_MODEL_x86_32 33.18 # include "adfiles/ad_x86_32.hpp" 33.19 -#endif 33.20 -#ifdef TARGET_ARCH_MODEL_x86_64 33.21 +#elif defined TARGET_ARCH_MODEL_x86_64 33.22 # include "adfiles/ad_x86_64.hpp" 33.23 -#endif 33.24 -#ifdef TARGET_ARCH_MODEL_sparc 33.25 +#elif defined TARGET_ARCH_MODEL_sparc 33.26 # include "adfiles/ad_sparc.hpp" 33.27 -#endif 33.28 -#ifdef TARGET_ARCH_MODEL_zero 33.29 +#elif defined TARGET_ARCH_MODEL_zero 33.30 # include "adfiles/ad_zero.hpp" 33.31 -#endif 33.32 -#ifdef TARGET_ARCH_MODEL_arm 33.33 -# include "adfiles/ad_arm.hpp" 33.34 -#endif 33.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 33.36 -# include "adfiles/ad_ppc_32.hpp" 33.37 -#endif 33.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 33.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 33.40 # include "adfiles/ad_ppc_64.hpp" 33.41 #endif 33.42
34.1 --- a/src/share/vm/opto/gcm.cpp Fri Feb 27 15:44:03 2015 -0800 34.2 +++ b/src/share/vm/opto/gcm.cpp Tue Mar 03 13:06:16 2015 -0800 34.3 @@ -1,5 +1,5 @@ 34.4 /* 34.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 34.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 34.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 34.8 * 34.9 * This code is free software; you can redistribute it and/or modify it 34.10 @@ -35,25 +35,17 @@ 34.11 #include "opto/rootnode.hpp" 34.12 #include "opto/runtime.hpp" 34.13 #include "runtime/deoptimization.hpp" 34.14 -#ifdef TARGET_ARCH_MODEL_x86_32 34.15 +#if defined AD_MD_HPP 34.16 +# include AD_MD_HPP 34.17 +#elif defined TARGET_ARCH_MODEL_x86_32 34.18 # include "adfiles/ad_x86_32.hpp" 34.19 -#endif 34.20 -#ifdef TARGET_ARCH_MODEL_x86_64 34.21 +#elif defined TARGET_ARCH_MODEL_x86_64 34.22 # include "adfiles/ad_x86_64.hpp" 34.23 -#endif 34.24 -#ifdef TARGET_ARCH_MODEL_sparc 34.25 +#elif defined TARGET_ARCH_MODEL_sparc 34.26 # include "adfiles/ad_sparc.hpp" 34.27 -#endif 34.28 -#ifdef TARGET_ARCH_MODEL_zero 34.29 +#elif defined TARGET_ARCH_MODEL_zero 34.30 # include "adfiles/ad_zero.hpp" 34.31 -#endif 34.32 -#ifdef TARGET_ARCH_MODEL_arm 34.33 -# include "adfiles/ad_arm.hpp" 34.34 -#endif 34.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 34.36 -# include "adfiles/ad_ppc_32.hpp" 34.37 -#endif 34.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 34.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 34.40 # include "adfiles/ad_ppc_64.hpp" 34.41 #endif 34.42
35.1 --- a/src/share/vm/opto/lcm.cpp Fri Feb 27 15:44:03 2015 -0800 35.2 +++ b/src/share/vm/opto/lcm.cpp Tue Mar 03 13:06:16 2015 -0800 35.3 @@ -1,5 +1,5 @@ 35.4 /* 35.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 35.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 35.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 35.8 * 35.9 * This code is free software; you can redistribute it and/or modify it 35.10 @@ -30,25 +30,17 @@ 35.11 #include "opto/cfgnode.hpp" 35.12 #include "opto/machnode.hpp" 35.13 #include "opto/runtime.hpp" 35.14 -#ifdef TARGET_ARCH_MODEL_x86_32 35.15 +#if defined AD_MD_HPP 35.16 +# include AD_MD_HPP 35.17 +#elif defined TARGET_ARCH_MODEL_x86_32 35.18 # include "adfiles/ad_x86_32.hpp" 35.19 -#endif 35.20 -#ifdef TARGET_ARCH_MODEL_x86_64 35.21 +#elif defined TARGET_ARCH_MODEL_x86_64 35.22 # include "adfiles/ad_x86_64.hpp" 35.23 -#endif 35.24 -#ifdef TARGET_ARCH_MODEL_sparc 35.25 +#elif defined TARGET_ARCH_MODEL_sparc 35.26 # include "adfiles/ad_sparc.hpp" 35.27 -#endif 35.28 -#ifdef TARGET_ARCH_MODEL_zero 35.29 +#elif defined TARGET_ARCH_MODEL_zero 35.30 # include "adfiles/ad_zero.hpp" 35.31 -#endif 35.32 -#ifdef TARGET_ARCH_MODEL_arm 35.33 -# include "adfiles/ad_arm.hpp" 35.34 -#endif 35.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 35.36 -# include "adfiles/ad_ppc_32.hpp" 35.37 -#endif 35.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 35.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 35.40 # include "adfiles/ad_ppc_64.hpp" 35.41 #endif 35.42
36.1 --- a/src/share/vm/opto/locknode.hpp Fri Feb 27 15:44:03 2015 -0800 36.2 +++ b/src/share/vm/opto/locknode.hpp Tue Mar 03 13:06:16 2015 -0800 36.3 @@ -1,5 +1,5 @@ 36.4 /* 36.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 36.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 36.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 36.8 * 36.9 * This code is free software; you can redistribute it and/or modify it 36.10 @@ -28,25 +28,17 @@ 36.11 #include "opto/node.hpp" 36.12 #include "opto/opcodes.hpp" 36.13 #include "opto/subnode.hpp" 36.14 -#ifdef TARGET_ARCH_MODEL_x86_32 36.15 +#if defined AD_MD_HPP 36.16 +# include AD_MD_HPP 36.17 +#elif defined TARGET_ARCH_MODEL_x86_32 36.18 # include "adfiles/ad_x86_32.hpp" 36.19 -#endif 36.20 -#ifdef TARGET_ARCH_MODEL_x86_64 36.21 +#elif defined TARGET_ARCH_MODEL_x86_64 36.22 # include "adfiles/ad_x86_64.hpp" 36.23 -#endif 36.24 -#ifdef TARGET_ARCH_MODEL_sparc 36.25 +#elif defined TARGET_ARCH_MODEL_sparc 36.26 # include "adfiles/ad_sparc.hpp" 36.27 -#endif 36.28 -#ifdef TARGET_ARCH_MODEL_zero 36.29 +#elif defined TARGET_ARCH_MODEL_zero 36.30 # include "adfiles/ad_zero.hpp" 36.31 -#endif 36.32 -#ifdef TARGET_ARCH_MODEL_arm 36.33 -# include "adfiles/ad_arm.hpp" 36.34 -#endif 36.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 36.36 -# include "adfiles/ad_ppc_32.hpp" 36.37 -#endif 36.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 36.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 36.40 # include "adfiles/ad_ppc_64.hpp" 36.41 #endif 36.42
37.1 --- a/src/share/vm/opto/matcher.cpp Fri Feb 27 15:44:03 2015 -0800 37.2 +++ b/src/share/vm/opto/matcher.cpp Tue Mar 03 13:06:16 2015 -0800 37.3 @@ -1,5 +1,5 @@ 37.4 /* 37.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 37.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 37.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 37.8 * 37.9 * This code is free software; you can redistribute it and/or modify it 37.10 @@ -38,25 +38,17 @@ 37.11 #include "opto/vectornode.hpp" 37.12 #include "runtime/atomic.hpp" 37.13 #include "runtime/os.hpp" 37.14 -#ifdef TARGET_ARCH_MODEL_x86_32 37.15 +#if defined AD_MD_HPP 37.16 +# include AD_MD_HPP 37.17 +#elif defined TARGET_ARCH_MODEL_x86_32 37.18 # include "adfiles/ad_x86_32.hpp" 37.19 -#endif 37.20 -#ifdef TARGET_ARCH_MODEL_x86_64 37.21 +#elif defined TARGET_ARCH_MODEL_x86_64 37.22 # include "adfiles/ad_x86_64.hpp" 37.23 -#endif 37.24 -#ifdef TARGET_ARCH_MODEL_sparc 37.25 +#elif defined TARGET_ARCH_MODEL_sparc 37.26 # include "adfiles/ad_sparc.hpp" 37.27 -#endif 37.28 -#ifdef TARGET_ARCH_MODEL_zero 37.29 +#elif defined TARGET_ARCH_MODEL_zero 37.30 # include "adfiles/ad_zero.hpp" 37.31 -#endif 37.32 -#ifdef TARGET_ARCH_MODEL_arm 37.33 -# include "adfiles/ad_arm.hpp" 37.34 -#endif 37.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 37.36 -# include "adfiles/ad_ppc_32.hpp" 37.37 -#endif 37.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 37.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 37.40 # include "adfiles/ad_ppc_64.hpp" 37.41 #endif 37.42
38.1 --- a/src/share/vm/opto/output.hpp Fri Feb 27 15:44:03 2015 -0800 38.2 +++ b/src/share/vm/opto/output.hpp Tue Mar 03 13:06:16 2015 -0800 38.3 @@ -1,5 +1,5 @@ 38.4 /* 38.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 38.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 38.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 38.8 * 38.9 * This code is free software; you can redistribute it and/or modify it 38.10 @@ -27,25 +27,17 @@ 38.11 38.12 #include "opto/block.hpp" 38.13 #include "opto/node.hpp" 38.14 -#ifdef TARGET_ARCH_MODEL_x86_32 38.15 +#if defined AD_MD_HPP 38.16 +# include AD_MD_HPP 38.17 +#elif defined TARGET_ARCH_MODEL_x86_32 38.18 # include "adfiles/ad_x86_32.hpp" 38.19 -#endif 38.20 -#ifdef TARGET_ARCH_MODEL_x86_64 38.21 +#elif defined TARGET_ARCH_MODEL_x86_64 38.22 # include "adfiles/ad_x86_64.hpp" 38.23 -#endif 38.24 -#ifdef TARGET_ARCH_MODEL_sparc 38.25 +#elif defined TARGET_ARCH_MODEL_sparc 38.26 # include "adfiles/ad_sparc.hpp" 38.27 -#endif 38.28 -#ifdef TARGET_ARCH_MODEL_zero 38.29 +#elif defined TARGET_ARCH_MODEL_zero 38.30 # include "adfiles/ad_zero.hpp" 38.31 -#endif 38.32 -#ifdef TARGET_ARCH_MODEL_arm 38.33 -# include "adfiles/ad_arm.hpp" 38.34 -#endif 38.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 38.36 -# include "adfiles/ad_ppc_32.hpp" 38.37 -#endif 38.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 38.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 38.40 # include "adfiles/ad_ppc_64.hpp" 38.41 #endif 38.42
39.1 --- a/src/share/vm/opto/regmask.cpp Fri Feb 27 15:44:03 2015 -0800 39.2 +++ b/src/share/vm/opto/regmask.cpp Tue Mar 03 13:06:16 2015 -0800 39.3 @@ -1,5 +1,5 @@ 39.4 /* 39.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 39.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 39.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 39.8 * 39.9 * This code is free software; you can redistribute it and/or modify it 39.10 @@ -25,25 +25,17 @@ 39.11 #include "precompiled.hpp" 39.12 #include "opto/compile.hpp" 39.13 #include "opto/regmask.hpp" 39.14 -#ifdef TARGET_ARCH_MODEL_x86_32 39.15 +#if defined AD_MD_HPP 39.16 +# include AD_MD_HPP 39.17 +#elif defined TARGET_ARCH_MODEL_x86_32 39.18 # include "adfiles/ad_x86_32.hpp" 39.19 -#endif 39.20 -#ifdef TARGET_ARCH_MODEL_x86_64 39.21 +#elif defined TARGET_ARCH_MODEL_x86_64 39.22 # include "adfiles/ad_x86_64.hpp" 39.23 -#endif 39.24 -#ifdef TARGET_ARCH_MODEL_sparc 39.25 +#elif defined TARGET_ARCH_MODEL_sparc 39.26 # include "adfiles/ad_sparc.hpp" 39.27 -#endif 39.28 -#ifdef TARGET_ARCH_MODEL_zero 39.29 +#elif defined TARGET_ARCH_MODEL_zero 39.30 # include "adfiles/ad_zero.hpp" 39.31 -#endif 39.32 -#ifdef TARGET_ARCH_MODEL_arm 39.33 -# include "adfiles/ad_arm.hpp" 39.34 -#endif 39.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 39.36 -# include "adfiles/ad_ppc_32.hpp" 39.37 -#endif 39.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 39.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 39.40 # include "adfiles/ad_ppc_64.hpp" 39.41 #endif 39.42
40.1 --- a/src/share/vm/opto/regmask.hpp Fri Feb 27 15:44:03 2015 -0800 40.2 +++ b/src/share/vm/opto/regmask.hpp Tue Mar 03 13:06:16 2015 -0800 40.3 @@ -1,5 +1,5 @@ 40.4 /* 40.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 40.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 40.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 40.8 * 40.9 * This code is free software; you can redistribute it and/or modify it 40.10 @@ -28,25 +28,17 @@ 40.11 #include "code/vmreg.hpp" 40.12 #include "libadt/port.hpp" 40.13 #include "opto/optoreg.hpp" 40.14 -#ifdef TARGET_ARCH_MODEL_x86_32 40.15 +#if defined ADGLOBALS_MD_HPP 40.16 +# include ADGLOBALS_MD_HPP 40.17 +#elif defined TARGET_ARCH_MODEL_x86_32 40.18 # include "adfiles/adGlobals_x86_32.hpp" 40.19 -#endif 40.20 -#ifdef TARGET_ARCH_MODEL_x86_64 40.21 +#elif defined TARGET_ARCH_MODEL_x86_64 40.22 # include "adfiles/adGlobals_x86_64.hpp" 40.23 -#endif 40.24 -#ifdef TARGET_ARCH_MODEL_sparc 40.25 +#elif defined TARGET_ARCH_MODEL_sparc 40.26 # include "adfiles/adGlobals_sparc.hpp" 40.27 -#endif 40.28 -#ifdef TARGET_ARCH_MODEL_zero 40.29 +#elif defined TARGET_ARCH_MODEL_zero 40.30 # include "adfiles/adGlobals_zero.hpp" 40.31 -#endif 40.32 -#ifdef TARGET_ARCH_MODEL_arm 40.33 -# include "adfiles/adGlobals_arm.hpp" 40.34 -#endif 40.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 40.36 -# include "adfiles/adGlobals_ppc_32.hpp" 40.37 -#endif 40.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 40.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 40.40 # include "adfiles/adGlobals_ppc_64.hpp" 40.41 #endif 40.42
41.1 --- a/src/share/vm/opto/runtime.cpp Fri Feb 27 15:44:03 2015 -0800 41.2 +++ b/src/share/vm/opto/runtime.cpp Tue Mar 03 13:06:16 2015 -0800 41.3 @@ -1,5 +1,5 @@ 41.4 /* 41.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 41.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 41.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 41.8 * 41.9 * This code is free software; you can redistribute it and/or modify it 41.10 @@ -68,25 +68,17 @@ 41.11 #include "runtime/vframe_hp.hpp" 41.12 #include "utilities/copy.hpp" 41.13 #include "utilities/preserveException.hpp" 41.14 -#ifdef TARGET_ARCH_MODEL_x86_32 41.15 +#if defined AD_MD_HPP 41.16 +# include AD_MD_HPP 41.17 +#elif defined TARGET_ARCH_MODEL_x86_32 41.18 # include "adfiles/ad_x86_32.hpp" 41.19 -#endif 41.20 -#ifdef TARGET_ARCH_MODEL_x86_64 41.21 +#elif defined TARGET_ARCH_MODEL_x86_64 41.22 # include "adfiles/ad_x86_64.hpp" 41.23 -#endif 41.24 -#ifdef TARGET_ARCH_MODEL_sparc 41.25 +#elif defined TARGET_ARCH_MODEL_sparc 41.26 # include "adfiles/ad_sparc.hpp" 41.27 -#endif 41.28 -#ifdef TARGET_ARCH_MODEL_zero 41.29 +#elif defined TARGET_ARCH_MODEL_zero 41.30 # include "adfiles/ad_zero.hpp" 41.31 -#endif 41.32 -#ifdef TARGET_ARCH_MODEL_arm 41.33 -# include "adfiles/ad_arm.hpp" 41.34 -#endif 41.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 41.36 -# include "adfiles/ad_ppc_32.hpp" 41.37 -#endif 41.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 41.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 41.40 # include "adfiles/ad_ppc_64.hpp" 41.41 #endif 41.42
42.1 --- a/src/share/vm/runtime/deoptimization.cpp Fri Feb 27 15:44:03 2015 -0800 42.2 +++ b/src/share/vm/runtime/deoptimization.cpp Tue Mar 03 13:06:16 2015 -0800 42.3 @@ -1,5 +1,5 @@ 42.4 /* 42.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 42.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 42.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 42.8 * 42.9 * This code is free software; you can redistribute it and/or modify it 42.10 @@ -66,25 +66,17 @@ 42.11 # include "vmreg_ppc.inline.hpp" 42.12 #endif 42.13 #ifdef COMPILER2 42.14 -#ifdef TARGET_ARCH_MODEL_x86_32 42.15 +#if defined AD_MD_HPP 42.16 +# include AD_MD_HPP 42.17 +#elif defined TARGET_ARCH_MODEL_x86_32 42.18 # include "adfiles/ad_x86_32.hpp" 42.19 -#endif 42.20 -#ifdef TARGET_ARCH_MODEL_x86_64 42.21 +#elif defined TARGET_ARCH_MODEL_x86_64 42.22 # include "adfiles/ad_x86_64.hpp" 42.23 -#endif 42.24 -#ifdef TARGET_ARCH_MODEL_sparc 42.25 +#elif defined TARGET_ARCH_MODEL_sparc 42.26 # include "adfiles/ad_sparc.hpp" 42.27 -#endif 42.28 -#ifdef TARGET_ARCH_MODEL_zero 42.29 +#elif defined TARGET_ARCH_MODEL_zero 42.30 # include "adfiles/ad_zero.hpp" 42.31 -#endif 42.32 -#ifdef TARGET_ARCH_MODEL_arm 42.33 -# include "adfiles/ad_arm.hpp" 42.34 -#endif 42.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 42.36 -# include "adfiles/ad_ppc_32.hpp" 42.37 -#endif 42.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 42.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 42.40 # include "adfiles/ad_ppc_64.hpp" 42.41 #endif 42.42 #endif // COMPILER2
43.1 --- a/src/share/vm/runtime/frame.hpp Fri Feb 27 15:44:03 2015 -0800 43.2 +++ b/src/share/vm/runtime/frame.hpp Tue Mar 03 13:06:16 2015 -0800 43.3 @@ -1,5 +1,5 @@ 43.4 /* 43.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 43.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 43.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 43.8 * 43.9 * This code is free software; you can redistribute it and/or modify it 43.10 @@ -31,25 +31,17 @@ 43.11 #include "runtime/registerMap.hpp" 43.12 #include "utilities/top.hpp" 43.13 #ifdef COMPILER2 43.14 -#ifdef TARGET_ARCH_MODEL_x86_32 43.15 +#if defined ADGLOBALS_MD_HPP 43.16 +# include ADGLOBALS_MD_HPP 43.17 +#elif defined TARGET_ARCH_MODEL_x86_32 43.18 # include "adfiles/adGlobals_x86_32.hpp" 43.19 -#endif 43.20 -#ifdef TARGET_ARCH_MODEL_x86_64 43.21 +#elif defined TARGET_ARCH_MODEL_x86_64 43.22 # include "adfiles/adGlobals_x86_64.hpp" 43.23 -#endif 43.24 -#ifdef TARGET_ARCH_MODEL_sparc 43.25 +#elif defined TARGET_ARCH_MODEL_sparc 43.26 # include "adfiles/adGlobals_sparc.hpp" 43.27 -#endif 43.28 -#ifdef TARGET_ARCH_MODEL_zero 43.29 +#elif defined TARGET_ARCH_MODEL_zero 43.30 # include "adfiles/adGlobals_zero.hpp" 43.31 -#endif 43.32 -#ifdef TARGET_ARCH_MODEL_arm 43.33 -# include "adfiles/adGlobals_arm.hpp" 43.34 -#endif 43.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 43.36 -# include "adfiles/adGlobals_ppc_32.hpp" 43.37 -#endif 43.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 43.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 43.40 # include "adfiles/adGlobals_ppc_64.hpp" 43.41 #endif 43.42 #endif // COMPILER2
44.1 --- a/src/share/vm/runtime/stubRoutines.hpp Fri Feb 27 15:44:03 2015 -0800 44.2 +++ b/src/share/vm/runtime/stubRoutines.hpp Tue Mar 03 13:06:16 2015 -0800 44.3 @@ -1,5 +1,5 @@ 44.4 /* 44.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 44.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 44.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 44.8 * 44.9 * This code is free software; you can redistribute it and/or modify it 44.10 @@ -99,29 +99,20 @@ 44.11 44.12 // Dependencies 44.13 friend class StubGenerator; 44.14 -#ifdef TARGET_ARCH_MODEL_x86_32 44.15 +#if defined STUBROUTINES_MD_HPP 44.16 +# include STUBROUTINES_MD_HPP 44.17 +#elif defined TARGET_ARCH_MODEL_x86_32 44.18 # include "stubRoutines_x86_32.hpp" 44.19 -#endif 44.20 -#ifdef TARGET_ARCH_MODEL_x86_64 44.21 +#elif defined TARGET_ARCH_MODEL_x86_64 44.22 # include "stubRoutines_x86_64.hpp" 44.23 -#endif 44.24 -#ifdef TARGET_ARCH_MODEL_sparc 44.25 +#elif defined TARGET_ARCH_MODEL_sparc 44.26 # include "stubRoutines_sparc.hpp" 44.27 -#endif 44.28 -#ifdef TARGET_ARCH_MODEL_zero 44.29 +#elif defined TARGET_ARCH_MODEL_zero 44.30 # include "stubRoutines_zero.hpp" 44.31 -#endif 44.32 -#ifdef TARGET_ARCH_MODEL_arm 44.33 -# include "stubRoutines_arm.hpp" 44.34 -#endif 44.35 -#ifdef TARGET_ARCH_MODEL_ppc_32 44.36 -# include "stubRoutines_ppc_32.hpp" 44.37 -#endif 44.38 -#ifdef TARGET_ARCH_MODEL_ppc_64 44.39 +#elif defined TARGET_ARCH_MODEL_ppc_64 44.40 # include "stubRoutines_ppc_64.hpp" 44.41 #endif 44.42 44.43 - 44.44 static jint _verify_oop_count; 44.45 static address _verify_oop_subroutine_entry; 44.46
45.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Feb 27 15:44:03 2015 -0800 45.2 +++ b/src/share/vm/runtime/vmStructs.cpp Tue Mar 03 13:06:16 2015 -0800 45.3 @@ -192,25 +192,17 @@ 45.4 #include "opto/rootnode.hpp" 45.5 #include "opto/subnode.hpp" 45.6 #include "opto/vectornode.hpp" 45.7 -#ifdef TARGET_ARCH_MODEL_x86_32 45.8 +#if defined ADGLOBALS_MD_HPP 45.9 +# include ADGLOBALS_MD_HPP 45.10 +#elif defined TARGET_ARCH_MODEL_x86_32 45.11 # include "adfiles/adGlobals_x86_32.hpp" 45.12 -#endif 45.13 -#ifdef TARGET_ARCH_MODEL_x86_64 45.14 +#elif defined TARGET_ARCH_MODEL_x86_64 45.15 # include "adfiles/adGlobals_x86_64.hpp" 45.16 -#endif 45.17 -#ifdef TARGET_ARCH_MODEL_sparc 45.18 +#elif defined TARGET_ARCH_MODEL_sparc 45.19 # include "adfiles/adGlobals_sparc.hpp" 45.20 -#endif 45.21 -#ifdef TARGET_ARCH_MODEL_zero 45.22 +#elif defined TARGET_ARCH_MODEL_zero 45.23 # include "adfiles/adGlobals_zero.hpp" 45.24 -#endif 45.25 -#ifdef TARGET_ARCH_MODEL_arm 45.26 -# include "adfiles/adGlobals_arm.hpp" 45.27 -#endif 45.28 -#ifdef TARGET_ARCH_MODEL_ppc_32 45.29 -# include "adfiles/adGlobals_ppc_32.hpp" 45.30 -#endif 45.31 -#ifdef TARGET_ARCH_MODEL_ppc_64 45.32 +#elif defined TARGET_ARCH_MODEL_ppc_64 45.33 # include "adfiles/adGlobals_ppc_64.hpp" 45.34 #endif 45.35 #endif // COMPILER2
46.1 --- a/src/share/vm/runtime/vm_version.cpp Fri Feb 27 15:44:03 2015 -0800 46.2 +++ b/src/share/vm/runtime/vm_version.cpp Tue Mar 03 13:06:16 2015 -0800 46.3 @@ -1,5 +1,5 @@ 46.4 /* 46.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 46.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 46.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 46.8 * 46.9 * This code is free software; you can redistribute it and/or modify it 46.10 @@ -180,17 +180,17 @@ 46.11 AIX_ONLY("aix") \ 46.12 BSD_ONLY("bsd") 46.13 46.14 +#ifndef CPU 46.15 #ifdef ZERO 46.16 #define CPU ZERO_LIBARCH 46.17 #else 46.18 #define CPU IA32_ONLY("x86") \ 46.19 IA64_ONLY("ia64") \ 46.20 AMD64_ONLY("amd64") \ 46.21 - ARM_ONLY("arm") \ 46.22 - PPC32_ONLY("ppc") \ 46.23 PPC64_ONLY("ppc64") \ 46.24 SPARC_ONLY("sparc") 46.25 #endif // ZERO 46.26 +#endif 46.27 46.28 const char *Abstract_VM_Version::vm_platform_string() { 46.29 return OS "-" CPU; 46.30 @@ -251,12 +251,6 @@ 46.31 #ifndef FLOAT_ARCH 46.32 #if defined(__SOFTFP__) 46.33 #define FLOAT_ARCH_STR "-sflt" 46.34 - #elif defined(E500V2) 46.35 - #define FLOAT_ARCH_STR "-e500v2" 46.36 - #elif defined(ARM) 46.37 - #define FLOAT_ARCH_STR "-vfp" 46.38 - #elif defined(PPC32) 46.39 - #define FLOAT_ARCH_STR "-hflt" 46.40 #else 46.41 #define FLOAT_ARCH_STR "" 46.42 #endif
47.1 --- a/src/share/vm/utilities/globalDefinitions_gcc.hpp Fri Feb 27 15:44:03 2015 -0800 47.2 +++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Mar 03 13:06:16 2015 -0800 47.3 @@ -1,5 +1,5 @@ 47.4 /* 47.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 47.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. 47.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 47.8 * 47.9 * This code is free software; you can redistribute it and/or modify it 47.10 @@ -220,7 +220,7 @@ 47.11 47.12 #define DEBUG_EXCEPTION ::abort(); 47.13 47.14 -#ifdef ARM 47.15 +#ifdef ARM32 47.16 #ifdef SOLARIS 47.17 #define BREAKPOINT __asm__ volatile (".long 0xe1200070") 47.18 #else
48.1 --- a/src/share/vm/utilities/macros.hpp Fri Feb 27 15:44:03 2015 -0800 48.2 +++ b/src/share/vm/utilities/macros.hpp Tue Mar 03 13:06:16 2015 -0800 48.3 @@ -1,5 +1,5 @@ 48.4 /* 48.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 48.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 48.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 48.8 * 48.9 * This code is free software; you can redistribute it and/or modify it 48.10 @@ -392,7 +392,6 @@ 48.11 #define NOT_E500V2(code) code 48.12 #endif 48.13 48.14 - 48.15 #ifdef ARM 48.16 #define ARM_ONLY(code) code 48.17 #define NOT_ARM(code) 48.18 @@ -401,6 +400,14 @@ 48.19 #define NOT_ARM(code) code 48.20 #endif 48.21 48.22 +#ifdef ARM32 48.23 +#define ARM32_ONLY(code) code 48.24 +#define NOT_ARM32(code) 48.25 +#else 48.26 +#define ARM32_ONLY(code) 48.27 +#define NOT_ARM32(code) code 48.28 +#endif 48.29 + 48.30 #ifdef JAVASE_EMBEDDED 48.31 #define EMBEDDED_ONLY(code) code 48.32 #define NOT_EMBEDDED(code)
