From patchwork Thu Apr 18 17:49:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789806 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp694624wrm; Thu, 18 Apr 2024 10:50:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3EjKUHC//NeJ3OJAR35tVK+ir+LI7R29iLGKZaWDRaCedAYZ1Y6Mp90viuPxYEGTD2AGf+MuYHxS9NsGB0W8f X-Google-Smtp-Source: AGHT+IH0QgLjyV6c72OygvDkdfokPJCI/6kE2KXJnMzxmK4qAhiolvtOuZ6WHQeGt+/TmKxt8IWW X-Received: by 2002:a05:6808:23c4:b0:3c6:f339:7f4c with SMTP id bq4-20020a05680823c400b003c6f3397f4cmr4599712oib.49.1713462639127; Thu, 18 Apr 2024 10:50:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713462639; cv=none; d=google.com; s=arc-20160816; b=Nwyn1MLdov09pa7v5cdfT2qyKBZ37XOpVVka64EDxtSb783dKHUwa2d8UcHWZkseIc gy4RAEDGFeNy8KaIa6HuaX2tV2RW3NM+fOEW5awqp3GuqyVENsWelwQVP7RPxTbSZhpI HBYRQl6XMO8bT9jG3pxfbF8MVT/iBpSTi8/zZg4No9+3n3j76r8qEEw2tFlxh0O9TFCb v2J+8OvgEAs8X+HnOWkAx5CruJnX01NqLN4LRo7zIfgBJXp0VNkh/RUR2T7qL+a11dVM gNxzNuFq3hpTD1zuoiqoIemOkYt2kQZN0hfSw5hCKfARCGIf+1e73h7JFoyAmiPtF9La iZ7Q== 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:cc:to :from; bh=AsIWopV2yCWfMJ3utGpj1cPSTZQCPCjI5i0yNra11Ww=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=GUAP6gsvVTZPxmj/RBJmCYmJLp+FGVpBSXwi8+KxAKrDQdr9HJuUB/ZJvBG9BTuRlN 7m5+Cq+aW5WgrUTmME6URnqUipWwN9UnLGFz+a3JjEHH9hfc1/clFFR1LFCkXXoeo1YM KXtH+1Jd8DA/xK+lYWxsAEyAwihX18HG1xmP5cv9yPQ/95Vx1uOcB5QLCfAlKkpx7yuk T9zrQFHkUvA6rCleKIi99ocAkXF7D38tXhdRzsMPcAQDPUyLS5mZm8xsFYU2Ts885uXg ictoiNLGEhIayzqJl+e1b+KwlWGRsuvcAgRADkt2+/GGvOAwnVSNtl6xvEANVKwym5E5 +emA==; 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 i26-20020a05620a0a1a00b0078f14ea3edbsi754242qka.50.2024.04.18.10.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 10:50:39 -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 1rxVtk-0008CL-I2; Thu, 18 Apr 2024 13:50:12 -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 1rxVth-0008Ay-TE; Thu, 18 Apr 2024 13:50:09 -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 1rxVtg-0007W8-7Z; Thu, 18 Apr 2024 13:50:09 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C40695FD64; Thu, 18 Apr 2024 20:49:59 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 13702B933A; Thu, 18 Apr 2024 20:49:57 +0300 (MSK) Received: (nullmailer pid 947815 invoked by uid 1000); Thu, 18 Apr 2024 17:49:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.3 091/116] target/sh4: Merge mach and macl into a union Date: Thu, 18 Apr 2024 20:49:21 +0300 Message-Id: <20240418174955.947730-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 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, 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 Allow host access to the entire 64-bit accumulator. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 7d95db5e78a24d3315e3112d26909a7262355cb7) Signed-off-by: Michael Tokarev diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 031dc0b457..adce3666a9 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -155,12 +155,22 @@ typedef struct CPUArchState { uint32_t pc; /* program counter */ uint32_t delayed_pc; /* target of delayed branch */ uint32_t delayed_cond; /* condition of delayed branch */ - uint32_t mach; /* multiply and accumulate high */ - uint32_t macl; /* multiply and accumulate low */ uint32_t pr; /* procedure register */ uint32_t fpscr; /* floating point status/control register */ uint32_t fpul; /* floating point communication register */ + /* multiply and accumulate: high, low and combined. */ + union { + uint64_t mac; + struct { +#if HOST_BIG_ENDIAN + uint32_t mach, macl; +#else + uint32_t macl, mach; +#endif + }; + }; + /* float point status register */ float_status fp_status;