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.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 226EEC433ED for ; Mon, 5 Apr 2021 15:23:21 +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 86B3F610A5 for ; Mon, 5 Apr 2021 15:23:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86B3F610A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTR4R-0004td-Fq for qemu-devel@archiver.kernel.org; Mon, 05 Apr 2021 11:23:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTQwQ-0005oZ-J6 for qemu-devel@nongnu.org; Mon, 05 Apr 2021 11:15:04 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:52914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTQwN-0000VR-O6 for qemu-devel@nongnu.org; Mon, 05 Apr 2021 11:15:02 -0400 Received: by mail-pj1-x1031.google.com with SMTP id ha17so6241128pjb.2 for ; Mon, 05 Apr 2021 08:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=5S8sJ3awaoB1kK8QVfv6OAG4ACV/oCzI6SBf2A8Ddms=; b=L3mNvCRoqJTCPISV+aT1fx7iULgLAgDBV9xUqgPmEOe7ltYulPXx9Pcx4ieZi6zlmF X7CjNANnCb+jVpEkTTr8QgaA76YWjeHTrsOKzbqNFzX5xDpqH+BPL7F1Tw0yxyOECiA2 lIiVoahSOhH4pRswL4i0FvK18bV9MMjhCujOrbJWOVTkZV/euxuZ6EF76wmIO5aFD73J 5GxCmxMMu5bIdIsToDdp4GvQJUmNBh5sRns46POyqiUpKfpiIS5whB+o7XlxIZSBW76H M+UYcQBgFBbjzD0piAH/qLTeIJyTmbs3trkUldYMxEoEwFLaInstE7YB+1ZqWtkkqXEs gzrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=5S8sJ3awaoB1kK8QVfv6OAG4ACV/oCzI6SBf2A8Ddms=; b=iVTH6DBKuG/0+dBXDCDkULPRsDfET7Ee+V+Z9DzpioJE7ZzM/nwtQvi5JzskIuTx6Y hmWNVW1ijMlivgYgdvMDV4YL0/tAHrA0eJagbZFUHH3fYLzGgzsCbFVQadLoiurutjHQ c3PGQlaL0/wfXllK/7T5ZNP7an71ATjkRu0OeSZQHSwy+NIeifvlc99U/WOQXMnfzPAL 5sTtKBgngIHBzwVn9gBw6BnvDLCW863l154z4jcJI6Sih+8168o29fpUlr3oZ6mWfrYr vR6lMFwd5WJcccTeIdgNNM9IT8BnEs12AzA/9q27JjjLIMhAMNNS3DsktUykcUO8pOJw 2waw== X-Gm-Message-State: AOAM5321SlK49B850Ywrrnk8g1/r10+pI9Z1UtEZpR4G7Cu2C+ufR5W1 e657Eh6cM0t34EJepDBMkiOhtw== X-Google-Smtp-Source: ABdhPJwpVktkWjUQJ3c/0p7UQght5xIWp42F2S7wna/2cYiJp/oyTk7wN0M70x5E9jN3T8IyvkLsPA== X-Received: by 2002:a17:902:8693:b029:e8:fdd4:361c with SMTP id g19-20020a1709028693b02900e8fdd4361cmr6610676plo.32.1617635698143; Mon, 05 Apr 2021 08:14:58 -0700 (PDT) Received: from [192.168.73.67] (50-200-230-211-static.hfc.comcastbusiness.net. [50.200.230.211]) by smtp.gmail.com with ESMTPSA id a8sm16515790pfk.138.2021.04.05.08.14.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Apr 2021 08:14:57 -0700 (PDT) Subject: Re: [PATCH v1 5/8] target/riscv: Remove the hardcoded SATP_MODE macro To: Alistair Francis , qemu-devel@nongnu.org, qemu-riscv@nongnu.org References: From: Richard Henderson Message-ID: Date: Mon, 5 Apr 2021 08:14:55 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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, NICE_REPLY_A=-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: alistair23@gmail.com, bmeng.cn@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 4/2/21 1:02 PM, Alistair Francis wrote: > @@ -622,9 +632,15 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address, > CPUState *cs = env_cpu(env); > int page_fault_exceptions; > if (first_stage) { > - page_fault_exceptions = > - get_field(env->satp, SATP_MODE) != VM_1_10_MBARE && > - !pmp_violation; > + if (riscv_cpu_is_32bit(env)) { > + page_fault_exceptions = > + get_field(env->satp, SATP32_MODE) != VM_1_10_MBARE && > + !pmp_violation; > + } else { > + page_fault_exceptions = > + get_field(env->satp, SATP64_MODE) != VM_1_10_MBARE && > + !pmp_violation; > + } Similar commentary wrt HGATP_MODE. > } else { > if (riscv_cpu_is_32bit(env)) { > page_fault_exceptions = > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index 6052b2d6e9..b0ebaa029e 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -930,16 +930,31 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val) > if (!riscv_feature(env, RISCV_FEATURE_MMU)) { > return 0; > } > - if (validate_vm(env, get_field(val, SATP_MODE)) && > - ((val ^ env->satp) & (SATP_MODE | SATP_ASID | SATP_PPN))) > - { > - if (env->priv == PRV_S && get_field(env->mstatus, MSTATUS_TVM)) { > - return -RISCV_EXCP_ILLEGAL_INST; > - } else { > - if ((val ^ env->satp) & SATP_ASID) { > - tlb_flush(env_cpu(env)); > + if (riscv_cpu_is_32bit(env)) { > + if (validate_vm(env, get_field(val, SATP32_MODE)) && > + ((val ^ env->satp) & (SATP32_MODE | SATP32_ASID | SATP32_PPN))) > + { > + if (env->priv == PRV_S && get_field(env->mstatus, MSTATUS_TVM)) { > + return -RISCV_EXCP_ILLEGAL_INST; > + } else { > + if ((val ^ env->satp) & SATP32_ASID) { > + tlb_flush(env_cpu(env)); > + } > + env->satp = val; > + } > + } I think you really don't want to be duplicating this code. Just select the constants into local variables. r~