From patchwork Fri May 17 04:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164389 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1703972ili; Thu, 16 May 2019 21:55:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5XfAeWuc0i7dRgh2X/sYB9Nj+MDZH950+FUzWp8T88KyxGJlpI63sthTrTDUFGmGOf8Ki X-Received: by 2002:a17:906:261b:: with SMTP id h27mr27278625ejc.97.1558068913902; Thu, 16 May 2019 21:55:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558068913; cv=none; d=google.com; s=arc-20160816; b=wTLH9KG0IYmJ+DWOiscngP59+9xeuA6ulX5mdn6UwdbRbbxD1G1cBeG6kSUJVLqvpJ BhMsC/w7f64SxUdKYaT/Bc4SUT6Q1jGO97Nw28J8MH1G64bWv1wVfsGgCzDF4SPZl9hd I5YXKpTRP0bQ95bkHcsyxNSkHE976jYWtaIIOlrkZ+0bCSjNRAd/syHEUma9OP0rP70h TaB1QXzcnKGkfpJH5gH1KT0FZR5t6zUfXnzuOSgd4IucXa4ZoonVZeM2zmZ6ZJm9FCgA Pwr79INb5AgMeCIgf7tosnR7BcaROT3BKqeqOqaHFgdYiobLQuCtKRXgRGzNCyrGDwqk NFZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1XbDcSxPxIwShmL7ibaMkqeCI/KNLPvufrTgWj8SAo0=; b=CzkTu3xxksXZLyy8tJj2cgp1siXJ6qNnI2R3IQmDNbQrJCOwtJmtOTsyLU46n+EeUz snsJ7fx76oMZTmF56ss4LsZ9KoyLu6hL+QHQpDofNrCcZ7UWqxDOwNZ7Rt3aAP08rIDO pB5nafJEMkk07nWb9SOWKH7KL+MUZskbQjbUb8o5QZbvY3CDomx3czFG1Or16DhfbHnm FevQcSZ+Ggs0V9ZchnRra7W1Hyd4UoqfCGr4Ol9wDMuD6naHcKXhhFY5e/+YKl3SQNPW 2/obEx2kqNGcuq/1QpnsD34ruHl6ZJVx+X1gS9nyobRm2rWpQt4YgagvVCkB01tadfh7 lWMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SScwKoIx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w50si5660497edc.110.2019.05.16.21.55.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 16 May 2019 21:55:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SScwKoIx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRUtk-0000ZM-Nu for patch@linaro.org; Fri, 17 May 2019 00:55:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRUqW-0006Dt-U4 for qemu-devel@nongnu.org; Fri, 17 May 2019 00:51:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRUqV-0007mu-GN for qemu-devel@nongnu.org; Fri, 17 May 2019 00:51:52 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:43325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRUqV-0007mG-8C for qemu-devel@nongnu.org; Fri, 17 May 2019 00:51:51 -0400 Received: by mail-pl1-x644.google.com with SMTP id n8so2723464plp.10 for ; Thu, 16 May 2019 21:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1XbDcSxPxIwShmL7ibaMkqeCI/KNLPvufrTgWj8SAo0=; b=SScwKoIx/kcXy1Ic6vYoIld9cRBBwYHozJQl/0GrAdod/+DOryjq/+KrWGrQV9ADw7 VmJsPMEkjrlTKExw2TC7wmoaeW6IUlLbHPz7lvm3q6WDmJov8HQ+mISAzzoBpyNIV6KL gGHUlOxEgC8zCvDoNNHbFRKKwzVacKcY59RsNBcYqOfcv67PhS3hlZZQEl0bqpx+nUNH D7aBBO/bPNdY0gJzWHz2ljsUg1DYy7WJRajRsTgq/pcCfaQqmCEpktnZNZqQIeF9Ji5M E4W3sl5VVD7EwVXx1ynrmFH9yQPlKivyCTiO8hQazvG2xeDchzy3xPVWdBXnuhfhsPf/ ommA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1XbDcSxPxIwShmL7ibaMkqeCI/KNLPvufrTgWj8SAo0=; b=BtOhlx+VVqaF+dtO1p8szyZJ1roj666nIz+/5ilRqsvdaS9dOYAxXrrUWq5sKeBEsG fC0+WDC+ozr0sZj9YD/bV31C8eI79pEBflVHxOkTZcHorWBePUjWfv0rwnJA0GKKE+rw gW32YZslF+OlZmrkkFDeUPrlgtMKMnwFAg/omkD/Kph/T8rbDlEB3hmdY4mvur2e5AEE npJLZa/zGp7+IY7EXREBpU4VnZxpPp0eDAZ7l1QNVgQf+5AoFSOB1rlHgCOWUMAr0nEV 5GL9DYlzDvTvih33hfao5DGd3Fu7pwxyuHWbbEnqmDfLSCkKQJegyOk97UAwXGnFfEET +7Xg== X-Gm-Message-State: APjAAAXqSJwaJaKMJxD1q8tY3tGoYgM4hV9Zx5UBtjOOo6LDfDvErXXp 2iAHrmMMBjXE4g3JgGAQtYeBIRLXePs= X-Received: by 2002:a17:902:20e2:: with SMTP id v31mr55147240plg.138.1558068709932; Thu, 16 May 2019 21:51:49 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id 132sm7709625pga.79.2019.05.16.21.51.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 21:51:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 16 May 2019 21:51:33 -0700 Message-Id: <20190517045136.3509-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190517045136.3509-1-richard.henderson@linaro.org> References: <20190517045136.3509-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::644 Subject: [Qemu-devel] [PATCH v14 10/13] hw/registerfields.h: Add 8bit and 16bit register macros 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: philmd@redhat.com, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Yoshinori Sato Some RX peripheral using 8bit and 16bit registers. Added 8bit and 16bit APIs. Signed-off-by: Yoshinori Sato Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190516055244.95559-11-ysato@users.sourceforge.jp> Signed-off-by: Richard Henderson --- include/hw/registerfields.h | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/include/hw/registerfields.h b/include/hw/registerfields.h index 2659a58737..a0bb0654d6 100644 --- a/include/hw/registerfields.h +++ b/include/hw/registerfields.h @@ -22,6 +22,14 @@ enum { A_ ## reg = (addr) }; \ enum { R_ ## reg = (addr) / 4 }; +#define REG8(reg, addr) \ + enum { A_ ## reg = (addr) }; \ + enum { R_ ## reg = (addr) }; + +#define REG16(reg, addr) \ + enum { A_ ## reg = (addr) }; \ + enum { R_ ## reg = (addr) / 2 }; + /* Define SHIFT, LENGTH and MASK constants for a field within a register */ /* This macro will define R_FOO_BAR_MASK, R_FOO_BAR_SHIFT and R_FOO_BAR_LENGTH @@ -34,6 +42,12 @@ MAKE_64BIT_MASK(shift, length)}; /* Extract a field from a register */ +#define FIELD_EX8(storage, reg, field) \ + extract8((storage), R_ ## reg ## _ ## field ## _SHIFT, \ + R_ ## reg ## _ ## field ## _LENGTH) +#define FIELD_EX16(storage, reg, field) \ + extract16((storage), R_ ## reg ## _ ## field ## _SHIFT, \ + R_ ## reg ## _ ## field ## _LENGTH) #define FIELD_EX32(storage, reg, field) \ extract32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ R_ ## reg ## _ ## field ## _LENGTH) @@ -49,6 +63,22 @@ * Assigning values larger then the target field will result in * compilation warnings. */ +#define FIELD_DP8(storage, reg, field, val) ({ \ + struct { \ + unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ + } v = { .v = val }; \ + uint8_t d; \ + d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ + R_ ## reg ## _ ## field ## _LENGTH, v.v); \ + d; }) +#define FIELD_DP16(storage, reg, field, val) ({ \ + struct { \ + unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ + } v = { .v = val }; \ + uint16_t d; \ + d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ + R_ ## reg ## _ ## field ## _LENGTH, v.v); \ + d; }) #define FIELD_DP32(storage, reg, field, val) ({ \ struct { \ unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ @@ -57,7 +87,7 @@ d = deposit32((storage), R_ ## reg ## _ ## field ## _SHIFT, \ R_ ## reg ## _ ## field ## _LENGTH, v.v); \ d; }) -#define FIELD_DP64(storage, reg, field, val) ({ \ +#define FIELD_DP64(storage, reg, field, val) ({ \ struct { \ unsigned int v:R_ ## reg ## _ ## field ## _LENGTH; \ } v = { .v = val }; \