From patchwork Tue Apr 26 18:18:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566084 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3850686map; Tue, 26 Apr 2022 11:45:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWaW3kiEc0NlAnBrazt8G4ozFfjQKRUhdLWGJtq3F+Ti6TvXWF/I/PdYc7lnwXv98ZmaFi X-Received: by 2002:a25:3a02:0:b0:641:68ce:1fe9 with SMTP id h2-20020a253a02000000b0064168ce1fe9mr22476065yba.320.1650998741338; Tue, 26 Apr 2022 11:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650998741; cv=none; d=google.com; s=arc-20160816; b=FJouzZ67KFp1CPNLTWkvxqlwkQkELIJFi7ASbsgj+/d/7WD3+C6dbtvO1NYrZ2mcyf ig9UhNdgIrAL7zcbnG+jetBbDDAXnWLgPJIJQcux0KBexiNr1EkWE3QeejddXkk00n4H dUr5+Qw+zmG+njG7VjJZHPyxdHHs9akDvGZxhaSbKuXFacq7M+7NWYGXEj1Cqnuj8PAn q0lfixYes1byj5JptiCDli4wEfdlNsCUYF9cyArfHFc0zAFxHFXdb7YQbQNGSeyuEkYs uSB/EFsVEepGILTAlE2CbdkCdvXoa7kNFk/TNS47QjRqPD7nVNvbpCiM9Tr6IWYcVN5N YbiQ== 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=oxknAb8WZp8/c3OBXmugT+dPS7TU38e5j5a7fcIuSm4=; b=MEZfm03Sjk4VW2TzmYNeJ2FT372fuNORbtCJmLCr6y5qrV7hqgEE12CURVgA2gizLd /Wj6+mnyc99vBxG4m7p9eNrFzhDvGw9mNaY3N14Yn3Boa/4nU6diJ2Pwvk6R5JqGfZZ9 SycdLYyDrUUTU8/z+i2oe+tWr6zPLoFQScw7w55zQns9+ScbCGijWBPBpef1LLkM+1tz 2X+W8kaqgqBLhVhfzjQ8F4GR7axXmckclUd1aSmxRXm/Di4UHbC98Q4cjeLqpiOn6xSz m+ZrEcfsAhfoet+TWZHwNAddlUqC6OuRXxms+XITl2bB/PwM8aLVSBS5F2f5rnZL950/ VBGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="A6ej/pQ4"; 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 h186-20020a0ddec3000000b002f826fb9a89si1905825ywe.213.2022.04.26.11.45.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 11:45:41 -0700 (PDT) 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="A6ej/pQ4"; 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]:45156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njQBw-0001Eh-QN for patch@linaro.org; Tue, 26 Apr 2022 14:45:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njPmY-0002YN-9E for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:26 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:38763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njPmV-0004Mc-Ax for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:26 -0400 Received: by mail-pf1-x429.google.com with SMTP id b15so18710989pfm.5 for ; Tue, 26 Apr 2022 11:19:22 -0700 (PDT) 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=oxknAb8WZp8/c3OBXmugT+dPS7TU38e5j5a7fcIuSm4=; b=A6ej/pQ47OMHEP9PGF0kxeHiOWzJYZb9uwPq0j6LrLToaGLadL+FLS+BZaJnVln1fB sKCeG/LZdNU0nw/0Rq+LuqsCqF/9c7Zz6LFngs9hUh2H6rdVGsRkv0ZZzbfGm2tJPmKw g+35UpkXy5LwysyYOkrzAM/9gEV9LvTzgoxlGY5BeHEHh/MLtJd15cKaCsi39imuSdKT BX3MYFeGJ3ZkNWcQUfCInFkWoE0l6qT6Mbh1G9iQCvoL/dhfr/E/rU5mRGwtDZK2MYsL N+Kyia6u2WlGElaKWHiZLm0gyxvOOITdxOgum4Rs0GsYulxQ3wWfBzBFisRy/x43DE7d SqUQ== 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=oxknAb8WZp8/c3OBXmugT+dPS7TU38e5j5a7fcIuSm4=; b=1a8YlR5zAVcWBLtmHIH2UzBQ99Fwl533tdh3NTBjaCOy6RCIC68cxNAypzWTORnKA5 yD3YiN2vMfytv6bqv3gO1k3BfGm1ftJUecK5XZRwERnNSdMk0t0u7M6V8Ygr/qZ/pN77 rhynpTc2fZHWpJQrEDqrUTpiqNiznFPdAzbCK8PWWL9GjVSK6FN5N5YwTprLNe7Cy0gM up0vIf6NDVnuMGopGl5Fc1Aa6M9NxM1cuFwvSLEhRPztg31hdiUVIOxoZTbqQ3+wNq8R KEyAz9aBMlV23SQ/awfG1t03bXPqTixmM6WVjyjUmJSB2u7fqt1VHog+1d5mxif1ELoL bwhQ== X-Gm-Message-State: AOAM531KgELLZTaU7sZVh904mDPmV88PbYOYBdIzCry2kjv7jiOf22jd OxIiPPGgKuOzm28eUOzorIsm+hcvRdWa6Q== X-Received: by 2002:a63:5d0a:0:b0:399:40fd:2012 with SMTP id r10-20020a635d0a000000b0039940fd2012mr21063148pgb.454.1650997162063; Tue, 26 Apr 2022 11:19:22 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j7-20020a056a00130700b004b9f7cd94a4sm16482827pfu.56.2022.04.26.11.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:19:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/68] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS Date: Tue, 26 Apr 2022 11:18:14 -0700 Message-Id: <20220426181907.103691-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426181907.103691-1-richard.henderson@linaro.org> References: <20220426181907.103691-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: Peter Maydell , Amir Gonnen Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Amir Gonnen Split NUM_CORE_REGS into components that can be used elsewhere. Reviewed-by: Peter Maydell Signed-off-by: Amir Gonnen Message-Id: <20220303153906.2024748-3-amir.gonnen@neuroblade.ai> [rth: Split out of a larger patch for shadow register sets.] Signed-off-by: Richard Henderson Message-Id: <20220421151735.31996-16-richard.henderson@linaro.org> --- target/nios2/cpu.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 3198c17213..09dc38a4e7 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -56,9 +56,11 @@ struct Nios2CPUClass { #define EXCEPTION_ADDRESS 0x00000004 #define FAST_TLB_MISS_ADDRESS 0x00000008 +#define NUM_GP_REGS 32 +#define NUM_CR_REGS 32 /* GP regs + CR regs + PC */ -#define NUM_CORE_REGS (32 + 32 + 1) +#define NUM_CORE_REGS (NUM_GP_REGS + NUM_CR_REGS + 1) /* General purpose register aliases */ #define R_ZERO 0 @@ -79,7 +81,7 @@ struct Nios2CPUClass { #define R_RA 31 /* Control register aliases */ -#define CR_BASE 32 +#define CR_BASE NUM_GP_REGS #define CR_STATUS (CR_BASE + 0) #define CR_STATUS_PIE (1 << 0) #define CR_STATUS_U (1 << 1)