From patchwork Thu Mar 10 11:26:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 550108 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp917256mag; Thu, 10 Mar 2022 03:54:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLzg9hZyHw+HswtawEoF+pXU0U2lSkdb0OKSHWoIbgCJyh/Zstl0EM0sZKxOOJyIDLW86U X-Received: by 2002:a81:6307:0:b0:2d6:6aee:dc75 with SMTP id x7-20020a816307000000b002d66aeedc75mr3607806ywb.249.1646913268290; Thu, 10 Mar 2022 03:54:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646913268; cv=none; d=google.com; s=arc-20160816; b=o3etSQSJjj3aSMXHQKp8CShTgUdzn3qTNr6BBHFqzxm/S/aKKW6BGwDFLGgl4Wd4Cz h4tjUka8IGQOsQTLmMPdnAy7nNc6K7+/UC8OXbCAJ5HtxgtoYmdl/RIUHSe/wRjPmfEv 8a1iD6A8L5IAh2zqIz3tIIv3Gig9Xr3zgjVDbjoLkCc54OaZg6qCUbRhWWzVBg7hFUot fczpqIBD78VEThRkf3wWiID3fjIA7bpyNabjmBI11m5zP8ShD3QAsNifQWm9pJYYLs9T B2JDEFqb3EqY9bFGL7j/y8xHpkXWc0Ot36KEt4KzwiZ1V0vnhnAKkB6/CYKZPmy9/4da BtYw== 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=e6sq5+VxzJ+iyeBdvkBx4ESzy/gdXULWUf0uyVhwts4=; b=AUbH9FTjmzXe0lTWt88rUzElj+7ZC/44iB7Z0LkFt5SgfoR8re4dMHZDh2Pjffvtd+ r9dRaRnTFZmnjYH0kTduv+CdxzNRJUMxlA+vLf+QRO5iIKvyncpkhDwRr02e8PLQHh6F mZF0kMzzBFhB0rrAKoV3DGLvE1Cr9SNzhV9KTLkrFytj2eIqsek8644fTU7S6sasS8Lp 7n1MsHe4F1/dQypsX3OLnuIcDtaboHaOxVDZz7qkOOWzs+MroQD/edwpc+RgyMp5JlOG eILcQ9SdwJs5RouZl4dLA1NqR8asSddlp0rCaw0vB21EZHRyhNaC/dE4Jtwt3P348x0d EDvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ckV13nbA; 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 r66-20020a818145000000b002dd4191a176si2134989ywf.346.2022.03.10.03.54.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Mar 2022 03:54:28 -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=ckV13nbA; 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]:59494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSHND-00037z-Kq for patch@linaro.org; Thu, 10 Mar 2022 06:54:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSGxS-0005cR-IM for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:50 -0500 Received: from [2607:f8b0:4864:20::1031] (port=46034 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSGxQ-0007yV-VT for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:50 -0500 Received: by mail-pj1-x1031.google.com with SMTP id m11-20020a17090a7f8b00b001beef6143a8so4944991pjl.4 for ; Thu, 10 Mar 2022 03:27:48 -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=e6sq5+VxzJ+iyeBdvkBx4ESzy/gdXULWUf0uyVhwts4=; b=ckV13nbAONqcjv7XIU0kL0eomQJTYp8RKRCHlrhu6he+2yvYE3j93z33QptmbrQpoe IezDqRCDeABj0npYedzBT877LqywYC7/kE/+CC0JXCCwESg4lqyXXEFLaMsPvL5GYX5j gkiBSmcserLjGcMSYUur+JEvOcv4VKDLqpTOOoA0+5p4xs/YN9IlQR2UeSyZjPBlQWRZ bnLyENDq7Is1kfC8Kuud/4SHWFDuoQIj94AfsNbao/fFoc8cGTpVtSxKWUqi+VCPhc+V YbUJJv449CMjG/BSnZEoB7sf0vD9fczIuUaQBiMekxuJdgOpKDps2UDwTGn0IE8a/1HU MTrg== 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=e6sq5+VxzJ+iyeBdvkBx4ESzy/gdXULWUf0uyVhwts4=; b=rxmIOAftXctnoiDvxbo8Jra6F6UWJSr1OW0ZCuBEmHcJmN4Nni8ZcI3mMRsgJpWE0T xHt1MR2KYrhPq2btIW88Wn2B1FOwymyA450RPOoDWdRl+dIm8sqcBI9j/urMaNhRFw9e e3ZfGHICCzSLiWu6bFxdWq77AJjLtTwROoPin/JYr6mbVjbOi0vUqR+rdAT5pyDw4T14 ISyCOEz3WCVAqFBam7pYgmPnTl50rGZRnkkK28vDiXtmOTDYCRgf/d/TZEoUl/pgKFHH dTkrqfm6bUCYgHvbr7OYB6Sr0R2OqUUk0WR2f+ofF62AdA8O9ip5On0VEm0Za9uFqcG5 IJ2g== X-Gm-Message-State: AOAM531Zn5tfSuDpPp1zTvN4R5VAvJrRgSFxg0xjQSFrDQU8QkgeW273 nkXxmBq2mpWseTvBEDFpxtPao5YCLRbxbQ== X-Received: by 2002:a17:902:d482:b0:151:ef7f:f5aa with SMTP id c2-20020a170902d48200b00151ef7ff5aamr4456489plg.58.1646911667698; Thu, 10 Mar 2022 03:27:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Mar 2022 03:27:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 19/48] target/nios2: Move R_FOO and CR_BAR into enumerations Date: Thu, 10 Mar 2022 03:26:56 -0800 Message-Id: <20220310112725.570053-20-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::1031 (failed) 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: -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, UPPERCASE_50_75=0.008 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" These symbols become available to the debugger. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/cpu.h | 72 ++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 7f805a933e..555972fe6b 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -61,25 +61,43 @@ struct Nios2CPUClass { #define NUM_CR_REGS 32 /* General purpose register aliases */ -#define R_ZERO 0 -#define R_AT 1 -#define R_RET0 2 -#define R_RET1 3 -#define R_ARG0 4 -#define R_ARG1 5 -#define R_ARG2 6 -#define R_ARG3 7 -#define R_ET 24 -#define R_BT 25 -#define R_GP 26 -#define R_SP 27 -#define R_FP 28 -#define R_EA 29 -#define R_BA 30 -#define R_RA 31 +enum { + R_ZERO = 0, + R_AT = 1, + R_RET0 = 2, + R_RET1 = 3, + R_ARG0 = 4, + R_ARG1 = 5, + R_ARG2 = 6, + R_ARG3 = 7, + R_ET = 24, + R_BT = 25, + R_GP = 26, + R_SP = 27, + R_FP = 28, + R_EA = 29, + R_BA = 30, + R_RA = 31, +}; /* Control register aliases */ -#define CR_STATUS 0 +enum { + CR_STATUS = 0, + CR_ESTATUS = 1, + CR_BSTATUS = 2, + CR_IENABLE = 3, + CR_IPENDING = 4, + CR_CPUID = 5, + CR_EXCEPTION = 7, + CR_PTEADDR = 8, + CR_TLBACC = 9, + CR_TLBMISC = 10, + CR_ENCINJ = 11, + CR_BADADDR = 12, + CR_CONFIG = 13, + CR_MPUBASE = 14, + CR_MPUACC = 15, +}; FIELD(CR_STATUS, PIE, 0, 1) FIELD(CR_STATUS, U, 1, 1) @@ -98,24 +116,12 @@ FIELD(CR_STATUS, RSIE, 23, 1) #define CR_STATUS_NMI R_CR_STATUS_NMI_MASK #define CR_STATUS_RSIE R_CR_STATUS_RSIE_MASK -#define CR_ESTATUS 1 -#define CR_BSTATUS 2 -#define CR_IENABLE 3 -#define CR_IPENDING 4 -#define CR_CPUID 5 -#define CR_CTL6 6 -#define CR_EXCEPTION 7 - FIELD(CR_EXCEPTION, CAUSE, 2, 5) FIELD(CR_EXCEPTION, ECCFTL, 31, 1) -#define CR_PTEADDR 8 - FIELD(CR_PTEADDR, VPN, 2, 20) FIELD(CR_PTEADDR, PTBASE, 22, 10) -#define CR_TLBACC 9 - FIELD(CR_TLBACC, PFN, 0, 20) FIELD(CR_TLBACC, G, 20, 1) FIELD(CR_TLBACC, X, 21, 1) @@ -130,8 +136,6 @@ FIELD(CR_TLBACC, IG, 25, 7) #define CR_TLBACC_X R_CR_TLBACC_X_MASK #define CR_TLBACC_G R_CR_TLBACC_G_MASK -#define CR_TLBMISC 10 - FIELD(CR_TLBMISC, D, 0, 1) FIELD(CR_TLBMISC, PERM, 1, 1) FIELD(CR_TLBMISC, BAD, 2, 1) @@ -150,12 +154,6 @@ FIELD(CR_TLBMISC, EE, 24, 1) #define CR_TLBMISC_PERM R_CR_TLBMISC_PERM_MASK #define CR_TLBMISC_D R_CR_TLBMISC_D_MASK -#define CR_ENCINJ 11 -#define CR_BADADDR 12 -#define CR_CONFIG 13 -#define CR_MPUBASE 14 -#define CR_MPUACC 15 - /* Exceptions */ #define EXCP_BREAK 0x1000 #define EXCP_RESET 0