/hg/icedtea6: Split arm assembler and Shark into different direc...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 22 08:27:30 PDT 2010
changeset 61d5e01c802e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=61d5e01c802e
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 22 16:27:14 2010 +0100
Split arm assembler and Shark into different directories so that
Shark is not copied for hs19 builds (hs19 includes Shark).
2010-09-22 Andrew John Hughes <ahughes at redhat.com>
* ports/hotspot/make/linux/makefiles/shark.make,
* ports/hotspot/src/cpu/zero/vm/asm_helper.cpp,
* ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/thumb2.cpp,
* ports/hotspot/src/share/vm/includeDB_shark,
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
* ports/hotspot/src/share/vm/shark/llvmValue.hpp,
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
* ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
* ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
* ports/hotspot/src/share/vm/shark/sharkContext.cpp,
* ports/hotspot/src/share/vm/shark/sharkContext.hpp,
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
* ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
* ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
* ports/hotspot/src/share/vm/shark/sharkStack.cpp,
* ports/hotspot/src/share/vm/shark/sharkStack.hpp,
* ports/hotspot/src/share/vm/shark/sharkState.cpp,
* ports/hotspot/src/share/vm/shark/sharkState.hpp,
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
* ports/hotspot/src/share/vm/shark/sharkType.hpp,
* ports/hotspot/src/share/vm/shark/sharkValue.cpp,
* ports/hotspot/src/share/vm/shark/sharkValue.hpp,
* ports/hotspot/src/share/vm/shark/shark_globals.cpp,
* ports/hotspot/src/share/vm/shark/shark_globals.hpp,
* ports/hotspot/tools/mkbc.c: Split into arm_port and shark
directories.
* Makefile.am: Only copy Shark when hs17 is built. hs19
includes Shark and the in-tree Shark fails to build with it.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp,
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp,
* arm_port/hotspot/tools/mkbc.c: New location of arm assembler
files.
* shark/hotspot/make/linux/makefiles/shark.make,
* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
* shark/hotspot/src/share/vm/includeDB_shark,
* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
* shark/hotspot/src/share/vm/shark/sharkState.cpp,
* shark/hotspot/src/share/vm/shark/sharkState.hpp,
* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
* shark/hotspot/src/share/vm/shark/sharkType.hpp,
* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
* shark/hotspot/src/share/vm/shark/shark_globals.hpp: New
location of Shark.
diffstat:
104 files changed, 34796 insertions(+), 34674 deletions(-)
ChangeLog | 110
Makefile.am | 34
arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 583 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7695 +++++++++++++++
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 6336 ++++++++++++
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 7456 ++++++++++++++
arm_port/hotspot/tools/mkbc.c | 607 +
ports/hotspot/make/linux/makefiles/shark.make | 32
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 583 -
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7695 ---------------
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 6336 ------------
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 62
ports/hotspot/src/cpu/zero/vm/thumb2.cpp | 7456 --------------
ports/hotspot/src/share/vm/includeDB_shark | 369
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 82
ports/hotspot/src/share/vm/shark/llvmValue.hpp | 62
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 1260 --
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 281
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 591 -
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 209
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 259
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 417
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 87
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 340
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 119
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 128
ports/hotspot/src/share/vm/shark/sharkConstant.hpp | 64
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 180
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 187
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 58
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 188
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 111
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 749 -
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 32
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 277
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 54
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 37
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 167
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 116
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 88
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 352
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 182
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 251
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 83
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 263
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 290
ports/hotspot/src/share/vm/shark/sharkState.cpp | 389
ports/hotspot/src/share/vm/shark/sharkState.hpp | 188
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 99
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 75
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 ---
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 430
ports/hotspot/src/share/vm/shark/sharkType.hpp | 112
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 260
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 332
ports/hotspot/src/share/vm/shark/shark_globals.cpp | 29
ports/hotspot/src/share/vm/shark/shark_globals.hpp | 54
ports/hotspot/tools/mkbc.c | 607 -
shark/hotspot/make/linux/makefiles/shark.make | 32
shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 62
shark/hotspot/src/share/vm/includeDB_shark | 369
shark/hotspot/src/share/vm/shark/llvmHeaders.hpp | 82
shark/hotspot/src/share/vm/shark/llvmValue.hpp | 62
shark/hotspot/src/share/vm/shark/sharkBlock.cpp | 1260 ++
shark/hotspot/src/share/vm/shark/sharkBlock.hpp | 281
shark/hotspot/src/share/vm/shark/sharkBuilder.cpp | 591 +
shark/hotspot/src/share/vm/shark/sharkBuilder.hpp | 209
shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 259
shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 417
shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 87
shark/hotspot/src/share/vm/shark/sharkCompiler.cpp | 340
shark/hotspot/src/share/vm/shark/sharkCompiler.hpp | 119
shark/hotspot/src/share/vm/shark/sharkConstant.cpp | 128
shark/hotspot/src/share/vm/shark/sharkConstant.hpp | 64
shark/hotspot/src/share/vm/shark/sharkContext.cpp | 180
shark/hotspot/src/share/vm/shark/sharkContext.hpp | 187
shark/hotspot/src/share/vm/shark/sharkEntry.hpp | 58
shark/hotspot/src/share/vm/shark/sharkFunction.cpp | 188
shark/hotspot/src/share/vm/shark/sharkFunction.hpp | 111
shark/hotspot/src/share/vm/shark/sharkInliner.cpp | 749 +
shark/hotspot/src/share/vm/shark/sharkInliner.hpp | 32
shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 277
shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 54
shark/hotspot/src/share/vm/shark/sharkInvariants.cpp | 37
shark/hotspot/src/share/vm/shark/sharkInvariants.hpp | 167
shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 116
shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 88
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 352
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 182
shark/hotspot/src/share/vm/shark/sharkRuntime.cpp | 251
shark/hotspot/src/share/vm/shark/sharkRuntime.hpp | 83
shark/hotspot/src/share/vm/shark/sharkStack.cpp | 263
shark/hotspot/src/share/vm/shark/sharkStack.hpp | 290
shark/hotspot/src/share/vm/shark/sharkState.cpp | 389
shark/hotspot/src/share/vm/shark/sharkState.hpp | 188
shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 99
shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 75
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 +++
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 430
shark/hotspot/src/share/vm/shark/sharkType.hpp | 112
shark/hotspot/src/share/vm/shark/sharkValue.cpp | 260
shark/hotspot/src/share/vm/shark/sharkValue.hpp | 332
shark/hotspot/src/share/vm/shark/shark_globals.cpp | 29
shark/hotspot/src/share/vm/shark/shark_globals.hpp | 54
diffs (truncated from 69917 to 500 lines):
diff -r e4c712442cf1 -r 61d5e01c802e ChangeLog
--- a/ChangeLog Tue Sep 21 17:37:58 2010 +0200
+++ b/ChangeLog Wed Sep 22 16:27:14 2010 +0100
@@ -1,3 +1,113 @@ 2010-09-21 Pavel Tisnovsky <ptisnovs at r
+2010-09-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make,
+ * ports/hotspot/src/cpu/zero/vm/asm_helper.cpp,
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/thumb2.cpp,
+ * ports/hotspot/src/share/vm/includeDB_shark,
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+ * ports/hotspot/src/share/vm/shark/llvmValue.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkValue.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp,
+ * ports/hotspot/src/share/vm/shark/shark_globals.cpp,
+ * ports/hotspot/src/share/vm/shark/shark_globals.hpp,
+ * ports/hotspot/tools/mkbc.c:
+ Split into arm_port and shark directories.
+ * Makefile.am: Only copy Shark when hs17 is built.
+ hs19 includes Shark and the in-tree Shark fails to build with it.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp,
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp,
+ * arm_port/hotspot/tools/mkbc.c:
+ New location of arm assembler files.
+ * shark/hotspot/make/linux/makefiles/shark.make,
+ * shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+ * shark/hotspot/src/share/vm/includeDB_shark,
+ * shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+ * shark/hotspot/src/share/vm/shark/llvmValue.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkContext.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkContext.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkStack.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkStack.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkState.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkState.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkType.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkValue.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkValue.hpp,
+ * shark/hotspot/src/share/vm/shark/shark_globals.cpp,
+ * shark/hotspot/src/share/vm/shark/shark_globals.hpp:
+ New location of Shark.
+
2010-09-21 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
diff -r e4c712442cf1 -r 61d5e01c802e Makefile.am
--- a/Makefile.am Tue Sep 21 17:37:58 2010 +0200
+++ b/Makefile.am Wed Sep 22 16:27:14 2010 +0100
@@ -524,7 +524,7 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
EXTRA_DIST = generated $(NETX_SRCDIR) \
$(abs_top_srcdir)/patches/* \
- contrib ports \
+ contrib shark arm_port \
extra overlays \
javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
@@ -881,11 +881,11 @@ clean-replace-hotspot:
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/tools \
- $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+if !WITH_ALT_HSBUILD
+ for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
+ $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
+ link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
cp -rv $$target $$link; \
done
if ! test "x$(WITH_CACAO)" = "xno" ; then \
@@ -897,19 +897,31 @@ stamps/ports.stamp: stamps/replace-hotsp
ln -sf $(abs_top_builddir)/ergo.c \
openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
+endif
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ cp -rv $$target $$link; \
+ done
mkdir -p stamps
touch stamps/ports.stamp
clean-ports:
- for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/tools \
- $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(echo $$target | sed 's/^.*ports/openjdk/'); \
+if !WITH_ALT_HSBUILD
+ for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
+ $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
+ $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
+ link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
rm -rf $$link; \
done
rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg
rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c
+endif
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ rm -rf $$link; \
+ done
rm -f stamps/ports.stamp
stamps/generated.stamp: stamps/ports.stamp
diff -r e4c712442cf1 -r 61d5e01c802e arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Wed Sep 22 16:27:14 2010 +0100
@@ -0,0 +1,583 @@
+/*
+ * Copyright 2009, 2010 Edward Nevill
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define ARCH_THUMBEE (1<<16)
+#define ARCH_VFP (1<<17)
+#define ARCH_CLZ (1<<18)
+
+#ifndef STATIC_OFFSETS
+
+#include "incls/_bytecodeInterpreter.cpp.incl"
+
+#include <linux/auxvec.h>
+#include <asm/hwcap.h>
+
+#define VECBUFF_SIZE 64
+
+extern "C" unsigned hwcap(void)
+{
+ int fd;
+ unsigned vecs[VECBUFF_SIZE];
+ unsigned *p;
+ int i, n;
+ unsigned rc = 0;
+ unsigned arch = 4;
+
+ fd = open("/proc/self/auxv", O_RDONLY);
+ if (fd < 0) return 0;
+ do {
+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
+ p = vecs;
+ i = n/8;
+ while (--i >= 0) {
+ unsigned tag = *p++;
+ unsigned value = *p++;
+ if (tag == 0) goto fini;
+ if (tag == AT_HWCAP) {
+ if (value & HWCAP_THUMBEE) rc |= ARCH_THUMBEE;
+ if (value & HWCAP_VFP) rc |= ARCH_VFP;
+ } else if (tag == AT_PLATFORM) {
+ const char *s = (const char *)value;
+ int c;
+
+ if (*s++ == 'v') {
+ arch = 0;
+ while ((isdigit)(c = *s++)) arch = arch * 10 + c - '0';
+ }
+ }
+ }
+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
+fini:
+ close(fd);
+// printf("arch = %d, rc = 0x%08x\n", arch, rc);
+ if (arch >= 5) rc |= ARCH_CLZ;
+ if (arch >= 7) rc |= ARCH_THUMBEE;
+ return rc | (1<<arch);
+}
+
+/* Thease functions allow the ASM interpreter to call CPP virtual functions.
+ * Otherwise the ASM interpreter has to grup around in the VTABLE which is
+ * not very portable.
+ */
+extern "C" bool JavaThread_is_lock_owned(JavaThread *r0, address r1)
+{
+ return r0->is_lock_owned(r1);
+}
+
+extern "C" HeapWord **CollectedHeap_top_addr(CollectedHeap *r0)
+{
+ return r0->top_addr();
+}
+
+extern "C" HeapWord **CollectedHeap_end_addr(CollectedHeap *r0)
+{
+ return r0->end_addr();
+}
+
+extern "C" char *SharedRuntime_generate_class_cast_message(const char *name, const char *klass)
+{
+ return SharedRuntime::generate_class_cast_message(name, klass);
+}
+
+#define HELPER_THROW(thread, name, msg) Exceptions::_throw_msg(thread, __FILE__, __LINE__, name, msg)
+
+class VMStructs {
+public:
+ static inline klassOop klass_at_addr(constantPoolOop constants, u2 index) {
+ return (klassOop) *constants->obj_at_addr(index);
+ }
+};
+
+extern "C" oop Helper_new(interpreterState istate, unsigned index)
+{
+ JavaThread *thread = istate->thread();
+
+ constantPoolOop constants = istate->method()->constants();
+ oop result = NULL;
+ if (!constants->tag_at(index).is_unresolved_klass()) {
+ // Make sure klass is initialized and doesn't have a finalizer
+ oop entry = VMStructs::klass_at_addr(constants, index);
+ klassOop k_entry = (klassOop) entry;
+ instanceKlass* ik = (instanceKlass*) k_entry->klass_part();
+ if ( ik->is_initialized() && ik->can_be_fastpath_allocated() ) {
+ size_t obj_size = ik->size_helper();
+ // If the TLAB isn't pre-zeroed then we'll have to do it
+ bool need_zero = !ZeroTLAB;
+ if (UseTLAB) {
+ result = (oop) thread->tlab().allocate(obj_size);
+ }
+ if (result == NULL) {
+ need_zero = true;
+ // Try allocate in shared eden
+ retry:
+ HeapWord* compare_to = *Universe::heap()->top_addr();
+ HeapWord* new_top = compare_to + obj_size;
+ if (new_top <= *Universe::heap()->end_addr()) {
+ if (Atomic::cmpxchg_ptr(new_top, Universe::heap()->top_addr(), compare_to) != compare_to) {
+ goto retry;
+ }
+ result = (oop) compare_to;
+ }
+ }
+ if (result != NULL) {
+ // Initialize object (if nonzero size and need) and then the header
+ if (need_zero ) {
+ HeapWord* to_zero = (HeapWord*) result + sizeof(oopDesc) / oopSize;
+ obj_size -= sizeof(oopDesc) / oopSize;
+ if (obj_size > 0 ) {
+ memset(to_zero, 0, obj_size * HeapWordSize);
+ }
+ }
+ if (UseBiasedLocking) {
+ result->set_mark(ik->prototype_header());
+ } else {
+ result->set_mark(markOopDesc::prototype());
+ }
+ result->set_klass_gap(0);
+ result->set_klass(k_entry);
+ return result;
+ }
+ }
+ }
+ // Slow case allocation
+ InterpreterRuntime::_new(thread, istate->method()->constants(), index);
+ result = thread->vm_result();
+ thread->set_vm_result(NULL);
+ return result;
+}
+
+extern "C" int Helper_instanceof(interpreterState istate, unsigned index, oop tos)
+{
+ if (tos == NULL) return 0;
+
+ // Constant pool may have actual klass or unresolved klass. If it is
+ // unresolved we must resolve it
+ if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) {
+ InterpreterRuntime::quicken_io_cc(istate->thread());
+ if (istate->thread()->has_pending_exception()) return 0;
+ }
+ klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index);
+ klassOop objKlassOop = tos->klass();
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ return objKlassOop == klassOf || objKlassOop->klass_part()->is_subtype_of(klassOf);
+}
+
+extern "C" oop Helper_checkcast(interpreterState istate, unsigned index, oop tos)
+{
+ if (tos == NULL) return NULL;
+
+ // Constant pool may have actual klass or unresolved klass. If it is
+ // unresolved we must resolve it
+ if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) {
+ oop except_oop;
+ InterpreterRuntime::quicken_io_cc(istate->thread());
+ if (except_oop = istate->thread()->pending_exception()) return except_oop;
+ }
+ klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index);
+ klassOop objKlassOop = tos->klass(); //ebx
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ if (objKlassOop != klassOf && !objKlassOop->klass_part()->is_subtype_of(klassOf)) {
+ ResourceMark rm(istate->thread());
+ const char* objName = Klass::cast(objKlassOop)->external_name();
+ const char* klassName = Klass::cast(klassOf)->external_name();
+ char* message = SharedRuntime::generate_class_cast_message(objName, klassName);
+ ThreadInVMfromJava trans(istate->thread());
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ClassCastException(), message);
+ }
+ return istate->thread()->pending_exception();
+}
+
+extern "C" oop Helper_aastore(interpreterState istate, oop value, int index, arrayOop arrayref)
+{
+ if (arrayref == NULL) {
+ ThreadInVMfromJava trans(istate->thread());
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), "");
+ } else if ((uint32_t)index >= (uint32_t)arrayref->length()) {
+ char message[jintAsStringSize];
+ sprintf(message, "%d", index);
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message);
+ } else {
+ if (value != NULL) {
+ /* Check assignability of value into arrayref */
+ klassOop rhsKlassOop = value->klass(); // EBX (subclass)
+ klassOop elemKlassOop = ((objArrayKlass*) arrayref->klass()->klass_part())->element_klass();
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ if (rhsKlassOop != elemKlassOop && !rhsKlassOop->klass_part()->is_subtype_of(elemKlassOop)) {
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayStoreException(), "");
+ goto handle_exception;
+ }
+ }
+ oop* elem_loc = (oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop));
+ // *(oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)) = value;
+ *elem_loc = value;
+ // Mark the card
+ BarrierSet* bs = Universe::heap()->barrier_set();
+ static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
+ OrderAccess::release_store(&_byte_map_base[(uintptr_t)elem_loc >> CardTableModRefBS::card_shift], 0);
+ }
+handle_exception:
+ return istate->thread()->pending_exception();
+}
+
+extern "C" void Helper_aputfield(oop obj)
+{
+ BarrierSet* bs = Universe::heap()->barrier_set();
+ static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
+ OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0);
+}
+
+extern "C" oop Helper_synchronized_enter(JavaThread *thread, BasicObjectLock *mon)
+{
+ BasicLock *lock = mon->lock();
+ markOop displaced = lock->displaced_header();
+
+ if (thread->is_lock_owned((address)displaced->clear_lock_bits()))
+ lock->set_displaced_header(NULL);
+ else
+ InterpreterRuntime::monitorenter(thread, mon);
+ return thread->pending_exception();
+}
+
+extern "C" oop Helper_synchronized_exit(JavaThread *thread, BasicObjectLock *mon)
+{
+ {
+ HandleMark __hm(thread);
+ if (mon->obj() == NULL)
+ InterpreterRuntime::throw_illegal_monitor_state_exception(thread);
+ else
+ InterpreterRuntime::monitorexit(thread, mon);
+ }
+ return thread->pending_exception();
+}
+
+extern "C" oop Helper_SafePoint(JavaThread *thread)
+{
+ {
+ HandleMarkCleaner __hmc(thread);
+ }
+ SafepointSynchronize::block(thread);
+ return thread->pending_exception();
+}
+
+extern "C" void Helper_RaiseArrayBoundException(JavaThread *thread, int index)
+{
+ char message[jintAsStringSize];
+ sprintf(message, "%d", index);
+ {
+ ThreadInVMfromJava trans(thread);
+ Exceptions::_throw_msg(thread, "[Bytecoce Interpreter]", 99,
+ vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message);
+ }
+}
+
+extern "C" void Helper_Raise(JavaThread *thread, symbolOopDesc *name, char const *msg)
+{
+ ThreadInVMfromJava trans(thread);
+ Exceptions::_throw_msg(thread, "[Bytecoce Interpreter]", 99, name, msg);
+}
+
+extern "C" void Helper_RaiseIllegalMonitorException(JavaThread *thread)
+{
+ HandleMark __hm(thread);
+ thread->clear_pending_exception();
+ InterpreterRuntime::throw_illegal_monitor_state_exception(thread);
+}
+
+extern "C" address Helper_HandleException(interpreterState istate, JavaThread *thread)
+{
+ HandleMarkCleaner __hmc(thread);
+ Handle except_oop(thread, thread->pending_exception());
More information about the distro-pkg-dev
mailing list