From nobody Mon Apr 29 07:56:44 2024 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 1487113038924118.13408238225918; Tue, 14 Feb 2017 14:57:18 -0800 (PST) Received: from localhost ([::1]:37585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdm28-0000pj-BC for importer@patchew.org; Tue, 14 Feb 2017 17:57:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdm1E-0000SV-IY for qemu-devel@nongnu.org; Tue, 14 Feb 2017 17:56:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdm1D-00028j-IS for qemu-devel@nongnu.org; Tue, 14 Feb 2017 17:56:20 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33501) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdm18-00027A-Nh; Tue, 14 Feb 2017 17:56:14 -0500 Received: by mail-qk0-x242.google.com with SMTP id 11so21058168qkl.0; Tue, 14 Feb 2017 14:56:13 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id x64sm1167965qke.60.2017.02.14.14.56.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 14:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SzYab0g/Gz+plr7lububySTaiRRc78KHjSkpDcv6TaU=; b=HTDH7V/TBsjE0IgEgjrFh9A5UmSW728sVMDQ9RbNH59bzeHgkghamAoM4hTlfYkNR+ yOGAk7Mfd7oN532B2cxB6bpGVhfjBCQfu24jiWNOYOtfMDHA3Y/2BZJauN+37Qr6s0bg Ct14UEIklPssXPVqYhZGgVxoNotyg9GJwC9x8FfDxluljRNr5BRkbIMhLhneKzJsIA/V lZ761XMWcaQOMaHfYnf3EdxoJK3qIw2kRQYrPfInNYSS1rre/Z6FiOuga04qAf9zPWFM xZRRVTpTZZt4AZIC8JGQFufubJJHJlBds4Ubq9B6MqYnNKb06BeiBF1RrdBzY2NUoJ/d gHtA== 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 :mime-version:content-transfer-encoding; bh=SzYab0g/Gz+plr7lububySTaiRRc78KHjSkpDcv6TaU=; b=mXYVPOmi/52ShqqZf7KtnJY5NUYUtmjyUtdToZOemrRBuSE0gAE36pSssyCrdIr0x8 vmndc6PtYQWUQTg/AR5jZYDn1lDaDfNWvPX6rdNE/3JtB6l0n4ZY1YFMQjIzr3V2rcBI ceQ6M9J6ESBaSHgfOkr5Z5dGtVjN/Xp/IArEG0iJm5LBDBBgGBm3Di/qe/9HeC9jabRg 444LhkxvXo057WBLZx5IUaS9swP5jOhNX8LlxsFZ1GucLpea+v6lwwykw01DRU/yL0cv sW+nfhS02TSBCE72yqueFeGQlLNIo5t8iK2LdRnFvp8u0imV9WYGQTmzFoCxJh0PtptL gK9g== X-Gm-Message-State: AMke39nPoFAC9tJu0ueKfww6sdDKHJhcyFsn/UkFtSKqpNJnCYyEpUE+GU9Fxxnlo9aopA== X-Received: by 10.55.165.131 with SMTP id o125mr29451797qke.254.1487112972562; Tue, 14 Feb 2017 14:56:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Crosthwaite , qemu-trivial@nongnu.org Date: Tue, 14 Feb 2017 19:55:35 -0300 Message-Id: <20170214225535.6880-1-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v3] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 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 --- v3: clarify functions affected in the commit message. v2: squashed together both previous commits as suggested by Francis Alista= ir. 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 4bfbc508de..482e3f827a 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.11.0