From patchwork Sun Feb 27 18:21:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546440 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2124526imf; Sun, 27 Feb 2022 10:22:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCZc2CBeEap4fUjBlAcmEki8sK6bqHJ4BvOkNhHMjPOEl3Ov2abHRVWhfqV9GYCZ6Zkl0Z X-Received: by 2002:a25:b8f:0:b0:61d:ccd3:db32 with SMTP id 137-20020a250b8f000000b0061dccd3db32mr15534984ybl.7.1645986149183; Sun, 27 Feb 2022 10:22:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986149; cv=none; d=google.com; s=arc-20160816; b=SXPIldbg18X/WE358fAOvhw0UoTdrYFo/YVvSzYAY5dtsw8eXxbAB6QlR7Kwahhmfk fv6u8Mf4vZXefdA4k2gScs4Nkua85Hr94M0u15S3oshpqXDRpStsB8DoiYUYK2flSpw0 Ynu0rR9Udpq5SMxGzAWHM9zkaEadlm7chnHsXl2JZN2FSK8HLimlk/Sif3DFNMugi82j fbwUiJbXTb35kQ/1w+pduTSRcU1c/nKKKC4BaVzOujGx5hcUJ24UhGFkfH3gzgnrCRuD Z77U8tMfVTgYI217E/xtVtlaDrnNTQ9WeW9hieruPvSSMON4h7hM3JWbmk90YzHRmdtV ZNVg== 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=JiLG8jrCqG2LmLZgkf4Aw8DjJEHnI6zkIpqp//BmyXY=; b=iIqwiXZCsBjHzAO3QUHjLqNN5DBThWDCJDG57Sbu2/c6U2ujfkuWUCSQzPKUFrzH+w VBveukU1Vybrful4hcbSBxNxrqPwAc2neAzipsii4OpIESKGSFLGf3Ji8wxWsoaExkAF s3E0X+q3G+6u6TlR8s8H+k3zoVc8j6PpLKJNww8+o+JexQMUsM9lKLuouOGcpc2RmxGo tplOmPFbJ7QbQwZKzJX7BTXmph81AqhgVX8d7Tt286xuJ/Wt81BnQM2N9psxZ4KWFzwC 6BGUVn4jjhpWHFlPRuOQkhq9Y3SrDbfUTpjN/+F706NkzeSxth3I+2Y1+dDd0gVaLS28 FgbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xEcX1c9F; 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 p123-20020a81b181000000b002d035ccfb1csi8012269ywh.448.2022.02.27.10.22.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:22:29 -0800 (PST) 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=xEcX1c9F; 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]:51102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOOBg-0002Z4-Kg for patch@linaro.org; Sun, 27 Feb 2022 13:22:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAo-0002Xq-5U for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:34 -0500 Received: from [2607:f8b0:4864:20::62d] (port=42729 helo=mail-pl1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAm-0007mY-J0 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:33 -0500 Received: by mail-pl1-x62d.google.com with SMTP id p17so8873012plo.9 for ; Sun, 27 Feb 2022 10:21:32 -0800 (PST) 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=JiLG8jrCqG2LmLZgkf4Aw8DjJEHnI6zkIpqp//BmyXY=; b=xEcX1c9FbjCwUu7YP+dvRzw4Q0NMLeAbx6ksgUendKQ0bRgTXNFRM21uVV4vw8okx7 yk/7cBQ9bqKXhQF/gnOkUchEHdA0RYTJTavPY6N89SJFkJVoL3aMdEmxLu5cAL4m2GOn P3DQ0nahXeSRHTjsLlvN0OUJgsGZVPhExZCGw0tC8JlCuGpJGk/EJsVNYjjJkMrLniVv SY7eCOYMOodDJuh0QvQQLK4aq8s1uQxAxdQIBjhTISWjvP55It7mEE9OIijAMloHy7g7 wrg+FeuJfQK0FbqCI5sC3NseG2ge1LAn/FO/1kOuq6srVLhQFtp8wd2Gt5v+9UgeLWF7 9klw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JiLG8jrCqG2LmLZgkf4Aw8DjJEHnI6zkIpqp//BmyXY=; b=dW3f5lwxO6CzL/gZLl/VonAvbaQ1x1XmJOskQYRv3KkX9+vUwgOaHITt7A5EK8jj62 BIJ7vRbL9dduiJAlgZT8JNStWU5aVMCwr7hCTI2bwlvkxRdVxWkdkLnp9xL/lQhPaL5U PYbRHLUOqic0yE8QuJwZl/c8ff2SvOeHs4Niy29NI9b4V/jg9fqbPTV/junjL/naoqOX Dm9dlAAa0y2arNZjjP8qMT+YJiv3B1ftjh/xtA4drN5/+3aDEw++syQWyQXcx7NiueTz 2uz0X+cslLPRroitvG+zdRR/0ib09BJ2D67oHivifjUk3rZBTuYebyNYdHG++eSoxpxs qN9g== X-Gm-Message-State: AOAM5309e/15bxqBJWAn+YcDq8tD0wdM1S/0/mB9+AFtEHfcTr914s2q jxMVOW9Qr4c1aLP6orISVr2ydOykmonWSQ== X-Received: by 2002:a17:902:b204:b0:14f:26a7:9f61 with SMTP id t4-20020a170902b20400b0014f26a79f61mr17025043plr.97.1645986091364; Sun, 27 Feb 2022 10:21:31 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/7] target/nios2: Remove mmu_read_debug Date: Sun, 27 Feb 2022 08:21:19 -1000 Message-Id: <20220227182125.21809-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This functionality can be had via plugins, if desired. In the meantime, it is unused code. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/nios2/helper.h | 1 - target/nios2/mmu.h | 1 - target/nios2/mmu.c | 20 -------------------- target/nios2/op_helper.c | 5 ----- target/nios2/translate.c | 17 ----------------- 5 files changed, 44 deletions(-) diff --git a/target/nios2/helper.h b/target/nios2/helper.h index 6c8f0b5b35..6d8eec1814 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -21,7 +21,6 @@ DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) #if !defined(CONFIG_USER_ONLY) -DEF_HELPER_2(mmu_read_debug, void, env, i32) DEF_HELPER_3(mmu_write, void, env, i32, i32) DEF_HELPER_1(check_interrupts, void, env) #endif diff --git a/target/nios2/mmu.h b/target/nios2/mmu.h index 4f46fbb82e..b7785b46c0 100644 --- a/target/nios2/mmu.h +++ b/target/nios2/mmu.h @@ -44,7 +44,6 @@ void mmu_flip_um(CPUNios2State *env, unsigned int um); unsigned int mmu_translate(CPUNios2State *env, Nios2MMULookup *lu, target_ulong vaddr, int rw, int mmu_idx); -void mmu_read_debug(CPUNios2State *env, uint32_t rn); void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v); void mmu_init(CPUNios2State *env); diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 2545c06761..5616c39d54 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -35,26 +35,6 @@ #define MMU_LOG(x) #endif -void mmu_read_debug(CPUNios2State *env, uint32_t rn) -{ - switch (rn) { - case CR_TLBACC: - MMU_LOG(qemu_log("TLBACC READ %08X\n", env->regs[rn])); - break; - - case CR_TLBMISC: - MMU_LOG(qemu_log("TLBMISC READ %08X\n", env->regs[rn])); - break; - - case CR_PTEADDR: - MMU_LOG(qemu_log("PTEADDR READ %08X\n", env->regs[rn])); - break; - - default: - break; - } -} - /* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, Nios2MMULookup *lu, diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index a59003855a..61fc4dc903 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -26,11 +26,6 @@ #include "qemu/main-loop.h" #if !defined(CONFIG_USER_ONLY) -void helper_mmu_read_debug(CPUNios2State *env, uint32_t rn) -{ - mmu_read_debug(env, rn); -} - void helper_mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) { mmu_write(env, rn, v); diff --git a/target/nios2/translate.c b/target/nios2/translate.c index f9abc2fdd2..194c8ebafd 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -448,23 +448,6 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) gen_check_supervisor(dc); switch (instr.imm5 + CR_BASE) { - case CR_PTEADDR: - case CR_TLBACC: - case CR_TLBMISC: - { -#if !defined(CONFIG_USER_ONLY) - if (likely(instr.c != R_ZERO)) { - tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]); -#ifdef DEBUG_MMU - TCGv_i32 tmp = tcg_const_i32(instr.imm5 + CR_BASE); - gen_helper_mmu_read_debug(cpu_R[instr.c], cpu_env, tmp); - tcg_temp_free_i32(tmp); -#endif - } -#endif - break; - } - default: if (likely(instr.c != R_ZERO)) { tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]); From patchwork Sun Feb 27 18:21:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546442 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2124579imf; Sun, 27 Feb 2022 10:22:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4S2iC/VMuGzsIBCUHf3aMnCSIviqViQlpPNAvhAXOOiNDIaHN9LCj3gMg/41NJq/8yUIM X-Received: by 2002:a0d:fe81:0:b0:2d6:3ee6:ae2a with SMTP id o123-20020a0dfe81000000b002d63ee6ae2amr16514519ywf.280.1645986155317; Sun, 27 Feb 2022 10:22:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986155; cv=none; d=google.com; s=arc-20160816; b=xL0spRmIk6A2PH/VtWv6QApFwsD0da7cvXGek2K8VxAbv74uP3hkbES5bw8NSSEmbo qZaab9h7+qRlF/9gHFgveFNNJY0d7f1fe0l6+N0sN72wGwKOpuOD6nvBnaaJYIt+1n63 KJdJAa36FWjYfRan4p7U421GY4th1FmR2sYeIa08h7/0S4aVAXOveOaod9srnjh1FCYc /mEF4BpI/rKxGQiQmOEc7/Vwpcpo/bwmlpi5rwqMdNmNk/EwDJ62CYXTf7blrRQ7/k/l r8SjNVi84jkCE0QahK4YJ4V0HXdv34At+b50u8ckw0+/UaBRA6FF4+zM1ufzhoedC4hK OC6w== 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=kflgz17ggbMf4pl8VvhV/1GKguptkIzSWpU/iXQLGD0=; b=qGzgimvFGdjIkriuJ2CwvcI0qHmJfMD3ZJY/o/AuyjjO1IMW9D/i8zDft6M5wzNvZt gO3P6ULPmZFUHpaK4lCPr8LIVkOC8Faa1BOoFAeW5C/hzLv1gDT5ZG/lHpV2tQTDHKfH yJp8XkkVYg/9w5aetVKCU3XIGTJ2jnWfYRBxzrDWoij3PyuC9Ug6g0IBtbzxDBpCOGKZ 4BuJsWtWjUFfRTlQUVS+PHyIQBs5iHajGsqdqQoQxG5/WI2uJwudstG91MOEAdjIQGZp mb87yOcqwvOaAJBW1wmbOTEGAuxCq0BwuYEr0NAiLLbIj/AyYdgzbPV6bhPqmXmWCatZ JeKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HnqNUhYy; 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 q127-20020a25d985000000b00620ee07672fsi6123519ybg.134.2022.02.27.10.22.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:22:35 -0800 (PST) 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=HnqNUhYy; 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]:51374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOOBm-0002jt-Q2 for patch@linaro.org; Sun, 27 Feb 2022 13:22:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAp-0002ZY-Vv for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:36 -0500 Received: from [2607:f8b0:4864:20::432] (port=41835 helo=mail-pf1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAn-0007nW-W9 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:35 -0500 Received: by mail-pf1-x432.google.com with SMTP id p8so9077998pfh.8 for ; Sun, 27 Feb 2022 10:21:33 -0800 (PST) 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=kflgz17ggbMf4pl8VvhV/1GKguptkIzSWpU/iXQLGD0=; b=HnqNUhYyvn4aZ9czg9bB5reb4HC/3VGv5gL0916ZSgzj9mZg1uS8cGZkcPsJlZI8Kg uN6oWuW/+842eOppXenPr63/CxBlFGP/99ewW9XMqg3g1kC8US1OzYXEAh3LQLrY1Ma6 U/P0xkQ0n486RKnKepOQeltSh0RiPBgBuBixJEkrrmWpG/cZ3OHqu0mLCSIqEsp7nrBO NGz6kr6KH9KZ7uDpgGkn8v8oLq+LzrRHeyQtJkyRrgb515A0+lstv2gqxiVktm4Tq9gB Z9W0KSjawNz3V7uwUAS0e0M0D9EXUIIonNhLZpfLgVsaQNOVNUsaHnl0x0HCz1shaq97 OEPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kflgz17ggbMf4pl8VvhV/1GKguptkIzSWpU/iXQLGD0=; b=E0bGDqRpT++wfxKcHG2bocH+3PmI/972VyLkCI59JBecjnhw7Oip8i0JG3coubBB2a amy6hyseJRiP7p9wu0bN4qrZC9M8uBk9SDv65KX/4B/ETAWeQu6QhSZrV8/+uf5Tud2T cX3yPi77xyGZYK4EBvDTWQ6TnoiiJ5p/mAQgvw092Y3NNRWXGY9BXJiziUE2nbvw4nIE 8xQXeCz24S+6yFoYQLepr87Bt7xGH9B64//5Vggcp/N5024J4IjDlQPKM/6+31mQt4wT m52xvcbupI/0YxzKbVI4+aOxgfh14T761iFJjGZTNGH5LfdOZ48pESdz3/mQIkc4wlF0 hfFw== X-Gm-Message-State: AOAM531c0BAAheb7kBIg7vJabnOJpe+wZMEC+cuO/WvxGDcZVddclaV3 PMUG6mzgzBO7bTfYO5r3O2pG92jSz4Rjcw== X-Received: by 2002:a63:10c:0:b0:36c:6dd0:44af with SMTP id 12-20020a63010c000000b0036c6dd044afmr14451242pgb.41.1645986092581; Sun, 27 Feb 2022 10:21:32 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/7] target/nios2: Replace MMU_LOG with tracepoints Date: Sun, 27 Feb 2022 08:21:20 -1000 Message-Id: <20220227182125.21809-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::432 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- meson.build | 1 + target/nios2/mmu.c | 96 ++++++++++++--------------------------- target/nios2/trace-events | 10 ++++ 3 files changed, 39 insertions(+), 68 deletions(-) create mode 100644 target/nios2/trace-events diff --git a/meson.build b/meson.build index 8df40bfac4..98f167d782 100644 --- a/meson.build +++ b/meson.build @@ -2692,6 +2692,7 @@ if have_system or have_user 'target/i386', 'target/i386/kvm', 'target/mips/tcg', + 'target/nios2', 'target/ppc', 'target/riscv', 'target/s390x', diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 5616c39d54..306370f675 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -23,18 +23,10 @@ #include "cpu.h" #include "exec/exec-all.h" #include "mmu.h" +#include "trace/trace-target_nios2.h" #if !defined(CONFIG_USER_ONLY) -/* Define this to enable MMU debug messages */ -/* #define DEBUG_MMU */ - -#ifdef DEBUG_MMU -#define MMU_LOG(x) x -#else -#define MMU_LOG(x) -#endif - /* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, Nios2MMULookup *lu, @@ -43,37 +35,26 @@ unsigned int mmu_translate(CPUNios2State *env, Nios2CPU *cpu = env_archcpu(env); int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4; int vpn = vaddr >> 12; + int way, n_ways = cpu->tlb_num_ways; - MMU_LOG(qemu_log("mmu_translate vaddr %08X, pid %08X, vpn %08X\n", - vaddr, pid, vpn)); - - int way; - for (way = 0; way < cpu->tlb_num_ways; way++) { - - Nios2TLBEntry *entry = - &env->mmu.tlb[(way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask)]; - - MMU_LOG(qemu_log("TLB[%d] TAG %08X, VPN %08X\n", - (way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask), - entry->tag, (entry->tag >> 12))); + for (way = 0; way < n_ways; way++) { + uint32_t index = (way * n_ways) + (vpn & env->mmu.tlb_entry_mask); + Nios2TLBEntry *entry = &env->mmu.tlb[index]; if (((entry->tag >> 12) != vpn) || (((entry->tag & (1 << 11)) == 0) && ((entry->tag & ((1 << cpu->pid_num_bits) - 1)) != pid))) { + trace_nios2_mmu_translate_miss(vaddr, pid, index, entry->tag); continue; } + lu->vaddr = vaddr & TARGET_PAGE_MASK; lu->paddr = (entry->data & CR_TLBACC_PFN_MASK) << TARGET_PAGE_BITS; lu->prot = ((entry->data & CR_TLBACC_R) ? PAGE_READ : 0) | ((entry->data & CR_TLBACC_W) ? PAGE_WRITE : 0) | ((entry->data & CR_TLBACC_X) ? PAGE_EXEC : 0); - MMU_LOG(qemu_log("HIT TLB[%d] %08X %08X %08X\n", - (way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask), - lu->vaddr, lu->paddr, lu->prot)); + trace_nios2_mmu_translate_hit(vaddr, pid, index, lu->paddr, lu->prot); return 1; } return 0; @@ -84,21 +65,18 @@ static void mmu_flush_pid(CPUNios2State *env, uint32_t pid) CPUState *cs = env_cpu(env); Nios2CPU *cpu = env_archcpu(env); int idx; - MMU_LOG(qemu_log("TLB Flush PID %d\n", pid)); for (idx = 0; idx < cpu->tlb_num_entries; idx++) { Nios2TLBEntry *entry = &env->mmu.tlb[idx]; - MMU_LOG(qemu_log("TLB[%d] => %08X %08X\n", - idx, entry->tag, entry->data)); - if ((entry->tag & (1 << 10)) && (!(entry->tag & (1 << 11))) && ((entry->tag & ((1 << cpu->pid_num_bits) - 1)) == pid)) { uint32_t vaddr = entry->tag & TARGET_PAGE_MASK; - MMU_LOG(qemu_log("TLB Flush Page %08X\n", vaddr)); - + trace_nios2_mmu_flush_pid_hit(pid, idx, vaddr); tlb_flush_page(cs, vaddr); + } else { + trace_nios2_mmu_flush_pid_miss(pid, idx, entry->tag); } } } @@ -108,18 +86,15 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) CPUState *cs = env_cpu(env); Nios2CPU *cpu = env_archcpu(env); - MMU_LOG(qemu_log("mmu_write %08X = %08X\n", rn, v)); - switch (rn) { case CR_TLBACC: - MMU_LOG(qemu_log("TLBACC: IG %02X, FLAGS %c%c%c%c%c, PFN %05X\n", - v >> CR_TLBACC_IGN_SHIFT, - (v & CR_TLBACC_C) ? 'C' : '.', - (v & CR_TLBACC_R) ? 'R' : '.', - (v & CR_TLBACC_W) ? 'W' : '.', - (v & CR_TLBACC_X) ? 'X' : '.', - (v & CR_TLBACC_G) ? 'G' : '.', - v & CR_TLBACC_PFN_MASK)); + trace_nios2_mmu_write_tlbacc(v >> CR_TLBACC_IGN_SHIFT, + (v & CR_TLBACC_C) ? 'C' : '.', + (v & CR_TLBACC_R) ? 'R' : '.', + (v & CR_TLBACC_W) ? 'W' : '.', + (v & CR_TLBACC_X) ? 'X' : '.', + (v & CR_TLBACC_G) ? 'G' : '.', + v & CR_TLBACC_PFN_MASK); /* if tlbmisc.WE == 1 then trigger a TLB write on writes to TLBACC */ if (env->regs[CR_TLBMISC] & CR_TLBMISC_WR) { @@ -138,16 +113,10 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) if ((entry->tag != newTag) || (entry->data != newData)) { if (entry->tag & (1 << 10)) { /* Flush existing entry */ - MMU_LOG(qemu_log("TLB Flush Page (OLD) %08X\n", - entry->tag & TARGET_PAGE_MASK)); tlb_flush_page(cs, entry->tag & TARGET_PAGE_MASK); } entry->tag = newTag; entry->data = newData; - MMU_LOG(qemu_log("TLB[%d] = %08X %08X\n", - (way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask), - entry->tag, entry->data)); } /* Auto-increment tlbmisc.WAY */ env->regs[CR_TLBMISC] = @@ -161,15 +130,14 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) break; case CR_TLBMISC: - MMU_LOG(qemu_log("TLBMISC: WAY %X, FLAGS %c%c%c%c%c%c, PID %04X\n", - v >> CR_TLBMISC_WAY_SHIFT, - (v & CR_TLBMISC_RD) ? 'R' : '.', - (v & CR_TLBMISC_WR) ? 'W' : '.', - (v & CR_TLBMISC_DBL) ? '2' : '.', - (v & CR_TLBMISC_BAD) ? 'B' : '.', - (v & CR_TLBMISC_PERM) ? 'P' : '.', - (v & CR_TLBMISC_D) ? 'D' : '.', - (v & CR_TLBMISC_PID_MASK) >> 4)); + trace_nios2_mmu_write_tlbmisc(v >> CR_TLBMISC_WAY_SHIFT, + (v & CR_TLBMISC_RD) ? 'R' : '.', + (v & CR_TLBMISC_WR) ? 'W' : '.', + (v & CR_TLBMISC_DBL) ? '2' : '.', + (v & CR_TLBMISC_BAD) ? 'B' : '.', + (v & CR_TLBMISC_PERM) ? 'P' : '.', + (v & CR_TLBMISC_D) ? 'D' : '.', + (v & CR_TLBMISC_PID_MASK) >> 4); if ((v & CR_TLBMISC_PID_MASK) != (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK)) { @@ -193,11 +161,6 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) CR_TLBMISC_PID_SHIFT); env->regs[CR_PTEADDR] &= ~CR_PTEADDR_VPN_MASK; env->regs[CR_PTEADDR] |= (entry->tag >> 12) << CR_PTEADDR_VPN_SHIFT; - MMU_LOG(qemu_log("TLB READ way %d, vpn %05X, tag %08X, data %08X, " - "tlbacc %08X, tlbmisc %08X, pteaddr %08X\n", - way, vpn, entry->tag, entry->data, - env->regs[CR_TLBACC], env->regs[CR_TLBMISC], - env->regs[CR_PTEADDR])); } else { env->regs[CR_TLBMISC] = v; } @@ -206,9 +169,8 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) break; case CR_PTEADDR: - MMU_LOG(qemu_log("PTEADDR: PTBASE %03X, VPN %05X\n", - v >> CR_PTEADDR_PTBASE_SHIFT, - (v & CR_PTEADDR_VPN_MASK) >> CR_PTEADDR_VPN_SHIFT)); + trace_nios2_mmu_write_pteaddr(v >> CR_PTEADDR_PTBASE_SHIFT, + (v & CR_PTEADDR_VPN_MASK) >> CR_PTEADDR_VPN_SHIFT); /* Writes to PTEADDR don't change the read-back VPN value */ env->regs[CR_PTEADDR] = (v & ~CR_PTEADDR_VPN_MASK) | @@ -226,8 +188,6 @@ void mmu_init(CPUNios2State *env) Nios2CPU *cpu = env_archcpu(env); Nios2MMU *mmu = &env->mmu; - MMU_LOG(qemu_log("mmu_init\n")); - mmu->tlb_entry_mask = (cpu->tlb_num_entries / cpu->tlb_num_ways) - 1; mmu->tlb = g_new0(Nios2TLBEntry, cpu->tlb_num_entries); } diff --git a/target/nios2/trace-events b/target/nios2/trace-events new file mode 100644 index 0000000000..07f1f0a5e7 --- /dev/null +++ b/target/nios2/trace-events @@ -0,0 +1,10 @@ +# mmu.c +nios2_mmu_translate_miss(uint32_t vaddr, uint32_t pid, uint32_t index, uint32_t tag) "mmu_translate: MISS vaddr=0x%08x pid=%u TLB[%u] tag=0x%08x" +nios2_mmu_translate_hit(uint32_t vaddr, uint32_t pid, uint32_t index, uint32_t paddr, uint32_t prot) "mmu_translate: HIT vaddr=0x%08x pid=%u TLB[%u] paddr=0x%08x prot=0x%x" + +nios2_mmu_flush_pid_miss(uint32_t pid, uint32_t index, uint32_t vaddr) "mmu_flush: MISS pid=%u TLB[%u] tag=0x%08x" +nios2_mmu_flush_pid_hit(uint32_t pid, uint32_t index, uint32_t vaddr) "mmu_flush: HIT pid=%u TLB[%u] vaddr=0x%08x" + +nios2_mmu_write_tlbacc(uint32_t ig, char c, char r, char w, char x, char g, uint32_t pfn) "mmu_write_tlbacc: ig=0x%02x flags=%c%c%c%c%c pfn=0x%08x" +nios2_mmu_write_tlbmisc(uint32_t way, char r, char w, char t, char b, char p, char d, uint32_t pid) "mmu_write_tlbmisc: way=0x%x flags=%c%c%c%c%c%c pid=%u" +nios2_mmu_write_pteaddr(uint32_t ptb, uint32_t vpn) "mmu_write_pteaddr: ptbase=0x%03x vpn=0x%05x" From patchwork Sun Feb 27 18:21:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546441 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2124538imf; Sun, 27 Feb 2022 10:22:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyuSeVzX5UsV8nSwPStQGNQC9zHweOGFU4RaghZJw3TOBLGOQHKV1k70pRL4x8i31q8oUP X-Received: by 2002:a81:f0c:0:b0:2d6:83ab:7605 with SMTP id 12-20020a810f0c000000b002d683ab7605mr16741785ywp.150.1645986150416; Sun, 27 Feb 2022 10:22:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986150; cv=none; d=google.com; s=arc-20160816; b=WB5gO8X0z75Shg7UvnK4L1OGveuhMggqbYnXwSfac74LSLkXOI2V7VAsjREWOussRD G6l4QvkRZqm+Nr0VQL9mznrrx+shBPoPf+7KPHaT8/bhD2nPe3lVaqJXwDZ2+tifPAa4 55YBpgCjUxfqYQ7LX/ZP1leM0TgQY27Is5mH4aGfY1PLfEpMM7V3gB/YLFsa/FTESt2L zO5GXr8IP+zpHhPmHoLrcJ0Q9sONkuC5yKdeGQuaf32S7w7UY9FBl2Dy29hb6HzlQsf6 yjqQcxl3MvjyIo3bR97dIxVddSbbtkwQpSkYod2o8i+jP9sNxWlHKjsRkVVBGJ8imK2C ngbg== 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=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=TQ6HvH/3Pt6vfoGTuhocll5lMzlNZ3GmxAFM0Rk0aLLTtMcUjRUP/FH+U0yGP2x1eI o4KIcpXEEk1x1VG1GGUr0BaWWkTEV7dRrdf1D1eGgJ6xbkkkwrkL5yC5ACTguMYMs+At g16Iee87XocE1KY3KF9h/cAeQxaitufVs4TXc1H38AZTdVxuFqPysMra2pC9UDnMr3xe eCROjo+l8A8PLh4EnH1FFRpcXWkachEX4T6cOkmKEpMqzMp938X/G9caUDiStlh4Ro5x z05i92O26Oaf+4PCYKE4xPyDMzODsTSlIlEuoTAdzYX3g4qHbdfbF/lnsfwEOfozT03u Zt2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rTZ88MCk; 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 u11-20020a81db0b000000b002d7af572512si7725988ywm.317.2022.02.27.10.22.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:22:30 -0800 (PST) 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=rTZ88MCk; 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]:51262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOOBh-0002g2-S9 for patch@linaro.org; Sun, 27 Feb 2022 13:22:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAr-0002cO-12 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:37 -0500 Received: from [2607:f8b0:4864:20::102e] (port=54028 helo=mail-pj1-x102e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAp-0007nl-3T for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:36 -0500 Received: by mail-pj1-x102e.google.com with SMTP id bx5so9198994pjb.3 for ; Sun, 27 Feb 2022 10:21:34 -0800 (PST) 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=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=rTZ88MCkNO/ftTZDXO/mXy2bILQk/iQZ+4uSCaWOvNU0nEXO/UkxlnKub391wHjnpa mqA2VLMZHJlgiGQO4lSWdcyVnI9CFdQwteIit1gURjc6X2VRLv0265TIC2Ko6MyGLPFk pJrFRjKkWNMt5+PMefB8WSxlsvMAOsZlpQITKEjmTNkNOcqOR4JJId0JL+dbl+1DRHAM KSToYIxM0atvDvRGZfHuHoQNI/MDymv51WW9ETG2OKyHDS+sJ6MjYhc5+k3MW8ZopVIt 8o/qAzqwNi6BNTMrztvNRKrl/AJWdgadbuzwo/vYzkvq705TgGoY3pAuwL24G56eAiEY RF8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=eFBzP4/GRWEemf6goosNmvf1FBDBXrEem3pT8Iwamwcgcs7tB98rlnqGUEfKzp8uDt hY2KWUlD5n4f/qtdtHE7JG7nOGleqcoV/gtIIDbqOoGgmnXSKdvr3/0x4xRaHUHUYO0x KL0eIupmopmXVPbYJ9wsBUdzLCZ1DfmOJ9jq0/isy2BDLBiVmLL0KpImQJdmzsH1yONG unkqHaGYBLyAdlcgNOorINOBYHKSZFjj7PIBkrKL7KNe6G0DD8swPkwt+VtXpdJuI2QL asuSkt2ba2buIF4K5iQeSTyhEKAvU8lJnUue51WItHgUYMtZpq4OiLkVvZY8ZwTa5wZB 7B4A== X-Gm-Message-State: AOAM530+q/ujaoe3A6H5uzPR5eYVKjXimyocZoHkDAhx8vvvMQRtJ3Ea d6aGSelTih3DeBD6r33ZFl2YDQsAmk2A3g== X-Received: by 2002:a17:902:744a:b0:14f:a63b:577d with SMTP id e10-20020a170902744a00b0014fa63b577dmr17109488plt.86.1645986093854; Sun, 27 Feb 2022 10:21:33 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/7] target/nios2: Only build mmu.c for system mode Date: Sun, 27 Feb 2022 08:21:21 -1000 Message-Id: <20220227182125.21809-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can thus remove an ifdef covering the entire file. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- target/nios2/mmu.c | 3 --- target/nios2/meson.build | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 306370f675..437fad09b7 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -25,7 +25,6 @@ #include "mmu.h" #include "trace/trace-target_nios2.h" -#if !defined(CONFIG_USER_ONLY) /* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, @@ -217,5 +216,3 @@ void dump_mmu(CPUNios2State *env) (entry->data & CR_TLBACC_X) ? 'X' : '-'); } } - -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/nios2/meson.build b/target/nios2/meson.build index e643917db1..62b384702d 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -2,14 +2,13 @@ nios2_ss = ss.source_set() nios2_ss.add(files( 'cpu.c', 'helper.c', - 'mmu.c', 'nios2-semi.c', 'op_helper.c', 'translate.c', )) nios2_softmmu_ss = ss.source_set() -nios2_softmmu_ss.add(files('monitor.c')) +nios2_softmmu_ss.add(files('monitor.c', 'mmu.c')) target_arch += {'nios2': nios2_ss} target_softmmu_arch += {'nios2': nios2_softmmu_ss} From patchwork Sun Feb 27 18:21:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546443 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2125741imf; Sun, 27 Feb 2022 10:24:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxs/CweGb42hKQDn496OOW2xMHbE6Qco+kNr9iEI1vuDTIh+jF3zmfOm1pV7TNm4THJktUr X-Received: by 2002:a81:2555:0:b0:2d0:dc91:5a1c with SMTP id l82-20020a812555000000b002d0dc915a1cmr16964004ywl.200.1645986282326; Sun, 27 Feb 2022 10:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986282; cv=none; d=google.com; s=arc-20160816; b=UYvTIOJ+sp5GG+bxJvapSXX3+xVuvY6jcD4xeP+vmg2BOxvXKRrwnn0hXfJUIyoWv4 P8yEdHWMgmUWx+ZQpfw7vGI7vie5K948u/rQe5iltNF48cET89M/Pl6645O544y3EoGP 1B3YHfLcLdEyGVzOmGYAHFtMdvREUKcJj2LOEivQ6I14LUD93imoVmi4k2KJSImTjbUZ 4qZoXpI1uwcelxLWgPLghbXrf269vsKGvb7ZBBdVPwVG1WobNNGNE2eM4+m5s3CwoAgL 8LMcAfzPmaYtnUqravaEdRvk3V7S51P7OCV2VWHv4bsr8uRg1NDR4O1nDRjLzDjaIkN5 OiNg== 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=NbiZjwZMOI9QBNqQOVnUdzp1maV43aZ7/lLWc9/UloU=; b=Gtwxf2iVNn5T1eopVa8K3bA0Kd+Nl6IF9YYFR1eIq0jxEoUbWmPi52BDaFNochMtM4 xLPCAOSWDj6AEP/xXx+o38Kk12hk5KJXcBImBcP0i+VYUSzwN/G/+s29aEW4UaLmhP9W V4yElOBZdw937EOGnyY53wodwf8A/2K8kKnacPEd/DzMtVFLZHXrHSqIJaEYnnTFgumD KNpLDaz3VWho+MEu58CHtPRSsbiQlLJGN7XRq/UcGPVSFfR7F7KQfiUTtGyTFULt4PSf PZCa5oZEgl8ZF/DlWkl9fKp5Y42rtoF+gPUjl9nTcFhcw51F0pzwoipC7nhVcMrgfNoE DErQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vlNF5cmg; 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 r85-20020a257658000000b0062448240997si7938098ybc.306.2022.02.27.10.24.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:24:42 -0800 (PST) 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=vlNF5cmg; 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]:59358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOODp-00083m-Oc for patch@linaro.org; Sun, 27 Feb 2022 13:24:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAs-0002fy-H1 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:38 -0500 Received: from [2607:f8b0:4864:20::1030] (port=51108 helo=mail-pj1-x1030.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAq-0007o6-Fo for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:38 -0500 Received: by mail-pj1-x1030.google.com with SMTP id m22so9243979pja.0 for ; Sun, 27 Feb 2022 10:21:36 -0800 (PST) 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=NbiZjwZMOI9QBNqQOVnUdzp1maV43aZ7/lLWc9/UloU=; b=vlNF5cmgJAbbqmcZaAeVhKYZyodeUq02DGyyv16HwwlaS9+uON7YyQF5DbBmKGcqKq XuUNBkJLZ6P5/XNdHw49E/i633xET4YkID6s4WEl88KUfQAQ8OsmbwgCkuNcYKKYh9UL 1VYJxGvsI9Fpo0/0yQ+Hs5C+dZVI4ntsZ0vYi2NrD3Cdd7qLpifwxfvyjCN0wV4SlErS Xsc8qY/nsI3wTP99j6G37sxzjHg1XMQsyo8mjakT3G69eEtXIjCCxspUU0SNZZWX41Kc +Sz+DOOO3ifhbGMXuqy21Fzl3n/4BwB/ZFMGXh3r8/wZp98rLS2gpJE9u89mELGP8nXT 0Dpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NbiZjwZMOI9QBNqQOVnUdzp1maV43aZ7/lLWc9/UloU=; b=q1yl6SqE+kclRhAf1Druygj75rEVirca6P/LMJdX4ZNtBPLC3VJ40jg18mxjsmNO6n /SdrVZxbCuB7Rc1QzIHz1QjuFF2T+d2vl+peGvOVRkqWtf5XgIgpd5BMkg4LVi5hNPYX tcXGAM3mBLf3eC6L5Gr9Ho/kgK6Ra8ghLBPpHLhZ3GMxwkqU+FTBou8UhG6FEyd+GvQO S0JUPu/5lMLd3NUfooARBnyFhWm+2kkp9j039DZCSJaJCnUghENYqssYwwaWPoaoAryQ bvItj14ne+oyCkDMdKDI7MbnC0zgCfwx1hz9sWKvrjUZ8bW/OevST3fIAhggR1bS23wz 4RdA== X-Gm-Message-State: AOAM533kP4sHxRQAOOY/P4XytvmV/Uhs0UXIhHZP0OA403Ppes+dn/gc 8GnHidsk/fYd5Lo3jGJIxIy51r3YEyzhlQ== X-Received: by 2002:a17:90a:9b08:b0:1bc:9b4f:8dff with SMTP id f8-20020a17090a9b0800b001bc9b4f8dffmr12783493pjp.159.1645986095229; Sun, 27 Feb 2022 10:21:35 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/7] target/nios2: Hoist R_ZERO check in rdctl Date: Sun, 27 Feb 2022 08:21:22 -1000 Message-Id: <20220227182125.21809-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1030 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will avoid having to replicate the check to additional cases. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- target/nios2/translate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 194c8ebafd..fa355308a9 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -447,11 +447,13 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) gen_check_supervisor(dc); + if (unlikely(instr.c == R_ZERO)) { + return; + } + switch (instr.imm5 + CR_BASE) { default: - if (likely(instr.c != R_ZERO)) { - tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]); - } + tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]); break; } } From patchwork Sun Feb 27 18:21:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546446 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2126689imf; Sun, 27 Feb 2022 10:26:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJypMYtjr0bgu5zbFo8mavISysRcbuVJBjXsCksv/pkTk+xkWmqLGQz6GaW2XpVnT1nqdcBR X-Received: by 2002:a81:84d5:0:b0:2d1:e85:bf04 with SMTP id u204-20020a8184d5000000b002d10e85bf04mr17193743ywf.465.1645986401076; Sun, 27 Feb 2022 10:26:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986401; cv=none; d=google.com; s=arc-20160816; b=zrT2rRfcthzy2TVlGzodLrR2/NJraOiy4SfPTmxNuFdd4AfmtAIbsX8/1+P3oxe4Bm 8A3riY2tgdz4B0LwO6+DOagJYwxQcve2DsOZYdQauhMC+IL+6w4nkS6sGKFrkUy50uil s/hEvyEh9AdrL0CZcdOwykFkZ1jwvcl6elDnpUrB1n99GNXLHpsEP59F0YlfoyVjjI/4 0y5D9c7q1nt3evIWpcdhs13mHTz7ZL8jKQv4jTTh9g5zBCUrARvUufg1EoI9kqlCn/IJ UHbNCy+avzyEgr6W2n8oRLIj7NU6tK5JoraDNdAJRSa5oVh4TE9FveP/HbgcGhyWC5u0 taUA== 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=aP6IO/cT72ijPpNPOU0qAba7aGUnduFPooW5AlogQb4=; b=Ly1UrFX9vMcjYO6Oul+NxXIF7x6fHYIfN4+4pumLqm2lfurrnkawidoD36fjQAVtyd waNjgT8ZYozULh3nvt2Lv6STvfD6NZc2GzhDvgxxTwWMpv+U11V3ZNVsXrfoaO1invU/ /Dn7UJbsCWp+3WAQJOwa9RM7wBVQ/CiAh/jPzZwqbWIEfzr73nKc0orLo0yaVvdkOxj4 czJD2dPd9ouDjVT3eIFQmmIVGFr1dQXO/7eC+V+vfe5NT2pGniHwrypJu/aoQkWqlxNf mIFX3eg2Qfc9mwh5gdsFD1wUu5YCFPO8XEikVJjSXBHrxNyPHwHSq+G1Q4jZDxhR/aXm C0QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YPXmB0Du; 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 72-20020a81034b000000b002d643754e58si6513197ywd.312.2022.02.27.10.26.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:26:40 -0800 (PST) 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=YPXmB0Du; 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]:37676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOOFi-0003xd-1C for patch@linaro.org; Sun, 27 Feb 2022 13:26:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAu-0002lm-FX for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:40 -0500 Received: from [2607:f8b0:4864:20::435] (port=43815 helo=mail-pf1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAr-0007p8-W9 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:40 -0500 Received: by mail-pf1-x435.google.com with SMTP id d187so9072957pfa.10 for ; Sun, 27 Feb 2022 10:21:37 -0800 (PST) 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=aP6IO/cT72ijPpNPOU0qAba7aGUnduFPooW5AlogQb4=; b=YPXmB0DuHvXBy4h/8iIYSJPibk8hI8o9xTq+Y1xsSE3yAFzlBAZMh4aJydSgxFJyDz pcwP2h5t0qKD/q/ymC1Iah7HifzVPVivqGuIWiOX9QceqQn/H4K0lbev1j4dHz8QUEko QmPJ7aeUVYcoN9D1Adn4Rj7gMxGAXE5fjtSxt7jpee2C+QId+rSCHUsEuo79flD0T7CB k89zv8gvONFmnq0Ux9i7JhbV0g4z9BamLOcwRTWT/FOy5olbD9/3/QUmZlLP7nx8jrPU tY3LL+6ojRlJMzHs58yToNngJmSpDE6Wt80r2vH1rmgv8SPnqfEepqAXnGtYf+kd4W7P b7Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aP6IO/cT72ijPpNPOU0qAba7aGUnduFPooW5AlogQb4=; b=zOlqXCRvkv4e22oWDJCLrRX5wndm414m8UrpSh9qtZbMfKQeHppC0f5hy6iYJ2DE54 03Qut4FLa5Gusm1yVnQtlT6Knxb+hp9CUzrFsBFb/3jzoILKQ3nQl9+atOtwn4CZ5jyK VcRLrJDh/UGVhrR8Fv/H9Stj/nZGMO2Vsj8XLcyY4h0XIr3x/FZZrCPQ6lUiza9APOct aZgqQ0EttJLzdLGQACGlwqKxt/rkn47dks/vzikh8B5kHn7u7tQ6H/773sozheaxUaaX D5I9yG1jvmCIXhqWIktx9SMKM275NtqsNC102vMNQ8ALpRcDsGKUIrsQG1EeGgLoVVD7 SEMQ== X-Gm-Message-State: AOAM530eFEv1n3qP52uidMCdvzBDPa+OwpxQg0HF6uN5MfJaLAw7mDKx Un0IdgHtDnZsbMZf13HGewc2mgxuPRvCMA== X-Received: by 2002:a05:6a00:244b:b0:4c9:319e:ecb7 with SMTP id d11-20020a056a00244b00b004c9319eecb7mr17748868pfj.58.1645986096656; Sun, 27 Feb 2022 10:21:36 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/7] target/nios2: Split mmu_write Date: Sun, 27 Feb 2022 08:21:23 -1000 Message-Id: <20220227182125.21809-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::435 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create three separate functions for the three separate registers. Avoid extra dispatch through op_helper.c. Dispatch to the correct function in translation. Clean up the ifdefs in wrctl. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/nios2/helper.h | 4 +- target/nios2/mmu.c | 180 +++++++++++++++++++-------------------- target/nios2/op_helper.c | 5 -- target/nios2/translate.c | 26 +++--- 4 files changed, 104 insertions(+), 111 deletions(-) diff --git a/target/nios2/helper.h b/target/nios2/helper.h index 6d8eec1814..21ef7f0791 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -21,6 +21,8 @@ DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) #if !defined(CONFIG_USER_ONLY) -DEF_HELPER_3(mmu_write, void, env, i32, i32) +DEF_HELPER_2(mmu_write_tlbacc, void, env, i32) +DEF_HELPER_2(mmu_write_tlbmisc, void, env, i32) +DEF_HELPER_2(mmu_write_pteaddr, void, env, i32) DEF_HELPER_1(check_interrupts, void, env) #endif diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 437fad09b7..4daab2a7ab 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "mmu.h" +#include "exec/helper-proto.h" #include "trace/trace-target_nios2.h" @@ -80,106 +81,103 @@ static void mmu_flush_pid(CPUNios2State *env, uint32_t pid) } } -void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) +void helper_mmu_write_tlbacc(CPUNios2State *env, uint32_t v) { CPUState *cs = env_cpu(env); Nios2CPU *cpu = env_archcpu(env); - switch (rn) { - case CR_TLBACC: - trace_nios2_mmu_write_tlbacc(v >> CR_TLBACC_IGN_SHIFT, - (v & CR_TLBACC_C) ? 'C' : '.', - (v & CR_TLBACC_R) ? 'R' : '.', - (v & CR_TLBACC_W) ? 'W' : '.', - (v & CR_TLBACC_X) ? 'X' : '.', - (v & CR_TLBACC_G) ? 'G' : '.', - v & CR_TLBACC_PFN_MASK); + trace_nios2_mmu_write_tlbacc(v >> CR_TLBACC_IGN_SHIFT, + (v & CR_TLBACC_C) ? 'C' : '.', + (v & CR_TLBACC_R) ? 'R' : '.', + (v & CR_TLBACC_W) ? 'W' : '.', + (v & CR_TLBACC_X) ? 'X' : '.', + (v & CR_TLBACC_G) ? 'G' : '.', + v & CR_TLBACC_PFN_MASK); - /* if tlbmisc.WE == 1 then trigger a TLB write on writes to TLBACC */ - if (env->regs[CR_TLBMISC] & CR_TLBMISC_WR) { - int way = (env->regs[CR_TLBMISC] >> CR_TLBMISC_WAY_SHIFT); - int vpn = (env->mmu.pteaddr_wr & CR_PTEADDR_VPN_MASK) >> 2; - int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4; - int g = (v & CR_TLBACC_G) ? 1 : 0; - int valid = ((vpn & CR_TLBACC_PFN_MASK) < 0xC0000) ? 1 : 0; - Nios2TLBEntry *entry = - &env->mmu.tlb[(way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask)]; - uint32_t newTag = (vpn << 12) | (g << 11) | (valid << 10) | pid; - uint32_t newData = v & (CR_TLBACC_C | CR_TLBACC_R | CR_TLBACC_W | - CR_TLBACC_X | CR_TLBACC_PFN_MASK); + /* if tlbmisc.WE == 1 then trigger a TLB write on writes to TLBACC */ + if (env->regs[CR_TLBMISC] & CR_TLBMISC_WR) { + int way = (env->regs[CR_TLBMISC] >> CR_TLBMISC_WAY_SHIFT); + int vpn = (env->mmu.pteaddr_wr & CR_PTEADDR_VPN_MASK) >> 2; + int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4; + int g = (v & CR_TLBACC_G) ? 1 : 0; + int valid = ((vpn & CR_TLBACC_PFN_MASK) < 0xC0000) ? 1 : 0; + Nios2TLBEntry *entry = + &env->mmu.tlb[(way * cpu->tlb_num_ways) + + (vpn & env->mmu.tlb_entry_mask)]; + uint32_t newTag = (vpn << 12) | (g << 11) | (valid << 10) | pid; + uint32_t newData = v & (CR_TLBACC_C | CR_TLBACC_R | CR_TLBACC_W | + CR_TLBACC_X | CR_TLBACC_PFN_MASK); - if ((entry->tag != newTag) || (entry->data != newData)) { - if (entry->tag & (1 << 10)) { - /* Flush existing entry */ - tlb_flush_page(cs, entry->tag & TARGET_PAGE_MASK); - } - entry->tag = newTag; - entry->data = newData; + if ((entry->tag != newTag) || (entry->data != newData)) { + if (entry->tag & (1 << 10)) { + /* Flush existing entry */ + tlb_flush_page(cs, entry->tag & TARGET_PAGE_MASK); } - /* Auto-increment tlbmisc.WAY */ - env->regs[CR_TLBMISC] = - (env->regs[CR_TLBMISC] & ~CR_TLBMISC_WAY_MASK) | - (((way + 1) & (cpu->tlb_num_ways - 1)) << - CR_TLBMISC_WAY_SHIFT); + entry->tag = newTag; + entry->data = newData; } - - /* Writes to TLBACC don't change the read-back value */ - env->mmu.tlbacc_wr = v; - break; - - case CR_TLBMISC: - trace_nios2_mmu_write_tlbmisc(v >> CR_TLBMISC_WAY_SHIFT, - (v & CR_TLBMISC_RD) ? 'R' : '.', - (v & CR_TLBMISC_WR) ? 'W' : '.', - (v & CR_TLBMISC_DBL) ? '2' : '.', - (v & CR_TLBMISC_BAD) ? 'B' : '.', - (v & CR_TLBMISC_PERM) ? 'P' : '.', - (v & CR_TLBMISC_D) ? 'D' : '.', - (v & CR_TLBMISC_PID_MASK) >> 4); - - if ((v & CR_TLBMISC_PID_MASK) != - (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK)) { - mmu_flush_pid(env, (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> - CR_TLBMISC_PID_SHIFT); - } - /* if tlbmisc.RD == 1 then trigger a TLB read on writes to TLBMISC */ - if (v & CR_TLBMISC_RD) { - int way = (v >> CR_TLBMISC_WAY_SHIFT); - int vpn = (env->mmu.pteaddr_wr & CR_PTEADDR_VPN_MASK) >> 2; - Nios2TLBEntry *entry = - &env->mmu.tlb[(way * cpu->tlb_num_ways) + - (vpn & env->mmu.tlb_entry_mask)]; - - env->regs[CR_TLBACC] &= CR_TLBACC_IGN_MASK; - env->regs[CR_TLBACC] |= entry->data; - env->regs[CR_TLBACC] |= (entry->tag & (1 << 11)) ? CR_TLBACC_G : 0; - env->regs[CR_TLBMISC] = - (v & ~CR_TLBMISC_PID_MASK) | - ((entry->tag & ((1 << cpu->pid_num_bits) - 1)) << - CR_TLBMISC_PID_SHIFT); - env->regs[CR_PTEADDR] &= ~CR_PTEADDR_VPN_MASK; - env->regs[CR_PTEADDR] |= (entry->tag >> 12) << CR_PTEADDR_VPN_SHIFT; - } else { - env->regs[CR_TLBMISC] = v; - } - - env->mmu.tlbmisc_wr = v; - break; - - case CR_PTEADDR: - trace_nios2_mmu_write_pteaddr(v >> CR_PTEADDR_PTBASE_SHIFT, - (v & CR_PTEADDR_VPN_MASK) >> CR_PTEADDR_VPN_SHIFT); - - /* Writes to PTEADDR don't change the read-back VPN value */ - env->regs[CR_PTEADDR] = (v & ~CR_PTEADDR_VPN_MASK) | - (env->regs[CR_PTEADDR] & CR_PTEADDR_VPN_MASK); - env->mmu.pteaddr_wr = v; - break; - - default: - break; + /* Auto-increment tlbmisc.WAY */ + env->regs[CR_TLBMISC] = + (env->regs[CR_TLBMISC] & ~CR_TLBMISC_WAY_MASK) | + (((way + 1) & (cpu->tlb_num_ways - 1)) << + CR_TLBMISC_WAY_SHIFT); } + + /* Writes to TLBACC don't change the read-back value */ + env->mmu.tlbacc_wr = v; +} + +void helper_mmu_write_tlbmisc(CPUNios2State *env, uint32_t v) +{ + Nios2CPU *cpu = env_archcpu(env); + + trace_nios2_mmu_write_tlbmisc(v >> CR_TLBMISC_WAY_SHIFT, + (v & CR_TLBMISC_RD) ? 'R' : '.', + (v & CR_TLBMISC_WR) ? 'W' : '.', + (v & CR_TLBMISC_DBL) ? '2' : '.', + (v & CR_TLBMISC_BAD) ? 'B' : '.', + (v & CR_TLBMISC_PERM) ? 'P' : '.', + (v & CR_TLBMISC_D) ? 'D' : '.', + (v & CR_TLBMISC_PID_MASK) >> 4); + + if ((v & CR_TLBMISC_PID_MASK) != + (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK)) { + mmu_flush_pid(env, (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> + CR_TLBMISC_PID_SHIFT); + } + /* if tlbmisc.RD == 1 then trigger a TLB read on writes to TLBMISC */ + if (v & CR_TLBMISC_RD) { + int way = (v >> CR_TLBMISC_WAY_SHIFT); + int vpn = (env->mmu.pteaddr_wr & CR_PTEADDR_VPN_MASK) >> 2; + Nios2TLBEntry *entry = + &env->mmu.tlb[(way * cpu->tlb_num_ways) + + (vpn & env->mmu.tlb_entry_mask)]; + + env->regs[CR_TLBACC] &= CR_TLBACC_IGN_MASK; + env->regs[CR_TLBACC] |= entry->data; + env->regs[CR_TLBACC] |= (entry->tag & (1 << 11)) ? CR_TLBACC_G : 0; + env->regs[CR_TLBMISC] = + (v & ~CR_TLBMISC_PID_MASK) | + ((entry->tag & ((1 << cpu->pid_num_bits) - 1)) << + CR_TLBMISC_PID_SHIFT); + env->regs[CR_PTEADDR] &= ~CR_PTEADDR_VPN_MASK; + env->regs[CR_PTEADDR] |= (entry->tag >> 12) << CR_PTEADDR_VPN_SHIFT; + } else { + env->regs[CR_TLBMISC] = v; + } + + env->mmu.tlbmisc_wr = v; +} + +void helper_mmu_write_pteaddr(CPUNios2State *env, uint32_t v) +{ + trace_nios2_mmu_write_pteaddr(v >> CR_PTEADDR_PTBASE_SHIFT, + (v & CR_PTEADDR_VPN_MASK) >> CR_PTEADDR_VPN_SHIFT); + + /* Writes to PTEADDR don't change the read-back VPN value */ + env->regs[CR_PTEADDR] = (v & ~CR_PTEADDR_VPN_MASK) | + (env->regs[CR_PTEADDR] & CR_PTEADDR_VPN_MASK); + env->mmu.pteaddr_wr = v; } void mmu_init(CPUNios2State *env) diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index 61fc4dc903..d729379e4d 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -26,11 +26,6 @@ #include "qemu/main-loop.h" #if !defined(CONFIG_USER_ONLY) -void helper_mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v) -{ - mmu_write(env, rn, v); -} - static void nios2_check_interrupts(CPUNios2State *env) { if (env->irq_pending && diff --git a/target/nios2/translate.c b/target/nios2/translate.c index fa355308a9..52965ba17e 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -461,30 +461,28 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) /* ctlN <- rA */ static void wrctl(DisasContext *dc, uint32_t code, uint32_t flags) { - R_TYPE(instr, code); - gen_check_supervisor(dc); +#ifndef CONFIG_USER_ONLY + R_TYPE(instr, code); + TCGv v = load_gpr(dc, instr.a); + switch (instr.imm5 + CR_BASE) { case CR_PTEADDR: - case CR_TLBACC: - case CR_TLBMISC: - { -#if !defined(CONFIG_USER_ONLY) - TCGv_i32 tmp = tcg_const_i32(instr.imm5 + CR_BASE); - gen_helper_mmu_write(cpu_env, tmp, load_gpr(dc, instr.a)); - tcg_temp_free_i32(tmp); -#endif + gen_helper_mmu_write_pteaddr(cpu_env, v); + break; + case CR_TLBACC: + gen_helper_mmu_write_tlbacc(cpu_env, v); + break; + case CR_TLBMISC: + gen_helper_mmu_write_tlbmisc(cpu_env, v); break; - } - default: - tcg_gen_mov_tl(cpu_R[instr.imm5 + CR_BASE], load_gpr(dc, instr.a)); + tcg_gen_mov_tl(cpu_R[instr.imm5 + CR_BASE], v); break; } /* If interrupts were enabled using WRCTL, trigger them. */ -#if !defined(CONFIG_USER_ONLY) if ((instr.imm5 + CR_BASE) == CR_STATUS) { if (tb_cflags(dc->base.tb) & CF_USE_ICOUNT) { gen_io_start(); From patchwork Sun Feb 27 18:21:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546444 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2125789imf; Sun, 27 Feb 2022 10:24:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbpvsJ25b8OMQUzwHxNw8+EuVL8uVzBG0S3x3rnfDpWRT/OcvemDsBRkqnMV9HtybL390n X-Received: by 2002:a0d:eb4a:0:b0:2d1:e0b1:6733 with SMTP id u71-20020a0deb4a000000b002d1e0b16733mr17495803ywe.218.1645986286362; Sun, 27 Feb 2022 10:24:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986286; cv=none; d=google.com; s=arc-20160816; b=ORnvElgAaO3K2Gqjn1CjP5UAMBA6iJJDp9MOW5M8JMxYE8gS3tpl8NxaWGWYkSRHlj 3gk/Z1z+fBhylYr0/9q2eXmnGwemOhUTEJn5pf1IIF38sYBXid5HdjGxuQ+zr8gYDOu4 kEv+bonf3anganrvmddejNgbfEl7DHUgpJOyWCrppSuKMXhZGEv9qKf90sBNh30cSnDk z7g9flkO+cyAfdA1Cwxc4hDrBsS5HD3vx7dn111NKJscxBiOtxQEMZNoumZ7DHNK4JM1 zTV05gegwocNjhFgqEG3g4F+xlAyjvijUud1AUlWr/DlmH35iGp9Zgr0llaWaEqTERnE 3Oxw== 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=RAL1NIBF7xZKJotAn1xZ6zr2b57K5Ny5tPwj+GqSPZE=; b=SGEJsBqmfrN4Z9IQwkK0ArgTibyX5cV3zQevu0iBDRI0beOiuf7iBYbnQyavOAJcnm PsHUQd9mB0jndJtkLeNFwYpq306uiX8fgS1LiwdkSKLpYPXNGEzQ0Z3AUVmx564uTtvr xKLLu7odPJ8a5hA5nIPcosmaO8neJzHbAJJQiPgWLM4Dj1+WiKMu6zaxztsC4oeg47jB CYxHH71YDZjilGP3zMWhX4w+ascE2v5FnOtHYjtuhTU3bSi0t4UOZx279pwhOpfNeGmf QRx5SUipbtlSnNBgEP3LkrG4z2URw08CyT6PKb0rgBMPLoAMGBvwSprhUzfJQ8IQGwCZ vcLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QqKWF0fv; 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 g39-20020a25ae67000000b0061df7c84b75si7448359ybe.691.2022.02.27.10.24.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:24:46 -0800 (PST) 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=QqKWF0fv; 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]:59782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOODt-0008KR-Tc for patch@linaro.org; Sun, 27 Feb 2022 13:24:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAu-0002m5-Ic for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:40 -0500 Received: from [2607:f8b0:4864:20::435] (port=38668 helo=mail-pf1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAt-0007pI-3p for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:40 -0500 Received: by mail-pf1-x435.google.com with SMTP id x18so9085542pfh.5 for ; Sun, 27 Feb 2022 10:21:38 -0800 (PST) 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=RAL1NIBF7xZKJotAn1xZ6zr2b57K5Ny5tPwj+GqSPZE=; b=QqKWF0fvqJFVLJShPA8r41r1TNaHsWYCesDf309pymM+7B1pP8MUsdzydywBvKxMUn cByMo9LYsdqFZyMxwHfIudAs6M859AgcvGPnvYyLM4R2KfBEW4/5ZaBKpNp/a82Oxehx 78wjic7OMjwttOdfq9RJvrSXvSJsUVhxxiQldiyQlD+xx3mH7AzSPlC9AQKzm6oIKTeN 9KoYDJDLmd8NZuKZghxaJ1AW98JLJEOCYBvuUxGBhDHguZ1BPnYMCDmTBP6pcQcxh/TW jHdkX66CVGl5JO3pz+qyi3l4qVMbUVPiLAqO6I8LjraaGG7QuhqEk6IGecPpizos26MX oqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RAL1NIBF7xZKJotAn1xZ6zr2b57K5Ny5tPwj+GqSPZE=; b=BnhvJ81nPV20SM78Yj7oTaX4Uxp/L7OkwJni1AeH4XC9wjUuiLPP4syMLPR4yaLQ3U jrDzSF+C8AhfrjEaSs2e8VklFdCRF2VRJR5r3EM+Xq/cAQNCB+1jCBgYUmGlaUJ4INP8 zQgbxpuTx4LKcwY5SFzXeVcG4D+irRpI61HS2IJuB52VrSNO/RQqecNhHmxFBUc0en7p Ywn4BB0v4D0o7PiQz8FPFbHzq6XKVl/GXDoknTE7cInmr9hHSZHH2cpjC+jYvGTsOPnK F/zVj1Y1JjJM9YMY7FCUxqajhi3Vtjwx6C5KKK7jNq1rLWbmeF5qRddND8HTSxmUXtlM M3AQ== X-Gm-Message-State: AOAM533qlRlOTxBaB1wrYBktOnF2o+H3VVQi7sJZ9bVuzpUTezveHKam ulwCrZucxXSa3qE0Z0C2GxFU6yvigG1oyg== X-Received: by 2002:a05:6a00:1494:b0:4f0:ece9:a01c with SMTP id v20-20020a056a00149400b004f0ece9a01cmr17484247pfu.58.1645986097953; Sun, 27 Feb 2022 10:21:37 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:37 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 6/7] target/nios2: Special case ipending in rdctl and wrctl Date: Sun, 27 Feb 2022 08:21:24 -1000 Message-Id: <20220227182125.21809-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::435 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It was never correct to be able to write to ipending. Until the rest of the irq code is tidied, the read of ipending will generate an "unnecessary" mask. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- target/nios2/translate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 52965ba17e..b17ce25a36 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -452,6 +452,15 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) } switch (instr.imm5 + CR_BASE) { + case CR_IPENDING: + /* + * The value of the ipending register is synthetic. + * In hw, this is the AND of a set of hardware irq lines + * with the ienable register. In qemu, we re-use the space + * of CR_IPENDING to store the set of irq lines. + */ + tcg_gen_and_tl(cpu_R[instr.c], cpu_R[CR_IPENDING], cpu_R[CR_IENABLE]); + break; default: tcg_gen_mov_tl(cpu_R[instr.c], cpu_R[instr.imm5 + CR_BASE]); break; @@ -477,6 +486,9 @@ static void wrctl(DisasContext *dc, uint32_t code, uint32_t flags) case CR_TLBMISC: gen_helper_mmu_write_tlbmisc(cpu_env, v); break; + case CR_IPENDING: + /* ipending is read only, writes ignored. */ + break; default: tcg_gen_mov_tl(cpu_R[instr.imm5 + CR_BASE], v); break; From patchwork Sun Feb 27 18:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546445 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2125809imf; Sun, 27 Feb 2022 10:24:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQUCN0OZmY/+sGJ2z12kId02gfUzzvmaB3oJMpFQhSWNR9E8XmOeQJog+/ldP0mkYyFtsv X-Received: by 2002:a25:bf90:0:b0:621:1a13:48f with SMTP id l16-20020a25bf90000000b006211a13048fmr15930767ybk.46.1645986289224; Sun, 27 Feb 2022 10:24:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986289; cv=none; d=google.com; s=arc-20160816; b=ivhKtSCM6UXnhInNNvNzYX8ZJ/hCRA/0imhUnOhb51xQMiQh3DXs0k60t8y+1/yThg L0juUVuAUfCWngr59YhJ49ArHej54KMcYmOEks7vmGcO9ySgYrcBFrklx10pGJfoi1UW rt7iWIwtPwMTNAZFyZ33W0mBvso9LXBy0Du1xIQ+s1YFoHKLKxoSaChjEEcPeJqrT7xZ rh03NZUnEQ40P6yoa+A4lZkg6+wixVkqZrw/Jhh6NUnCF1emb+BMRa4LhyTAHgM5E4xB ZsMqaqPzXIioGyf1qyTxr4rbpFhzq1DQaoeH0Ue94u3jguvouoAKam0iVJoPBPVzxViE ghIQ== 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=1zSh8vavOK2dDRCHMdm2xP+DD5rjftdrYBF4cR1vNmw=; b=ajLmaL4Nk9rHmObu3RXb8CGaxiRzXd6HrKteN5HEpFW4kpCLKpWnjCckxTNlDiQHM/ qKlBT4rwCvYZXWIx7ip0O3BI7cqBKKW80Wd/9dhMQU8vOi2k329bzBRCHu+585qTctZl cHvJE/scx12NiowtgqXqFmwmi4RfuwOHiUFm7rAEPn4qm6R+4nsjux+JB9fLqHRG3Jo2 MYs2+EkknmXkpIIx/4FKHyxEHtLssoq2cU8ohsXRZiFoTO0CkEnwoduIoaQ0MJdc2LjE YCR0ep1QFgi6M2Am5Mb4Ey/e1bFkDWhvhwrJ4+LsQoiN+Go0byfSsOnnHSc83W/LTmn9 qf+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="h/gDasq1"; 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 c126-20020a251c84000000b0061d74ab5b27si6878898ybc.544.2022.02.27.10.24.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:24:49 -0800 (PST) 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="h/gDasq1"; 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]:60128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOODw-00006R-Nl for patch@linaro.org; Sun, 27 Feb 2022 13:24:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAw-0002tp-B1 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:42 -0500 Received: from [2607:f8b0:4864:20::1030] (port=41596 helo=mail-pj1-x1030.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAu-0007pT-P1 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:42 -0500 Received: by mail-pj1-x1030.google.com with SMTP id ev16-20020a17090aead000b001bc3835fea8so9436947pjb.0 for ; Sun, 27 Feb 2022 10:21:40 -0800 (PST) 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=1zSh8vavOK2dDRCHMdm2xP+DD5rjftdrYBF4cR1vNmw=; b=h/gDasq1Hy8kheLbjEQ4bSzKMb2frFHTbUNXStTJdhhonyD+YCFxVE601hUktz+WYm VVtgSq7myBFI0LaLI2g2T+jSBTSotFrES5W4BsmXKMpo9Fqns3RO2TFqoEKTdV09hn/a xOhr7j2YDZHB0ysY6HmrYQak0KnykwUan22KKpSjwHAEnDBFfWDY4g1nl9V1DMM/SJqf Soli+zKAtOA+lEAEk2Z4i9QF+LMZLWEJOyyfJYDaAEF7FEfPnou0PdM7PhJt1qEzr+TC 3PM4atTCk5BER5N2eIl7Ix6cb11VeQM51A95pFbInTN+dNC0oLXwmYYG5NKa3q6JYgw7 tJ7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1zSh8vavOK2dDRCHMdm2xP+DD5rjftdrYBF4cR1vNmw=; b=6bBYcxqR2rnjqwMGUvCBw5qXH6kGYGCHSV/q4SUmPLi8lAHPMADnJwqfMWOOljZZ7U 0qczKhkPft7c3ds3GF7r+n/iRvOnCgRi7E0InW+z0I9RJirBuKHk+R/kBu1jST3G7ZSF PbUEYUYFWoNiQiAlmwelh18HefdEwr/3yFjbOuhxr33pzPopFJ/mnjfULv6ISgpp3/9q YxNakzSpnteQSZuILPnOQtwMzWttTd4D/oixHQTKTqi9A9ftU+zqPuFb6BzHstGV5WFX 744SwNlAl3SXfWXkkpuUjX17h7RCPwKL4tN5vVJEawKVWBjoKc7n41Q7G9x0Aw3eIxWA fIHA== X-Gm-Message-State: AOAM530MPxNhqnN6IP76+U6q42y68q/H9Ih5H04mkV0GULd5OEBr9Ca+ 72dG1Y+/v/Z5gXqtDO9USQUoY2zbHcDmQg== X-Received: by 2002:a17:90a:8d82:b0:1bc:6b54:e798 with SMTP id d2-20020a17090a8d8200b001bc6b54e798mr13092201pjo.77.1645986099405; Sun, 27 Feb 2022 10:21:39 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:38 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 7/7] target/nios2: Rewrite interrupt handling Date: Sun, 27 Feb 2022 08:21:25 -1000 Message-Id: <20220227182125.21809-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1030 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Drop irq_pending boolean. Drop helper_check_interrupts. Move checks for irq disabled into nios2_cpu_exec_interrupt. End the TB on writes to ienable, just like to status. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- target/nios2/cpu.h | 1 - target/nios2/helper.h | 1 - target/nios2/cpu.c | 10 ++++------ target/nios2/op_helper.c | 19 ------------------- target/nios2/translate.c | 14 +++++--------- 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index d2ba0c5bbd..a00e4229ce 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -160,7 +160,6 @@ struct CPUNios2State { #if !defined(CONFIG_USER_ONLY) Nios2MMU mmu; - uint32_t irq_pending; #endif int error_code; }; diff --git a/target/nios2/helper.h b/target/nios2/helper.h index 21ef7f0791..a44ecfdf7a 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -24,5 +24,4 @@ DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) DEF_HELPER_2(mmu_write_tlbacc, void, env, i32) DEF_HELPER_2(mmu_write_tlbmisc, void, env, i32) DEF_HELPER_2(mmu_write_pteaddr, void, env, i32) -DEF_HELPER_1(check_interrupts, void, env) #endif diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 4cade61e93..6975ae4bdb 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -73,12 +73,9 @@ static void nios2_cpu_set_irq(void *opaque, int irq, int level) env->regs[CR_IPENDING] = deposit32(env->regs[CR_IPENDING], irq, 1, !!level); - env->irq_pending = env->regs[CR_IPENDING] & env->regs[CR_IENABLE]; - - if (env->irq_pending && (env->regs[CR_STATUS] & CR_STATUS_PIE)) { - env->irq_pending = 0; + if (env->regs[CR_IPENDING]) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); - } else if (!env->irq_pending) { + } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); } } @@ -134,7 +131,8 @@ static bool nios2_cpu_exec_interrupt(CPUState *cs, int interrupt_request) CPUNios2State *env = &cpu->env; if ((interrupt_request & CPU_INTERRUPT_HARD) && - (env->regs[CR_STATUS] & CR_STATUS_PIE)) { + (env->regs[CR_STATUS] & CR_STATUS_PIE) && + (env->regs[CR_IPENDING] & env->regs[CR_IENABLE])) { cs->exception_index = EXCP_IRQ; nios2_cpu_do_interrupt(cs); return true; diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index d729379e4d..caa885f7b4 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -21,28 +21,9 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "qemu/main-loop.h" -#if !defined(CONFIG_USER_ONLY) -static void nios2_check_interrupts(CPUNios2State *env) -{ - if (env->irq_pending && - (env->regs[CR_STATUS] & CR_STATUS_PIE)) { - env->irq_pending = 0; - cpu_interrupt(env_cpu(env), CPU_INTERRUPT_HARD); - } -} - -void helper_check_interrupts(CPUNios2State *env) -{ - qemu_mutex_lock_iothread(); - nios2_check_interrupts(env); - qemu_mutex_unlock_iothread(); -} -#endif /* !CONFIG_USER_ONLY */ - void helper_raise_exception(CPUNios2State *env, uint32_t index) { CPUState *cs = env_cpu(env); diff --git a/target/nios2/translate.c b/target/nios2/translate.c index b17ce25a36..ce3aacf59d 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -489,19 +489,15 @@ static void wrctl(DisasContext *dc, uint32_t code, uint32_t flags) case CR_IPENDING: /* ipending is read only, writes ignored. */ break; + case CR_STATUS: + case CR_IENABLE: + /* If interrupts were enabled using WRCTL, trigger them. */ + dc->base.is_jmp = DISAS_UPDATE; + /* fall through */ default: tcg_gen_mov_tl(cpu_R[instr.imm5 + CR_BASE], v); break; } - - /* If interrupts were enabled using WRCTL, trigger them. */ - if ((instr.imm5 + CR_BASE) == CR_STATUS) { - if (tb_cflags(dc->base.tb) & CF_USE_ICOUNT) { - gen_io_start(); - } - gen_helper_check_interrupts(cpu_env); - dc->base.is_jmp = DISAS_UPDATE; - } #endif }