From patchwork Wed Oct 16 20:09:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 835838 Delivered-To: patch@linaro.org Received: by 2002:a5d:6804:0:b0:37d:45d0:187 with SMTP id w4csp618821wru; Wed, 16 Oct 2024 13:13:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPrixNq43IbBWBpNrgMCWzyfhdquwgCQyxOJRYhjuOCL5Dp1SImKmsj+5X4yq6RWD7Uy8uvw==@linaro.org X-Google-Smtp-Source: AGHT+IFWKF761D56d9MVF4x/+EZ6tEuVFDrrBT+rXbQ4hx2Mi9pjB37NcQLkoS/UeA6uoBv5J/zn X-Received: by 2002:a05:620a:24d4:b0:7b1:49f7:90c2 with SMTP id af79cd13be357-7b149f7939cmr310556685a.26.1729109627790; Wed, 16 Oct 2024 13:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729109627; cv=none; d=google.com; s=arc-20240605; b=b9m+OJu5co5qfYIpmJzJhrxVA5UkMWWn+SPft+tDHv84LpwnbGjAzF79sxUBqj4YZB T2q1EYxMEYqmYnoagomJ/Wagvi3F2S/Q1h9HlPsGUSFBDI8sfwVVzjoiO+U698OMOwFI QMZ9q6wH8Q+NklwS2GajCKD9hv3Q36A6YWyna6THxIMAoBDghUTzD0yKblcKCPF94mqQ 0Mq10ClXkhbQgmAX+c+5uDIFQQbfHYfEaI5xViBBr5/a2sZvAmhmFsxQx6qaL2Hxug9x 9lcxrUp5XZib6Lf6HuTLGiPXQ/iQEo5vRoeWRcOIFzPGUuDnoYUig6zQSmlTJGvT8Qsn i00A== 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; bh=0VYY9xOyVPfkAU9T4OwMt83yWBMxMR1kkt4Cun5Q2sk=; fh=bMaafE1clBtiBaCrlbrbcY1DSEPhhFUklUk4XoVHiPU=; b=NYiYqNaS9A/RP7cS/KyWTh6aEEgC9IaTGeg0bSytXdY0TFvu3NMrYfxs2W26eE+L9t bpk+DkWjHEVefA6ckT6pHSPBF/XwhUg6OJk36bFLJ7tkE2UeGYu9j9wf4NVWqV6TisTl mOXpJMsyS5S5GEr5PSr/4QznM3eIXT1zeH5JHLPnC0H+0n/6NoCRaIFH7QYWm5Z1bQoY eqntj0K88Q257pVcLz5yLYr2pEpdCzSA7qEqTeFR7KAKFYTT94Dj30NG2LbAPGwpqf0p 7UknTSQ2swPVPDlazw7fq5ne53NSMUt0QaQEaa+NZPOk3gX8I1Si4wt5WMaz6+UfymXd dX2g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b1363752edsi449153485a.134.2024.10.16.13.13.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Oct 2024 13:13:47 -0700 (PDT) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1AM2-0004mZ-H7; Wed, 16 Oct 2024 16:10:46 -0400 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 1t1AM0-0004m3-IY; Wed, 16 Oct 2024 16:10:44 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1ALy-0000fe-UO; Wed, 16 Oct 2024 16:10:44 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1DDA398F95; Wed, 16 Oct 2024 23:10:06 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 121D5156375; Wed, 16 Oct 2024 23:10:26 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev Subject: [Stable-9.1.1 35/49] tcg/ppc: Use TCG_REG_TMP2 for scratch tcg_out_qemu_st Date: Wed, 16 Oct 2024 23:09:54 +0300 Message-Id: <20241016201025.256294-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Richard Henderson In the fallback when STDBRX is not available, avoid clobbering TCG_REG_TMP1, which might be h.base, which is still in use. Use TCG_REG_TMP2 instead. Cc: qemu-stable@nongnu.org Fixes: 01a112e2e9 ("tcg/ppc: Reorg tcg_out_tlb_read") Signed-off-by: Richard Henderson Tested-By: Michael Tokarev (cherry picked from commit 4cabcb89b101942346aebff081aa1453e958fe7f) Signed-off-by: Michael Tokarev diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 3553a47ba9..69abd30bbb 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -2704,9 +2704,9 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg datalo, TCGReg datahi, uint32_t insn = qemu_stx_opc[opc & (MO_BSWAP | MO_SIZE)]; if (!have_isa_2_06 && insn == STDBRX) { tcg_out32(s, STWBRX | SAB(datalo, h.base, h.index)); - tcg_out32(s, ADDI | TAI(TCG_REG_TMP1, h.index, 4)); + tcg_out32(s, ADDI | TAI(TCG_REG_TMP2, h.index, 4)); tcg_out_shri64(s, TCG_REG_R0, datalo, 32); - tcg_out32(s, STWBRX | SAB(TCG_REG_R0, h.base, TCG_REG_TMP1)); + tcg_out32(s, STWBRX | SAB(TCG_REG_R0, h.base, TCG_REG_TMP2)); } else { tcg_out32(s, insn | SAB(datalo, h.base, h.index)); }