From patchwork Fri Jan 15 21:04:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 363772 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp208891jap; Fri, 15 Jan 2021 13:11:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUr5tKpRTvMHVvfpjXskXLXFQMvEXVS1nvpL8xkkiIs2i7wa9WM+Aw33UnTv8JhXVNfSSF X-Received: by 2002:a25:3812:: with SMTP id f18mr20889651yba.327.1610745071812; Fri, 15 Jan 2021 13:11:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610745071; cv=none; d=google.com; s=arc-20160816; b=oslpFqubR23ZYFm51wgGeMzZRHPONx1r0tjPdvwoGYllz4U8xAIVy8SSMa/G84++Jz Ui3mvrZHsq63Ld3GIPCaMOL51JTuI42JFtr2w/DI9ZePwkzwZZ4I5+4IJYlivNJb+Nvp 682qPsNX41jZVaFm7rjJkKKB5TdqJxrjVjUbosMSBRWm+8sh3kT1v7HYilvdWvFaUdf7 dvP5k21dBDNdwtL6wSGf61NtSVLUg0r4EVBNqDOd0S/hFFSaqbB6iNnNLC2QKgWSFTrN dooaaFHfgKWfY/5MIAXpVjoRICcyCzV1lyjxJo9xH+TxhsWebrc09vQHfTeolKVBNWT7 WnoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=1xs+B7n85Sc5uzV5j6utRcKTGu4woILglNEqrZ9dlk4=; b=G546d7tusAu7yZMuVUOa+30Zm8u74RlPBfpKozgbY6QxAZXKrVN8SFLwaT/JYDJrIp g9Ttyb2RlK/PS3mRYt6Z0/Grsxhuij4WSJxKRAojFKmTn2FzGvYkD7UtFw3a2iATfwlz o3zSUlyOk2Z11CNjP6gJ5ATd5jtSAEkEOB66o8VYDSQBStA9B/iKewL3MGKzjGC09vR1 +3geJJ/hxa1q3AfUpbcTWJ8C9GiMDOdvFBJeCFBhli9NKxy3Irfig072rX5iuGvGbhBp sZlBeQ4jib1oAZQ6NTFyH48n7BFYmQT0Q/NCFKOVjKePGfEy11mZAlENJCuDOVWHv+YD +xUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZFt5Ginu; 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 m13si10824916ybm.9.2021.01.15.13.11.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jan 2021 13:11:11 -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=ZFt5Ginu; 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]:59148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0WND-0002RR-7z for patch@linaro.org; Fri, 15 Jan 2021 16:11:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0WHQ-0003j6-9m for qemu-devel@nongnu.org; Fri, 15 Jan 2021 16:05:12 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:33384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0WHN-0004DB-Vx for qemu-devel@nongnu.org; Fri, 15 Jan 2021 16:05:12 -0500 Received: by mail-pf1-x42c.google.com with SMTP id h186so6270263pfe.0 for ; Fri, 15 Jan 2021 13:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1xs+B7n85Sc5uzV5j6utRcKTGu4woILglNEqrZ9dlk4=; b=ZFt5GinuIQRMOQGQ2YNsFV8ynOifgQ4oLainLFd4ZSdv42w0HPjz/7kWuehxo+zOhM cYz10NVQHnfW+4mm1lKWm6OMKtq5jazGD4jlTkhAq++lZGY0+tNToPqzQnpE3O0Hf0eh XkhFFyocl3uT9a51TYchg/Ls2HED4BFEx+i6vTFgeGG57DY/DzRr7MD3Jsj9A6t4K32o +r9B0IDxkhU8jWzWo2kpXggy1dfWo1IIHYu27ab25DGI1qkpge7aM/037YR9p5Lx3U3g DmG6rchPo7Thd9ljCY6XWUs1vwhLbnYTfnsAwtsSr+1dwJmvtkZizbYioW+UBo3Xy/Dn 1fkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1xs+B7n85Sc5uzV5j6utRcKTGu4woILglNEqrZ9dlk4=; b=cnO3SHpUr4w9xMBgFSxTpwkez/vAnAedu0gm6wCotsOws3ESNQisILQSfGRnAl2UAg DuuKx9j+x+4rgm1rWTYWr7l1XV5ICepuwb0iOyrtuNpC7pVc9iZ5NlTEqChcUEcG8rtF KA1ajOGCeneJ6IER1YerOinrlTqUEkQIrKePmHwgWVq8BAXk1qQsuK9dJBAz+dFcRe1m yGe/f4bm7FKWTVRdGR0zI+7sWCBIUmfQdbG6L8Zp+Jo1TslC99M5gCZ/2XtNImcM5/4g Q38s+/iJYOwZY/yS6m0RtQils5StxxrPtXcfECnnyw3hLo4d2grfsxMRg4958ojcW/xO AZnA== X-Gm-Message-State: AOAM532DNkd0slK/Sm7mwoZY3W8zXWYIebnH+1B/BeXhQuiXFTU3XhCs mBcLO6L4FVQdtWLN5BSN3MUFthABp6ZtDTWi X-Received: by 2002:a63:5642:: with SMTP id g2mr14534995pgm.434.1610744708257; Fri, 15 Jan 2021 13:05:08 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id h15sm8920221pfo.71.2021.01.15.13.05.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 13:05:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 06/22] tcg/ppc: Split out target constraints to tcg-target-con-str.h Date: Fri, 15 Jan 2021 11:04:40 -1000 Message-Id: <20210115210456.1053477-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115210456.1053477-1-richard.henderson@linaro.org> References: <20210115210456.1053477-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Peter Maydell 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)