From nobody Tue Feb 10 05:41:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1765982075; cv=none; d=zohomail.com; s=zohoarc; b=dZE/M2j1aaPaaVzoHvtdikyzKnJ+uc3AuJ8YvXXQwUG7IHXd9Yz926ffIKvuV9Cdhh4s5LlFT/b+8s6iePPmLAH//BrQqE8D7ozyA8JuaQ/vWkOD6ydS4ffKVMgCUOMXpobrQQGrCrR2qZmVZKBaQKQOZhUkCF0BUn1hgZ+SrEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765982075; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hw1yIVI7Fe2b/MFRMttYe0v8MoYDRmNEX3bk78jaHXE=; b=YufD4obr452fSZTtD6vK0wK6wStkrH11h1+OLf/F4rbQQ03oUaPzELTu7EO1TRlW7+WzKqfVq99zQvz3ev9wkyotahqTmuUtFgXctFxYNEgIGDUODS2QEZGrTPxWEWKiMspC8ypWCGcT+FfrLvDiGwfGsVTL3wcr3DfuYbwCTfQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765982075510225.5990968653456; Wed, 17 Dec 2025 06:34:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVsb3-00039Z-Nf; Wed, 17 Dec 2025 09:33:45 -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 1vVsb2-00032H-MF for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:33:44 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vVsb0-0007XU-Ri for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:33:44 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-477563e28a3so4023465e9.1 for ; Wed, 17 Dec 2025 06:33:42 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47bd932a3e5sm30579265e9.0.2025.12.17.06.33.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Dec 2025 06:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765982020; x=1766586820; 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=hw1yIVI7Fe2b/MFRMttYe0v8MoYDRmNEX3bk78jaHXE=; b=CkgU2my3sFwFCmgO4FfFQQ01w7kA7XLxoa3Zst3hYbFt8n/c5V7yZc79ZTozVEoRo9 zZaXIMjm0OrY42bMA4TqqGW8scfloBletIESrNor20Pw1fWXGRUbVJBRWy5bCpddbUsJ MbjJdVA6DLhlF3C+3pIkx4q8NF9uASW/809b6MVXPxFBz8ileP6Rrl3irnawx8sdbi0m SiuwBZVsXs0/ftw/C9+T1lUmdZFaQCzuJf1BKH8cvSNYDlo8wQS0VFlWFQBXdabfhtxm mKz6V6+h9Sf+aquCuH1YWiPzIzY4yUqoNlpS5/Kk5MKQHWuvnXb2cJgKNwTxc6B/QqFx KZUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765982020; x=1766586820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hw1yIVI7Fe2b/MFRMttYe0v8MoYDRmNEX3bk78jaHXE=; b=UjA2ZjW7pKjl1Sz5ATMjBDh231CSqsgIuF8Lg547ocut9mbAzHVDEcLNjilmdiGjYx nOvYLlVwpxOYLNBGVtfTH+jfqjMEoOaOHQhuBGOGGR5BM3X0DFn3F5XkAY8U0oDgIRTR vpCmu0Qn8mLfhh2zkdld0PiYAWoADCu5mXD9ySKqm86wPhEKPvfJTOOGnD+fx77XCIQm Zw2A6JW9NIV93zBhlOTwxPdezIMYouoMXchjod+GW/4SCOYfd9hb1+yFmUijKaQySxuv AU0gYpuKdAchGHOGVy7KO2ZXnefl6LjMm/VDgWDWAcleKASQMoYMHQPjX1U6GLyjNI8E jsgA== X-Gm-Message-State: AOJu0YyR+GYNJTLZP+j5zbSsqxBh3rReaEgB0a/YYoGd9za56UyPLbIw nwH5n3LEJZ34z0xBehqCKPr8qmzAA7/rRwiX+9NjMzy4gpTgN7WCIG5cyaVMrVredeuw6z14Iut gcrrff1SCXw== X-Gm-Gg: AY/fxX7WrEpx2HDJZRiA1vTAUK00QBZcGatjME1B0k2XnV9pxLNiwEDE1p5iTX91B9O ccgl53ugmdkDnLNk1tcVkp8SJtmHc3M9Y75YR6NYEnQvQOaweLirDhkQi34jWhHvDam6pqcvfuA YRZJZnFXxaD/b0DWC768G3ZKJeVFnArRGreXMXD3ZfMfXjGqyfqHTYrWbviaA2D0vh6BtXAqyv1 7DVtxZz0Q0vqb3/iJjFdMZ7/Ihjuc9l1qM7R+fn3hs0r1E78+FWrrPizHs/mzMkyzj4G7QJbFWt scrUFA2Hk3z6R4ZQ4AwXwXu2WAherq1Wt8h5/UQjX85Gph+ukabGzxdAaxkE43P7qlyZWz+Qikf qQt/ZSLuQpFVyl699a/SC2Ha5ky9ZeQAmGcgkkkJ1m35Auy9wrAB0vqU6mJZHAhJ7RKz86Kdlad 1eowXlhYHKF1meokOgA1dkCFWyYbF1w4AfxPa+DiTj4njNjVp6TO0PoUuFaDMm X-Google-Smtp-Source: AGHT+IFTRmhLCWL5HUIOCsnG2fw+BtwoGKxqtqDZUh4rn48UcNyYBTSdMWLpzSeYPavUYAquibmLbg== X-Received: by 2002:a05:600c:64cf:b0:479:255f:8805 with SMTP id 5b1f17b1804b1-47a8f094212mr166712095e9.4.1765982020332; Wed, 17 Dec 2025 06:33:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Anton Johansson , qemu-arm@nongnu.org, Mark Cave-Ayland , Paolo Bonzini , "Michael S. Tsirkin" , Artyom Tarasenko , Peter Maydell , David Hildenbrand , Peter Xu Subject: [PATCH 14/14] system/memory: Sort methods in memory_ldst.c.inc file Date: Wed, 17 Dec 2025 15:31:50 +0100 Message-ID: <20251217143150.94463-15-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217143150.94463-1-philmd@linaro.org> References: <20251217143150.94463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1765982078050158500 For clarity, sort methods by access size (B, W, L, Q). Fix coding style. Only code movement, no logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- system/memory_ldst.c.inc | 86 ++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc index 6387bb9d332..5a979ea6ac3 100644 --- a/system/memory_ldst.c.inc +++ b/system/memory_ldst.c.inc @@ -63,37 +63,46 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_= DECL, MemOp mop, return val; } =20 -/* warning: addr must be aligned */ -static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) -{ - return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, add= r, - attrs, result); -} - -/* warning: addr must be aligned */ -static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) -{ - return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, add= r, - attrs, result); -} - -uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, - hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, + MemTxAttrs attrs, MemTxResult *re= sult) { return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_8, addr, attrs, result); } =20 /* warning: addr must be aligned */ -static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +static inline +uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) { return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_16, add= r, attrs, result); } =20 +/* warning: addr must be aligned */ +static inline +uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) +{ + return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, add= r, + attrs, result); +} + +/* warning: addr must be aligned */ +static inline +uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, + MemTxAttrs attrs, + MemTxResult *result) +{ + return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, add= r, + attrs, result); +} + static inline void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop, hwaddr addr, uint64_t val, @@ -133,31 +142,40 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DE= CL, MemOp mop, RCU_READ_UNLOCK(); } =20 -/* warning: addr must be aligned */ -static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *r= esult) -{ - glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val, - attrs, result); -} - -void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result) +void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val, + MemTxAttrs attrs, MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, MO_8, addr, val, attrs, result); } =20 /* warning: addr must be aligned */ -static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *r= esult) +static inline +void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint16_t val, + MemTxAttrs attrs, + MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_16, addr, val, attrs, result); } =20 -static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, - MemOp mop, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *r= esult) +/* warning: addr must be aligned */ +static inline +void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint32_t val, + MemTxAttrs attrs, + MemTxResult *result) +{ + glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val, + attrs, result); +} + +static inline +void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, MemOp mop, + hwaddr addr, uint64_t val, + MemTxAttrs attrs, + MemTxResult *result) { glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_64, addr, val, attrs, result); --=20 2.52.0