From nobody Tue Nov 26 22:36:08 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704463202; cv=none; d=zohomail.com; s=zohoarc; b=IZ4T5wy8i0CNt9GZTIsHL0j2fKw14gjmdj8atwKE09/osQ9c3/10qcae6F1iCAilcKyUnkHO0nWVVkwCoaGD3KDobZcNfS0d8CnrGwdsSfOo4xRi8YG6adp7hMAvlM3NauarLlugwu/2G6sR8orpIZywla2OTTguZH3takz/mQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704463202; h=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=FAeSf6AyHlWJ1aj4AEUmp5aZamGhHrmjKFEVdVz+6yI=; b=DOV2qzxjFnn+zFedwcqjLGzAewuxER9XBszq9xr83Wvs2+mLSoUTwJpm04X9aZIc6dxF3bJtIiXHxPYz0d9gfmBd0mWrifDd4IVLUwWknhO7y0BBwUtTdvy4Xk7BtwBCIvYY49CbV1BiapZJAdJJIbpSHoAWyNvyWeMViiZGdpM= 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 1704463202028965.7933734273968; Fri, 5 Jan 2024 06:00:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLkj1-0005bF-He; Fri, 05 Jan 2024 08:59:03 -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 1rLkiz-0005aW-V4 for qemu-devel@nongnu.org; Fri, 05 Jan 2024 08:59:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLkix-00039e-Sr for qemu-devel@nongnu.org; Fri, 05 Jan 2024 08:59:01 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-402-uiKVQ9gKOia80ZqURwrOfQ-1; Fri, 05 Jan 2024 08:58:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D1A23816B42; Fri, 5 Jan 2024 13:58:56 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.193.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A7B13C25; Fri, 5 Jan 2024 13:58:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2D0A118017F0; Fri, 5 Jan 2024 14:58:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704463138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FAeSf6AyHlWJ1aj4AEUmp5aZamGhHrmjKFEVdVz+6yI=; b=MdAs7um4DwQ3TEuWLEPTXle/vdUO4U07tEsTwbd1K5WxxKtuXIuKyl1VGllTpNQ66oDjK2 uLIX3fpuBu+FqPTUXDm6rAaK7nBYpIzsqmL47P1D9LRL927qmWkuj/B5fCFkTi8EKM3uBf rWdxARfCu4kDwuK0vVHDmWp64RD6M1k= X-MC-Unique: uiKVQ9gKOia80ZqURwrOfQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Hanna Reitz , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Gerd Hoffmann Subject: [PATCH 1/2] hw/pflash: refactor pflash_data_write() Date: Fri, 5 Jan 2024 14:58:53 +0100 Message-ID: <20240105135855.268064-2-kraxel@redhat.com> In-Reply-To: <20240105135855.268064-1-kraxel@redhat.com> References: <20240105135855.268064-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.679, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704463204063100003 Content-Type: text/plain; charset="utf-8" Move the offset calculation, do it once at the start of the function and let the 'p' variable point directly to the memory location which should be updated. This makes it simpler to update other buffers than pfl->storage in an upcoming patch. No functional change. Signed-off-by: Gerd Hoffmann --- hw/block/pflash_cfi01.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 3e2dc08bd78f..67f1c9773ab3 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -403,33 +403,35 @@ static void pflash_update(PFlashCFI01 *pfl, int offse= t, static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset, uint32_t value, int width, int be) { - uint8_t *p =3D pfl->storage; + uint8_t *p; =20 trace_pflash_data_write(pfl->name, offset, width, value, pfl->counter); + p =3D pfl->storage + offset; + switch (width) { case 1: - p[offset] =3D value; + p[0] =3D value; break; case 2: if (be) { - p[offset] =3D value >> 8; - p[offset + 1] =3D value; + p[0] =3D value >> 8; + p[1] =3D value; } else { - p[offset] =3D value; - p[offset + 1] =3D value >> 8; + p[0] =3D value; + p[1] =3D value >> 8; } break; case 4: if (be) { - p[offset] =3D value >> 24; - p[offset + 1] =3D value >> 16; - p[offset + 2] =3D value >> 8; - p[offset + 3] =3D value; + p[0] =3D value >> 24; + p[1] =3D value >> 16; + p[2] =3D value >> 8; + p[3] =3D value; } else { - p[offset] =3D value; - p[offset + 1] =3D value >> 8; - p[offset + 2] =3D value >> 16; - p[offset + 3] =3D value >> 24; + p[0] =3D value; + p[1] =3D value >> 8; + p[2] =3D value >> 16; + p[3] =3D value >> 24; } break; } --=20 2.43.0