From patchwork Wed Sep 6 14:49:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111787 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp995899qge; Wed, 6 Sep 2017 07:53:03 -0700 (PDT) X-Received: by 10.80.170.137 with SMTP id q9mr6399172edc.289.1504709583549; Wed, 06 Sep 2017 07:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504709583; cv=none; d=google.com; s=arc-20160816; b=YpYSu/RKPS0MBV50NsMrOB1ch9vupictGvRuE6/zMezOQR/w0R3mb2CDPU7bQSROH+ 5Ugv5hT8JqIVWCBMHsKnZZAe3CoxzBAN20UI0/c7kdfKcHA5e8bU8wThpyDLApeEMRoE /wD1Oa3VQNkbRGxHZkKYvNqXN2FCVX6M8zR07d0SwBLakjBE/nfBO1NTVSORwXhO0iqB n1oEke/VtQ/+ZSA3oC9Z5eBhJcIIezbCHN/YohmFvbG3xb7btPDXxWld+n7Z8naho5Gw +cjRVxDKFpnsa5cTmmgLVSeDqHQdkKF0Ic3eYXNw5BPf+7VPAbiU3+K2mIFEJ/eXDO6J A4yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=2xI+Bv3Slue+8/Kr/D6CnEnYyj7+r0K2GR4PNLIeK1w=; b=Hkj4XfIEOjrhmAGZ5WA7JIosuy2a9sLj9+sjGr/UcPs/6Gi2yCIag2ycvIYhESSE92 sVlBxUTWDmgmkB1VWDuUUBv1pV4yVFt6K7Yc5caYjVb5Y7I29Uj15JxpppygUcmN00X3 qDtMgNfYjcDqm3aegRsS8MIhBAjikSSv2Ql8Gr041u3OEROhUPhoWulbuwXREkc5lOYh KyTzkiFnZpoYbuGLneKZAde4izxz42WE4HVrYumDSBdWp+XHQIeBAIiF8vPAgPDI4t9/ GIzFXVdpezFuGZN/A/A2P/MWa9/TKSrtYO7xzKDt7ADJ7HvL0dhmFgmLNv28BCmfbrbE tj7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B58WItzz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g27si783943edc.336.2017.09.06.07.53.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 06 Sep 2017 07:53:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B58WItzz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpbhO-0007nY-CK for patch@linaro.org; Wed, 06 Sep 2017 10:53:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpbeO-0005T6-4r for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:49:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpbeM-0000IV-TK for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:49:56 -0400 Received: from mail-pg0-x232.google.com ([2607:f8b0:400e:c05::232]:32782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpbeM-0000ID-Kw for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:49:54 -0400 Received: by mail-pg0-x232.google.com with SMTP id t3so15708435pgt.0 for ; Wed, 06 Sep 2017 07:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2xI+Bv3Slue+8/Kr/D6CnEnYyj7+r0K2GR4PNLIeK1w=; b=B58WItzzpHolVSZDYnLf7nL9QAgdUNmPqjqUa7FRej+r/+noFFF9V6DQ0BRsDyQQ1z XoUdbKVS2fhehsJ5ZG0ikMn2plv2hhBwttnJgjwgXFSFEFyojSMDYnEDyPofqFCn0IYD EtzulzH0K7LyofX+FJtCKXeikjQ26u3xm4CEI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2xI+Bv3Slue+8/Kr/D6CnEnYyj7+r0K2GR4PNLIeK1w=; b=Eg2PhROjz//cuJ684iG4/187Sk1lVQjRgLbB12apeIgZ+8qmEDRJb+PBMOQ9KBwFBK HMwpdR62bIYuXGU/rWK8FnENHLsZbwpxi7GYp868QaHlFQ7Pgt7xBHq9r03afxRXoSqt i4ko7CGiW8ZbXUiYUNKQ7uym6sOf+McQRA9HoRnya18PQnoecn3bQZ67z9M84Ad64Wwd pZTG4s7UVu2UGjUKOv2ab/s0KzX6j0oWGUj3Uz7Q2a2hSuMssicpDx0FrAViilvCdfmY YKlrOhhvAMeLRg1VvW5khpsKjPIKfAFdgOx9DHK3a5ULK1SAGcafINhCOYqgM+Pqntlf iLmQ== X-Gm-Message-State: AHPjjUhiBLas9VTRCk80svOBMhtzRSFKWWp4IepqjR4/+XnqiPHBoIBd qVepr7xoeffeL7J+XPxzMA== X-Google-Smtp-Source: ADKCNb7/9XATXFaKFdgrMfr2ObytWceBlG02T7C90ViX7JQsUGcAh1tTzoHhB4p7sBi1tnYNS2nybQ== X-Received: by 10.99.121.66 with SMTP id u63mr7796176pgc.72.1504709393311; Wed, 06 Sep 2017 07:49:53 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id h1sm3467646pfg.153.2017.09.06.07.49.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Sep 2017 07:49:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 07:49:34 -0700 Message-Id: <20170906144940.30880-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170906144940.30880-1-richard.henderson@linaro.org> References: <20170906144940.30880-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::232 Subject: [Qemu-devel] [PULL 08/14] tcg/s390: Merge cmpi facilities check to tcg_target_op_def X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Acked-by: Cornelia Huck Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 68 +++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 38 deletions(-) -- 2.13.5 diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index d34649eb13..e075b4844a 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -41,7 +41,7 @@ #define TCG_CT_CONST_MULI 0x100 #define TCG_CT_CONST_ORI 0x200 #define TCG_CT_CONST_XORI 0x400 -#define TCG_CT_CONST_CMPI 0x800 +#define TCG_CT_CONST_U31 0x800 #define TCG_CT_CONST_ADLI 0x1000 #define TCG_CT_CONST_ZERO 0x2000 @@ -398,7 +398,18 @@ static const char *target_parse_constraint(TCGArgConstraint *ct, ct->ct |= TCG_CT_CONST_XORI; break; case 'C': - ct->ct |= TCG_CT_CONST_CMPI; + /* ??? We have no insight here into whether the comparison is + signed or unsigned. The COMPARE IMMEDIATE insn uses a 32-bit + signed immediate, and the COMPARE LOGICAL IMMEDIATE insn uses + a 32-bit unsigned immediate. If we were to use the (semi) + obvious "val == (int32_t)val" we would be enabling unsigned + comparisons vs very large numbers. The only solution is to + take the intersection of the ranges. */ + /* ??? Another possible solution is to simply lie and allow all + constants here and force the out-of-range values into a temp + register in tgen_cmp when we have knowledge of the actual + comparison code in use. */ + ct->ct |= TCG_CT_CONST_U31; break; case 'Z': ct->ct |= TCG_CT_CONST_ZERO; @@ -463,35 +474,6 @@ static int tcg_match_xori(TCGType type, tcg_target_long val) return 1; } -/* Imediates to be used with comparisons. */ - -static int tcg_match_cmpi(TCGType type, tcg_target_long val) -{ - if (s390_facilities & FACILITY_EXT_IMM) { - /* The COMPARE IMMEDIATE instruction is available. */ - if (type == TCG_TYPE_I32) { - /* We have a 32-bit immediate and can compare against anything. */ - return 1; - } else { - /* ??? We have no insight here into whether the comparison is - signed or unsigned. The COMPARE IMMEDIATE insn uses a 32-bit - signed immediate, and the COMPARE LOGICAL IMMEDIATE insn uses - a 32-bit unsigned immediate. If we were to use the (semi) - obvious "val == (int32_t)val" we would be enabling unsigned - comparisons vs very large numbers. The only solution is to - take the intersection of the ranges. */ - /* ??? Another possible solution is to simply lie and allow all - constants here and force the out-of-range values into a temp - register in tgen_cmp when we have knowledge of the actual - comparison code in use. */ - return val >= 0 && val <= 0x7fffffff; - } - } else { - /* Only the LOAD AND TEST instruction is available. */ - return val == 0; - } -} - /* Immediates to be used with add2/sub2. */ static int tcg_match_add2i(TCGType type, tcg_target_long val) @@ -537,8 +519,8 @@ static int tcg_target_const_match(tcg_target_long val, TCGType type, return tcg_match_ori(type, val); } else if (ct & TCG_CT_CONST_XORI) { return tcg_match_xori(type, val); - } else if (ct & TCG_CT_CONST_CMPI) { - return tcg_match_cmpi(type, val); + } else if (ct & TCG_CT_CONST_U31) { + return val >= 0 && val <= 0x7fffffff; } else if (ct & TCG_CT_CONST_ZERO) { return val == 0; } @@ -2252,7 +2234,9 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) static const TCGTargetOpDef r_r = { .args_ct_str = { "r", "r" } }; static const TCGTargetOpDef r_L = { .args_ct_str = { "r", "L" } }; static const TCGTargetOpDef L_L = { .args_ct_str = { "L", "L" } }; + static const TCGTargetOpDef r_ri = { .args_ct_str = { "r", "ri" } }; static const TCGTargetOpDef r_rC = { .args_ct_str = { "r", "rC" } }; + 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_0_ri = { .args_ct_str = { "r", "0", "ri" } }; static const TCGTargetOpDef r_0_rK = { .args_ct_str = { "r", "0", "rK" } }; @@ -2320,8 +2304,10 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) return &r_r_ri; case INDEX_op_brcond_i32: + /* Without EXT_IMM, only the LOAD AND TEST insn is available. */ + return (s390_facilities & FACILITY_EXT_IMM ? &r_ri : &r_rZ); case INDEX_op_brcond_i64: - return &r_rC; + return (s390_facilities & FACILITY_EXT_IMM ? &r_rC : &r_rZ); case INDEX_op_bswap16_i32: case INDEX_op_bswap16_i64: @@ -2366,16 +2352,22 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) case INDEX_op_setcond_i32: case INDEX_op_setcond_i64: { - static const TCGTargetOpDef setc + /* Without EXT_IMM, only the LOAD AND TEST insn is available. */ + static const TCGTargetOpDef setc_z + = { .args_ct_str = { "r", "r", "rZ" } }; + static const TCGTargetOpDef setc_c = { .args_ct_str = { "r", "r", "rC" } }; - return &setc; + return (s390_facilities & FACILITY_EXT_IMM ? &setc_c : &setc_z); } case INDEX_op_movcond_i32: case INDEX_op_movcond_i64: { - static const TCGTargetOpDef movc + /* Without EXT_IMM, only the LOAD AND TEST insn is available. */ + static const TCGTargetOpDef movc_z + = { .args_ct_str = { "r", "r", "rZ", "r", "0" } }; + static const TCGTargetOpDef movc_c = { .args_ct_str = { "r", "r", "rC", "r", "0" } }; - return &movc; + return (s390_facilities & FACILITY_EXT_IMM ? &movc_c : &movc_z); } case INDEX_op_div2_i32: case INDEX_op_div2_i64: