/hg/release/icedtea6-1.7: 12 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Feb 26 06:13:35 PST 2010
changeset ec3742b13c3d in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=ec3742b13c3d
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Jan 15 15:36:43 2010 +0100
PR icedtea/428: Remove -pedantic from LLVM_CFLAGS. 2010-01-15
Xerxes R?nby <xerxes at zafena.se>
PR icedtea/428:
* configure.ac (LLVM_CFLAGS): Remove -pedantic from LLVM_CFLAGS.
changeset f3e8f98dbb6c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f3e8f98dbb6c
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Feb 01 12:28:24 2010 +0100
Update Shark for LLVM r94686 API change.
2010-02-01 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::SharkCompiler): Use sharkContext::module
instead of sharkContext::module_provider when using LLVM 2.7
to handle LLVM r94686 API change.
* ports/hotspot/src/share/vm/shark/sharkContext.hpp
(sharkContext::module): Made public when using LLVM 2.7.
(sharkContext::module_provider): Undefine when using LLVM 2.7.
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
changeset 9f41e0c31f6a in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=9f41e0c31f6a
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 12 13:24:25 2010 +0000
Strip stupid options that llvm-config supplies
changeset f2de2e275530 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f2de2e275530
author: Gary Benson <gbenson at redhat.com>
date: Mon Feb 15 11:41:03 2010 +0000
Synchronize Zero with upstream
changeset b33d364cfd9c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=b33d364cfd9c
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 16 15:54:50 2010 +0000
Add s390 support to TCK setup helper script
changeset 706550cd6ad6 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=706550cd6ad6
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 17 14:46:46 2010 +0100
Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.
2010-02-17 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::SharkCompiler): Implement host CPU feature
autotuner using LLVM 2.7 APIs.
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Define
llvm/ADT/StringMap.h and llvm/System/Host.h depending on
LLVM version. Allways define llvm/Support/CommandLine.h.
changeset 568b122fc6de in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=568b122fc6de
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 19 09:58:06 2010 +0000
Backport "6927165: Zero S/390 fixes" from upstream
changeset 0cf0b14685a3 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0cf0b14685a3
author: Xerxes R?nby <xerxes at zafena.se>
date: Sun Feb 21 16:24:11 2010 +0100
Update Shark for LLVM r95390 API change.
2010-02-21 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(MCPU): Explicitly defined for use by LLVM command line parser.
(MAttrs): Likewise. (SharkCompiler::SharkCompiler): Create
the JIT using LLVM EngineBuilder in order to explicitly set
MCPU and MAttrs when using LLVM 2.7.
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Include
llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the JIT
are linked in.
changeset 98e567a32b04 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=98e567a32b04
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 09:01:28 2010 +0000
Comment fix
changeset fc1f68bd0bf1 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=fc1f68bd0bf1
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:05:51 2010 +0000
Add 2010 to some copyright headers that were missing it
changeset 6267ffedf454 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6267ffedf454
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:08:37 2010 -0500
Reformat Shark to match upstream HotSpot
changeset 151ff5eb1467 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=151ff5eb1467
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 17:36:57 2010 +0000
Whitespace fixes
diffstat:
51 files changed, 1117 insertions(+), 1516 deletions(-)
ChangeLog | 152 +++++++++
configure.ac | 37 ++
contrib/jck/compile-native-code.sh | 3
ports/hotspot/make/linux/makefiles/shark.make | 6
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 29 +
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 4
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 12
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 8
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 10
ports/hotspot/src/share/vm/includeDB_shark | 2
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 8
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 157 +++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 85 +----
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 193 ++++--------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 14
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 67 +---
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 129 ++------
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 18 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 96 ++++--
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 15
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 9
ports/hotspot/src/share/vm/shark/sharkConstant.hpp | 12
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 17 -
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 95 ++---
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 21 -
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 46 +-
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 37 --
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 107 ++----
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 2
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 34 --
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 50 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 51 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 12
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 17 -
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 68 +---
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 52 ---
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 19 -
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 65 +---
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 92 ++---
ports/hotspot/src/share/vm/shark/sharkState.cpp | 42 +-
ports/hotspot/src/share/vm/shark/sharkState.hpp | 65 +---
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 13
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 5
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 222 +++++---------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 115 ++-----
ports/hotspot/src/share/vm/shark/sharkType.hpp | 75 +---
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 168 +++-------
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 65 +---
diffs (truncated from 6623 to 500 lines):
diff -r 728d7fbb5008 -r 151ff5eb1467 ChangeLog
--- a/ChangeLog Thu Feb 25 22:58:15 2010 -0500
+++ b/ChangeLog Tue Feb 23 17:36:57 2010 +0000
@@ -1,3 +1,155 @@ 2010-02-25 Deepak Bhole <dbhole at redhat.
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+ with trailing opening braces to match upstream HotSpot.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
+2010-02-21 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (MCPU): Explicitly defined for use by LLVM command line parser.
+ (MAttrs): Likewise.
+ (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+ in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+ Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+ JIT are linked in.
+
+2010-02-19 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+ Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+ (os::atomic_copy64): Added s390 specific implementation.
+
+2010-02-17 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (SharkCompiler::SharkCompiler): Implement host CPU feature
+ autotuner using LLVM 2.7 APIs.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+ Define llvm/ADT/StringMap.h and llvm/System/Host.h
+ depending on LLVM version.
+ Allways define llvm/Support/CommandLine.h.
+
+2010-02-16 Gary Benson <gbenson at redhat.com>
+
+ * contrib/jck/compile-native-code.sh: Add s390.
+
+2010-02-15 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
+ (CppInterpreter::result_type_of): New method.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+ (CppInterpreter::result_type_of): Likewise.
+ (CppInterpreter::main_loop): Use the above.
+ (CppInterpreter::native_entry): Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+ (os::is_allocatable): s/AMD64/_LP64/.
+
+2010-02-12 Gary Benson <gbenson at redhat.com>
+
+ * configure.ac: Strip stupid options that llvm-config supplies.
+
+2010-02-01 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (SharkCompiler::SharkCompiler): Use sharkContext::module
+ instead of sharkContext::module_provider when using LLVM 2.7
+ to handle LLVM r94686 API change.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp
+ (sharkContext::module): Made public when using LLVM 2.7.
+ (sharkContext::module_provider): Undefine when using LLVM 2.7.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
+ (llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
+
+2010-01-15 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ PR icedtea/428:
+ * configure.ac (LLVM_CFLAGS): Remove -pedantic from LLVM_CFLAGS.
+
2010-02-25 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
diff -r 728d7fbb5008 -r 151ff5eb1467 configure.ac
--- a/configure.ac Thu Feb 25 22:58:15 2010 -0500
+++ b/configure.ac Tue Feb 23 17:36:57 2010 +0000
@@ -433,12 +433,39 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
FIND_TOOL([LLVM_CONFIG], [llvm-config])
llvm_components="jit engine nativecodegen"
- LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
- sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
- sed -e 's/-D_DEBUG//g'`
+ dnl LLVM_CFLAGS
+ LLVM_CFLAGS=
+ for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
+ if echo "$flag" | grep -q '^-[[ID]]'; then
+ if test "$flag" != "-D_DEBUG"; then
+ if test "x$LLVM_CFLAGS" != "x"; then
+ LLVM_CFLAGS="$LLVM_CFLAGS "
+ fi
+ LLVM_CFLAGS="$LLVM_CFLAGS$flag"
+ fi
+ fi
+ done
+ dnl LLVM_LDFLAGS
+ LLVM_LDFLAGS=
+ for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
+ if echo "$flag" | grep -q '^-L'; then
+ if test "x$LLVM_LDFLAGS" != "x"; then
+ LLVM_LDFLAGS="$LLVM_LDFLAGS "
+ fi
+ LLVM_LDFLAGS="$LLVM_LDFLAGS$flag"
+ fi
+ done
+ dnl LLVM_LIBS
+ LLVM_LIBS=
+ for flag in $($LLVM_CONFIG --libs $llvm_components); do
+ if echo "$flag" | grep -q '^-l'; then
+ if test "x$LLVM_LIBS" != "x"; then
+ LLVM_LIBS="$LLVM_LIBS "
+ fi
+ LLVM_LIBS="$LLVM_LIBS$flag"
+ fi
+ done
LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
- LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
- LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
fi
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_LDFLAGS)
diff -r 728d7fbb5008 -r 151ff5eb1467 contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh Thu Feb 25 22:58:15 2010 -0500
+++ b/contrib/jck/compile-native-code.sh Tue Feb 23 17:36:57 2010 +0000
@@ -21,6 +21,9 @@ case "$arch" in
case "$arch" in
arm*)
MFLAG=
+ ;;
+ s390)
+ MFLAG=-m31
;;
i?86|ppc)
MFLAG=-m32
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
#
# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -20,10 +20,10 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
-#
+#
#
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
TYPE = SHARK
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ void CppInterpreter::main_loop(int recur
}
else if (istate->msg() == BytecodeInterpreter::return_from_method) {
// Copy the result into the caller's frame
- result_slots = type2size[method->result_type()];
+ result_slots = type2size[result_type_of(method)];
assert(result_slots >= 0 && result_slots <= 2, "what?");
result = istate->stack() + result_slots;
break;
@@ -394,9 +394,10 @@ void CppInterpreter::native_entry(method
// Push our result
if (!HAS_PENDING_EXCEPTION) {
- stack->set_sp(stack->sp() - type2size[method->result_type()]);
+ BasicType type = result_type_of(method);
+ stack->set_sp(stack->sp() - type2size[type]);
- switch (method->result_type()) {
+ switch (type) {
case T_VOID:
break;
@@ -707,6 +708,26 @@ int AbstractInterpreter::BasicType_as_in
return i;
}
+BasicType CppInterpreter::result_type_of(methodOop method) {
+ BasicType t;
+ switch (method->result_index()) {
+ case 0 : t = T_BOOLEAN; break;
+ case 1 : t = T_CHAR; break;
+ case 2 : t = T_BYTE; break;
+ case 3 : t = T_SHORT; break;
+ case 4 : t = T_INT; break;
+ case 5 : t = T_LONG; break;
+ case 6 : t = T_VOID; break;
+ case 7 : t = T_FLOAT; break;
+ case 8 : t = T_DOUBLE; break;
+ case 9 : t = T_OBJECT; break;
+ default: ShouldNotReachHere();
+ }
+ assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
+ "out of step with AbstractInterpreter::BasicType_as_index");
+ return t;
+}
+
address InterpreterGenerator::generate_empty_entry() {
if (!UseFastEmptyMethods)
return NULL;
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,3 +41,7 @@
private:
// Stack overflow checks
static bool stack_overflow_imminent(JavaThread *thread);
+
+ private:
+ // Fast result type determination
+ static BasicType result_type_of(methodOop method);
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx, PreInflateSpin,
define_pd_global(intx, StackYellowPages, 2);
define_pd_global(intx, StackRedPages, 1);
-define_pd_global(intx, StackShadowPages, 3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx, StackShadowPages, 5 LP64_ONLY(+1) DEBUG_ONLY(+3));
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,11 @@
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
- *
+ *
*/
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler. See globals.hpp for details of what they do.
define_pd_global(bool, BackgroundCompilation, true );
define_pd_global(bool, UseTLAB, true );
@@ -52,7 +50,7 @@ define_pd_global(intx, NewRatio,
define_pd_global(intx, NewRatio, 12 );
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
define_pd_global(intx, InitialCodeCacheSize, 160*K);
-define_pd_global(intx, ReservedCodeCacheSize, 32*M );
+define_pd_global(intx, ReservedCodeCacheSize, 32*M );
define_pd_global(bool, ProfileInterpreter, false);
define_pd_global(intx, CodeCacheExpansionSize, 32*K );
define_pd_global(uintx, CodeCacheMinBlockLength, 1 );
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -249,11 +249,9 @@ void os::Linux::set_fpu_control_word(int
}
bool os::is_allocatable(size_t bytes) {
-#ifdef AMD64
- // unused on amd64?
+#ifdef _LP64
return true;
#else
-
if (bytes < 2 * G) {
return true;
}
@@ -265,7 +263,7 @@ bool os::is_allocatable(size_t bytes) {
}
return addr != NULL;
-#endif // AMD64
+#endif // _LP64
}
///////////////////////////////////////////////////////////////////////////////
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
"stfd %0, 0(%2)\n"
: "=f"(tmp)
: "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+ double tmp;
+ asm volatile ("ld %0, 0(%1)\n"
+ "std %0, 0(%2)\n"
+ : "=r"(tmp)
+ : "a"(src), "a"(dst));
#else
*(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
}
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/includeDB_shark Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
// CA 95054 USA or visit www.sun.com if you need additional information or
// have any questions.
-//
+//
//
// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -34,16 +34,20 @@
#include <llvm/Instructions.h>
#include <llvm/LLVMContext.h>
#include <llvm/Module.h>
+#if SHARK_LLVM_VERSION < 27
#include <llvm/ModuleProvider.h>
+#endif
#include <llvm/Support/IRBuilder.h>
#include <llvm/System/Threading.h>
#include <llvm/Target/TargetSelect.h>
#include <llvm/Type.h>
#include <llvm/ExecutionEngine/JITMemoryManager.h>
-#if SHARK_LLVM_VERSION < 27
#include <llvm/Support/CommandLine.h>
-#else
+#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
+#include <llvm/ADT/StringMap.h>
#include <llvm/Support/Debug.h>
+#include <llvm/System/Host.h>
#endif
#include <map>
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Tue Feb 23 17:36:57 2010 +0000
@@ -28,8 +28,7 @@
using namespace llvm;
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
SharkValue *a, *b, *c, *d;
int i;
@@ -45,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
if (SharkTraceBytecodes)
tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-
+
if (has_trap() && trap_bci() == bci()) {
do_trap(trap_request());
return;
@@ -96,7 +95,7 @@ void SharkBlock::parse_bytecode(int star
More information about the distro-pkg-dev
mailing list