From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd55N-0003gB-AP for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:10:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd55H-0005uE-Oo for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:10:49 -0500 Received: from smtp191.dfw.emailsrvr.com ([67.192.241.191]:54116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd55H-0005u9-Lf for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:10:43 -0500 Message-ID: <4EF0DDB5.9040806@calxeda.com> Date: Tue, 20 Dec 2011 13:10:45 -0600 From: Mark Langsdorf MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 3/9] arm: add missing v7 cp15 registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.orgpeter.maydell@linaro.org From: Rob Herring Signed-off-by: Rob Herring Signed-off-by: Mark Langsdorf Conflicts: target-arm/cpu.h target-arm/helper.c --- target-arm/cpu.h | 1 + target-arm/helper.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 129edbb..b89c085 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -152,6 +152,7 @@ typedef struct CPUARMState { uint32_t c15_i_max; /* Maximum D-cache dirty line index. */ uint32_t c15_i_min; /* Minimum D-cache dirty line index. */ uint32_t c15_threadid; /* TI debugger thread-ID. */ + uint32_t c15_scubase; /* SCU base address. */ } cp15; struct { diff --git a/target-arm/helper.c b/target-arm/helper.c index 816c4c4..37110bc 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2197,6 +2197,13 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn) * 0x200 << ($rn & 0xfff), when MMU is off. */ goto bad_reg; } + if (ARM_CPUID(env) == ARM_CPUID_CORTEXA9) { + switch (crm) { + case 0: + return env->cp15.c15_scubase; + } + goto bad_reg; + } return 0; } bad_reg: -- 1.7.5.4