From patchwork Mon Feb 17 19:30:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 865961 Delivered-To: patch@linaro.org Received: by 2002:a5d:64e6:0:b0:38f:210b:807b with SMTP id g6csp1252793wri; Mon, 17 Feb 2025 11:35:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWXfbndLf54UJJpd3+QiMLCzktbLkHqijQxhKvBIEkaM4MXUz3p44e0v7SY6Vce4jJAA6t/1Q==@linaro.org X-Google-Smtp-Source: AGHT+IEJzDC5ai5YPb7QkdPex4tfvfuWrFETgw7+qUgT9y/Iic2tdX6ZstokB+ZK7io8LSLO09kc X-Received: by 2002:a05:620a:1790:b0:7b6:c4c7:ecfe with SMTP id af79cd13be357-7c08a98632emr1160284485a.4.1739820901116; Mon, 17 Feb 2025 11:35:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739820901; cv=none; d=google.com; s=arc-20240605; b=SPmy+L8fSNTMvIrrOjnZVXA3RidlIrV5NQpFehgrFCeFhMq/OmRGWXdIf5mLj/1j7w 7xl/PFxJsrjXkjLANYYXvYjiT+ukqe2RTs+Lf+TDIX2TUzyooPV4XdBj4BBRdGpH4xT7 6L+Aj9MaHCAnZXZIDhYtkmJHYea5Z5pgEbLx0Xh5uQVjwUyd3oYFf/7sbSSAuO4+2dcw WLuJe32jfN2lwzxb2Z/YMU5EhtCa5HBrrHdFU34lg/1qF3bH/u1UG3WZ2qtIjjtrNGCs /oTS6KTM2Zarahye/Ssx7Re/fwujlEjOf21SB6qpSn710T9DibeDYQVjyMz7othHVK+3 otag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to :from:dkim-signature; bh=ArewPxzX2L3g8+NIrXN+9y4T1awyV4Vx9ORorXETkQs=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=FHq1IyqTNMuT47rDWr86ljry+S9HyOR0H8QKnHyIN1n2kV7jXiJ7ixaExiz6WXkIE1 WFMqbFs0SikuP4py6q8zNQiWWH1XCRx6P4mmuhIzujVtLe7qvF2OP6OMkmxy2uio9H20 /hcT5EPQtIW2MUJtBXftsJcRM63P15RZSw9RjWJ1X/6rqdtXUmc96R6SK6IigYkVq803 /Ki5DtOO+7bZwmErVAh7M8OrSXxQRKZSl7DNkfFgdjLkYhSvhX6dvz/UxvwtaEKY6Mj0 cu8+R+JfBiFWQLSzlIpLM2iXFpD863qBaRgm8KosNnlrnfMGRbYkXd+4f2Z12vcekzdF Uygw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="la7DW/W/"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c09fc2b80bsi230212585a.301.2025.02.17.11.35.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Feb 2025 11:35:01 -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="la7DW/W/"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tk6pj-0002bN-1L; Mon, 17 Feb 2025 14:31:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tk6p8-0001yh-8O for qemu-devel@nongnu.org; Mon, 17 Feb 2025 14:30:38 -0500 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tk6p3-0008QE-Q0 for qemu-devel@nongnu.org; Mon, 17 Feb 2025 14:30:32 -0500 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2fbf77b2b64so8698828a91.2 for ; Mon, 17 Feb 2025 11:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739820627; x=1740425427; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ArewPxzX2L3g8+NIrXN+9y4T1awyV4Vx9ORorXETkQs=; b=la7DW/W/yYvIeHXxeU7vw3EXenGtRJR2au5sIqfegcu8346raRUms/46aufTBUhP7h WySLoD4Qs+RxAKlxZnDRzPHw5YXzm85YE+Pptq9137FgxVow3GjbXTPA+aU5sgJDiDtP RJyCQwL/+KQlfXcUWEl7Os9rYJ0jmCRBzCcnd6mPoSTCyx3l2STSgP3pF2+UPO9Y+sgu RyV9oFMdwUyDLZYuHl2KRhvTgUe2kFhEOBc6rtws96OK8jK3Z/W16UOl+8xVt0079QYN AxWjvKP4D4jKtJfopk2LjGxgm2uQmdMlNaT7NrxpBkv/SUpbpA2yBpksKjwRk5AYU05W R9Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739820627; x=1740425427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ArewPxzX2L3g8+NIrXN+9y4T1awyV4Vx9ORorXETkQs=; b=u1mgWuVY0XVzRtdnhIGKkkA0JqZS8ufuS5CiMdk9GV8osbTvYGDo5UwS4MlF3fObFT vsf+jVQvR+C5oH8g4R6zKzXXnCM6/ZtdAMmHhcYtpo57J1jXwdGfyrqA9qpzHk3GGcp+ wcvuAPaHPj6idTkS2HT4znCSGUwyZqjKA9+W+fMzKdW1rf1AbkgKAXHbbVp3hS1CfL99 6QTANDausEzjf9Fsn0jb8PtrTJM8cP4QtEDDn3oalPl7BuqDJNAq85R+ZXoC4Us/Ac3H O6EHFk4T8JJ4mfybQc+CYCtU8m5LPDnvLw6W4NO/vfSTQPN7o1bpwArhWnFzzamUvio+ tMkQ== X-Gm-Message-State: AOJu0YxP0HFh7EuuoP2kMmfqYBcPlENhFXiA2huLH80Tyn7zz3dfwUHn /YK65LJBojmymv/UDoeG9K0Yaao58Bm+4TD4bXUg+/R1gt1nlRzYLf2aarydNdYsv6A6GF8K3tr g X-Gm-Gg: ASbGncv5Y6pUP7EIHAAtXU3MxOxUXwDir5Zyi8DaB4UdzaAlgXSeMSma0K29bh0V+5V ABfzna/5O1n1YtOnj3ftlJMUGb4wv3qYOwSzW4yszcBOLZ215rWEKVzeaeJ4T4fcFtjzW83qJRy JE2zyA3toQTbvwBEI1kai4JhHYXMNBRxP+rfSVWa8bvpC9/9TeDQehTKOvQQcZ19yCTOOJiM6uR lO0ueA5j9cbfVymA/aJcziufe+nF7OaunPrcm4YzexOrDKd2Por6V25bxEzeNg3Ep9p8oLNjXc9 Ez/dNyaRpngoDrX/FvTVmz54bcE49+XDlV45PWezAuDTtOI= X-Received: by 2002:a05:6a00:2447:b0:732:7fc1:92b with SMTP id d2e1a72fcca58-7327fc109efmr6331735b3a.14.1739820627446; Mon, 17 Feb 2025 11:30:27 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7326a38ff76sm4347164b3a.160.2025.02.17.11.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 11:30:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 20/27] tcg/sparc64: Use 'z' constraint Date: Mon, 17 Feb 2025 11:30:01 -0800 Message-ID: <20250217193009.2873875-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217193009.2873875-1-richard.henderson@linaro.org> References: <20250217193009.2873875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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.29 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-bounces+patch=linaro.org@nongnu.org Replace target-specific 'Z' with generic 'z'. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/sparc64/tcg-target-con-set.h | 12 ++++++------ tcg/sparc64/tcg-target-con-str.h | 1 - tcg/sparc64/tcg-target.c.inc | 17 +++++++---------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/tcg/sparc64/tcg-target-con-set.h b/tcg/sparc64/tcg-target-con-set.h index 434bf25072..61f9fa3d9f 100644 --- a/tcg/sparc64/tcg-target-con-set.h +++ b/tcg/sparc64/tcg-target-con-set.h @@ -10,11 +10,11 @@ * tcg-target-con-str.h; the constraint combination is inclusive or. */ C_O0_I1(r) -C_O0_I2(rZ, r) -C_O0_I2(rZ, rJ) +C_O0_I2(rz, r) +C_O0_I2(rz, rJ) C_O1_I1(r, r) C_O1_I2(r, r, r) -C_O1_I2(r, rZ, rJ) -C_O1_I4(r, rZ, rJ, rI, 0) -C_O2_I2(r, r, rZ, rJ) -C_O2_I4(r, r, rZ, rZ, rJ, rJ) +C_O1_I2(r, rz, rJ) +C_O1_I4(r, rz, rJ, rI, 0) +C_O2_I2(r, r, rz, rJ) +C_O2_I4(r, r, rz, rz, rJ, rJ) diff --git a/tcg/sparc64/tcg-target-con-str.h b/tcg/sparc64/tcg-target-con-str.h index 0577ec4942..2f033b3ac2 100644 --- a/tcg/sparc64/tcg-target-con-str.h +++ b/tcg/sparc64/tcg-target-con-str.h @@ -16,4 +16,3 @@ REGS('r', ALL_GENERAL_REGS) */ CONST('I', TCG_CT_CONST_S11) CONST('J', TCG_CT_CONST_S13) -CONST('Z', TCG_CT_CONST_ZERO) diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index 527af5665d..7c722f59a8 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -76,7 +76,6 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { #define TCG_CT_CONST_S11 0x100 #define TCG_CT_CONST_S13 0x200 -#define TCG_CT_CONST_ZERO 0x400 #define ALL_GENERAL_REGS MAKE_64BIT_MASK(0, 32) @@ -340,9 +339,7 @@ static bool tcg_target_const_match(int64_t val, int ct, val = (int32_t)val; } - if ((ct & TCG_CT_CONST_ZERO) && val == 0) { - return 1; - } else if ((ct & TCG_CT_CONST_S11) && check_fit_tl(val, 11)) { + if ((ct & TCG_CT_CONST_S11) && check_fit_tl(val, 11)) { return 1; } else if ((ct & TCG_CT_CONST_S13) && check_fit_tl(val, 13)) { return 1; @@ -1579,7 +1576,7 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_st_i64: case INDEX_op_qemu_st_i32: case INDEX_op_qemu_st_i64: - return C_O0_I2(rZ, r); + return C_O0_I2(rz, r); case INDEX_op_add_i32: case INDEX_op_add_i64: @@ -1611,22 +1608,22 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_setcond_i64: case INDEX_op_negsetcond_i32: case INDEX_op_negsetcond_i64: - return C_O1_I2(r, rZ, rJ); + return C_O1_I2(r, rz, rJ); case INDEX_op_brcond_i32: case INDEX_op_brcond_i64: - return C_O0_I2(rZ, rJ); + return C_O0_I2(rz, rJ); case INDEX_op_movcond_i32: case INDEX_op_movcond_i64: - return C_O1_I4(r, rZ, rJ, rI, 0); + return C_O1_I4(r, rz, rJ, rI, 0); case INDEX_op_add2_i32: case INDEX_op_add2_i64: case INDEX_op_sub2_i32: case INDEX_op_sub2_i64: - return C_O2_I4(r, r, rZ, rZ, rJ, rJ); + return C_O2_I4(r, r, rz, rz, rJ, rJ); case INDEX_op_mulu2_i32: case INDEX_op_muls2_i32: - return C_O2_I2(r, r, rZ, rJ); + return C_O2_I2(r, r, rz, rJ); case INDEX_op_muluh_i64: return C_O1_I2(r, r, r);