From patchwork Thu Mar 10 11:26:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 550098 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp910791mag; Thu, 10 Mar 2022 03:45:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJy77DV7xo8D8jVIMs3krHLit66NnSvItpt/JNeYVzc7apl1kO9+XwJ7wVdCmJY94XZPdSZ3 X-Received: by 2002:a25:d181:0:b0:629:1919:d8e5 with SMTP id i123-20020a25d181000000b006291919d8e5mr3421749ybg.85.1646912739175; Thu, 10 Mar 2022 03:45:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646912739; cv=none; d=google.com; s=arc-20160816; b=eg4jk/0U4ny0RUA/ROFW7tRewBzv8uon4a34bZm7pHug+Auz9VJcN/mgX4kRpHgbmY DQDwmmR4BLWp2dwwO92KJNoWtp52csFAcEMTFHkNTOgAGO/trqPqwZFKPaAAPaM7DVel x9/ogrBiJYrTMJWL2zhifAb9Mh4ZYQ0g0BaAsSYiNZ5BODRwUpS3qYs4VCH+cH4AOqh1 IqJOVIgbdgHsiViQ0y/JOXs+cSo2EWMQy/AfVCO3cpFU+r+vtkTXxr0e2OLCqg7KJ/Li cBqSgjoUZdWoju/I/Ukb75AOtX8Y5ZqZxg7cNcX6fpVYj5D4RfboR/zWGPDrc416hoUu pD1Q== 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=NO5qDCidg6tXT/kBs+ctrp9mOI+zlSE5VUcpn5RQSbI=; b=RWAtoo0jrxswqPvO+i6jCxYlh7h7J7xBoXbGT876cqkM/l7IbjnYYaIquoN9P5ls5v Y/3325HNxsMWF6+/hnbaY9IiC+lzJj6VxktqXl2Hx+46wwinRIIioKQO1myn4ZWzWWvh IfVIoA8EGp+qTlc1dSfrkpD4VHdT4kfKZGx0Hdw/tixF0jQQeC7f4H0GLQno/ZoojfPZ AJkEBEgJPWfj5U6PaVra1YLaabKixrjqXORuFhTWWCLv78KFhmXGuOW6cB96bjgmv6RV hJ6MuHuK+sFBQ7U9gnyTtftRjSQKnSsryz+0/t4VXWlkpAOt90f4+/9oXklKxc0/LaWD pYJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Mq0oxVi4; 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=fail (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 c203-20020a251cd4000000b006246c88a1adsi2960695ybc.399.2022.03.10.03.45.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Mar 2022 03:45:39 -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=fail header.i=@linaro.org header.s=google header.b=Mq0oxVi4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSHEg-00031W-My for patch@linaro.org; Thu, 10 Mar 2022 06:45:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSGxK-0005Ge-Q5 for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:42 -0500 Received: from [2607:f8b0:4864:20::102b] (port=35645 helo=mail-pj1-x102b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSGxJ-0007wr-7t for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:42 -0500 Received: by mail-pj1-x102b.google.com with SMTP id mg21-20020a17090b371500b001bef9e4657cso8015301pjb.0 for ; Thu, 10 Mar 2022 03:27: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=NO5qDCidg6tXT/kBs+ctrp9mOI+zlSE5VUcpn5RQSbI=; b=Mq0oxVi4HUaSZ9l0SxP5Z2LoFJrv2mz+s/HxKiAVEp/qeJo93dDTlWsohwcdFsZe4W rzybK2xVNehIfg3GyhEjNQBhmY3vUrvV8NskGfvI8EznR0iFSB7CeEonGkrI+8W2+sZa Sy2WskG3gl44gi9fXvsolAieLNWPAZaHSH+W2stOZkIZPhQuDrFajUXgXFR94348kbZN 5OnTOqhH236pASucXt12FNnq7hAkE34S8p8PqdYYbOE6TY88o/wjqSQfoh7acQRBo7tF /awe3sb9g1oIeMBXsI+lf5/9eJ5x01ai7Bi3mb2zWC0z3Fn2Ur2FR2OOhhP++Y/v1JIw l5Uw== 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=NO5qDCidg6tXT/kBs+ctrp9mOI+zlSE5VUcpn5RQSbI=; b=zyib/qOz2JwjhzWos8WwMTa/Uk1f1VTrCKVFj91EYBsWio9767iTmtMpb85mBZxNJ/ rQovL6Yjg+B5zUCwPLKyczyrSnMYcCjrIL3xZkAsVVbknut7itWQxTds+ZyhyA+86agL umRUdisw+lZmUKCudGY3Tsz0A53Rd0v/ASvDqyV0xSsGVk/rWCZ/n+6ToJZ2I4U6R7jp pf4jExfRamh5wOPpwRON49WzObxbdmUb+NcfrS6XS+QLR4Dt2zTybsDpV88pYwYbXhA+ mm1PXMIP2lO64N4eFaQbQyapYX8wuHYGtMC07lsK5+iqpC9JZYRmQoCVDkKvk1L6FMde 1qrg== X-Gm-Message-State: AOAM530SKVIA8PjyoDmhSzW3pJxwzBpni6ffF1rUlkFKU0ywczAx7/hT gIqqjntawZH4HvIPrqFpKnvjzwhBIkpgMQ== X-Received: by 2002:a17:902:ab4c:b0:151:eb86:dcb5 with SMTP id ij12-20020a170902ab4c00b00151eb86dcb5mr4470962plb.126.1646911659982; Thu, 10 Mar 2022 03:27:39 -0800 (PST) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id js15-20020a17090b148f00b001bfc8614b93sm3114977pjb.1.2022.03.10.03.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Mar 2022 03:27:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 12/48] target/nios2: Clean up nios2_cpu_dump_state Date: Thu, 10 Mar 2022 03:26:49 -0800 Message-Id: <20220310112725.570053-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310112725.570053-1-richard.henderson@linaro.org> References: <20220310112725.570053-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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: marex@denx.de, peter.maydell@linaro.org, amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not print control registers for user-only mode. Rename reserved control registers to "resN", where N is the control register index. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/translate.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 2e486651f5..45fe2f9a05 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -783,16 +783,18 @@ static const char * const gr_regnames[NUM_GP_REGS] = { "fp", "ea", "ba", "ra", }; +#ifndef CONFIG_USER_ONLY static const char * const cr_regnames[NUM_CR_REGS] = { "status", "estatus", "bstatus", "ienable", - "ipending", "cpuid", "reserved0", "exception", + "ipending", "cpuid", "res6", "exception", "pteaddr", "tlbacc", "tlbmisc", "reserved1", "badaddr", "config", "mpubase", "mpuacc", - "reserved2", "reserved3", "reserved4", "reserved5", - "reserved6", "reserved7", "reserved8", "reserved9", - "reserved10", "reserved11", "reserved12", "reserved13", - "reserved14", "reserved15", "reserved16", "reserved17", + "res16", "res17", "res18", "res19", + "res20", "res21", "res22", "res23", + "res24", "res25", "res26", "res27", + "res28", "res29", "res30", "res31", }; +#endif #include "exec/gen-icount.h" @@ -904,10 +906,6 @@ void nios2_cpu_dump_state(CPUState *cs, FILE *f, int flags) CPUNios2State *env = &cpu->env; int i; - if (!env) { - return; - } - qemu_fprintf(f, "IN: PC=%x %s\n", env->pc, lookup_symbol(env->pc)); for (i = 0; i < NUM_GP_REGS; i++) { @@ -916,13 +914,14 @@ void nios2_cpu_dump_state(CPUState *cs, FILE *f, int flags) qemu_fprintf(f, "\n"); } } + +#if !defined(CONFIG_USER_ONLY) for (i = 0; i < NUM_CR_REGS; i++) { qemu_fprintf(f, "%9s=%8.8x ", cr_regnames[i], env->ctrl[i]); if ((i + 1) % 4 == 0) { qemu_fprintf(f, "\n"); } } -#if !defined(CONFIG_USER_ONLY) qemu_fprintf(f, " mmu write: VPN=%05X PID %02X TLBACC %08X\n", env->mmu.pteaddr_wr & CR_PTEADDR_VPN_MASK, (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4,