/hg/icedtea6: 12 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Fri Mar 16 08:03:34 PDT 2012
changeset 92b8e217ffe9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92b8e217ffe9
author: aph
date: Tue Feb 28 04:56:04 2012 -0500
save work in a temporary commit
changeset 8ff8561d6267 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8ff8561d6267
author: aph
date: Tue Feb 28 09:58:50 2012 -0500
save work in a temporary commit
changeset a2b7cc226931 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a2b7cc226931
author: aph
date: Tue Feb 28 12:00:41 2012 -0500
Handlers for _compareAndSwapInt and _compareAndSwapLong
2012-02-28 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
(IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
encodings.
(Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
(Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
(handle_special_method): Use intrinsic_id instead of method_kind.
Add handlers for _compareAndSwapInt and _compareAndSwapLong.
(Thumb2_codegen): Call handle_special_method() for invokevirtual.
Pass stackdepth to handle_special_method().
changeset 9b5d9161c9dd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9b5d9161c9dd
author: aph
date: Wed Feb 29 17:51:34 2012 +0000
Enable compareAndSwap on jlongs.
2012-02-29 Andrew Haley <aph at redhat.com>
* patches/arm.patch (void get_processor_features): New function
that enables compareAndSwap on jlongs.
(atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
function.
(atomic_linux_zero.inline.hpp: Atomic::store): Use
arm_val_compare_and_swap.
changeset 5b30d8907b48 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5b30d8907b48
author: aph
date: Fri Mar 02 10:10:47 2012 -0500
Revert ARM-specific code from atomic_linux_zero.inline.hpp
changeset 672784296bca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=672784296bca
author: aph
date: Fri Mar 02 10:16:07 2012 -0500
Reorganize ARM concurrency inlining patch.
2012-03-02 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: New file.
* patches/arm.patch (void get_processor_features): New function
that enables compareAndSwap on jlongs.
(atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
function.
(atomic_linux_zero.inline.hpp: Atomic::store): Use
arm_val_compare_and_swap.
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
(IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
encodings.
(Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
(Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
(handle_special_method): Use intrinsic_id instead of method_kind.
Add handlers for _compareAndSwapInt and _compareAndSwapLong.
(Thumb2_codegen): Call handle_special_method() for invokevirtual.
Pass stackdepth to handle_special_method().
changeset d549e720bebb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d549e720bebb
author: aph
date: Fri Mar 02 12:49:43 2012 -0500
Minor reorg of arm.patch.
changeset fd60dc8238c7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd60dc8238c7
author: aph
date: Tue Mar 13 16:56:04 2012 +0000
merge
changeset f2b27b309c43 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2b27b309c43
author: aph
date: Wed Mar 14 05:47:19 2012 -0400
ARM: Replace some obscure constants with symbols.
2012-03-14 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (ldc, ldc_w):
Replace numeric constants for constant pool with symbols.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (build_frame):
Likewise.
(fast_native_entry): Likewise.
changeset 248d25e53f7e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=248d25e53f7e
author: aph
date: Thu Mar 15 07:48:08 2012 -0400
ARM it(): handle negated conditions.
2012-03-15 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (it): Add code to
handle negated conditions.
(handle_special_method): Use blx_reg rather than blx in case the
target is thumb code.
changeset 461a2b36448e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=461a2b36448e
author: aph
date: Fri Mar 16 08:36:04 2012 -0400
Use unified syntax for thumb code.
2012-03-16 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax
for thumb code.
changeset d5ab30d2a0fc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d5ab30d2a0fc
author: aph
date: Fri Mar 16 08:50:50 2012 -0400
merge
diffstat:
ChangeLog | 127 ++++-
Makefile.am | 6 +-
NEWS | 2 +
arm_port/hotspot/src/cpu/zero/vm/arm_cas.S | 31 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4 +-
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 12 +-
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 198 +++++-
patches/ScriptEngineManager-doc.patch | 28 +
patches/arm.patch | 52 +
patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch | 20 +
patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch | 22 +
tapset/jstack.stp.in | 287 +++++----
12 files changed, 606 insertions(+), 183 deletions(-)
diffs (truncated from 1096 to 500 lines):
diff -r 01123e3102cc -r d5ab30d2a0fc ChangeLog
--- a/ChangeLog Wed Feb 22 15:36:29 2012 +0000
+++ b/ChangeLog Fri Mar 16 08:50:50 2012 -0400
@@ -1,12 +1,127 @@
+<<<<<<< local
+2012-03-16 Andrew Haley <aph at redhat.com>
+=======
+2012-03-14 Mark Wielaard <mjw at redhat.com>
+>>>>>>> other
+
+<<<<<<< local
+ * arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax
+ for thumb code.
+=======
+ * Makefile.am (EXTRA_DIST): Add tapset/jstack.stp.in.
+>>>>>>> other
+
+<<<<<<< local
+2012-03-15 Andrew Haley <aph at redhat.com>
+=======
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+>>>>>>> other
+
+<<<<<<< local
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (it): Add code to
+ handle negated conditions.
+ (handle_special_method): Use blx_reg rather than blx in case the
+ target is thumb code.
+=======
+ * tapset/jstack.stp.in: Wrap heap accessors in try-catch block to be
+ able to report unusual frames.
+>>>>>>> other
+
+<<<<<<< local
+2012-03-14 Andrew Haley <aph at redhat.com>
+=======
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+>>>>>>> other
+
+<<<<<<< local
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (ldc, ldc_w):
+ Replace numeric constants for constant pool with symbols.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (build_frame):
+ Likewise.
+ (fast_native_entry): Likewise.
+=======
+ * tapset/jstack.stp.in: Use @var construct if available to pick
+ target variable from the right CU (needed by newer DWARF/gcc
+ versions).
+>>>>>>> other
+
+<<<<<<< local
+2012-03-02 Andrew Haley <aph at redhat.com>
+=======
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+>>>>>>> other
+
+<<<<<<< local
+ * arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: New file.
+ * patches/arm.patch (void get_processor_features): New function
+ that enables compareAndSwap on jlongs.
+ (atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
+ function.
+ (atomic_linux_zero.inline.hpp: Atomic::store): Use
+ arm_val_compare_and_swap.
+=======
+ * tapset/jstack.stp.in: Index globals on pid() to support multiple
+ running hotspot jstacks at the same time.
+>>>>>>> other
+
+<<<<<<< local
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
+ (IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
+ encodings.
+ (Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
+ (Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
+ (handle_special_method): Use intrinsic_id instead of method_kind.
+ Add handlers for _compareAndSwapInt and _compareAndSwapLong.
+ (Thumb2_codegen): Call handle_special_method() for invokevirtual.
+ Pass stackdepth to handle_special_method().
+=======
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+>>>>>>> other
+
+<<<<<<< local
+=======
+ * tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
+
+>>>>>>> other
+2012-03-02 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
+ (handle_special_method): Fix a off by one byte SIGILL crash
+ during BLX call to thumb compiled StrictMath intrinsics for
+ --with-float=hard --with-mode=thumb ARM builds.
+
+2012-02-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch:
+ Backport of S4465490: Suspicious about double-check locking idiom being
+ used in the code.
+
+2012-02-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch:
+ Backport of S6883983: JarVerifier dependency on
+ sun.security.pkcs should be removed
+
+2012-02-24 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/ScriptEngineManager-doc.patch:
+ Added patch with JavaDoc fixes for ScriptEngineManager class.
+ * Makefile.am: updated
+
2012-02-22 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
- (handle_special_method, jstack_to_vfp, vfp_to_jstack): New
- functions.
- (Thumb2_codegen): Call handle_special_method.
- (t_vop_ops): Add VSQRT.
- (T_VMOVD_VFP_TOVFP): New macro.
- (vmov_reg_d_VFP_to_VFP): New function.
+ (handle_special_method, jstack_to_vfp, vfp_to_jstack): New
+ functions.
+ (Thumb2_codegen): Call handle_special_method.
+ (t_vop_ops): Add VSQRT.
+ (T_VMOVD_VFP_TOVFP): New macro.
+ (vmov_reg_d_VFP_to_VFP): New function.
2012-02-20 Andrew Haley <aph at redhat.com>
diff -r 01123e3102cc -r d5ab30d2a0fc Makefile.am
--- a/Makefile.am Wed Feb 22 15:36:29 2012 +0000
+++ b/Makefile.am Fri Mar 16 08:50:50 2012 -0400
@@ -420,7 +420,10 @@
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
- patches/openjdk/remove-mimpure-option-to-gcc.patch
+ patches/openjdk/remove-mimpure-option-to-gcc.patch \
+ patches/ScriptEngineManager-doc.patch \
+ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
+ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -640,6 +643,7 @@
autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
+ tapset/jstack.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
diff -r 01123e3102cc -r d5ab30d2a0fc NEWS
--- a/NEWS Wed Feb 22 15:36:29 2012 +0000
+++ b/NEWS Fri Mar 16 08:50:50 2012 -0400
@@ -18,6 +18,8 @@
- S6706974: Add krb5 test infrastructure
- S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
- S6761072: new krb5 tests fail on multiple platforms
+ - S6883983: JarVerifier dependency on sun.security.pkcs should be removed
+ - S4465490: Suspicious about double-check locking idiom being used in the code
New in release 1.10.6 (2012-02-14):
diff -r 01123e3102cc -r d5ab30d2a0fc arm_port/hotspot/src/cpu/zero/vm/arm_cas.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/arm_cas.S Fri Mar 16 08:50:50 2012 -0400
@@ -0,0 +1,31 @@
+#ifdef __ARM_ARCH_7A__
+@ jlong
+@ arm_val_compare_and_swap_long(volatile void *ptr,
+@ jlong oldval,
+@ jlong newval) {
+ .pushsection .text
+ .global arm_val_compare_and_swap_long
+#ifdef __thumb__
+ .syntax unified
+ .thumb_func
+#endif
+ .type arm_val_compare_and_swap_long, %function
+arm_val_compare_and_swap_long:
+ stmfd sp!, {r4, r5, r6, r7}
+ ldrd r4, [sp, #16]
+ dmb sy
+0: ldrexd r6, [r0]
+ cmp r6, r2
+ it eq
+ cmpeq r7, r3
+ bne 1f
+ strexd r1, r4, [r0]
+ cmp r1, #0
+ bne 0b
+ dmb sy
+1: mov r0, r6
+ mov r1, r7
+ ldmfd sp!, {r4, r5, r6, r7}
+ bx lr
+ .popsection
+#endif // __ARM_ARCH_7A__
diff -r 01123e3102cc -r d5ab30d2a0fc arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Wed Feb 22 15:36:29 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Fri Mar 16 08:50:50 2012 -0400
@@ -2091,7 +2091,7 @@
bne 2f
add r0, tmp1, #CONSTANTPOOL_BASE
ldr r0, [r0, lr, lsl #2]
- ldr r1, [r0, #60]
+ ldr r1, [r0, #KLASS_PART + KLASS_JAVA_MIRROR]
PUSH r1
DISPATCH 0
2:
@@ -2147,7 +2147,7 @@
bne 2f
add r0, r2, #CONSTANTPOOL_BASE
ldr r0, [r0, lr, lsl #2]
- ldr r1, [r0, #60]
+ ldr r1, [r0, #KLASS_PART + KLASS_JAVA_MIRROR]
PUSH r1
DISPATCH 0
2:
diff -r 01123e3102cc -r d5ab30d2a0fc arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Feb 22 15:36:29 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Mar 16 08:50:50 2012 -0400
@@ -737,8 +737,8 @@
tst r2, #JVM_ACC_STATIC
ldrne r2, [r1, #METHOD_CONSTANTS]
ldreq r2, [r6, #0]
- ldrne r2, [r2, #16]
- ldrne r2, [r2, #60]
+ ldrne r2, [r2, #CONSTANTPOOL_POOL_HOLDER]
+ ldrne r2, [r2, #KLASS_PART + KLASS_JAVA_MIRROR]
str r2, [r7, #4]
.L10:
ldr r2, [r3, #8]
@@ -1125,9 +1125,9 @@
beq .do_fast_copy_args
ldr r2, [r11, #METHOD_CONSTANTS]
- ldr r2, [r2, #16]
+ ldr r2, [r2, #CONSTANTPOOL_POOL_HOLDER]
str r3, [lr], #4
- ldr r2, [r2, #60]
+ ldr r2, [r2, #KLASS_PART + KLASS_JAVA_MIRROR]
add r1, r1, #4
str r2, [r3]
@@ -2861,9 +2861,9 @@
tst r3, #JVM_ACC_STATIC
ldrne r3, [r0, #METHOD_CONSTANTS]
ldreq sl, [locals, #0]
- ldrne r2, [r3, #16]
+ ldrne r2, [r3, #CONSTANTPOOL_POOL_HOLDER]
ldr tmp1, [istate, #ISTATE_MONITOR_BASE]
- ldrne sl, [r2, #60]
+ ldrne sl, [r2, #KLASS_PART + KLASS_JAVA_MIRROR]
ldr r3, [sl, #0]
orr tmp_xxx, r3, #1
str tmp_xxx, [tmp1, #-8]!
diff -r 01123e3102cc -r d5ab30d2a0fc arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Feb 22 15:36:29 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Mar 16 08:50:50 2012 -0400
@@ -3042,6 +3042,7 @@
#define T_IT(cond, mask) (0xbf00 | (conds[cond] << 4) | (mask))
#define IT_MASK_T 8
+#define IT_MASK_TEE 0x0e
#define PATCH(loc) do { \
unsigned oldidx = codebuf->idx; \
@@ -3067,6 +3068,28 @@
int it(CodeBuf *codebuf, unsigned cond, unsigned mask)
{
+ if (cond & 1) {
+ // If this is a negated condition, flip all the bits above the
+ // least significant bit that is 1. Note that at least one bit is
+ // always 1 in mask
+ switch (mask & (-mask)) {
+ case 8:
+ break;
+ case 4:
+ mask ^= 8;
+ break;
+ case 2:
+ mask ^= 0x0c;
+ break;
+ case 1:
+ mask ^= 0x0e;
+ break;
+ default:
+ // Impossible unless someone specified an incorrect mask
+ longjmp(compiler_error_env, COMPILER_RESULT_FAILED);
+ }
+ }
+
return out_16(codebuf, T_IT(cond, mask));
}
@@ -4233,7 +4256,8 @@
eor_imm(jinfo->codebuf, r_result, r, 0x80000000);
}
-void Thumb2_dNeg(Thumb2_Info *jinfo, u32 opc)
+// arm_op is either DP_EOR (for dnegate) or DP_BIC (for dabs)
+static void Thumb2_dUnaryOp(Thumb2_Info *jinfo, u32 arm_op)
{
Thumb2_Stack *jstack = jinfo->jstack;
unsigned r_lo, r_hi, r_res_lo, r_res_hi;
@@ -4248,7 +4272,17 @@
JASSERT(r_res_lo != r_res_hi, "oops");
JASSERT(r_res_lo != r_hi, "r_res_lo != r_hi");
mov_reg(jinfo->codebuf, r_res_lo, r_lo);
- eor_imm(jinfo->codebuf, r_res_hi, r_hi, 0x80000000);
+ dop_imm(jinfo->codebuf, arm_op, r_res_hi, r_hi, 0x80000000);
+}
+
+void Thumb2_dNeg(Thumb2_Info *jinfo)
+{
+ Thumb2_dUnaryOp(jinfo, DP_EOR);
+}
+
+void Thumb2_dAbs(Thumb2_Info *jinfo)
+{
+ Thumb2_dUnaryOp(jinfo, DP_BIC);
}
void Thumb2_lOp(Thumb2_Info *jinfo, u32 opc)
@@ -5008,42 +5042,34 @@
// Expand a call to a "special" method. These are usually inlines of
// java.lang.Math methods. Return true if the inlining succeeded.
-static bool handle_special_method(methodOop callee, Thumb2_Info *jinfo) {
+static bool handle_special_method(methodOop callee, Thumb2_Info *jinfo,
+ unsigned stackdepth) {
+ Thumb2_Stack *jstack = jinfo->jstack;
+ CodeBuf *codebuf = jinfo->codebuf;
+
+ const char *entry_name;
+
+ switch (callee->intrinsic_id()) {
+ case vmIntrinsics::_dabs:
+ {
+ Thumb2_dAbs(jinfo);
+ return true;
+ }
+
#ifdef __ARM_PCS_VFP
- Thumb2_Stack *jstack = jinfo->jstack;
-
- const char *entry_name;
-
- unsigned loc1 = 0;
-
- switch (Interpreter::method_kind(callee)) {
- case Interpreter::java_lang_math_abs:
- {
- unsigned r_lo, r_hi;
-
- Thumb2_Fill(jinfo, 2);
- r_lo = POP(jstack);
- r_hi = POP(jstack);
- dop_imm_s(jinfo->codebuf, DP_BIC, r_hi, r_hi, 0x80000000, 0);
- PUSH(jstack, r_hi);
- PUSH(jstack, r_lo);
-
- return true;
- }
-
- case Interpreter::java_lang_math_sin:
+ case vmIntrinsics::_dsin:
entry_name = "Java_java_lang_StrictMath_sin";
break;
- case Interpreter::java_lang_math_cos:
+ case vmIntrinsics::_dcos:
entry_name = "Java_java_lang_StrictMath_cos";
break;
- case Interpreter::java_lang_math_tan:
+ case vmIntrinsics::_dtan:
entry_name = "Java_java_lang_StrictMath_tan";
break;
- case Interpreter::java_lang_math_sqrt:
+ case vmIntrinsics::_dsqrt:
{
void *entry_point = dlsym(NULL, "Java_java_lang_StrictMath_sqrt");
if (! entry_point)
@@ -5070,20 +5096,112 @@
// FIXME: The JNI StrictMath routines don't use the JNIEnv *env
// parameter, so it's arguably pointless to pass it here.
add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT);
- blx(jinfo->codebuf, (unsigned)entry_point);
+ mov_imm(jinfo->codebuf, ARM_IP, (unsigned)entry_point);
+ blx_reg(jinfo->codebuf, ARM_IP);
bcc_patch(jinfo->codebuf, COND_EQ, loc);
vfp_to_jstack(jinfo, VFP_D0);
return true;
}
- case Interpreter::java_lang_math_log:
+ case vmIntrinsics::_dlog:
entry_name = "Java_java_lang_StrictMath_log";
break;
- case Interpreter::java_lang_math_log10:
+ case vmIntrinsics::_dlog10:
entry_name = "Java_java_lang_StrictMath_log10";
break;
+#endif // __ARM_PCS_VFP
+
+ case vmIntrinsics::_compareAndSwapInt:
+ {
+ Thumb2_Fill(jinfo, 4);
+
+ unsigned update = POP(jstack);
+ unsigned expect = POP(jstack);
+ unsigned offset = POP(jstack);
+ POP(jstack); // Actually the high part of the offset
+
+ // unsigned object = POP(jstack);
+ // unsigned unsafe = POP(jstack); // Initially an instance of java.lang.Unsafe
+
+ Thumb2_Flush(jinfo);
+ // Get ourself a result reg that's not one of the inputs
+ unsigned exclude = (1<<update)|(1<<expect)|(1<<offset);
+ unsigned result = JSTACK_PREFER(jstack, ~exclude);
+
+ ldm(codebuf, (1<<ARM_IP)|(1<<ARM_LR), Rstack, POP_FD, 1); // Object addr
+ add_reg(codebuf, result, offset, ARM_IP); // result now points to word
+ ldr_imm(codebuf, ARM_LR, ARM_LR, 0, 0, 0); // Security check
+
+ fullBarrier(codebuf);
+
+ int retry = out_loc(codebuf);
+ ldrex_imm(codebuf, ARM_LR, result, 0);
+ cmp_reg(codebuf, ARM_LR, expect);
+ int loc_failed = forward_16(codebuf);
+ strex_imm(codebuf, ARM_IP, update, result, 0);
+ cmp_imm(codebuf, ARM_IP, 0);
+ branch(codebuf, COND_NE, retry);
+ bcc_patch(jinfo->codebuf, COND_NE, loc_failed);
+
+ it(codebuf, COND_NE, IT_MASK_TEE);
+ mov_imm(codebuf, result, 0);
+ mov_imm(codebuf, result, 1);
+ fullBarrier(codebuf);
+
+ PUSH(jstack, result);
+ }
+ return true;
+
+ case vmIntrinsics::_compareAndSwapLong:
+ {
+ Thumb2_Fill(jinfo, 4);
+
+ unsigned update_lo = POP(jstack);
+ unsigned update_hi = POP(jstack);
+ unsigned expect_lo = POP(jstack);
+ unsigned expect_hi = POP(jstack);
+
+ Thumb2_Flush(jinfo);
+ Thumb2_save_locals(jinfo, stackdepth - 4); // 4 args popped above
+
+ // instance of java.lang.Unsafe:
+ ldr_imm(jinfo->codebuf, ARM_LR, Rstack, 3 * wordSize, 1, 0);
+ ldr_imm(codebuf, ARM_LR, ARM_LR, 0, 0, 0); // Security check
+
+ // Object:
+ ldr_imm(jinfo->codebuf, ARM_LR, Rstack, 2 * wordSize, 1, 0);
+ // Offset:
+ ldr_imm(jinfo->codebuf, ARM_IP, Rstack, 0 * wordSize, 1, 0);
+ add_reg(codebuf, ARM_LR, ARM_LR, ARM_IP); // ARM_LR now points to word
+
+ fullBarrier(codebuf);
+
+ int retry = out_loc(codebuf);
+ ldrexd(codebuf, JAZ_V2, JAZ_V3, ARM_LR);
+ cmp_reg(codebuf, JAZ_V2, expect_lo);
+ it(jinfo->codebuf, COND_EQ, IT_MASK_T);
+ cmp_reg(codebuf, JAZ_V3, expect_hi);
+
+ int loc_failed = forward_16(codebuf);
+ strexd(codebuf, JAZ_V1, update_lo, update_hi, ARM_LR);
+ cmp_imm(codebuf, JAZ_V1, 0);
+ branch(codebuf, COND_NE, retry);
+ bcc_patch(jinfo->codebuf, COND_NE, loc_failed);
+
+ unsigned result = JSTACK_REG(jinfo->jstack);
+
+ it(codebuf, COND_NE, IT_MASK_TEE);
More information about the distro-pkg-dev
mailing list