ARM: More intrinsics

[Andrew Haley]

Xerxes noticed an inconsistency in my patch.  I've removed the unused
masks, and redefined the condition in the atomic operations to use ETT
(else, true, true) rather than the confused encoding I used before.

So, it's now

+      it(codebuf, COND_EQ, IT_MASK_ETT);

instead of

-      it(codebuf, COND_NE, IT_MASK_TEE);

I had to do this because it's the only way the encodings make any
sense.  There isn't really any encoding for TEE that works with
COND_NE: it has to be expressed in the binary as COND_EQ:ETT.
(If cond is true, don't do X, but do Y and Z.)

If you want the whole patch resubmitting with these changes I will do
so.

Andrew.



diff -r f2b27b309c43 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp       Wed Mar 14 05:47:19
2012 -0400
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp       Wed Mar 14 13:20:41
2012 -0400
@@ -3039,13 +3039,10 @@
 #define T_CBZ(r, uoff) (0xb100 | (((uoff) & 0x1f) << 3) | (((uoff) & 0x20) <<
(8-5)) | ((r) & 7))
 #define T_CBNZ(r, uoff)        (0xb900 | (((uoff) & 0x1f) << 3) | (((uoff) &
0x20) << (8-5)) | ((r) & 7))

-#define T_IT(cond, mask) (0xbf00 | (conds[cond] << 4) | (mask))
+#define T_IT(cond, mask) (0xbf00 | (conds[cond] << 4) ^ (mask))

 #define IT_MASK_T      8
-#define IT_MASK_TE     0x14
-#define IT_MASK_TT     0x1e
-#define IT_MASK_TTT    0x1e
-#define IT_MASK_TEE    0x12
+#define IT_MASK_ETT    0x12

 #define PATCH(loc)     do {                                            \
          unsigned oldidx = codebuf->idx;                               \
@@ -5077,7 +5074,8 @@
       // 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);

@@ -5125,7 +5123,7 @@
       branch(codebuf, COND_NE, retry);
       bcc_patch(jinfo->codebuf, COND_NE, loc_failed);

-      it(codebuf, COND_NE, IT_MASK_TEE);
+      it(codebuf, COND_EQ, IT_MASK_ETT);
       mov_imm(codebuf, result, 0);
       mov_imm(codebuf, result, 1);
       fullBarrier(codebuf);
@@ -5172,7 +5170,7 @@

       unsigned result = JSTACK_REG(jinfo->jstack);

-      it(codebuf, COND_NE, IT_MASK_TEE);
+      it(codebuf, COND_EQ, IT_MASK_ETT);
       mov_imm(codebuf, result, 0);
       mov_imm(codebuf, result, 1);
       fullBarrier(codebuf);