From nobody Tue Apr 23 17:42:12 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 1486784742126144.2498512072292; Fri, 10 Feb 2017 19:45:42 -0800 (PST) Received: from localhost ([::1]:46994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccOd1-0000Tu-9M for importer@patchew.org; Fri, 10 Feb 2017 22:45:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccOc8-0008UH-7H for qemu-devel@nongnu.org; Fri, 10 Feb 2017 22:44:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ccOc7-0001Kg-0N for qemu-devel@nongnu.org; Fri, 10 Feb 2017 22:44:44 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ccOc2-0001Jq-9F; Fri, 10 Feb 2017 22:44:38 -0500 Received: by mail-qt0-x243.google.com with SMTP id n13so6753217qtc.0; Fri, 10 Feb 2017 19:44:37 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id 43sm2999918qty.26.2017.02.10.19.44.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2017 19:44:36 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=O2P6l0yiJDHkQ2c0a+J1QUFS0ozUv4J4VxEBTPadCdE=; b=m2ula7z49d+1LhJt5MCb4QB/0pbw+lu9K4Ev0zRvGpqaFFCB63SYWsX1VZLUpPvGZg Udk/xHbWk0P8LFcCjs0TiulJSty+V6zw1JemOXYDFs3QU4GnTRnLRfI2PST1qjWj/d4J v0B4aPz1pXnPZKcO4ezTGKPfgkqMLKC1evjF2wLHzqnZA84XgGO+EK9J68sb8TpNguZU xiONqvH2W1HfHpt24VYXmJ0HJhDunpT7alFpmOBOiffHk/cxgf32l/KokM0+dy5boKxR C0gGad7Q5EWGGsitdsfTOrCZI+hiXorbrZvCyoYizklXFFF8P0Tk4CTKgzzb7zNAnGH3 +YJA== 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=O2P6l0yiJDHkQ2c0a+J1QUFS0ozUv4J4VxEBTPadCdE=; b=g1r2lQ2hZKuCyk/QxXsbrU81eKI6uW2Qe33t6MaQNGOUNuq2U16yHTPgn0KCgy69ge qQLyJgWTPWeTxNLHYkZGeRwxd1j+f5970JFb1jHDR3T2H98Lt15EVBDLGWGi5kIoFkri gnjhRnHQczEWsLelqW+YnoN0b8zymsskUNwGV3YHSyg9mSnezuX2dpHGnsV/h1yfSOuJ yvW9fZjpbNKMiyR9omvgqSh5OPxrNTcblAe9hY3LFu6E0ugRrp0h/f6h1J3OfJbTdU0X xni998f+AYRfiB/7g6Z4/DS+OVJ4DYz+sd9JuRw1weLzXB50oNoB96VGT9LOPILBOdiG ep9Q== X-Gm-Message-State: AMke39lEEiHxdPTotYKjNhDEYAO3R9RZzxw5a5twKga3w//0Yn4brxIuMDBJTt+6GYIFPQ== X-Received: by 10.200.46.36 with SMTP id r33mr12297066qta.92.1486784677492; Fri, 10 Feb 2017 19:44:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , qemu-trivial@nongnu.org Date: Sat, 11 Feb 2017 00:43:32 -0300 Message-Id: <20170211034332.12498-1-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: 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:c0d::243 Subject: [Qemu-devel] [PATCH v2] 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() function expects a bitmask argument. 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 --- 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