yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-18 15:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/i386: Move constraint type check to tcg_target_const_match

Browse source 
Rather than check the type when filling in the constraint,
check it when matching the constant. This removes the only
use of the type argument to target_parse_constraint.

Backports c7c778b5b9b7865a3e7200805ac561c5d334b8d0
This commit is contained in:
Richard Henderson 2021-03-04 15:46:26 -05:00 committed by Lioncash
parent daafb0ba17
commit ea25434061
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qemu/tcg/i386/tcg-target.inc.c
View file

@ -270,13 +270,13 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,
break; break;
case 'e': case 'e':
ct->ct |= (type == TCG_TYPE_I32 ? TCG_CT_CONST : TCG_CT_CONST_S32); ct->ct |= TCG_CT_CONST_S32;
break; break;
case 'Z': case 'Z':
ct->ct |= (type == TCG_TYPE_I32 ? TCG_CT_CONST : TCG_CT_CONST_U32); ct->ct |= TCG_CT_CONST_U32;
break; break;
case 'I': case 'I':
ct->ct |= (type == TCG_TYPE_I32 ? TCG_CT_CONST : TCG_CT_CONST_I32); ct->ct |= TCG_CT_CONST_I32;
break; break;
default: default:
@ -293,14 +293,20 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
if (ct & TCG_CT_CONST) { if (ct & TCG_CT_CONST) {
return 1; return 1;
} }
if ((ct & TCG_CT_CONST_S32) && val == (int32_t)val) { if (type == TCG_TYPE_I32) {
return 1; if (ct & (TCG_CT_CONST_S32 | TCG_CT_CONST_U32 | TCG_CT_CONST_I32)) {
} return 1;
if ((ct & TCG_CT_CONST_U32) && val == (uint32_t)val) { }
return 1; } else {
} if ((ct & TCG_CT_CONST_S32) && val == (int32_t)val) {
if ((ct & TCG_CT_CONST_I32) && ~val == (int32_t)~val) { return 1;
return 1; }
if ((ct & TCG_CT_CONST_U32) && val == (uint32_t)val) {
return 1;
}
if ((ct & TCG_CT_CONST_I32) && ~val == (int32_t)~val) {
return 1;
}
} }
if ((ct & TCG_CT_CONST_WSZ) && val == (type == TCG_TYPE_I32 ? 32 : 64)) { if ((ct & TCG_CT_CONST_WSZ) && val == (type == TCG_TYPE_I32 ? 32 : 64)) {
return 1; return 1;