From patchwork Wed May 26 23:46:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 448323 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2b0d:0:0:0:0 with SMTP id gc13csp6045479ejc; Wed, 26 May 2021 16:51:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq4USlTK7Im7+H8ZgiAzjnhtI+REAoa9ObPlwkNAO0ZjVwxjFfE70VPVUUXN2DwCkOnBQC X-Received: by 2002:a92:d4c7:: with SMTP id o7mr716627ilm.130.1622073119266; Wed, 26 May 2021 16:51:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622073119; cv=none; d=google.com; s=arc-20160816; b=SjeYrCJbl0a3IU9aHfRdqh+vMT9STqhmPc6G1JCHVLc+vNjBjmQtE9sjUm9gTueorS zu+1ZWYx43vad5FxWksQ1fSeAFsGC95UY5LsTh9J0f4LJ7m9/7QJ5vSDVGYxZ79ptwXO PuJxfrMfz/VCxM5pDirnghpxs66pOlfAq77o6imKkQGeyvS/zMmwZVaeRG/j4Xex97VP H2/0VMY6kgXT5SDPSPlSqbAPOeDPK8JLwvfFqG/8hGKXaaFLCm5xR7+OPxJoig16DGzS x/l929dzqmlN3uVrsV3xr4YFYwXhDPe07SrHgECLW1WA5LGLiM5dVjSDEQ1as8YqpTgv 2Sdg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=GwFPfaEmVEpOzuuThVVY+CbHhMoholSixs381w2V9KE=; b=D03Fx/JYaAM+wn1oQMsQO5hNavLSVLmnGf7Jt7obx3CDU9ySgE3WGBtbRRJAqzIEnZ Pl2u7oMDyFVtt2ij0X91W2VuLehxQzPXHCZiyzKY0pIeAlLqL9PF7YTM9AuSd5dHMhTZ QrCJ4RkrnjnXTMEWqs0+P4kqk0BWIfXXhVwn5oIieRJ8VxJAK6rgjOZoNHI/RBx6JZc9 cczZQHBCD2oA9zupT3BN5vlNeldXrh8QESBvGlVtfU34/Iix0JfzIW1WzFfj+K3MYwCu jRUccd58b9bc4cTILUmdVi/6u2jmEFOzXuSDaJVeGFY8s0RPARDJbbSlRme4iV5IjLg4 T+/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4ruGN8E; 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=pass (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 d70si717579iog.4.2021.05.26.16.51.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 May 2021 16:51:59 -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=pass header.i=@linaro.org header.s=google header.b=Y4ruGN8E; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm3Jd-0003Ok-W4 for patch@linaro.org; Wed, 26 May 2021 19:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm3FI-0005c3-SF for qemu-devel@nongnu.org; Wed, 26 May 2021 19:47:29 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:45992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lm3F9-0004SU-Mt for qemu-devel@nongnu.org; Wed, 26 May 2021 19:47:28 -0400 Received: by mail-pl1-x636.google.com with SMTP id s4so1409285plg.12 for ; Wed, 26 May 2021 16:47:17 -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=GwFPfaEmVEpOzuuThVVY+CbHhMoholSixs381w2V9KE=; b=Y4ruGN8EFpTFVXiT0gmCtMSfPq8HSfelI7epdpjobZuUwkWtrbR2H1K758tHNSU35j Sz2mmBmf5s0bRrdP6yyomAwF3KBfexQMbCxw02mLTuahY6sSn58F/NOh1H3AHWsSNtq4 hmWPCGhhxGndF2uDd1rMnTpqbauyxRrWI5LM+TDpoUfHlBlD9YatW/eR7tsW4XWwl3mv xgiwss3fO5tsPLLs8GQr2g3mvIJTkZt96TVLGfHcw5vAxA5R61KM6gJPPgJzhUV1zeOM g1l5rxlTQR2MzJOaXfaTQBetySkJ+fwhHb9TYGflj+02s8rVMbzsxYl1Ow28GehanfTu 5WaQ== 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=GwFPfaEmVEpOzuuThVVY+CbHhMoholSixs381w2V9KE=; b=tAk/iDV+SpIwzF1oVHU/PmyKUnc8xKehfMksx1D1Vlk71teh4mYb0HrPqMh7rXCPn8 5D6Ck49VkBef5qaQYzGV5Cajd6wknJrNOWsW12/Kwg708wxoVdrAq6/Ev+y2YPJHZ/W3 Qy6ox9wInOhMm6ff7PJPQUXT51zb3demc7zhDyqtj0ESdo/4FYyitJbNqzM5IDqDP7BB lEmcrLehpynuYcfBy7KH6BnL9xKTYc2qEnW/DN0ANFN3Ti2wvR8FbCz0QFM0HnQJCAyP hK6/Osvfb8qT3s2iFbq/uN5VwjeqfyfZCVmid0MT1ITA/Tm0dqzBDc6jw2IK/FvTpVaE Ovzw== X-Gm-Message-State: AOAM532h32bj36H/DTY/bzdKD6Hd9aLI7HPM6iadDYQZ8du5eKESvbcz o7XUMtyqVoesjaWvGm7ZKd9sux4GysUrDA== X-Received: by 2002:a17:90a:e2ca:: with SMTP id fr10mr6519973pjb.6.1622072837084; Wed, 26 May 2021 16:47:17 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id g13sm285355pfi.18.2021.05.26.16.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 16:47:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 05/31] exec/memory_ldst_cached: Use correct type size Date: Wed, 26 May 2021 16:46:44 -0700 Message-Id: <20210526234710.125396-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526234710.125396-1-richard.henderson@linaro.org> References: <20210526234710.125396-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Use uint16_t for (unsigned) 16-bit word. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210518183655.1711377-6-philmd@redhat.com> Signed-off-by: Richard Henderson --- include/exec/memory_ldst_cached.h.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ldst_cached.h.inc index c33449d0cd..d7834f852c 100644 --- a/include/exec/memory_ldst_cached.h.inc +++ b/include/exec/memory_ldst_cached.h.inc @@ -24,7 +24,7 @@ #define LD_P(size) \ glue(glue(ld, size), glue(ENDIANNESS, _p)) -static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache, +static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache, hwaddr addr, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 2 <= cache->len - addr); @@ -72,7 +72,7 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache, glue(glue(st, size), glue(ENDIANNESS, _p)) static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) { assert(addr < cache->len && 2 <= cache->len - addr); if (likely(cache->ptr)) {