tcg-sparc improvements, v2
cover tcg-sparc improvements, v2
Changes since v1:
* Add comments for all optional instructions that aren't implemented on each architecture, as requested.
* Rebase vs master.
r~
Richard Henderson (7):
tcg-sparc: Implement neg.
tcg-sparc: Implement not.
tcg: Optional target implementation of ANDC.
tcg: Optional target implementation of ORC.
tcg-sparc: Implement ANDC.
tcg-sparc: Implement ORC.
tcg: Add comments for all optional instructions not implemented.
tcg/arm/tcg-target.h | 14 ++++++++++++++ tcg/i386/tcg-target.h | 12 +++++++----- tcg/mips/tcg-target.h | 4 +++- tcg/ppc/tcg-target.h | 10 +++++++++- tcg/ppc64/tcg-target.h | 25 ++++++++++++++++++++++--- tcg/s390/tcg-target.h | 30 ++++++++++++++++++++++++++++++ tcg/sparc/tcg-target.c | 30 ++++++++++++++++++++++++++++++ tcg/sparc/tcg-target.h | 31 ++++++++++++++++++++++++------- tcg/tcg-op.h | 22 ++++++++++++++++++++++ tcg/tcg-opc.h | 12 ++++++++++++ tcg/x86_64/tcg-target.h | 6 +++++- 11 files changed, 178 insertions(+), 18 deletions(-)
PATCH 1/7 tcg-sparc: Implement neg.
The fallback implementation of "ret = 0 - arg1" isn't ideal, first because of the extra tcg op to load the zero, and second because we fail to handle zero as %g0 for arg1 of the sub.
--- tcg/sparc/tcg-target.c | 13 +++++++++++++ tcg/sparc/tcg-target.h | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-)
tcg/sparc/tcg-target.c +13 -0
@@ -1234,6 +1234,10 @@ static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args, c =ARITH_UMUL ; goto gen_arith; + OP_32_64(neg): + c =ARITH_SUB ; + goto gen_arith1; +case INDEX_op_div_i32:tcg_out_div32 (s, args[0 ], args[1 ], args[2 ], const_args[2 ],0 );break ;
@@ -1392,6 +1396,10 @@ static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args,tcg_out_arithc (s, args[0 ], args[1 ], args[2 ], const_args[2 ], c);break ; + gen_arith1: +tcg_out_arithc (s, args[0 ],TCG_REG_G0 , args[1 ], const_args[1 ], c); +break ; +default :fprintf (stderr,"unknown opcode 0x%x\n" , opc);tcg_abort ();
@@ -1431,6 +1439,8 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_shr_i32, { "r", "r", "rJ" } }, { INDEX_op_sar_i32, { "r", "r", "rJ" } }, + { INDEX_op_neg_i32, { "r", "rJ" } }, + { INDEX_op_brcond_i32, { "r", "rJ" } }, { INDEX_op_setcond_i32, { "r", "r", "rJ" } },
@@ -1484,6 +1494,9 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_shl_i64, { "r", "r", "rJ" } }, { INDEX_op_shr_i64, { "r", "r", "rJ" } }, { INDEX_op_sar_i64, { "r", "r", "rJ" } }, + + { INDEX_op_neg_i64, { "r", "rJ" } }, + { INDEX_op_ext32s_i64, { "r", "ri" } }, { INDEX_op_ext32u_i64, { "r", "ri" } },
tcg/sparc/tcg-target.h +3 -2
@@ -91,15 +91,16 @@ enum {#define TCG_TARGET_HAS_div_i32#define TCG_TARGET_HAS_div_i64 +#define TCG_TARGET_HAS_neg_i32 +#if TCG_TARGET_REG_BITS ==64 #define TCG_TARGET_HAS_ext32s_i64#define TCG_TARGET_HAS_ext32u_i64 +#define TCG_TARGET_HAS_neg_i64#endif //#define TCG_TARGET_HAS_bswap32_i32 //#define TCG_TARGET_HAS_bswap64_i64 -//#define TCG_TARGET_HAS_neg_i32 -//#define TCG_TARGET_HAS_neg_i64 /* Note: must be synced with dyngen-exec.h and Makefile.target */
Signature · 1 line
1.6.6
PATCH 2/7 tcg-sparc: Implement not.
In reply to Richard HendersonThe fallback implementation of "ret = arg1 ^ -1" isn't ideal because of the extra tcg op to load the minus one.
--- tcg/sparc/tcg-target.c | 6 ++++++ tcg/sparc/tcg-target.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-)
tcg/sparc/tcg-target.c +6 -0
@@ -226,6 +226,7 @@ static inline int tcg_target_const_match(tcg_target_long val,#define ARITH_AND (INSN_OP(2) | INSN_OP3(0x01))#define ARITH_OR (INSN_OP(2) | INSN_OP3(0x02))#define ARITH_ORCC (INSN_OP(2) | INSN_OP3(0x12)) +#define ARITH_ORN (INSN_OP(2) | INSN_OP3(0x06))#define ARITH_XOR (INSN_OP(2) | INSN_OP3(0x03))#define ARITH_SUB (INSN_OP(2) | INSN_OP3(0x04))#define ARITH_SUBCC (INSN_OP(2) | INSN_OP3(0x14))
@@ -1237,6 +1238,9 @@ static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args, OP_32_64(neg): c =ARITH_SUB ; goto gen_arith1; + OP_32_64(not): + c =ARITH_ORN ; + goto gen_arith1;case INDEX_op_div_i32:tcg_out_div32 (s, args[0 ], args[1 ], args[2 ], const_args[2 ],0 );
@@ -1440,6 +1444,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_sar_i32, { "r", "r", "rJ" } }, { INDEX_op_neg_i32, { "r", "rJ" } }, + { INDEX_op_not_i32, { "r", "rJ" } }, { INDEX_op_brcond_i32, { "r", "rJ" } }, { INDEX_op_setcond_i32, { "r", "r", "rJ" } },
@@ -1496,6 +1501,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_sar_i64, { "r", "r", "rJ" } }, { INDEX_op_neg_i64, { "r", "rJ" } }, + { INDEX_op_not_i64, { "r", "rJ" } }, { INDEX_op_ext32s_i64, { "r", "ri" } }, { INDEX_op_ext32u_i64, { "r", "ri" } },
tcg/sparc/tcg-target.h +2 -0
@@ -92,11 +92,13 @@ enum {#define TCG_TARGET_HAS_div_i64#define TCG_TARGET_HAS_neg_i32 +#define TCG_TARGET_HAS_not_i32#if TCG_TARGET_REG_BITS ==64 #define TCG_TARGET_HAS_ext32s_i64#define TCG_TARGET_HAS_ext32u_i64#define TCG_TARGET_HAS_neg_i64 +#define TCG_TARGET_HAS_not_i64#endif //#define TCG_TARGET_HAS_bswap32_i32
Signature · 1 line
1.6.6
PATCH 3/7 tcg: Optional target implementation of ANDC.
In reply to Richard HendersonPreviously ANDC was always implemented by tcg-op.h with an explicit NOT opcode. Allow a target implementation.
--- tcg/tcg-op.h | 11 +++++++++++ tcg/tcg-opc.h | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-)
tcg/tcg-op.h +11 -0
@@ -1650,20 +1650,31 @@ static inline void tcg_gen_concat32_i64(TCGv_i64 dest, TCGv_i64 low, TCGv_i64 histatic inline void tcg_gen_andc_i32 (TCGv_i32 ret,TCGv_i32 arg1,TCGv_i32 arg2) { +#ifdef TCG_TARGET_HAS_andc_i32 +tcg_gen_op3_i32 (INDEX_op_andc_i32, ret, arg1, arg2); +#else TCGv_i32 t0; t0 =tcg_temp_new_i32 ();tcg_gen_not_i32 (t0, arg2);tcg_gen_and_i32 (ret, arg1, t0);tcg_temp_free_i32 (t0); +#endif }static inline void tcg_gen_andc_i64 (TCGv_i64 ret,TCGv_i64 arg1,TCGv_i64 arg2) { +#ifdef TCG_TARGET_HAS_andc_i64 +tcg_gen_op3_i64 (INDEX_op_andc_i64, ret, arg1, arg2); +#elif defined(TCG_TARGET_HAS_andc_i32) &&TCG_TARGET_REG_BITS ==32 +tcg_gen_andc_i32 (TCGV_LOW (ret),TCGV_LOW (arg1),TCGV_LOW (arg2)); +tcg_gen_andc_i32 (TCGV_HIGH (ret),TCGV_HIGH (arg1),TCGV_HIGH (arg2)); +#else TCGv_i64 t0; t0 =tcg_temp_new_i64 ();tcg_gen_not_i64 (t0, arg2);tcg_gen_and_i64 (ret, arg1, t0);tcg_temp_free_i64 (t0); +#endif }static inline void tcg_gen_eqv_i32 (TCGv_i32 ret,TCGv_i32 arg1,TCGv_i32 arg2)
tcg/tcg-opc.h +6 -0
@@ -109,6 +109,9 @@ DEF2(not_i32, 1, 1, 0, 0)#ifdef TCG_TARGET_HAS_neg_i32 DEF2(neg_i32, 1, 1, 0, 0)#endif +#ifdef TCG_TARGET_HAS_andc_i32 +DEF2(andc_i32, 1, 2, 0, 0) +#endif #if TCG_TARGET_REG_BITS ==64 DEF2 (mov_i64,1 ,1 ,0 ,0 )
@@ -185,6 +188,9 @@ DEF2(not_i64, 1, 1, 0, 0)#ifdef TCG_TARGET_HAS_neg_i64 DEF2(neg_i64, 1, 1, 0, 0)#endif +#ifdef TCG_TARGET_HAS_andc_i64 +DEF2(andc_i64, 1, 2, 0, 0) +#endif #endif /* QEMU specific */
Signature · 1 line
1.6.6
PATCH 4/7 tcg: Optional target implementation of ORC.
In reply to Richard HendersonPreviously ORC was always implemented by tcg-op.h with an explicit NOT opcode. Allow a target implementation.
--- tcg/tcg-op.h | 11 +++++++++++ tcg/tcg-opc.h | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-)
tcg/tcg-op.h +11 -0
@@ -1715,20 +1715,31 @@ static inline void tcg_gen_nor_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)static inline void tcg_gen_orc_i32 (TCGv_i32 ret,TCGv_i32 arg1,TCGv_i32 arg2) { +#ifdef TCG_TARGET_HAS_orc_i32 +tcg_gen_op3_i32 (INDEX_op_orc_i32, ret, arg1, arg2); +#else TCGv_i32 t0; t0 =tcg_temp_new_i32 ();tcg_gen_not_i32 (t0, arg2);tcg_gen_or_i32 (ret, arg1, t0);tcg_temp_free_i32 (t0); +#endif }static inline void tcg_gen_orc_i64 (TCGv_i64 ret,TCGv_i64 arg1,TCGv_i64 arg2) { +#ifdef TCG_TARGET_HAS_orc_i64 +tcg_gen_op3_i64 (INDEX_op_orc_i64, ret, arg1, arg2); +#elif defined(TCG_TARGET_HAS_orc_i32) &&TCG_TARGET_REG_BITS ==32 +tcg_gen_orc_i32 (TCGV_LOW (ret),TCGV_LOW (arg1),TCGV_LOW (arg2)); +tcg_gen_orc_i32 (TCGV_HIGH (ret),TCGV_HIGH (arg1),TCGV_HIGH (arg2)); +#else TCGv_i64 t0; t0 =tcg_temp_new_i64 ();tcg_gen_not_i64 (t0, arg2);tcg_gen_or_i64 (ret, arg1, t0);tcg_temp_free_i64 (t0); +#endif }static inline void tcg_gen_rotl_i32 (TCGv_i32 ret,TCGv_i32 arg1,TCGv_i32 arg2)
tcg/tcg-opc.h +6 -0
@@ -112,6 +112,9 @@ DEF2(neg_i32, 1, 1, 0, 0)#ifdef TCG_TARGET_HAS_andc_i32 DEF2(andc_i32, 1, 2, 0, 0)#endif +#ifdef TCG_TARGET_HAS_orc_i32 +DEF2(orc_i32, 1, 2, 0, 0) +#endif #if TCG_TARGET_REG_BITS ==64 DEF2 (mov_i64,1 ,1 ,0 ,0 )
@@ -191,6 +194,9 @@ DEF2(neg_i64, 1, 1, 0, 0)#ifdef TCG_TARGET_HAS_andc_i64 DEF2(andc_i64, 1, 2, 0, 0)#endif +#ifdef TCG_TARGET_HAS_orc_i64 +DEF2(orc_i64, 1, 2, 0, 0) +#endif #endif /* QEMU specific */
Signature · 1 line
1.6.6
PATCH 5/7 tcg-sparc: Implement ANDC.
In reply to Richard Henderson--- tcg/sparc/tcg-target.c | 6 ++++++ tcg/sparc/tcg-target.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-)
tcg/sparc/tcg-target.c +6 -0
@@ -224,6 +224,7 @@ static inline int tcg_target_const_match(tcg_target_long val,#define ARITH_ADD (INSN_OP(2) | INSN_OP3(0x00))#define ARITH_ADDCC (INSN_OP(2) | INSN_OP3(0x10))#define ARITH_AND (INSN_OP(2) | INSN_OP3(0x01)) +#define ARITH_ANDN (INSN_OP(2) | INSN_OP3(0x05))#define ARITH_OR (INSN_OP(2) | INSN_OP3(0x02))#define ARITH_ORCC (INSN_OP(2) | INSN_OP3(0x12))#define ARITH_ORN (INSN_OP(2) | INSN_OP3(0x06))
@@ -1216,6 +1217,9 @@ static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args, OP_32_64(and): c =ARITH_AND ; goto gen_arith; + OP_32_64(andc): + c =ARITH_ANDN ; + goto gen_arith; OP_32_64(or): c =ARITH_OR ; goto gen_arith;
@@ -1436,6 +1440,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_remu_i32, { "r", "r", "rJ" } }, { INDEX_op_sub_i32, { "r", "r", "rJ" } }, { INDEX_op_and_i32, { "r", "r", "rJ" } }, + { INDEX_op_andc_i32, { "r", "r", "rJ" } }, { INDEX_op_or_i32, { "r", "r", "rJ" } }, { INDEX_op_xor_i32, { "r", "r", "rJ" } },
@@ -1493,6 +1498,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_remu_i64, { "r", "r", "rJ" } }, { INDEX_op_sub_i64, { "r", "r", "rJ" } }, { INDEX_op_and_i64, { "r", "r", "rJ" } }, + { INDEX_op_andc_i64, { "r", "r", "rJ" } }, { INDEX_op_or_i64, { "r", "r", "rJ" } }, { INDEX_op_xor_i64, { "r", "r", "rJ" } },
tcg/sparc/tcg-target.h +2 -0
@@ -93,12 +93,14 @@ enum {#define TCG_TARGET_HAS_neg_i32#define TCG_TARGET_HAS_not_i32 +#define TCG_TARGET_HAS_andc_i32#if TCG_TARGET_REG_BITS ==64 #define TCG_TARGET_HAS_ext32s_i64#define TCG_TARGET_HAS_ext32u_i64#define TCG_TARGET_HAS_neg_i64#define TCG_TARGET_HAS_not_i64 +#define TCG_TARGET_HAS_andc_i64#endif //#define TCG_TARGET_HAS_bswap32_i32
Signature · 1 line
1.6.6
PATCH 6/7 tcg-sparc: Implement ORC.
In reply to Richard Henderson--- tcg/sparc/tcg-target.c | 5 +++++ tcg/sparc/tcg-target.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)
tcg/sparc/tcg-target.c +5 -0
@@ -1223,6 +1223,9 @@ static inline void tcg_out_op(TCGContext *s, int opc, const TCGArg *args, OP_32_64(or): c =ARITH_OR ; goto gen_arith; + OP_32_64(orc): + c =ARITH_ORN ; + goto gen_arith; OP_32_64(xor): c =ARITH_XOR ; goto gen_arith;
@@ -1442,6 +1445,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_and_i32, { "r", "r", "rJ" } }, { INDEX_op_andc_i32, { "r", "r", "rJ" } }, { INDEX_op_or_i32, { "r", "r", "rJ" } }, + { INDEX_op_orc_i32, { "r", "r", "rJ" } }, { INDEX_op_xor_i32, { "r", "r", "rJ" } }, { INDEX_op_shl_i32, { "r", "r", "rJ" } },
@@ -1500,6 +1504,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { INDEX_op_and_i64, { "r", "r", "rJ" } }, { INDEX_op_andc_i64, { "r", "r", "rJ" } }, { INDEX_op_or_i64, { "r", "r", "rJ" } }, + { INDEX_op_orc_i64, { "r", "r", "rJ" } }, { INDEX_op_xor_i64, { "r", "r", "rJ" } }, { INDEX_op_shl_i64, { "r", "r", "rJ" } },
tcg/sparc/tcg-target.h +2 -0
@@ -94,6 +94,7 @@ enum {#define TCG_TARGET_HAS_neg_i32#define TCG_TARGET_HAS_not_i32#define TCG_TARGET_HAS_andc_i32 +#define TCG_TARGET_HAS_orc_i32#if TCG_TARGET_REG_BITS ==64 #define TCG_TARGET_HAS_ext32s_i64
@@ -101,6 +102,7 @@ enum {#define TCG_TARGET_HAS_neg_i64#define TCG_TARGET_HAS_not_i64#define TCG_TARGET_HAS_andc_i64 +#define TCG_TARGET_HAS_orc_i64#endif //#define TCG_TARGET_HAS_bswap32_i32
Signature · 1 line
1.6.6
PATCH 7/7 tcg: Add comments for all optional instructions not implemented.
In reply to Richard Henderson--- tcg/arm/tcg-target.h | 14 ++++++++++++++ tcg/i386/tcg-target.h | 12 +++++++----- tcg/mips/tcg-target.h | 4 +++- tcg/ppc/tcg-target.h | 10 +++++++++- tcg/ppc64/tcg-target.h | 25 ++++++++++++++++++++++--- tcg/s390/tcg-target.h | 30 ++++++++++++++++++++++++++++++ tcg/sparc/tcg-target.h | 22 ++++++++++++++++------ tcg/x86_64/tcg-target.h | 6 +++++- 8 files changed, 106 insertions(+), 17 deletions(-)
tcg/arm/tcg-target.h +14 -0
@@ -63,6 +63,20 @@ enum {#define TCG_TARGET_STACK_ALIGN 8#define TCG_TARGET_CALL_STACK_OFFSET 0 +/* optional instructions */ +// #define TCG_TARGET_HAS_div_i32 +// #define TCG_TARGET_HAS_rot_i32 +// #define TCG_TARGET_HAS_ext8s_i32 +// #define TCG_TARGET_HAS_ext16s_i32 +// #define TCG_TARGET_HAS_ext8u_i32 +// #define TCG_TARGET_HAS_ext16u_i32 +// #define TCG_TARGET_HAS_bswap16_i32 +// #define TCG_TARGET_HAS_bswap32_i32 +// #define TCG_TARGET_HAS_not_i32 +// #define TCG_TARGET_HAS_neg_i32 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_orc_i32 +#define TCG_TARGET_HAS_GUEST_BASE enum {
tcg/i386/tcg-target.h +7 -5
@@ -45,15 +45,17 @@ enum {#define TCG_TARGET_CALL_STACK_OFFSET 0/* optional instructions */ -#define TCG_TARGET_HAS_bswap16_i32 -#define TCG_TARGET_HAS_bswap32_i32 -#define TCG_TARGET_HAS_neg_i32 -#define TCG_TARGET_HAS_not_i32 +#define TCG_TARGET_HAS_rot_i32#define TCG_TARGET_HAS_ext8s_i32#define TCG_TARGET_HAS_ext16s_i32 -#define TCG_TARGET_HAS_rot_i32#define TCG_TARGET_HAS_ext8u_i32#define TCG_TARGET_HAS_ext16u_i32 +#define TCG_TARGET_HAS_bswap16_i32 +#define TCG_TARGET_HAS_bswap32_i32 +#define TCG_TARGET_HAS_neg_i32 +#define TCG_TARGET_HAS_not_i32 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_GUEST_BASE
tcg/mips/tcg-target.h +3 -1
@@ -80,11 +80,13 @@ enum {/* optional instructions */ #define TCG_TARGET_HAS_div_i32#define TCG_TARGET_HAS_not_i32 +#undef TCG_TARGET_HAS_rot_i32#undef TCG_TARGET_HAS_ext8s_i32#undef TCG_TARGET_HAS_ext16s_i32#undef TCG_TARGET_HAS_bswap32_i32#undef TCG_TARGET_HAS_bswap16_i32 -#undef TCG_TARGET_HAS_rot_i32 +#undef TCG_TARGET_HAS_andc_i32 +#undef TCG_TARGET_HAS_orc_i32/* optional instructions automatically implemented */ #undef TCG_TARGET_HAS_neg_i32/* sub rd, zero, rt */
tcg/ppc/tcg-target.h +9 -1
@@ -77,10 +77,18 @@ enum {#endif /* optional instructions */ -#define TCG_TARGET_HAS_neg_i32#define TCG_TARGET_HAS_div_i32 +// #define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_ext8s_i32#define TCG_TARGET_HAS_ext16s_i32 +// #define TCG_TARGET_HAS_ext8u_i32 +// #define TCG_TARGET_HAS_ext16u_i32 +// #define TCG_TARGET_HAS_bswap16_i32 +// #define TCG_TARGET_HAS_bswap32_i32 +// #define TCG_TARGET_HAS_not_i32 +#define TCG_TARGET_HAS_neg_i32 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_orc_i32 #define TCG_AREG0 TCG_REG_R27#define TCG_AREG1 TCG_REG_R24
tcg/ppc64/tcg-target.h +22 -3
@@ -68,15 +68,34 @@ enum {#define TCG_TARGET_CALL_STACK_OFFSET 48/* optional instructions */ -#define TCG_TARGET_HAS_neg_i32#define TCG_TARGET_HAS_div_i32 -#define TCG_TARGET_HAS_neg_i64 -#define TCG_TARGET_HAS_div_i64 +// #define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_ext8s_i32#define TCG_TARGET_HAS_ext16s_i32 +// #define TCG_TARGET_HAS_ext8u_i32 +// #define TCG_TARGET_HAS_ext16u_i32 +// #define TCG_TARGET_HAS_bswap16_i32 +// #define TCG_TARGET_HAS_bswap32_i32 +// #define TCG_TARGET_HAS_not_i32 +#define TCG_TARGET_HAS_neg_i32 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_orc_i32 + +#define TCG_TARGET_HAS_div_i64 +// #define TCG_TARGET_HAS_rot_i64 #define TCG_TARGET_HAS_ext8s_i64#define TCG_TARGET_HAS_ext16s_i64#define TCG_TARGET_HAS_ext32s_i64 +// #define TCG_TARGET_HAS_ext8u_i64 +// #define TCG_TARGET_HAS_ext16u_i64 +// #define TCG_TARGET_HAS_ext32u_i64 +// #define TCG_TARGET_HAS_bswap16_i64 +// #define TCG_TARGET_HAS_bswap32_i64 +// #define TCG_TARGET_HAS_bswap64_i64 +// #define TCG_TARGET_HAS_not_i64 +#define TCG_TARGET_HAS_neg_i64 +// #define TCG_TARGET_HAS_andc_i64 +// #define TCG_TARGET_HAS_orc_i64 #define TCG_AREG0 TCG_REG_R27#define TCG_AREG1 TCG_REG_R24
tcg/s390/tcg-target.h +30 -0
@@ -46,6 +46,36 @@ enum { };#define TCG_TARGET_NB_REGS 16 +/* optional instructions */ +// #define TCG_TARGET_HAS_div_i32 +// #define TCG_TARGET_HAS_rot_i32 +// #define TCG_TARGET_HAS_ext8s_i32 +// #define TCG_TARGET_HAS_ext16s_i32 +// #define TCG_TARGET_HAS_ext8u_i32 +// #define TCG_TARGET_HAS_ext16u_i32 +// #define TCG_TARGET_HAS_bswap16_i32 +// #define TCG_TARGET_HAS_bswap32_i32 +// #define TCG_TARGET_HAS_not_i32 +// #define TCG_TARGET_HAS_neg_i32 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_orc_i32 + +// #define TCG_TARGET_HAS_div_i64 +// #define TCG_TARGET_HAS_rot_i64 +// #define TCG_TARGET_HAS_ext8s_i64 +// #define TCG_TARGET_HAS_ext16s_i64 +// #define TCG_TARGET_HAS_ext32s_i64 +// #define TCG_TARGET_HAS_ext8u_i64 +// #define TCG_TARGET_HAS_ext16u_i64 +// #define TCG_TARGET_HAS_ext32u_i64 +// #define TCG_TARGET_HAS_bswap16_i64 +// #define TCG_TARGET_HAS_bswap32_i64 +// #define TCG_TARGET_HAS_bswap64_i64 +// #define TCG_TARGET_HAS_not_i64 +// #define TCG_TARGET_HAS_neg_i64 +// #define TCG_TARGET_HAS_andc_i64 +// #define TCG_TARGET_HAS_orc_i64 +/* used for function call generation */ #define TCG_REG_CALL_STACK TCG_REG_R15#define TCG_TARGET_STACK_ALIGN 8
tcg/sparc/tcg-target.h +16 -6
@@ -89,26 +89,36 @@ enum {/* optional instructions */ #define TCG_TARGET_HAS_div_i32 -#define TCG_TARGET_HAS_div_i64 - +// #define TCG_TARGET_HAS_rot_i32 +// #define TCG_TARGET_HAS_ext8s_i32 +// #define TCG_TARGET_HAS_ext16s_i32 +// #define TCG_TARGET_HAS_ext8u_i32 +// #define TCG_TARGET_HAS_ext16u_i32 +// #define TCG_TARGET_HAS_bswap16_i32 +// #define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_neg_i32#define TCG_TARGET_HAS_not_i32#define TCG_TARGET_HAS_andc_i32#define TCG_TARGET_HAS_orc_i32#if TCG_TARGET_REG_BITS ==64 +#define TCG_TARGET_HAS_div_i64 +// #define TCG_TARGET_HAS_rot_i64 +// #define TCG_TARGET_HAS_ext8s_i64 +// #define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext32s_i64 +// #define TCG_TARGET_HAS_ext8u_i64 +// #define TCG_TARGET_HAS_ext16u_i64 #define TCG_TARGET_HAS_ext32u_i64 +// #define TCG_TARGET_HAS_bswap16_i64 +// #define TCG_TARGET_HAS_bswap32_i64 +// #define TCG_TARGET_HAS_bswap64_i64 #define TCG_TARGET_HAS_neg_i64#define TCG_TARGET_HAS_not_i64#define TCG_TARGET_HAS_andc_i64#define TCG_TARGET_HAS_orc_i64#endif -//#define TCG_TARGET_HAS_bswap32_i32 -//#define TCG_TARGET_HAS_bswap64_i64 - -/* Note: must be synced with dyngen-exec.h and Makefile.target */ #ifdef CONFIG_SOLARIS #define TCG_AREG0 TCG_REG_G2
tcg/x86_64/tcg-target.h +5 -1
@@ -75,10 +75,14 @@ enum {#define TCG_TARGET_HAS_ext8u_i64#define TCG_TARGET_HAS_ext16u_i64#define TCG_TARGET_HAS_ext32u_i64 -#define TCG_TARGET_HAS_rot_i32#define TCG_TARGET_HAS_rot_i64 +// #define TCG_TARGET_HAS_andc_i32 +// #define TCG_TARGET_HAS_andc_i64 +// #define TCG_TARGET_HAS_orc_i32 +// #define TCG_TARGET_HAS_orc_i64 +#define TCG_TARGET_HAS_GUEST_BASE /* Note: must be synced with dyngen-exec.h */
Signature · 1 line
1.6.6
Blue Swirl
AppliedThanks, applied all.
Quoted 32 lines · Richard Henderson
Changes since v1:
* Add comments for all optional instructions that aren't implemented on each architecture, as requested.
* Rebase vs master.r~
Richard Henderson (7):
tcg-sparc: Implement neg.
tcg-sparc: Implement not.
tcg: Optional target implementation of ANDC.
tcg: Optional target implementation of ORC.
tcg-sparc: Implement ANDC.
tcg-sparc: Implement ORC.
tcg: Add comments for all optional instructions not implemented.tcg/arm/tcg-target.h | 14 ++++++++++++++ tcg/i386/tcg-target.h | 12 +++++++----- tcg/mips/tcg-target.h | 4 +++- tcg/ppc/tcg-target.h | 10 +++++++++- tcg/ppc64/tcg-target.h | 25 ++++++++++++++++++++++--- tcg/s390/tcg-target.h | 30 ++++++++++++++++++++++++++++++ tcg/sparc/tcg-target.c | 30 ++++++++++++++++++++++++++++++ tcg/sparc/tcg-target.h | 31 ++++++++++++++++++++++++------- tcg/tcg-op.h | 22 ++++++++++++++++++++++ tcg/tcg-opc.h | 12 ++++++++++++ tcg/x86_64/tcg-target.h | 6 +++++- 11 files changed, 178 insertions(+), 18 deletions(-)