From patchwork Mon May 19 09:22:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 350170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D262F140086 for ; Mon, 19 May 2014 19:26:29 +1000 (EST) Received: from localhost ([::1]:46824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJpz-0006d3-PT for incoming@patchwork.ozlabs.org; Mon, 19 May 2014 05:26:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJpS-0005dy-6F for qemu-devel@nongnu.org; Mon, 19 May 2014 05:26:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmJpM-0005la-4V for qemu-devel@nongnu.org; Mon, 19 May 2014 05:25:54 -0400 Received: from mail-yk0-x235.google.com ([2607:f8b0:4002:c07::235]:38094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJpL-0005lP-M7 for qemu-devel@nongnu.org; Mon, 19 May 2014 05:25:47 -0400 Received: by mail-yk0-f181.google.com with SMTP id 131so4199940ykp.26 for ; Mon, 19 May 2014 02:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ldqjYgNBExslBCe4EzszwgpeUkkzy74e2YmQekmHhJQ=; b=Xubg8bgRKbw7B+H6hZDvOnTCFuf74XzcXwOyAvfEBwZEMwqw+Uao3TM3O9gT7eapIL N0IxMJafLj1VkPQRuo53KdcacbcW96+oQGuJMDemxcBJUXpgGP+E2wQ42N1L9wGI+IJZ IrtzA+DZcOkU1nYgEDNvF2scrPknfjJJcrGorNRk4xaMl1yc+hpodH9o2NIgIWMcx+Ln 4fMZE/lhriQ/acxOf7CDs6t3Ls4/U4ZhwyFoqvsOrupfcgWAG1s5oeWYhzqcGfln1n+5 PlOpEKSVvodEm/pCPmszYB0HEkPA7/ZHT+qC9ASSDD/1aYv4t46LjzZTPe39s1CJ2bGv Z/gw== X-Received: by 10.236.135.197 with SMTP id u45mr1869973yhi.150.1400491547309; Mon, 19 May 2014 02:25:47 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id z69sm24339642yha.26.2014.05.19.02.25.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 19 May 2014 02:25:46 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 19 May 2014 19:22:44 +1000 Message-Id: <1400491383-6725-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> References: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c07::235 Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 03/22] target-arm: c12_vbar -> vbar_el[] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" No functional change. Preparation for adding EL2 and 3 versions of this reg. Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 2 +- target-arm/helper-a64.c | 2 +- target-arm/helper.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 0b30ab8..11b7a0b 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -198,7 +198,7 @@ typedef struct CPUARMState { uint32_t c9_pmuserenr; /* perf monitor user enable */ uint32_t c9_pminten; /* perf monitor interrupt enables */ uint64_t mair_el1; - uint64_t c12_vbar; /* vector base address register */ + uint64_t vbar_el[2]; /* vector base address register */ uint32_t c13_fcse; /* FCSE PID. */ uint64_t contextidr_el1; /* Context ID. */ uint64_t tpidr_el0; /* User RW Thread register. */ diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 13c5865..b8e6d56 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -443,7 +443,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; - target_ulong addr = env->cp15.c12_vbar; + target_ulong addr = env->cp15.vbar_el[1]; int i; if (arm_current_pl(env) == 0) { diff --git a/target-arm/helper.c b/target-arm/helper.c index 107cd5f..bba7297 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -657,7 +657,7 @@ static void vbar_write(CPUARMState *env, const ARMCPRegInfo *ri, * contexts. (ARMv8 would permit us to do no masking at all, but ARMv7 * requires the bottom five bits to be RAZ/WI because they're UNK/SBZP.) */ - env->cp15.c12_vbar = value & ~0x1FULL; + env->cp15.vbar_el[1] = value & ~0x1FULL; } static uint64_t ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri) @@ -766,7 +766,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { { .name = "VBAR", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .crn = 12, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL1_RW, .writefn = vbar_write, - .fieldoffset = offsetof(CPUARMState, cp15.c12_vbar), + .fieldoffset = offsetof(CPUARMState, cp15.vbar_el[1]), .resetvalue = 0 }, { .name = "SCR", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 0, .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.c1_scr), @@ -3379,7 +3379,7 @@ void arm_cpu_do_interrupt(CPUState *cs) * and is never in monitor mode this feature is always active. * Note: only bits 31:5 are valid. */ - addr += env->cp15.c12_vbar; + addr += env->cp15.vbar_el[1]; } switch_mode (env, new_mode); env->spsr = cpsr_read(env);