/hg/release/icedtea7-forest-2.3/hotspot: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 21 21:18:35 UTC 2014
changeset 79284ed240e2 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=79284ed240e2
author: andrew
date: Thu Dec 26 19:52:09 2013 +0000
Add Shark definitions from 8003868
changeset 2fbc5b8d63b3 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=2fbc5b8d63b3
author: andrew
date: Thu Dec 26 19:52:45 2013 +0000
Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
changeset 71fc00fc11be in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=71fc00fc11be
author: simonis
date: Mon Mar 17 13:40:34 2014 +0000
Re-enable the 'gamma' test at the end of the HotSpot build, but only for HotSpot based bootstrap JDKs.
The 'gamma' launcher only works with HotSpot based bootstrap JDKs because it uses the freshly build libjvm.so in the context and together with the class library of the boot JDK which was used to build it. This combination will not work for other JDKs.
changeset 9747f83d7a38 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=9747f83d7a38
author: aph
date: Fri Mar 21 20:57:28 2014 +0000
Replace literal offsets for METHOD_SIZEOFPARAMETERS and ISTATE_NEXT_FRAME with correct symbolic names.
Fix trace code not to dereference null pointers.
Correct Helper_aputfield and helper_aastore not to use static _byte_map_base.
Comment-out calls to TRACE.
Make sure that ISTATE_METHOD and ISTATE_SELF_LINK are set even when JITting fails.
diffstat:
make/linux/makefiles/buildtree.make | 12 ++++++++++++
src/cpu/zero/vm/asm_helper.cpp | 12 +++---------
src/cpu/zero/vm/cppInterpreter_arm.S | 19 +++++++++++--------
src/share/vm/shark/sharkCompiler.cpp | 1 -
src/share/vm/shark/shark_globals.hpp | 10 ++++++++++
5 files changed, 36 insertions(+), 18 deletions(-)
diffs (181 lines):
diff -r 383082077d46 -r 9747f83d7a38 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make Fri Jan 31 21:14:06 2014 +0000
+++ b/make/linux/makefiles/buildtree.make Fri Mar 21 20:57:28 2014 +0000
@@ -384,6 +384,7 @@
DATA_MODE/sparcv9 = 64
DATA_MODE/amd64 = 64
DATA_MODE/ia64 = 64
+DATA_MODE/ppc64 = 64
DATA_MODE/zero = $(ARCH_DATA_MODEL)
JAVA_FLAG/32 = -d32
@@ -392,6 +393,9 @@
WRONG_DATA_MODE_MSG = \
echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK."
+WRONG_JDK_MSG = \
+ echo "JAVA_HOME must point to a HotSpot based JDK \\\(genuine Sun/Oracle or OpenJDK\\\)."
+
CROSS_COMPILING_MSG = \
echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
@@ -428,6 +432,14 @@
echo " exit 0"; \
echo "fi"; \
echo ""; \
+ echo "# 'gamma' only runs with HotSpot based JDKs (genuine Sun/Oracle or OpenJDK)"; \
+ echo ""; \
+ echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -version 2>&1 | grep -E 'OpenJDK|HotSpot' > /dev/null"; \
+ echo "if [ \$$? -ne 0 ]; then "; \
+ echo " $(WRONG_JDK_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
echo "# Use gamma_g if it exists"; \
echo ""; \
echo "GAMMA_PROG=gamma"; \
diff -r 383082077d46 -r 9747f83d7a38 src/cpu/zero/vm/asm_helper.cpp
--- a/src/cpu/zero/vm/asm_helper.cpp Fri Jan 31 21:14:06 2014 +0000
+++ b/src/cpu/zero/vm/asm_helper.cpp Fri Mar 21 20:57:28 2014 +0000
@@ -360,22 +360,16 @@
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);
+ ((objArrayOopDesc *) arrayref)->obj_at_put(index, value);
}
handle_exception:
return istate->thread()->pending_exception();
}
-extern "C" void Helper_aputfield(oop obj)
+extern "C" void Helper_aputfield(oop obj, oop val, int offset)
{
BarrierSet* bs = Universe::heap()->barrier_set();
- static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
+ jbyte* _byte_map_base = (((CardTableModRefBS*)bs)->byte_map_base);
OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0);
}
diff -r 383082077d46 -r 9747f83d7a38 src/cpu/zero/vm/cppInterpreter_arm.S
--- a/src/cpu/zero/vm/cppInterpreter_arm.S Fri Jan 31 21:14:06 2014 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_arm.S Fri Mar 21 20:57:28 2014 +0000
@@ -526,10 +526,13 @@
mrs r4, cpsr
mov r0, jpc
ldr r1, [thread, #THREAD_TOP_ZERO_FRAME]
+ cmp r1, #0
sub r1, r1, #ISTATE_NEXT_FRAME
+ beq 0f
+ DECACHE_JPC
ldr r2, =my_trace
blx r2
- msr cpsr, r4
+0: msr cpsr, r4
ldmfd sp!, {r0, r1, r2, r3, r4, lr, ip}
.endm
@@ -861,7 +864,7 @@
SLOW_ENTRY
empty_entry:
- ldrh r3, [r0, #42]
+ ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS]
ldr r1, [r2, #THREAD_JAVA_SP]
add r1, r1, r3, lsl #2
str r1, [r2, #THREAD_JAVA_SP]
@@ -870,7 +873,7 @@
FAST_ENTRY
fast_empty_entry:
- ldrh r3, [r0, #42]
+ ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS]
ldr r1, [thread, #THREAD_JAVA_SP]
add r1, r1, r3, lsl #2
str r1, [thread, #THREAD_JAVA_SP]
@@ -1072,7 +1075,7 @@
ldr r1, [thread, #THREAD_STACK_SIZE]
ldr r3, [thread, #THREAD_STACK_BASE]
- add r0, r9, #72
+ add r0, r9, #ISTATE_NEXT_FRAME
rsb r3, r1, r3
rsb r3, r3, arm_sp
@@ -1095,7 +1098,7 @@
str r5, [thread, #THREAD_LAST_JAVA_FP]
ldr r5, [thread, #THREAD_JAVA_SP]
str r5, [thread, #THREAD_LAST_JAVA_SP]
- ldr r11, [r11, #-72 + ISTATE_METHOD]
+ ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
cmp r1, #0
bne .fast_native_entry_exception
ldr r5, [r11, #METHOD_SIGNATUREHANDLER]
@@ -1118,7 +1121,7 @@
ldr r11, [thread, #THREAD_TOP_ZERO_FRAME]
ldr r1, [thread, #THREAD_PENDING_EXC]
mov r3, #0
- ldr r11, [r11, #-72 + ISTATE_METHOD]
+ ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
cmp r1, #0
str r3, [thread, #THREAD_LAST_JAVA_SP]
str r3, [thread, #THREAD_LAST_JAVA_FP]
@@ -3340,12 +3343,12 @@
str locals, [istate, #ISTATE_LOCALS]
USEC cmp r3, lr
str constpool, [istate, #ISTATE_CONSTANTS]
+ str tmp1, [istate, #ISTATE_METHOD]
+ str istate, [istate, #ISTATE_SELF_LINK]
USEC bcs method_entry_freq_count_overflow
DISPATCH_NEXT
DISPATCH_NEXT
DISPATCH_NEXT
- str tmp1, [istate, #ISTATE_METHOD]
- str istate, [istate, #ISTATE_SELF_LINK]
@ mov lr, #0
@ str lr, [istate, #ISTATE_PREV_LINK]
@ str lr, [istate, #ISTATE_CALLEE]
diff -r 383082077d46 -r 9747f83d7a38 src/share/vm/shark/sharkCompiler.cpp
--- a/src/share/vm/shark/sharkCompiler.cpp Fri Jan 31 21:14:06 2014 +0000
+++ b/src/share/vm/shark/sharkCompiler.cpp Fri Mar 21 20:57:28 2014 +0000
@@ -212,7 +212,6 @@
&inc_table,
this,
env->comp_level(),
- false,
false);
}
diff -r 383082077d46 -r 9747f83d7a38 src/share/vm/shark/shark_globals.hpp
--- a/src/share/vm/shark/shark_globals.hpp Fri Jan 31 21:14:06 2014 +0000
+++ b/src/share/vm/shark/shark_globals.hpp Fri Mar 21 20:57:28 2014 +0000
@@ -40,6 +40,12 @@
product(intx, SharkMaxInlineSize, 32, \
"Maximum bytecode size of methods to inline when using Shark") \
\
+ product(bool, EliminateNestedLocks, true, \
+ "Eliminate nested locks of the same object when possible") \
+ \
+ product(ccstr, SharkOptimizationLevel, "Default", \
+ "The optimization level passed to LLVM, possible values: None, Less, Default and Agressive") \
+ \
/* compiler debugging */ \
develop(ccstr, SharkPrintTypeflowOf, NULL, \
"Print the typeflow of the specified method") \
@@ -58,6 +64,10 @@
\
diagnostic(bool, SharkPerformanceWarnings, false, \
"Warn about things that could be made faster") \
+ \
+ develop(ccstr, SharkVerifyFunction, NULL, \
+ "Runs LLVM verify over LLVM IR") \
+
SHARK_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
More information about the distro-pkg-dev
mailing list