tcg: Allow target-specific implementation of EQV.

Signed-off-by: Richard Henderson <[email protected]>
Signed-off-by: Aurelien Jarno <[email protected]>

diff --git a/tcg/README b/tcg/README
index 281c1143f3e4db0919f2f0ea463fe3b212592f1a..fe8c3d5d8fe6f65d2fcc7e7eab2f7fe49ea0b5e3 100644 (file)
--- a/tcg/README
+++ b/tcg/README
@@ -213,7 +213,7 @@ t0=t1&~t2
 
 * eqv_i32/i64 t0, t1, t2
 
-t0=~(t1^t2)
+t0=~(t1^t2), or equivalently, t0=t1^~t2
 
 * nand_i32/i64 t0, t1, t2
 

diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h
index 7242be88231b35ba314259411333d3e4797c24ea..cfcd4af4a7f21384796448d40189a0137c73dc9d 100644 (file)
--- a/tcg/arm/tcg-target.h
+++ b/tcg/arm/tcg-target.h
@@ -67,6 +67,7 @@ enum {
 // #define TCG_TARGET_HAS_rot_i32
 #define TCG_TARGET_HAS_andc_i32
 // #define TCG_TARGET_HAS_orc_i32
+// #define TCG_TARGET_HAS_eqv_i32
 
 #define TCG_TARGET_HAS_GUEST_BASE
 

diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
index 7bb765e39c406f1a98f61e86ceba252aa40c4e7d..83e004b620e63a19b92133f43c4539a57ddf2a23 100644 (file)
--- a/tcg/i386/tcg-target.h
+++ b/tcg/i386/tcg-target.h
@@ -57,6 +57,7 @@ enum {
 #define TCG_TARGET_HAS_not_i32
 // #define TCG_TARGET_HAS_andc_i32
 // #define TCG_TARGET_HAS_orc_i32
+// #define TCG_TARGET_HAS_eqv_i32
 
 #define TCG_TARGET_HAS_GUEST_BASE
 

diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index 6b7741cfb9593905db1c5aad39e8a5a634438a0e..00f89f473b73ce4e1b92e54cc688c1153cde3131 100644 (file)
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -87,6 +87,7 @@ enum {
 #undef TCG_TARGET_HAS_bswap16_i32
 #undef TCG_TARGET_HAS_andc_i32
 #undef TCG_TARGET_HAS_orc_i32
+#undef TCG_TARGET_HAS_eqv_i32
 
 /* optional instructions automatically implemented */
 #undef TCG_TARGET_HAS_neg_i32      /* sub  rd, zero, rt   */

diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h
index 5cae81f0ff3a0ed6de768121c75926f9721ac848..d0c476134760a5da9be7bbb15a1cbb36367a009c 100644 (file)
--- a/tcg/ppc/tcg-target.h
+++ b/tcg/ppc/tcg-target.h
@@ -89,6 +89,7 @@ enum {
 #define TCG_TARGET_HAS_neg_i32
 #define TCG_TARGET_HAS_andc_i32
 #define TCG_TARGET_HAS_orc_i32
+/* #define TCG_TARGET_HAS_eqv_i32 */
 
 #define TCG_AREG0 TCG_REG_R27
 

diff --git a/tcg/ppc64/tcg-target.h b/tcg/ppc64/tcg-target.h
index e3677519a6a3a5194eb92c8028cfc7bf4fc9ee46..11096c5163b30108dd71ecf6e8016e27112ef5ed 100644 (file)
--- a/tcg/ppc64/tcg-target.h
+++ b/tcg/ppc64/tcg-target.h
@@ -80,6 +80,7 @@ enum {
 #define TCG_TARGET_HAS_neg_i32
 /* #define TCG_TARGET_HAS_andc_i32 */
 /* #define TCG_TARGET_HAS_orc_i32 */
+/* #define TCG_TARGET_HAS_eqv_i32 */
 
 #define TCG_TARGET_HAS_div_i64
 /* #define TCG_TARGET_HAS_rot_i64 */
@@ -96,6 +97,7 @@ enum {
 #define TCG_TARGET_HAS_neg_i64
 /* #define TCG_TARGET_HAS_andc_i64 */
 /* #define TCG_TARGET_HAS_orc_i64 */
+/* #define TCG_TARGET_HAS_eqv_i64 */
 
 #define TCG_AREG0 TCG_REG_R27
 

diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index 82e2be7c37107c349e76e99a34df20275ae94596..2d10e73b81b845827e78b2681a6a13c08b86d097 100644 (file)
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -59,6 +59,7 @@ enum {
 // #define TCG_TARGET_HAS_neg_i32
 // #define TCG_TARGET_HAS_andc_i32
 // #define TCG_TARGET_HAS_orc_i32
+// #define TCG_TARGET_HAS_eqv_i32
 
 // #define TCG_TARGET_HAS_div_i64
 // #define TCG_TARGET_HAS_rot_i64
@@ -75,6 +76,7 @@ enum {
 // #define TCG_TARGET_HAS_neg_i64
 // #define TCG_TARGET_HAS_andc_i64
 // #define TCG_TARGET_HAS_orc_i64
+// #define TCG_TARGET_HAS_eqv_i64
 
 /* used for function call generation */
 #define TCG_REG_CALL_STACK             TCG_REG_R15

diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h
index c27c284efd522f2f6570b9cf74c7985fa0251447..aabdd9dc500877d42af975ea0ba1d12a4e33fa18 100644 (file)
--- a/tcg/sparc/tcg-target.h
+++ b/tcg/sparc/tcg-target.h
@@ -100,6 +100,7 @@ enum {
 #define TCG_TARGET_HAS_not_i32
 #define TCG_TARGET_HAS_andc_i32
 #define TCG_TARGET_HAS_orc_i32
+// #define TCG_TARGET_HAS_eqv_i32
 
 #if TCG_TARGET_REG_BITS == 64
 #define TCG_TARGET_HAS_div_i64
@@ -117,6 +118,7 @@ enum {
 #define TCG_TARGET_HAS_not_i64
 #define TCG_TARGET_HAS_andc_i64
 #define TCG_TARGET_HAS_orc_i64
+// #define TCG_TARGET_HAS_eqv_i64
 #endif
 
 /* Note: must be synced with dyngen-exec.h */

diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index f15c80351b47c653aaf7b34419af307749bb06ce..b535406363cd504eff266a08f9f6163077d19556 100644 (file)
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -1740,14 +1740,25 @@ static inline void tcg_gen_andc_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
 
 static inline void tcg_gen_eqv_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
 {
+#ifdef TCG_TARGET_HAS_eqv_i32
+    tcg_gen_op3_i32(INDEX_op_eqv_i32, ret, arg1, arg2);
+#else
     tcg_gen_xor_i32(ret, arg1, arg2);
     tcg_gen_not_i32(ret, ret);
+#endif
 }
 
 static inline void tcg_gen_eqv_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
 {
+#ifdef TCG_TARGET_HAS_eqv_i64
+    tcg_gen_op3_i64(INDEX_op_eqv_i64, ret, arg1, arg2);
+#elif defined(TCG_TARGET_HAS_eqv_i32) && TCG_TARGET_REG_BITS == 32
+    tcg_gen_eqv_i32(TCGV_LOW(ret), TCGV_LOW(arg1), TCGV_LOW(arg2));
+    tcg_gen_eqv_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2));
+#else
     tcg_gen_xor_i64(ret, arg1, arg2);
     tcg_gen_not_i64(ret, ret);
+#endif
 }
 
 static inline void tcg_gen_nand_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)

diff --git a/tcg/tcg-opc.h b/tcg/tcg-opc.h
index 441e51f5c97f5284e0b979920c96d13f5223ebcd..8c34a83d27ce3dbe1e628df4a415221e94226b8e 100644 (file)
--- a/tcg/tcg-opc.h
+++ b/tcg/tcg-opc.h
@@ -116,6 +116,9 @@ DEF2(andc_i32, 1, 2, 0, 0)
 #ifdef TCG_TARGET_HAS_orc_i32
 DEF2(orc_i32, 1, 2, 0, 0)
 #endif
+#ifdef TCG_TARGET_HAS_eqv_i32
+DEF2(eqv_i32, 1, 2, 0, 0)
+#endif
 
 #if TCG_TARGET_REG_BITS == 64
 DEF2(mov_i64, 1, 1, 0, 0)
@@ -199,6 +202,9 @@ DEF2(andc_i64, 1, 2, 0, 0)
 #ifdef TCG_TARGET_HAS_orc_i64
 DEF2(orc_i64, 1, 2, 0, 0)
 #endif
+#ifdef TCG_TARGET_HAS_eqv_i64
+DEF2(eqv_i64, 1, 2, 0, 0)
+#endif
 #endif
 
 /* QEMU specific */

diff --git a/tcg/x86_64/tcg-target.h b/tcg/x86_64/tcg-target.h
index 02448b5d841530c6bf51a1a0ebe57a72cf57d423..2225faa62590989c2af64b2c3188c4ddc43dd16b 100644 (file)
--- a/tcg/x86_64/tcg-target.h
+++ b/tcg/x86_64/tcg-target.h
@@ -84,6 +84,8 @@ enum {
 // #define TCG_TARGET_HAS_andc_i64
 // #define TCG_TARGET_HAS_orc_i32
 // #define TCG_TARGET_HAS_orc_i64
+// #define TCG_TARGET_HAS_eqv_i32
+// #define TCG_TARGET_HAS_eqv_i64
 
 #define TCG_TARGET_HAS_GUEST_BASE