From patchwork Sun Mar 23 22:50:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875642 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp1882828wrb; Sun, 23 Mar 2025 15:51:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWNcX85hJoCjEN0zokyc6qQr6CHkFEMZYcvjfAmd0P3VuvKJpcoDAeRT72AdEUwSs+6rbjJYA==@linaro.org X-Google-Smtp-Source: AGHT+IGfuG8dedxT2/h0hoIHs7xYW2pyh1ydv5mPcPXsQ3eFfxxaFFEB3MMvoMY6i6b9pb6NtTNi X-Received: by 2002:a05:620a:3195:b0:7c5:5a51:d2d1 with SMTP id af79cd13be357-7c5ba1f82b6mr2026679085a.55.1742770280963; Sun, 23 Mar 2025 15:51:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742770280; cv=none; d=google.com; s=arc-20240605; b=Rzsx+g7NtWovQtXMuipEOhljLqvACGFareaxxGz9eDmXfD5NB+88MyVqHpJb26JEWy sr0VeE2mSC8xxZrf9AYMdDotG619uM8KL1NAaXsLZDrezp2eTVCHtTG8dwuXY+09jMx1 TuYp5BaRBkFKUugRLCESvVJ+VZkHJga6o9jAyC0fKdOxLISXAXmwoF3bA03JD+zlpsTP lfXrKplLLHzsWb38+0NDAB1mCG4Fdv3PFnx6yyBPXm0SbAsUTtbcOzo5NqyTi4HY9CTv AL+abuwxGGMkEaiPavL1367abid2ZLv6IpIoH8pkE/JlrLE9qBTKWMu20tuB6uFHC4U7 Zbmg== 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=cnaIE/coD7iehBI3M+vr/MPS6inHzuGVqj/KxNr6j7E=; fh=vck2nDYxqcFlydCmWbI+Nh5uhp2JVAcrdICqGSnk6Bo=; b=UdfHumri+ueewNe/hwldZ2zAnd9lBDTJsVMDbw5xx0zmkLnS2BKOkItN+X4pKm5JmU 6rmPUoOVMVRHlUsCiywwLNO/d6X74XEamZtHAaHT5oBoeNdl7ZEcXzVMiAAhrmpmo1Rn AD8RDRgnkwRNbNq4BB2xok3io5hpEvLJ/tYBUg8iHGE8h7IjL3/U9gVvCJMsEvlJw3ZN ESfEEHxpO1y/WbO4+FeoQQ967iIwuI+vLpeaDDHr8KWM6OnGkXYPU+/k8zQxSFEsVCzv n6dqUsqboZfYk6J79/mPzq5Vn1ZcOKGzSITriz6CuoAY767KZc5RnhhMYFSAXJYmPEkg w30g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Bc/IwGpf"; 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-7c5b93628cfsi629598585a.555.2025.03.23.15.51.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Mar 2025 15:51:20 -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; dkim=pass header.i=@linaro.org header.s=google header.b="Bc/IwGpf"; 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 1twU9k-0003qG-N2; Sun, 23 Mar 2025 18:51:00 -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 1twU9h-0003pv-US for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:50:57 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU9g-0007Dz-8t for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:50:57 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3913d129c1aso2660143f8f.0 for ; Sun, 23 Mar 2025 15:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742770254; x=1743375054; 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=cnaIE/coD7iehBI3M+vr/MPS6inHzuGVqj/KxNr6j7E=; b=Bc/IwGpfRUSZ81FA+sCWB0EnvEMuK+NWcB3c2+pWgbyEbNaKd2ysHzEaKyQzF3bfRF H7h447c5YqGPHVJLVPCpc2L0wZI5/Jgt05v3aNqF/RRPqIwGC9TgkbaXjolDEsiFbQpD UZldXoFPZgs3u+eJ9tLnNWrG2YRBqKwL2ZRmGz9L37Gvr3yNRsl3XSF9it8z+CRRWqBW WSVTigJoXIsk8cGdG5iJyWuNwPxQmLIdry4xYuI6JfRRcVQjjxGS3RJuOWQKvEh9wqh7 03E2Y2+k4DdyeyRCAMhJfVGuj026Ci8GLxvjSE4qYj1ZYSkIcrOh6i7RITZYVN6wuPV1 /MrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742770254; x=1743375054; 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=cnaIE/coD7iehBI3M+vr/MPS6inHzuGVqj/KxNr6j7E=; b=MB9cko3/IAEZUCG87zeFXXXQBCMuSwcSTP3KeVf+Bjj9NRfmf8nV3USLlpynJNY2W1 zmEBF4hCLHohaHa/r+bBhBs+T8Tgf+SX8mWDPm9vFx1oQ66PtsjKubpBDNJAEzDVBdUy rvcGKVSLmgXTqay0lfrfvIIqpnaTOLf1fpvOMcKgTiKvMB0h3Jjw/lgFtFBl14FZ+lvr +r72wQ7SPR+oywrmknef42cwHnL8+xSZgntYc//DJxbXSU3Wsln8ovsPWmvATP/M/Ut/ WIUjw5toxYHYXDnIzl6r/9QDedEJJ3yONbTYo8gDihVdkIZ7NxUaqoJ2Ns9qRVt9pv0h UJFw== X-Gm-Message-State: AOJu0YxSknXB2ZPsG63QJdyZ+td9QjhxI61IwhvoUbPtpVTtdNeOVxCq cov5TbdNznE39QQ6msxOivFZuEwOBxH5tGYAsvg/zEekH/uRzyCl1rMbpluTNh3Jadu15a4Wt6Y D X-Gm-Gg: ASbGncvhZqCHBz/GWSsPjp0QSZIXO553JHr76uSizzdApm7eFVvTwy4K7yul64xYZeK bxw8sV4wD1juREQTuuK5kSz1T0kV8L4J1zy03guKRbpp/06i17TmvjyAXlUV//o1mODUA/JA8PN UIxXbVEUDsiQS6iZULZ8GnkQJVg4a8Blk5IMLIjtMl+bL3WUCuBIicf9c3zKyEVs8pYuu1RZEF1 ECgVThRebGqDsEBdy1PXNlw3yGcKShfJ+2/MlWZIDUS0XB6CMtoBrxJVQt9PaNaRK18w/XUd5Y9 P+m4pjkFru3aqoqz4K0tb7I07u52Se6tNe0VLnIH860s3vKTb9QaRhsUlQpLvolGeu+m6xBY3M6 g4cy+L6U8EKYFPF2c8v4YmXt9 X-Received: by 2002:a05:6000:188e:b0:390:dec3:2780 with SMTP id ffacd0b85a97d-3997f93c60fmr8091542f8f.24.1742770253834; Sun, 23 Mar 2025 15:50:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9b5193sm9154958f8f.55.2025.03.23.15.50.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:50:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Pierrick Bouvier , Huacai Chen , Peter Xu , Jiaxun Yang , Fabiano Rosas , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH-for-10.1 1/3] target/mips: Inline qemu_get_betls() and qemu_put_betls() Date: Sun, 23 Mar 2025 23:50:45 +0100 Message-ID: <20250323225047.35419-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323225047.35419-1-philmd@linaro.org> References: <20250323225047.35419-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 We only use qemu_get_betls() and qemu_put_betls() once in the whole code base. Inline them (checking TARGET_MIPS64 instead of TARGET_LONG_BITS == 64) so we can remove them later as unused. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/mips/system/machine.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 8af11fd896b..c4c92a9a1ca 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -139,7 +139,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, r4k_tlb_t *v = pv; uint16_t flags; - qemu_get_betls(f, &v->VPN); +#ifdef TARGET_MIPS64 + qemu_get_be64s(f, &v->VPN); +#else + qemu_get_be32s(f, &v->VPN); +#endif qemu_get_be32s(f, &v->PageMask); qemu_get_be16s(f, &v->ASID); qemu_get_be32s(f, &v->MMID); @@ -182,7 +186,11 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, (v->D0 << 1) | (v->D1 << 0)); - qemu_put_betls(f, &v->VPN); +#ifdef TARGET_MIPS64 + qemu_put_be64s(f, &v->VPN); +#else + qemu_put_be32s(f, &v->VPN); +#endif qemu_put_be32s(f, &v->PageMask); qemu_put_be16s(f, &asid); qemu_put_be32s(f, &mmid); From patchwork Sun Mar 23 22:50:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875644 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp1882849wrb; Sun, 23 Mar 2025 15:51:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDo0UfgetHPa0+xR5zWKq+f0UUp7XX9ze2yKLbWl1bKraDKErCofoI1BYsiZESoQB+4PlmUA==@linaro.org X-Google-Smtp-Source: AGHT+IG5Kz56JpvKs2Tjzd1+lw5sjiGq5u0R4pZft4bAFNikQA5UzvAFiSDrUXOuO0dCj0L/jvax X-Received: by 2002:a05:622a:228f:b0:476:8288:9558 with SMTP id d75a77b69052e-4771de61266mr136257331cf.46.1742770288087; Sun, 23 Mar 2025 15:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742770288; cv=none; d=google.com; s=arc-20240605; b=FX4f1kbaywO7fyOE7bCGYVaM8a4grMCkOl61W4NZEG7vK4E/Hf/5HBnQAHv6Mqhk0Z lKtWwt+/inzza33B9P0UBnZIzWN0yIlDfzf9VuYxl+xUxrbEZNn2w8ix7hPnDA+nntOc lwfErrkFywP0Aqh2JXRO6ESxr5nC+Fhx0jktwWElJrxScvHZzA1ewdpkVQOG5cHqgUV6 A1Wtt97XZlSDSbWBIrIz+YjuAdQhmEfgI6S239k4RGVoMtaUIOyjr7/2nx5stZGQyzh5 J82ERdtyi+Tu9y8PaFz5lLyaq4nw5vUKJIWzGy217O/rDrKC5S7N1O+yVaCPouXZWvuj q9gw== 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=2ONHD5d7pAXIaEH45P/RlmSMtYEst+nDWdheP9MRJb4=; fh=vck2nDYxqcFlydCmWbI+Nh5uhp2JVAcrdICqGSnk6Bo=; b=Qd8CbzNvthuLVutrRs0vd5IBXo77+r7Pe6jxLeYS6+aGVN8+3A80euLQQVhorllP2n r2FQBS974c+X5ctOXXVeEsIJRUgvwb6BxN1smVkWDdqEzteWpj9v/lolK6n3hLT8iFot q86KXlJ4lbFjVM9cilp2DsAowahZsWTF0Y4V19Qes62vsaXHHsck1xOb7oOVtuj+Phhu MRpKSy91W9H3+amdqeHVF8xWreaAzbgf4EktzXrqLl+3umDfrtCrTSnKnlMF6V24tHYq 9ybRrb3C+Yi7UlE/8VUsLjeu24ymPNvSaGQgtQmUCCj5eGWKUJkphoBFtdY09Z41AhRS nguQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bHerPZeR; 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 d75a77b69052e-477409d2198si11535031cf.115.2025.03.23.15.51.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Mar 2025 15:51:28 -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; dkim=pass header.i=@linaro.org header.s=google header.b=bHerPZeR; 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 1twU9o-0003qu-58; Sun, 23 Mar 2025 18:51:04 -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 1twU9m-0003qh-K6 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:51:02 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU9l-0007EO-30 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:51:02 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-39141ffa9fcso3277188f8f.0 for ; Sun, 23 Mar 2025 15:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742770259; x=1743375059; 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=2ONHD5d7pAXIaEH45P/RlmSMtYEst+nDWdheP9MRJb4=; b=bHerPZeRvZbS6/1ml7IZckksN5V92FsNnyLTh8FpZY449Ay5WU7yF9wKnZBwd9MYLc 4bf7fKrZwfvo4AT1zESGpD2GYBr3U687svh5USRYowCZAgR5j3H35YYCtqnYJUmif5pn kNjUbEp4hdXiHpia3qdGroMiuWv0vB8P2f0w6oy5eo/pmsq7HxPBl47ws41q1R8KqYM4 aPoFM76rB0kb+JdytJtY6zO+AmaRe2FZ0QbYClP4zByZ7byn4wmLbuJi8KZz1feFycb/ K0PzKTOrDtX0DFdtS1sFsfEprZN6CCJls/82neCTlemTDp8AHkhigDGsWieq+0KkcrGa KIRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742770259; x=1743375059; 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=2ONHD5d7pAXIaEH45P/RlmSMtYEst+nDWdheP9MRJb4=; b=IhbGN22uu1ytHSxNn1u0jYjvgZ2+Y7EyNHoaIRrzJlISjdnuST2ebY63huwMbtH7eS 6qBU8MD46l+jYwtUnEg2T8WNV0aK/voZpnxdO4P9DnNknub33XlM5bQ1CAPNiUsmxza+ YGp2iLAfCUQbhSMy4rhZbwyNhz+sP+WvSAXEZOw0O8wMprYah/v9Sv3DHjQoCXNMDIcU RYIRfBF2MPBgVyVgsQge4SXX3iE2ooafwjYTCo0Qtc5nsS0j1oeR2B8gZDzToT19FL4j aIMRftBArUd1drn6AmRNKBwRcCKtqXhHIyZ5WYCSdUDrGPcvZbpQal9ixE0+e8YlDbwB 7E/g== X-Gm-Message-State: AOJu0Yzpt8vyMX8AbAvqos1YymwgYkv4aPXNVotaOsvNiV7vGkHYqQJF x/Hi9vXuR++VyXH5bBGwdJZkhodu4gma318Q7V+x445ecqxEzagcx4g1diL1Ngj1mTc9MASjFvB E X-Gm-Gg: ASbGncvCiYbWr3EEzH3Gjra20HeDcpVg2+By0+y+EQmWCbC67ihWkTBoraZgwyqRKWr 3gKXRslOdxKSvC8V5uWE8yllX9W18E3LmTmirRb3ZA8jXcZb5kQb3s/YzlNsEBGuWTaCTd7lp/0 N8sy3k+JS2Le6JqDQ045uW4czGQ6lz/Ds4ISQzdZ/8wfhZAvnZ/FBo8ak4f2C3i/AL2J3TIJ04Y g46exVbeTh6Yd63zzc9IFAwUzTB42QalSrAA5Q6xgU+lNNyiWsulPb2VGSVMJ5xMIvLvBCph/fF 7sV2CR6WsRBsvDu6KvSdJorJBVe6qgHS5XAyFZIJMpvom5UEM55nyZaruGaUO4wicYBxQaJDaTc gXVegLoUFA3/B3xNFZxnpvzYC X-Received: by 2002:a5d:64e7:0:b0:391:13ef:1af8 with SMTP id ffacd0b85a97d-3997f9423admr9035105f8f.54.1742770259316; Sun, 23 Mar 2025 15:50:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fd277c9sm102906645e9.22.2025.03.23.15.50.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:50:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Pierrick Bouvier , Huacai Chen , Peter Xu , Jiaxun Yang , Fabiano Rosas , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH-for-10.1 2/3] target/sparc: Inline qemu_get_betl() and qemu_put_betl() Date: Sun, 23 Mar 2025 23:50:46 +0100 Message-ID: <20250323225047.35419-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323225047.35419-1-philmd@linaro.org> References: <20250323225047.35419-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 We only use qemu_get_betl() and qemu_put_betl() once in the whole code base. Inline them (checking TARGET_SPARC64 instead of TARGET_LONG_BITS == 64) so we can remove them later as unused. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/sparc/machine.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 222e5709c55..cc58812781b 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -87,7 +87,13 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t size, const VMStateField *field) { SPARCCPU *cpu = opaque; - target_ulong val = qemu_get_betl(f); + target_ulong val; + +#ifdef TARGET_SPARC64 + val = qemu_get_be64(f); +#else + val = qemu_get_be32(f); +#endif cpu_put_fsr(&cpu->env, val); return 0; @@ -99,7 +105,11 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t size, SPARCCPU *cpu = opaque; target_ulong val = cpu_get_fsr(&cpu->env); - qemu_put_betl(f, val); +#ifdef TARGET_SPARC64 + qemu_put_be64(f, val); +#else + qemu_put_be32(f, val); +#endif return 0; } From patchwork Sun Mar 23 22:50:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875645 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp1882905wrb; Sun, 23 Mar 2025 15:51:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwA9BOdOZdn1HjVPHNhebFN6+8jtF9KwS2DwBhLmfSym315VcNNsYazQIgE7F0zU8U4q7Teg==@linaro.org X-Google-Smtp-Source: AGHT+IH/3rvXcxRMA8WE6P3OgAVQfhj0DxNogNyLHvJxa2FaOkNvgCMj3uphWHjtYYJ8qtQm9Wia X-Received: by 2002:a05:6214:2504:b0:6e4:5a38:dd0f with SMTP id 6a1803df08f44-6eb348e09bdmr239405016d6.4.1742770309529; Sun, 23 Mar 2025 15:51:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742770309; cv=none; d=google.com; s=arc-20240605; b=WLQDG+fJAMAZ5eJNwcOrXTx8c4NWeVXisF2olcfEvYn6zkl048IdxNzEIEazw9lOiD BCC+MGCox49SAde6Z/STG8nxIwn4qogBKL041tIHO9CPP1ZtudTgdC7AIi9NnfAQ2eym SevBxtTkWfT8mDajnds4F3Ez5mkZ60VABZaPiQ8qn97bBFaaFfirvooh9XExUCMrbwD9 VJIUOcudJJ4+C/EfNODBEKnby0G6I1WknjbeSKthv69/JTqqRLcHSoKtl3ERtLCKIPm1 OLZau//T5q6U2IricTjaA3YzWCpCGMvL/cjG9CrqWrDb2GQSEl7jHEPFDPXW/LDYtBiu pRJA== 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=0rA7H09Gy6oI0z35COjFJAyjrWGBYRErfci6Tvqs+Ck=; fh=vck2nDYxqcFlydCmWbI+Nh5uhp2JVAcrdICqGSnk6Bo=; b=fGsWA9ZrquVkpJvk/2OOEJL9D8R1JLou4FXdMXrWpKQcMDOgp/VZyNh+pXyyVCmWyc nIjPIM9+twCjWIo8w9wlcA7apcTbrnMGKj7AGacswvNVGcTPUaDtk5Y0WqBPiNtSNbdC KkkVvJ+IL/kK45INTccQjVfGGD9x8DIG0dbO7vq+83dHxK/rTvtjFCbeKaAKemZUq/nT UdT4Viq/O8JxNwXQNyUmAz2w3r6jrDlPWNTqJowGfIJOEHJkofXc1AuMfEODWnNVNWQE oQzH+r1iP86re0iKEVxrYaXl4ZHlrEFPIQXyKhcn3mUe6moWnnBWHlAGp26PzxIa4u7l fddQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cTO5/bFb"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 6a1803df08f44-6eb3ef560b2si62675826d6.144.2025.03.23.15.51.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Mar 2025 15:51:49 -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; dkim=fail header.i=@linaro.org header.s=google header.b="cTO5/bFb"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail 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 1twU9u-00040G-0Q; Sun, 23 Mar 2025 18:51:10 -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 1twU9r-0003xh-P0 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:51:07 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU9q-0007Ex-33 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:51:07 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso25575705e9.1 for ; Sun, 23 Mar 2025 15:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742770264; x=1743375064; 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=0rA7H09Gy6oI0z35COjFJAyjrWGBYRErfci6Tvqs+Ck=; b=cTO5/bFbC/UDwtfE3Xp+Er2lvoGD7pLG2hTwe3TQB/XADZtfvaFMA2q05sRxiI8gTU i9OYsFQC9yg1d3Af6+hwHpKH6AM1T0bVqqIWKV1hSaY9YTUJNaw4gX0zVuFEcZgQu7b6 uyaxFANmHgmnMvQyXqxH4sl4VWi7RUaiRv2ClET8NvH25d2DuZo5yM+o3CO2IIU7+l2B 1N/Djl3aGN6dqOso7GrVJ/6GeWxgz4S2zLJnY4ikUBiHO7EhBu9kjEXjPovJs8VFzvXn GqLn61tlzIcZ7VnV9O61+6vHtZRFH+iSlTv+AgLJaVbe9xAgS/hET3l63eGsVg6NA8kj uDHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742770264; x=1743375064; 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=0rA7H09Gy6oI0z35COjFJAyjrWGBYRErfci6Tvqs+Ck=; b=WOqpKKSq21z9Djk/QbrWAtjcuK/4rZaXWD+Q6idTbswJ8LQsHg927pvFqtK8QKRuih ZGf8p6MaEnXvdAO9saUkDespuaVnPZWQbK+R8XehBgoEdnQFPlRYf6KObu3zoP5btkDK 3EYshO4uVfvz9kpBF+6sqQgs3p24wAUF6k3wwUJUv2zpFZPasmBdxpJktPKJo63hIqiZ mL3O5dk2WFOAAtrbWzpiDOQL6R6X6tVVSO1RD84FLBDZe9/app7U1tH+rqgGUReDDmAn z6JrVCU2qpNWRzpRljA6nSmnAbCXiLSFRapEsIT1lqgT/dNHaAobhIjsukVHymdBt/Hc uxfA== X-Gm-Message-State: AOJu0Yy6wfft5ycrCFtyB/tB23N7mAeF7ZtTBnKxZnPc7ieqDlVZkfcy ICj7FfHN+ixOpsJWZHG1cGeQGeChO75I+dUUBBjaWbdmsbbMcu0fifr4/YwZs/CUEOsxmhnOqCe J X-Gm-Gg: ASbGncsr3sYQVDa4prbWX89oJ9uoueynhiS5cdgBUZEgzUM0iVUCuXCbIVFjlTwMkaO ZJcLHVkgctrNa4AsF2P12ThKtiTCcBGOq/O49jNw/jBSQOTo4Jdwv8zuDg9MxDdwfObGsdX23os 417gCqy/f/a4BeVOYRvXwhKKs+HRcNzJztpn1uliumAD47XkbFGA8iqTtQI3f8qsPrYHrcNpe9H gIz0Dz9IKq9yIHOPAu1Vv1R/To1m93zHJdc5spJRruN3Fjvkpam9EeCCec2SwGzqG7rjSOvnrpQ gKS+7/bvtn5oBb440gY0C5HtGwNYi1O05OeZsyt3zE9IgaddYehFI2EUqL+aifdzNprc+d3qlbS vLlkTGKxW74HPj8+vKgshGkiG X-Received: by 2002:a05:600c:1ca4:b0:43d:b3:fb1 with SMTP id 5b1f17b1804b1-43d50a3c12amr67724185e9.27.1742770264130; Sun, 23 Mar 2025 15:51:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f43ecbsm150658885e9.10.2025.03.23.15.51.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:51:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Pierrick Bouvier , Huacai Chen , Peter Xu , Jiaxun Yang , Fabiano Rosas , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH-for-10.1 3/3] migration/cpu: Remove qemu_{get, put}_[s]betl[s] macros Date: Sun, 23 Mar 2025 23:50:47 +0100 Message-ID: <20250323225047.35419-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323225047.35419-1-philmd@linaro.org> References: <20250323225047.35419-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 The following macros: - qemu_put_betl() - qemu_get_betl() - qemu_put_betls() - qemu_get_betls() - qemu_put_sbetl() - qemu_get_sbetl() - qemu_put_sbetls() - qemu_get_sbetls() are not used in the whole code base, remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Fabiano Rosas Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 65abe3c8cc0..5066939d4c9 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -8,15 +8,6 @@ #include "migration/vmstate.h" #if TARGET_LONG_BITS == 64 -#define qemu_put_betl qemu_put_be64 -#define qemu_get_betl qemu_get_be64 -#define qemu_put_betls qemu_put_be64s -#define qemu_get_betls qemu_get_be64s -#define qemu_put_sbetl qemu_put_sbe64 -#define qemu_get_sbetl qemu_get_sbe64 -#define qemu_put_sbetls qemu_put_sbe64s -#define qemu_get_sbetls qemu_get_sbe64s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT64_V(_f, _s, _v) #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v) \ @@ -29,15 +20,6 @@ VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 #else -#define qemu_put_betl qemu_put_be32 -#define qemu_get_betl qemu_get_be32 -#define qemu_put_betls qemu_put_be32s -#define qemu_get_betls qemu_get_be32s -#define qemu_put_sbetl qemu_put_sbe32 -#define qemu_get_sbetl qemu_get_sbe32 -#define qemu_put_sbetls qemu_put_sbe32s -#define qemu_get_sbetls qemu_get_sbe32s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v) \