From nobody Mon Feb 9 08:00:08 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.zoho.com; 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 1488265551831565.5818261841092; Mon, 27 Feb 2017 23:05:51 -0800 (PST) Received: from localhost ([::1]:59067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cibr4-0007AW-En for importer@patchew.org; Tue, 28 Feb 2017 02:05:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cibpX-0006EV-Q9 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 02:04:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cibpU-0000Ol-N7 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 02:04:15 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:47006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cibpU-0000OZ-GW; Tue, 28 Feb 2017 02:04:12 -0500 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B09E54358A; Tue, 28 Feb 2017 10:04:11 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 894822C; Tue, 28 Feb 2017 09:45:00 +0300 (MSK) Received: (nullmailer pid 19629 invoked by uid 1000); Tue, 28 Feb 2017 06:44:59 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 09:44:50 +0300 Message-Id: <4729b3a41d11f053a6d03620ff12b266dd0ab330.1488264243.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 07/14] register: fix incorrect read mask 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: qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 The register_read() and register_write() functions expect a bitmask argumen= t. To avoid duplicated code, a new inlined function register_enabled_mask() is introduced. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Signed-off-by: Michael Tokarev --- hw/core/register.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/core/register.c b/hw/core/register.c index be170dc..dc335a7 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -59,6 +59,15 @@ static inline uint64_t register_read_val(RegisterInfo *r= eg) return 0; /* unreachable */ } =20 +static inline uint64_t register_enabled_mask(int data_size, unsigned size) +{ + if (data_size < size) { + size =3D data_size; + } + + return MAKE_64BIT_MASK(0, size * 8); +} + void register_write(RegisterInfo *reg, uint64_t val, uint64_t we, const char *prefix, bool debug) { @@ -192,11 +201,7 @@ void register_write_memory(void *opaque, hwaddr addr, } =20 /* Generate appropriate write enable mask */ - if (reg->data_size < size) { - we =3D MAKE_64BIT_MASK(0, reg->data_size * 8); - } else { - we =3D MAKE_64BIT_MASK(0, size * 8); - } + we =3D register_enabled_mask(reg->data_size, size); =20 register_write(reg, value, we, reg_array->prefix, reg_array->debug); @@ -208,6 +213,7 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, RegisterInfoArray *reg_array =3D opaque; RegisterInfo *reg =3D NULL; uint64_t read_val; + uint64_t re; int i; =20 for (i =3D 0; i < reg_array->num_elements; i++) { @@ -223,7 +229,10 @@ uint64_t register_read_memory(void *opaque, hwaddr add= r, return 0; } =20 - read_val =3D register_read(reg, size * 8, reg_array->prefix, + /* Generate appropriate read enable mask */ + re =3D register_enabled_mask(reg->data_size, size); + + read_val =3D register_read(reg, re, reg_array->prefix, reg_array->debug); =20 return extract64(read_val, 0, size * 8); --=20 2.1.4