From nobody Mon Feb 9 22:04:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538008106821957.5065713962283; Wed, 26 Sep 2018 17:28:26 -0700 (PDT) Received: from localhost ([::1]:33146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5KAL-0007Jj-Gm for importer@patchew.org; Wed, 26 Sep 2018 20:28:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5K6g-0004xD-Up for qemu-devel@nongnu.org; Wed, 26 Sep 2018 20:24:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5K6e-00010d-Hd for qemu-devel@nongnu.org; Wed, 26 Sep 2018 20:24:38 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5K6e-00010I-B6 for qemu-devel@nongnu.org; Wed, 26 Sep 2018 20:24:36 -0400 Received: by mail-wr1-x42e.google.com with SMTP id b11-v6so655972wru.9 for ; Wed, 26 Sep 2018 17:24:36 -0700 (PDT) Received: from x1.local (106.red-88-7-90.staticip.rima-tde.net. [88.7.90.106]) by smtp.gmail.com with ESMTPSA id x14-v6sm559668wmc.36.2018.09.26.17.24.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 17:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+GD3z/eIrVCqie1m7U9g0zWeFiwEEBNETij89vpHNQM=; b=pbw4RGSHwE+A/SAPGOsJKrIjR+EDWSQ1qqI397q7L8/1qo5ezNrtz+mMKmkpSbSE/Z KxBgYkPVyDLgaksMrHLjQZzT0+k59lVgaZujUyl41qzqi+T7Z+FvYeusIXeTHcnkKotB CrjW9zDq2FqXarRivz//ennW0iVdA5GrPscSU1Y3qXZLNJkQd8QZwFn9dy27OSlaWo5y TCysAUrLQOCVlXki+DcYoHN+ENKcZkV/odqufCEqryiNPYDuy6NNBfN7pi+tlK/wHTzo NuvYx/9Qm3VoRea3b3gOrjE1xkDxlotKMLsrX1QAxzhCD4iXHPHJrI7AjAo+VHA3mi+U zK4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+GD3z/eIrVCqie1m7U9g0zWeFiwEEBNETij89vpHNQM=; b=VNtQ8Yo41xryqO0FX/tR1pfTipOq+HcOGwJabyeelFTpdAIwqnlZGKm0uGb0/UvG1w /54GIysoAfYiTCoXNtxqJl9Pf4l/lgIAT7or0eCFCzshYV58U2COLk9cwDcgSM6Xp8Ji dZjmRePnGCQmWQHFosLPNVziV1uxGBG+XJ+AwsfcSU5Wx58CJfS3dkRTsXCDZbO2b7Ob n3nTJ9BAT2X0nxglY7ZebNSg+G8JQrNsSQXKBg3zPgVQX6rwyUHsU8ZbrpueUjri0Ogb zlabeBAYnxB8+CDyJpGhXvG8/X0uvBXHujonowhP8SsnI3CjbSwncyb6cs8CxtxyjakK PlQg== X-Gm-Message-State: ABuFfohxxy5O+e+9+3mJCjpoj09orVJZcaA2N1P3HKF3R0EmfnJSENKd xvAFSvZ/bTdRleGcM3cbiX0= X-Google-Smtp-Source: ACcGV62Pt1CDO1rZGGsf67zGWlMfsNDzLNimQM56h1eaHh3J0cH4TRFBjx+BzTtad+ZBm7RbYsP94A== X-Received: by 2002:adf:8103:: with SMTP id 3-v6mr6722752wrm.213.1538007875302; Wed, 26 Sep 2018 17:24:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Peter Maydell Date: Thu, 27 Sep 2018 02:24:15 +0200 Message-Id: <20180927002416.1781-3-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927002416.1781-1-f4bug@amsat.org> References: <20180927002416.1781-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH 2/3] memory: Refactor common shifting code from accessors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- memory.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/memory.c b/memory.c index 385b9d3590..48edf7dc23 100644 --- a/memory.c +++ b/memory.c @@ -374,6 +374,21 @@ static void adjust_endianness(MemoryRegion *mr, uint64= _t *data, unsigned size) } } =20 +static inline void memory_region_shift_read_access(uint64_t *value, + unsigned shift, + uint64_t mask, + uint64_t tmp) +{ + *value |=3D (tmp & mask) << shift; +} + +static inline uint64_t memory_region_shift_write_access(uint64_t *value, + unsigned shift, + uint64_t mask) +{ + return (*value >> shift) & mask; +} + static hwaddr memory_region_to_absolute_addr(MemoryRegion *mr, hwaddr offs= et) { MemoryRegion *root; @@ -418,7 +433,7 @@ static MemTxResult memory_region_oldmmio_read_accessor(= MemoryRegion *mr, hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); } - *value |=3D (tmp & mask) << shift; + memory_region_shift_read_access(value, shift, mask, tmp); return MEMTX_OK; } =20 @@ -444,7 +459,7 @@ static MemTxResult memory_region_read_accessor(MemoryR= egion *mr, hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); } - *value |=3D (tmp & mask) << shift; + memory_region_shift_read_access(value, shift, mask, tmp); return MEMTX_OK; } =20 @@ -471,7 +486,7 @@ static MemTxResult memory_region_read_with_attrs_access= or(MemoryRegion *mr, hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); } - *value |=3D (tmp & mask) << shift; + memory_region_shift_read_access(value, shift, mask, tmp); return r; } =20 @@ -483,9 +498,8 @@ static MemTxResult memory_region_oldmmio_write_accessor= (MemoryRegion *mr, uint64_t mask, MemTxAttrs attrs) { - uint64_t tmp; + uint64_t tmp =3D memory_region_shift_write_access(value, shift, mask); =20 - tmp =3D (*value >> shift) & mask; if (mr->subpage) { trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); } else if (mr =3D=3D &io_mem_notdirty) { @@ -509,9 +523,8 @@ static MemTxResult memory_region_write_accessor(MemoryR= egion *mr, uint64_t mask, MemTxAttrs attrs) { - uint64_t tmp; + uint64_t tmp =3D memory_region_shift_write_access(value, shift, mask); =20 - tmp =3D (*value >> shift) & mask; if (mr->subpage) { trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); } else if (mr =3D=3D &io_mem_notdirty) { @@ -535,9 +548,8 @@ static MemTxResult memory_region_write_with_attrs_acces= sor(MemoryRegion *mr, uint64_t mask, MemTxAttrs attr= s) { - uint64_t tmp; + uint64_t tmp =3D memory_region_shift_write_access(value, shift, mask); =20 - tmp =3D (*value >> shift) & mask; if (mr->subpage) { trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); } else if (mr =3D=3D &io_mem_notdirty) { --=20 2.19.0