From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61723C433F5 for ; Thu, 16 Sep 2021 04:44:15 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BCE6761186 for ; Thu, 16 Sep 2021 04:44:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BCE6761186 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQjFt-0004yV-Lm for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 00:44:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQjEi-0004FY-Ad; Thu, 16 Sep 2021 00:43:00 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]:35369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQjEc-0002wX-0q; Thu, 16 Sep 2021 00:42:58 -0400 Received: by mail-il1-x131.google.com with SMTP id h29so5408902ila.2; Wed, 15 Sep 2021 21:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yskA2MtkTEYh0zmVCGh8Lnad2w1kA63qb6ufLgBYLC0=; b=nUz4ooff+FKL2UhDqoQD3jea838UsxUC7SHV5Y/B+oJUUGbnzeXqZsL0dXVpvWu5Rs 0bkC8pt7o1WCQk4cLaMIK4RdTUyWpm6rxRpT4Ekn3jpF1LQVjk0Ax78O396lXPjnzduE zgMSP+zc3zVsdDfpnQ+YGI/Yqo/Ib2GZfcATgglYFIYpLBXhuKIt+zwOLMGiRCxBs+yT VRhw2YP5/BIQkNIy7eXZx/UOZFxqF/reFoTVRu/qvUz5ODItcyp12ndCOkZSwgE2SA9u 2JQi29nIwL0zgGUSa8JvNTGQvLhP8zFMu7633WcO/Dl4+hJweoEFPQXB9xwucEXAxtIo 3LFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yskA2MtkTEYh0zmVCGh8Lnad2w1kA63qb6ufLgBYLC0=; b=ChSb13irGG4oET6f4mrk43MW4zPUVf+Jq4UF1TUYdKEGLVILwHovYJXxXinXTet1dS OZ+L0X+6UFatyRzMJMsYlYEp0F5nYwBqFiab9/rwbPaCD1Z1xjEOg/0GPdOvf2NSsW8c FZPmEaoLIV/r4+XkZgqQgEqtziCbHLke/ffx3bzS1wuhKQ800DafnO+OktjGUn10h3n7 R4PRr9gSim7wKGhBEAoAxJvQnPJH5aGkzcRoe17hzSCPYWC6Ql9Ux4yfRz67ms3ALNuz ayhHYHjNsnQGFIaZiOvILkw0bVEvuatbWWDrDdptQVJuuFm1DiuKQDVZGdG+RmuyPBRq sx7w== X-Gm-Message-State: AOAM532FyGqSfrvcOXJBzYQwYfIYyUTlVSdlvLZ34c5G+H428IzRrCpk rjCEfMJ+dAYyIdavOcEV8RY0A+nn6nNQBd7vhSU= X-Google-Smtp-Source: ABdhPJxL5P5uDCslJqe3qkvedDCf60RKCKk3zNN1qyKguEnfZkRs+AUG7clsAHeoJgx1xU8kiQ/DYVU7dxogMX8iG0k= X-Received: by 2002:a05:6e02:1088:: with SMTP id r8mr2581845ilj.46.1631767371534; Wed, 15 Sep 2021 21:42:51 -0700 (PDT) MIME-Version: 1.0 References: <20210915084601.24304-1-bmeng.cn@gmail.com> In-Reply-To: <20210915084601.24304-1-bmeng.cn@gmail.com> From: Alistair Francis Date: Thu, 16 Sep 2021 14:42:24 +1000 Message-ID: Subject: Re: [PATCH] target/riscv: csr: Rename HCOUNTEREN_CY and friends To: Bin Meng Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=alistair23@gmail.com; helo=mail-il1-x131.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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: "open list:RISC-V" , Alistair Francis , "qemu-devel@nongnu.org Developers" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Sep 15, 2021 at 6:47 PM Bin Meng wrote: > > The macro name HCOUNTEREN_CY suggests it is for CSR HCOUNTEREN, but > in fact it applies to M-mode and S-mode CSR too. Rename these macros > to have the COUNTEREN_ prefix. > > Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Alistair > --- > > target/riscv/cpu_bits.h | 8 ++++---- > target/riscv/csr.c | 24 ++++++++++++------------ > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h > index 7330ff5a19..34564d367c 100644 > --- a/target/riscv/cpu_bits.h > +++ b/target/riscv/cpu_bits.h > @@ -397,10 +397,10 @@ > #define HSTATUS32_WPRI 0xFF8FF87E > #define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL > > -#define HCOUNTEREN_CY (1 << 0) > -#define HCOUNTEREN_TM (1 << 1) > -#define HCOUNTEREN_IR (1 << 2) > -#define HCOUNTEREN_HPM3 (1 << 3) > +#define COUNTEREN_CY (1 << 0) > +#define COUNTEREN_TM (1 << 1) > +#define COUNTEREN_IR (1 << 2) > +#define COUNTEREN_HPM3 (1 << 3) > > /* Privilege modes */ > #define PRV_U 0 > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index 50a2c3a3b4..1cd34a6453 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -71,20 +71,20 @@ static RISCVException ctr(CPURISCVState *env, int csrno) > if (riscv_cpu_virt_enabled(env)) { > switch (csrno) { > case CSR_CYCLE: > - if (!get_field(env->hcounteren, HCOUNTEREN_CY) && > - get_field(env->mcounteren, HCOUNTEREN_CY)) { > + if (!get_field(env->hcounteren, COUNTEREN_CY) && > + get_field(env->mcounteren, COUNTEREN_CY)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > case CSR_TIME: > - if (!get_field(env->hcounteren, HCOUNTEREN_TM) && > - get_field(env->mcounteren, HCOUNTEREN_TM)) { > + if (!get_field(env->hcounteren, COUNTEREN_TM) && > + get_field(env->mcounteren, COUNTEREN_TM)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > case CSR_INSTRET: > - if (!get_field(env->hcounteren, HCOUNTEREN_IR) && > - get_field(env->mcounteren, HCOUNTEREN_IR)) { > + if (!get_field(env->hcounteren, COUNTEREN_IR) && > + get_field(env->mcounteren, COUNTEREN_IR)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > @@ -98,20 +98,20 @@ static RISCVException ctr(CPURISCVState *env, int csrno) > if (riscv_cpu_is_32bit(env)) { > switch (csrno) { > case CSR_CYCLEH: > - if (!get_field(env->hcounteren, HCOUNTEREN_CY) && > - get_field(env->mcounteren, HCOUNTEREN_CY)) { > + if (!get_field(env->hcounteren, COUNTEREN_CY) && > + get_field(env->mcounteren, COUNTEREN_CY)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > case CSR_TIMEH: > - if (!get_field(env->hcounteren, HCOUNTEREN_TM) && > - get_field(env->mcounteren, HCOUNTEREN_TM)) { > + if (!get_field(env->hcounteren, COUNTEREN_TM) && > + get_field(env->mcounteren, COUNTEREN_TM)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > case CSR_INSTRETH: > - if (!get_field(env->hcounteren, HCOUNTEREN_IR) && > - get_field(env->mcounteren, HCOUNTEREN_IR)) { > + if (!get_field(env->hcounteren, COUNTEREN_IR) && > + get_field(env->mcounteren, COUNTEREN_IR)) { > return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; > } > break; > -- > 2.25.1 > >