From patchwork Thu May 5 09:11:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 569939 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp617906mal; Thu, 5 May 2022 03:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkz7wIFo7dkfLRttMGD+ekWOacuNdFi3z7BrMosFfNekCNkl+Q4/EKbGDztIXPQkI3TJRE X-Received: by 2002:a05:620a:2981:b0:69f:8a4e:8ba with SMTP id r1-20020a05620a298100b0069f8a4e08bamr19303140qkp.353.1651745605401; Thu, 05 May 2022 03:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651745605; cv=none; d=google.com; s=arc-20160816; b=wPkmZHcBCu6MV7qnnSdR/d9fe19Lc+l608oWLw15fMOsIuttk9mNSMwlXnjN10ag2i Sn4zBEKdEdMbLy0O+X+2YlJ0rVxz+CMZecmhtYWaDmhKQr7u7tSd9GpgKcenE8LlAVHc J2YFHzjSIJE7xSWGLQae7qqUYGQgfE3YWTV+ZWA8LBh+8nJntQAMUrg2g5MsCopmBWJ8 FcqwslPbzkWuy0Cpv9FIiaJilF4MGlEmjVh8aDwQImKOqnXaxmVTcuBa24RAanXO7465 Q9auPP+UKeb1fAAU5yA8jWe8Vqv7XJYnNrr7BejAqTumAckRcR8mUnsjG6aHMUI+TOPr J/tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=juGYeCU9KAGWm+sx2XQ7zrm8YPa+MyJD56BKOagRgGE=; b=fgdtatn+ZAjuy7WgDw+/lgun43gmsxrQGucfTpVkclWGkF0VYoXQO32/i+Yz0Jjt+V iLxbIsDxV2y0CCWZQkCvnVl+I6a7RdYH0LWlvBecR9d68LY1dSABQorgP/tqe0lcQHkg epBhJ1TPA6wZBuhUUEwDfmN6QxWSCzjtE18SoqDu0MRAodxDLEV1n1/v2qPkKCwqauh5 A1tJ+FFYBcawTIZoyyrV1vnBK+qavP4kVcwR8Ilxr1NCMiX45rDHowM4A6Zi/pwRDE6j nXLQg748BhaLaIHfXd+AggKOzTOegMcs6oHtHWGMjiKz7wS7+zuk+8Oa4Z9TwcSuEyHz 5bRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CMQ+nGQn; 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 k18-20020a0cfa52000000b0045a8e55c33csi526036qvo.110.2022.05.05.03.13.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 03:13:25 -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=CMQ+nGQn; 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]:38958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmYU8-0007Jr-UE for patch@linaro.org; Thu, 05 May 2022 06:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmXWs-0005IX-7P for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:10 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmXWp-0003Dr-Rd for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:09 -0400 Received: by mail-wr1-x430.google.com with SMTP id c11so5216069wrn.8 for ; Thu, 05 May 2022 02:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=juGYeCU9KAGWm+sx2XQ7zrm8YPa+MyJD56BKOagRgGE=; b=CMQ+nGQnmb0Y0tUSUF36q4yJ8Bn4KLShAQP2aeEYkz9S23sEAri/VdwfuFTb2VtBDW hXKdN41Lx+ia6jEpkGEHMX2IwHvepJ5rbCAhOvmiIl1QkgZ/xVpp9/fbP6SIkiLPNrpU IsfDQy8ct/UrIsCpxDg5O96UQxleiQiNtXl37i7JUAU8HQ+HRPTCVX1joQi5vunM8obh RoaluQq9cdBL4TrZTWTPBe3a3gHETONI1MmsXFtrixbO5R44T4b7PRdSeTTF7Lpn9rTL expi3EZBgG8sfaJ4t+QTYwFsdsPxiZgVTetM8h3n78F9pnqFOpjDhLef72GOPr86QLvs aTYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=juGYeCU9KAGWm+sx2XQ7zrm8YPa+MyJD56BKOagRgGE=; b=eLB3wNCWLeWnkRXmV82P5oT698k+RpAZtpP2ixywdSP5Ije6zWGLgFaI4ItLMDaorE lzGrZNQ/y6Jl7/avejbOZATrSmeYJZubTcGvm4GkakIQaOci6e5bMfMZg8rxKXhCtOlh wMk2dzIFnS15sbT9wTKc8E2+E5rx6eyUfYypwm/ULyESAHACCwMt8/frM5hkQTUmioq6 1pXsXydbwJMMtxmV4TtvVY5RW3wMHeqmlyLzmJ7fWZmsl1OYXOMZ6v7H50o1dKbdyphr v8M92jizvbF5U4q49xC1mRjXrO5+h57TycEENv48xwRf/QXe+KCaedD2XAZa7EXJiXh+ 9f5Q== X-Gm-Message-State: AOAM532628cyifQ4/thk8LugzL+U3ZeL03gMflrEOHze6C13iAPtGS9s jF48xuSTHnToS0LHiwNEECGr69tSFM4WGw== X-Received: by 2002:a5d:4f05:0:b0:20a:dd25:5725 with SMTP id c5-20020a5d4f05000000b0020add255725mr19871135wru.546.1651741926926; Thu, 05 May 2022 02:12:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j14-20020adfe50e000000b0020c6a524fd5sm841612wrm.99.2022.05.05.02.12.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 02:12:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/23] target/arm: Reformat comments in add_cpreg_to_hashtable Date: Thu, 5 May 2022 10:11:43 +0100 Message-Id: <20220505091147.2657652-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220505091147.2657652-1-peter.maydell@linaro.org> References: <20220505091147.2657652-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Put the block comments into the current coding style. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20220501055028.646596-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index fa1e7bd462c..81612952f3a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8496,15 +8496,16 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) return cpu_list; } +/* + * Private utility function for define_one_arm_cp_reg_with_opaque(): + * add a single reginfo struct to the hash table. + */ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, void *opaque, CPState state, CPSecureState secstate, int crm, int opc1, int opc2, const char *name) { - /* Private utility function for define_one_arm_cp_reg_with_opaque(): - * add a single reginfo struct to the hash table. - */ uint32_t key; ARMCPRegInfo *r2; bool is64 = r->type & ARM_CP_64BIT; @@ -8568,7 +8569,8 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, isbanked = r->bank_fieldoffsets[0] && r->bank_fieldoffsets[1]; if (isbanked) { - /* Register is banked (using both entries in array). + /* + * Register is banked (using both entries in array). * Overwriting fieldoffset as the array is only used to define * banked registers but later only fieldoffset is used. */ @@ -8577,7 +8579,8 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, if (state == ARM_CP_STATE_AA32) { if (isbanked) { - /* If the register is banked then we don't need to migrate or + /* + * If the register is banked then we don't need to migrate or * reset the 32-bit instance in certain cases: * * 1) If the register has both 32-bit and 64-bit instances then we @@ -8592,8 +8595,9 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, r2->type |= ARM_CP_ALIAS; } } else if ((secstate != r->secure) && !ns) { - /* The register is not banked so we only want to allow migration of - * the non-secure instance. + /* + * The register is not banked so we only want to allow migration + * of the non-secure instance. */ r2->type |= ARM_CP_ALIAS; } @@ -8607,7 +8611,8 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, } } - /* By convention, for wildcarded registers only the first + /* + * By convention, for wildcarded registers only the first * entry is used for migration; the others are marked as * ALIAS so we don't try to transfer the register * multiple times. Special registers (ie NOP/WFI) are @@ -8622,7 +8627,8 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, r2->type |= ARM_CP_ALIAS | ARM_CP_NO_GDB; } - /* Check that raw accesses are either forbidden or handled. Note that + /* + * Check that raw accesses are either forbidden or handled. Note that * we can't assert this earlier because the setup of fieldoffset for * banked registers has to be done first. */