From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTZcN-0000Z4-Rq for qemu-devel@nongnu.org; Fri, 28 Mar 2014 12:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTZcM-0005W3-42 for qemu-devel@nongnu.org; Fri, 28 Mar 2014 12:26:55 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTZcL-0005Vb-RJ for qemu-devel@nongnu.org; Fri, 28 Mar 2014 12:26:53 -0400 From: Peter Maydell Date: Fri, 28 Mar 2014 16:10:12 +0000 Message-Id: <1396023024-2262-26-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1396023024-2262-1-git-send-email-peter.maydell@linaro.org> References: <1396023024-2262-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v5 25/37] target-arm: Implement AArch64 view of ACTLR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , patches@linaro.org, Michael Matz , Alexander Graf , Will Newton , Dirk Mueller , Laurent Desnogues , =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvmarm@lists.cs.columbia.edu, Christoffer Dall , Richard Henderson Implement the AArch64 view of the ACTLR (auxiliary control register). Note that QEMU internally tends to call this AUXCR for historical reasons. Signed-off-by: Peter Maydell --- target-arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 10300aa..f2e6f17 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2316,7 +2316,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_AUXCR)) { ARMCPRegInfo auxcr = { - .name = "AUXCR", .cp = 15, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 1, + .name = "AUXCR", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 1, .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = cpu->reset_auxcr }; -- 1.9.0