[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/27] tcg-ppc64: Rearrange integer constant cons
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v3 09/27] tcg-ppc64: Rearrange integer constant constraints |
Date: |
Mon, 1 Apr 2013 21:23:12 -0700 |
We'll need a zero, and Z makes more sense for that. Make sure we
have a full compliment of signed and unsigned 16 and 32-bit tests.
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc64/tcg-target.c | 43 +++++++++++++++++++++++++++++++++----------
1 file changed, 33 insertions(+), 10 deletions(-)
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 31b0cb7..0e4826d 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -22,7 +22,11 @@
* THE SOFTWARE.
*/
-#define TCG_CT_CONST_U32 0x100
+#define TCG_CT_CONST_S16 0x100
+#define TCG_CT_CONST_U16 0x200
+#define TCG_CT_CONST_S32 0x400
+#define TCG_CT_CONST_U32 0x800
+#define TCG_CT_CONST_ZERO 0x1000
static uint8_t *tb_ret_addr;
@@ -242,9 +246,21 @@ static int target_parse_constraint (TCGArgConstraint *ct,
const char **pct_str)
tcg_regset_reset_reg (ct->u.regs, TCG_REG_R6);
#endif
break;
- case 'Z':
+ case 'I':
+ ct->ct |= TCG_CT_CONST_S16;
+ break;
+ case 'J':
+ ct->ct |= TCG_CT_CONST_U16;
+ break;
+ case 'T':
+ ct->ct |= TCG_CT_CONST_S32;
+ break;
+ case 'U':
ct->ct |= TCG_CT_CONST_U32;
break;
+ case 'Z':
+ ct->ct |= TCG_CT_CONST_ZERO;
+ break;
default:
return -1;
}
@@ -257,13 +273,20 @@ static int target_parse_constraint (TCGArgConstraint *ct,
const char **pct_str)
static int tcg_target_const_match (tcg_target_long val,
const TCGArgConstraint *arg_ct)
{
- int ct;
-
- ct = arg_ct->ct;
- if (ct & TCG_CT_CONST)
+ int ct = arg_ct->ct;
+ if (ct & TCG_CT_CONST) {
+ return 1;
+ } else if ((ct & TCG_CT_CONST_S16) && val == (int16_t)val) {
+ return 1;
+ } else if ((ct & TCG_CT_CONST_U16) && val == (uint16_t)val) {
return 1;
- else if ((ct & TCG_CT_CONST_U32) && (val == (uint32_t) val))
+ } else if ((ct & TCG_CT_CONST_S32) && val == (int32_t)val) {
return 1;
+ } else if ((ct & TCG_CT_CONST_U32) && val == (uint32_t)val) {
+ return 1;
+ } else if ((ct & TCG_CT_CONST_ZERO) && val == 0) {
+ return 1;
+ }
return 0;
}
@@ -1607,9 +1630,9 @@ static const TCGTargetOpDef ppc_op_defs[] = {
{ INDEX_op_add_i64, { "r", "r", "ri" } },
{ INDEX_op_sub_i64, { "r", "r", "ri" } },
- { INDEX_op_and_i64, { "r", "r", "rZ" } },
- { INDEX_op_or_i64, { "r", "r", "rZ" } },
- { INDEX_op_xor_i64, { "r", "r", "rZ" } },
+ { INDEX_op_and_i64, { "r", "r", "rU" } },
+ { INDEX_op_or_i64, { "r", "r", "rU" } },
+ { INDEX_op_xor_i64, { "r", "r", "rU" } },
{ INDEX_op_shl_i64, { "r", "r", "ri" } },
{ INDEX_op_shr_i64, { "r", "r", "ri" } },
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/27] Modernize tcg/ppc64, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 01/27] disas: Disassemble all ppc insns for the host, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 02/27] tcg-ppc64: Use TCGReg everywhere, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 03/27] tcg-ppc64: Introduce and use tcg_out_rlw, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 05/27] tcg-ppc64: Introduce and use tcg_out_shli64, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 04/27] tcg-ppc64: Introduce and use tcg_out_ext32u, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 07/27] tcg-ppc64: Cleanup tcg_out_movi, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 06/27] tcg-ppc64: Introduce and use tcg_out_shri64, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 08/27] tcg-ppc64: Introduce and use TAI and SAI, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 09/27] tcg-ppc64: Rearrange integer constant constraints,
Richard Henderson <=
- [Qemu-devel] [PATCH v3 10/27] tcg-ppc64: Improve constant add and sub ops., Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 12/27] tcg-ppc64: Improve and_i32 with constant, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 11/27] tcg-ppc64: Tidy or and xor patterns., Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 13/27] tcg-ppc64: Improve and_i64 with constant, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 14/27] tcg-ppc64: Streamline qemu_ld/st insn selection, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 16/27] tcg-ppc64: Implement bswap16 and bswap32, Richard Henderson, 2013/04/02
- [Qemu-devel] [PATCH v3 15/27] tcg-ppc64: Implement rotates, Richard Henderson, 2013/04/02