From patchwork Fri Oct 13 07:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manos Pitsidianakis X-Patchwork-Id: 13420240 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E10CDC41513 for ; Fri, 13 Oct 2023 07:52:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrCxS-00072v-So; Fri, 13 Oct 2023 03:51:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrCwq-0005gD-JF for qemu-devel@nongnu.org; Fri, 13 Oct 2023 03:51:04 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qrCwc-0004r8-7w for qemu-devel@nongnu.org; Fri, 13 Oct 2023 03:51:04 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32d849cc152so1730344f8f.1 for ; Fri, 13 Oct 2023 00:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697183448; x=1697788248; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hrUsD3RhfEePTarbxbhkSuBWQuSjk/BmdC/mQSx7OjQ=; b=klZoSw0ARtrToaAopFabgKQ5D+jijZqjGeaKirFFCLq186FkbicTgfNsSCiCokNc8n 2FuuYC+T4bD3Cdv+76UmfPyld8uHqd5lTEqAgnovHbu5IwkDQhiIRY4eX+aazB8WZwHB mzhe33OVe46omrREgjtdCnPABGFtIikE5gw8XbLoVSoUEQpfOTjDENG+3aoZH0VIw/YT Dif8WF8CnYW6XoifNoQE0/phZf1NS+5D8D2cnT2kRyzmRxNjTtI5kiJp5/3HXIqi/H5B Aeo1vx9Vlxep6BPGc+S0CPsPtb3Yk3kZUd6/YYHcHZGPSr3wD18G41+UtMeqFQGPkBo8 z1Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697183448; x=1697788248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hrUsD3RhfEePTarbxbhkSuBWQuSjk/BmdC/mQSx7OjQ=; b=dpnCGVg8lqRd5qCPDnhh+pFEk3o/+cQdiGbYZAPzWbo1tSgUjwrh4Gx+eRD3gWlu9a w/pmgRzgYw6u31oONYlaH7Vc4ml2oes7Ex/apq16VuCoXGIJyD+FvcMyMKewMaWSHZ/T cdZ9Hk4Gj4YK33/K7/pewmr9Kf4BAJ2tEp5Oj0wOK+u4BWPXmrUV6FL57ujyO/X9M0n4 s6IL5yxdzVtE8muVOLB2YfkRkWSvuaucfKIP1JMIYAVzbXWuK+aLg8SO88R6WZ4Me1pE Y9kPH4aMPwhEYzmY2qcedPbmwUxXWZV+F0+E07gmPBSBnRcX0kpSYZpAFTDD8dMbm7k5 ln1A== X-Gm-Message-State: AOJu0Yz0UcEk54fHVIeFzqeywtL0yhBNeind9yMhVYutsfKGYVDYYEfz YajuP0m/Be2lP8acJhAYB1ONDMIiIpenX6YoJbU= X-Google-Smtp-Source: AGHT+IHnZ4WQPR8xEEOuKm3fMSQTeJh5TjzZlJRY55yKwbJ6UDj+XItWy6CfTlODH9F3uU/s7GXQdA== X-Received: by 2002:adf:fa03:0:b0:32d:9b3d:d61 with SMTP id m3-20020adffa03000000b0032d9b3d0d61mr850246wrr.10.1697183448245; Fri, 13 Oct 2023 00:50:48 -0700 (PDT) Received: from localhost.localdomain (adsl-170.109.242.226.tellas.gr. [109.242.226.170]) by smtp.gmail.com with ESMTPSA id m8-20020adfa3c8000000b0032d7fde2d3csm7990663wrb.79.2023.10.13.00.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 00:50:47 -0700 (PDT) From: Emmanouil Pitsidianakis To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org Cc: Emmanouil Pitsidianakis , Max Filippov Subject: [RFC PATCH 31/78] target/xtensa: add fallthrough pseudo-keyword Date: Fri, 13 Oct 2023 10:47:35 +0300 Message-Id: <390bd7d2c57e0ab48dad854c7dd44037a3fe31c4.1697183082.git.manos.pitsidianakis@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wr1-x429.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org In preparation of raising -Wimplicit-fallthrough to 5, replace all fall-through comments with the fallthrough attribute pseudo-keyword. Signed-off-by: Emmanouil Pitsidianakis --- target/xtensa/op_helper.c | 8 ++++---- target/xtensa/translate.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index 7bb8cd6726..69b72f474d 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -73,58 +73,58 @@ void HELPER(update_ccompare)(CPUXtensaState *env, uint32_t i) /*! * Check vaddr accessibility/cache attributes and raise an exception if * specified by the ATOMCTL SR. * * Note: local memory exclusion is not implemented */ void HELPER(check_atomctl)(CPUXtensaState *env, uint32_t pc, uint32_t vaddr) { uint32_t paddr, page_size, access; uint32_t atomctl = env->sregs[ATOMCTL]; int rc = xtensa_get_physical_addr(env, true, vaddr, 1, xtensa_get_cring(env), &paddr, &page_size, &access); /* * s32c1i never causes LOAD_PROHIBITED_CAUSE exceptions, * see opcode description in the ISA */ if (rc == 0 && (access & (PAGE_READ | PAGE_WRITE)) != (PAGE_READ | PAGE_WRITE)) { rc = STORE_PROHIBITED_CAUSE; } if (rc) { HELPER(exception_cause_vaddr)(env, pc, rc, vaddr); } /* * When data cache is not configured use ATOMCTL bypass field. * See ISA, 4.3.12.4 The Atomic Operation Control Register (ATOMCTL) * under the Conditional Store Option. */ if (!xtensa_option_enabled(env->config, XTENSA_OPTION_DCACHE)) { access = PAGE_CACHE_BYPASS; } switch (access & PAGE_CACHE_MASK) { case PAGE_CACHE_WB: atomctl >>= 2; - /* fall through */ + fallthrough; case PAGE_CACHE_WT: atomctl >>= 2; - /* fall through */ + fallthrough; case PAGE_CACHE_BYPASS: if ((atomctl & 0x3) == 0) { HELPER(exception_cause_vaddr)(env, pc, LOAD_STORE_ERROR_CAUSE, vaddr); } break; case PAGE_CACHE_ISOLATE: HELPER(exception_cause_vaddr)(env, pc, LOAD_STORE_ERROR_CAUSE, vaddr); break; default: break; } } @@ -132,41 +132,41 @@ void HELPER(check_atomctl)(CPUXtensaState *env, uint32_t pc, uint32_t vaddr) void HELPER(check_exclusive)(CPUXtensaState *env, uint32_t pc, uint32_t vaddr, uint32_t is_write) { uint32_t paddr, page_size, access; uint32_t atomctl = env->sregs[ATOMCTL]; int rc = xtensa_get_physical_addr(env, true, vaddr, is_write, xtensa_get_cring(env), &paddr, &page_size, &access); if (rc) { HELPER(exception_cause_vaddr)(env, pc, rc, vaddr); } /* When data cache is not configured use ATOMCTL bypass field. */ if (!xtensa_option_enabled(env->config, XTENSA_OPTION_DCACHE)) { access = PAGE_CACHE_BYPASS; } switch (access & PAGE_CACHE_MASK) { case PAGE_CACHE_WB: atomctl >>= 2; - /* fall through */ + fallthrough; case PAGE_CACHE_WT: atomctl >>= 2; - /* fall through */ + fallthrough; case PAGE_CACHE_BYPASS: if ((atomctl & 0x3) == 0) { HELPER(exception_cause_vaddr)(env, pc, EXCLUSIVE_ERROR_CAUSE, vaddr); } break; case PAGE_CACHE_ISOLATE: HELPER(exception_cause_vaddr)(env, pc, LOAD_STORE_ERROR_CAUSE, vaddr); break; default: break; } } diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 54bee7ddba..8ef940933c 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -795,24 +795,24 @@ again: static void opcode_add_resource(struct slot_prop *op, uint32_t resource, char direction, int index) { switch (direction) { case 'm': case 'i': assert(op->n_in < ARRAY_SIZE(op->in)); op->in[op->n_in].resource = resource; op->in[op->n_in].index = index; ++op->n_in; - /* fall through */ + fallthrough; case 'o': if (direction == 'm' || direction == 'o') { assert(op->n_out < ARRAY_SIZE(op->out)); op->out[op->n_out].resource = resource; op->out[op->n_out].index = index; ++op->n_out; } break; default: g_assert_not_reached(); } }