ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg/s390: Merge muli facilities check to tcg_target_op_def 

Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-06-16 14:52:32 -07:00 committed by Richard Henderson
parent 07952d9570
commit a8f0269e9e
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tcg/s390/tcg-target.inc.c
View File

@ -38,12 +38,13 @@
a 32-bit displacement here Just In Case. */ a 32-bit displacement here Just In Case. */
#define USE_LONG_BRANCHES 0 #define USE_LONG_BRANCHES 0
#define TCG_CT_CONST_MULI 0x100 #define TCG_CT_CONST_S16 0x100
#define TCG_CT_CONST_ORI 0x200 #define TCG_CT_CONST_S32 0x200
#define TCG_CT_CONST_XORI 0x400 #define TCG_CT_CONST_ORI 0x400
#define TCG_CT_CONST_U31 0x800 #define TCG_CT_CONST_XORI 0x800
#define TCG_CT_CONST_ADLI 0x1000 #define TCG_CT_CONST_U31 0x1000
#define TCG_CT_CONST_ZERO 0x2000 #define TCG_CT_CONST_ADLI 0x2000
#define TCG_CT_CONST_ZERO 0x4000
/* Several places within the instruction set 0 means "no register" /* Several places within the instruction set 0 means "no register"
rather than TCG_REG_R0. */ rather than TCG_REG_R0. */
@ -388,8 +389,11 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,
case 'A': case 'A':
ct->ct |= TCG_CT_CONST_ADLI; ct->ct |= TCG_CT_CONST_ADLI;
break; break;
case 'K': case 'I':
ct->ct |= TCG_CT_CONST_MULI; ct->ct |= TCG_CT_CONST_S16;
break;
case 'J':
ct->ct |= TCG_CT_CONST_S32;
break; break;
case 'O': case 'O':
ct->ct |= TCG_CT_CONST_ORI; ct->ct |= TCG_CT_CONST_ORI;
@ -503,16 +507,10 @@ static int tcg_target_const_match(tcg_target_long val, TCGType type,
} }
/* The following are mutually exclusive. */ /* The following are mutually exclusive. */
if (ct & TCG_CT_CONST_MULI) { if (ct & TCG_CT_CONST_S16) {
/* Immediates that may be used with multiply. If we have the return val == (int16_t)val;
general-instruction-extensions, then we have MULTIPLY SINGLE } else if (ct & TCG_CT_CONST_S32) {
IMMEDIATE with a signed 32-bit, otherwise we have only return val == (int32_t)val;
MULTIPLY HALFWORD IMMEDIATE, with a signed 16-bit. */
if (s390_facilities & FACILITY_GEN_INST_EXT) {
return val == (int32_t)val;
} else {
return val == (int16_t)val;
}
} else if (ct & TCG_CT_CONST_ADLI) { } else if (ct & TCG_CT_CONST_ADLI) {
return tcg_match_add2i(type, val); return tcg_match_add2i(type, val);
} else if (ct & TCG_CT_CONST_ORI) { } else if (ct & TCG_CT_CONST_ORI) {
@ -2239,7 +2237,8 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op)
static const TCGTargetOpDef r_rZ = { .args_ct_str = { "r", "rZ" } }; static const TCGTargetOpDef r_rZ = { .args_ct_str = { "r", "rZ" } };
static const TCGTargetOpDef r_r_ri = { .args_ct_str = { "r", "r", "ri" } }; static const TCGTargetOpDef r_r_ri = { .args_ct_str = { "r", "r", "ri" } };
static const TCGTargetOpDef r_0_ri = { .args_ct_str = { "r", "0", "ri" } }; static const TCGTargetOpDef r_0_ri = { .args_ct_str = { "r", "0", "ri" } };
static const TCGTargetOpDef r_0_rK = { .args_ct_str = { "r", "0", "rK" } }; static const TCGTargetOpDef r_0_rI = { .args_ct_str = { "r", "0", "rI" } };
static const TCGTargetOpDef r_0_rJ = { .args_ct_str = { "r", "0", "rJ" } };
static const TCGTargetOpDef r_0_rO = { .args_ct_str = { "r", "0", "rO" } }; static const TCGTargetOpDef r_0_rO = { .args_ct_str = { "r", "0", "rO" } };
static const TCGTargetOpDef r_0_rX = { .args_ct_str = { "r", "0", "rX" } }; static const TCGTargetOpDef r_0_rX = { .args_ct_str = { "r", "0", "rX" } };
@ -2274,9 +2273,15 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op)
case INDEX_op_sub_i32: case INDEX_op_sub_i32:
case INDEX_op_sub_i64: case INDEX_op_sub_i64:
return &r_0_ri; return &r_0_ri;
case INDEX_op_mul_i32: case INDEX_op_mul_i32:
/* If we have the general-instruction-extensions, then we have
MULTIPLY SINGLE IMMEDIATE with a signed 32-bit, otherwise we
have only MULTIPLY HALFWORD IMMEDIATE, with a signed 16-bit. */
return (s390_facilities & FACILITY_GEN_INST_EXT ? &r_0_ri : &r_0_rI);
case INDEX_op_mul_i64: case INDEX_op_mul_i64:
return &r_0_rK; return (s390_facilities & FACILITY_GEN_INST_EXT ? &r_0_rJ : &r_0_rI);
case INDEX_op_or_i32: case INDEX_op_or_i32:
case INDEX_op_or_i64: case INDEX_op_or_i64:
return &r_0_rO; return &r_0_rO;