From patchwork Wed Feb 3 02:15:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 375354 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp732985jah; Tue, 2 Feb 2021 18:22:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHiZ8WuNp4+2/F/KKYics+rZTSUsUCuftGQNFuNJWgXlm4F7oCbTXtLNZhbfTS9bMMuHka X-Received: by 2002:a25:ea09:: with SMTP id p9mr1202671ybd.109.1612318928013; Tue, 02 Feb 2021 18:22:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612318928; cv=none; d=google.com; s=arc-20160816; b=mCEFqka980QS1a9h8cgZf+Z1qp9GvGSaBB0BsofUsKv0RltbeEIgbm6qYuKT9zMxzP CTYMM+3d/mSz/Ftcxp2ofIEgtPf1gD/mMdF4NX+h8RenK8+l7jIlR910vS3Mwk6Muf8A iJ9xZXBINZNm5sV5030BrAPxJB0AZG8zDRcwdnOIJtjkwxZCfGt6Agc1ddqt0KM/LJl/ H2475hpOH8V0N5IDAQj7AZxvbfNEqjmZoLyE3j2olLwykD6kT5ntBGR4NQ8ObC/w5MOR nHRFsNZW9UM/EeSnWpDEvug8Cq5GNfImLmmVR1AiZ5D6TwacBWGd1mM2rJqneFQvIEZU dNxQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=XGfh414c63a3dPyZNddXaSBenVIz6c16myIzk/I+W7I=; b=hYev7VSKnjcZyhBeU+SduKSWGRrNbNXTyfTOqK8Q2CJQbqKwgDURGm1Gj3xqI8xqWe FzUI0V0Mo7b3EHsuGCv2TR4brTU6dUHHUYRh/+2+ba+ENRGzxZrWgqu03yj/2OI8Qq8o 55hkJ5t3rqUKH7jNRLuZ5KSEsL4kA7ZgPy/lXmQ3VqHsZmMIkE1Nqr1x11xYqpM795sn TivxNyCvf5As1UoVeqTDEqFCqTL9TwP+AtYrNn+DRnvD/fnZCKKsed6zpRJk+Laqrm4e Myv+iKOotkbIEeFkfCRgVmnvqkp7ofkLVENCcCsdrQc5aOpvmVQY8/2NqbtqZ4wjCJuY He+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CPqHCj0L; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i4si766887ybt.336.2021.02.02.18.22.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Feb 2021 18:22:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CPqHCj0L; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l77nz-0006PB-Ba for patch@linaro.org; Tue, 02 Feb 2021 21:22:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l77iD-0007jB-Pe for qemu-devel@nongnu.org; Tue, 02 Feb 2021 21:16:12 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:42016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l77iB-00010m-1G for qemu-devel@nongnu.org; Tue, 02 Feb 2021 21:16:09 -0500 Received: by mail-pg1-x536.google.com with SMTP id g15so16218143pgu.9 for ; Tue, 02 Feb 2021 18:16:06 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=XGfh414c63a3dPyZNddXaSBenVIz6c16myIzk/I+W7I=; b=CPqHCj0LJ4uGRHANLyu0558P8Abbr/uQY7i1R2Qp8wJ00ym7KkKVZfjafiO6RVdlQT 7cmOFGV1Mm9EapbY1D5ZguTw9gMoRqoZwyHF4uNkD39Z3+W8xgCu9yvRSeER7I2qdp34 PGScoBus5u3qaWXHWHjeO13JjhzpFs1/3pLi7YLaf/DRhA0ZIc60mdWnJTaxmlJDQvZ0 ufxjPAB0tBd3GbZYDZTcndmUaBnKek7GR/CCIVqc4R0oGCqCS7tT7N6FZ9j1+eB/a6Vu uBEEOCCGMi53riVTAyuZvCVl2eD0dhwmfOp1KBO54HZ1FPYoDAZlk/szw5ld7T3cWT3k R5AA== 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:mime-version:content-transfer-encoding; bh=XGfh414c63a3dPyZNddXaSBenVIz6c16myIzk/I+W7I=; b=AurBbnCrguPjDTE+W9xHeMiDaGxEV5zZO4OEckbM5kSnijZ5SB7Ro1Cv5k/1DOQSCB SBW+Iq6T4jggcEzgk8ul7Ly1siI3XXOZUpkBzR4lY3m3zhkRR0jVRSMavUxII1gOAycD pTAxq8dylOE/KxQtC2ZVvhPz9swjjj5bYp8MMyA6oPMQ8OjMh4rQy0j4Hhrf8I1jHKdr 6pcCxLSnqudhStqL7o4gDgyYEhby48KeqttX755d+bniulK6PI2eu6N+lC2GKtdLtdrZ uDIyk7iM9dXhOP92dJZrAZJD7du0JPlWNSGwNT/avJ76MO+QSR6AZHZRHC5XXpNJh3HP 0RYQ== X-Gm-Message-State: AOAM533zotHuQcF7urwYMCHCLmtqht/nD7InrP97t6iBDq6wOXpi10Ys bRz10kCjYoBY0frkH9G/oVzkJHAu5/hSmlLn X-Received: by 2002:a62:8803:0:b029:1d0:6910:7b07 with SMTP id l3-20020a6288030000b02901d069107b07mr939542pfd.71.1612318565761; Tue, 02 Feb 2021 18:16:05 -0800 (PST) Received: from localhost.localdomain (cpe-66-27-222-29.hawaii.res.rr.com. [66.27.222.29]) by smtp.gmail.com with ESMTPSA id x1sm270301pgj.37.2021.02.02.18.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 18:16:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 08/24] tcg/ppc: Split out target constraints to tcg-target-con-str.h Date: Tue, 2 Feb 2021 16:15:34 -1000 Message-Id: <20210203021550.375058-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210203021550.375058-1-richard.henderson@linaro.org> References: <20210203021550.375058-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target-con-str.h | 30 +++++++++++++++ tcg/ppc/tcg-target.h | 1 + tcg/ppc/tcg-target.c.inc | 73 ++++++++---------------------------- 3 files changed, 46 insertions(+), 58 deletions(-) create mode 100644 tcg/ppc/tcg-target-con-str.h -- 2.25.1 diff --git a/tcg/ppc/tcg-target-con-str.h b/tcg/ppc/tcg-target-con-str.h new file mode 100644 index 0000000000..298ca20d5b --- /dev/null +++ b/tcg/ppc/tcg-target-con-str.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Define PowerPC target-specific operand constraints. + * Copyright (c) 2021 Linaro + */ + +/* + * Define constraint letters for register sets: + * REGS(letter, register_mask) + */ +REGS('r', ALL_GENERAL_REGS) +REGS('v', ALL_VECTOR_REGS) +REGS('A', 1u << TCG_REG_R3) +REGS('B', 1u << TCG_REG_R4) +REGS('C', 1u << TCG_REG_R5) +REGS('D', 1u << TCG_REG_R6) +REGS('L', ALL_QLOAD_REGS) +REGS('S', ALL_QSTORE_REGS) + +/* + * Define constraint letters for constants: + * CONST(letter, TCG_CT_CONST_* bit set) + */ +CONST('I', TCG_CT_CONST_S16) +CONST('J', TCG_CT_CONST_U16) +CONST('M', TCG_CT_CONST_MONE) +CONST('T', TCG_CT_CONST_S32) +CONST('U', TCG_CT_CONST_U32) +CONST('W', TCG_CT_CONST_WSZ) +CONST('Z', TCG_CT_CONST_ZERO) diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index d1339afc66..40ed4b82dd 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -185,5 +185,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS +#define TCG_TARGET_CON_STR_H #endif diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index cf64892295..e5aa8d2d10 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -62,6 +62,21 @@ #define TCG_CT_CONST_MONE 0x2000 #define TCG_CT_CONST_WSZ 0x4000 +#define ALL_GENERAL_REGS 0xffffffffu +#define ALL_VECTOR_REGS 0xffffffff00000000ull + +#ifdef CONFIG_SOFTMMU +#define ALL_QLOAD_REGS \ + (ALL_GENERAL_REGS & \ + ~((1 << TCG_REG_R3) | (1 << TCG_REG_R4) | (1 << TCG_REG_R5))) +#define ALL_QSTORE_REGS \ + (ALL_GENERAL_REGS & ~((1 << TCG_REG_R3) | (1 << TCG_REG_R4) | \ + (1 << TCG_REG_R5) | (1 << TCG_REG_R6))) +#else +#define ALL_QLOAD_REGS (ALL_GENERAL_REGS & ~(1 << TCG_REG_R3)) +#define ALL_QSTORE_REGS ALL_QLOAD_REGS +#endif + TCGPowerISA have_isa; static bool have_isel; bool have_altivec; @@ -222,64 +237,6 @@ static bool reloc_pc14(tcg_insn_unit *src_rw, const tcg_insn_unit *target) return false; } -/* parse target specific constraints */ -static const char *target_parse_constraint(TCGArgConstraint *ct, - const char *ct_str, TCGType type) -{ - switch (*ct_str++) { - case 'A': case 'B': case 'C': case 'D': - tcg_regset_set_reg(ct->regs, 3 + ct_str[0] - 'A'); - break; - case 'r': - ct->regs = 0xffffffff; - break; - case 'v': - ct->regs = 0xffffffff00000000ull; - break; - case 'L': /* qemu_ld constraint */ - ct->regs = 0xffffffff; - tcg_regset_reset_reg(ct->regs, TCG_REG_R3); -#ifdef CONFIG_SOFTMMU - tcg_regset_reset_reg(ct->regs, TCG_REG_R4); - tcg_regset_reset_reg(ct->regs, TCG_REG_R5); -#endif - break; - case 'S': /* qemu_st constraint */ - ct->regs = 0xffffffff; - tcg_regset_reset_reg(ct->regs, TCG_REG_R3); -#ifdef CONFIG_SOFTMMU - tcg_regset_reset_reg(ct->regs, TCG_REG_R4); - tcg_regset_reset_reg(ct->regs, TCG_REG_R5); - tcg_regset_reset_reg(ct->regs, TCG_REG_R6); -#endif - break; - case 'I': - ct->ct |= TCG_CT_CONST_S16; - break; - case 'J': - ct->ct |= TCG_CT_CONST_U16; - break; - case 'M': - ct->ct |= TCG_CT_CONST_MONE; - break; - case 'T': - ct->ct |= TCG_CT_CONST_S32; - break; - case 'U': - ct->ct |= TCG_CT_CONST_U32; - break; - case 'W': - ct->ct |= TCG_CT_CONST_WSZ; - break; - case 'Z': - ct->ct |= TCG_CT_CONST_ZERO; - break; - default: - return NULL; - } - return ct_str; -} - /* test if a constant matches the constraint */ static int tcg_target_const_match(tcg_target_long val, TCGType type, const TCGArgConstraint *arg_ct)