From patchwork Wed Aug 31 21:57:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 112720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2E185B6F64 for ; Thu, 1 Sep 2011 09:44:07 +1000 (EST) Received: from localhost ([::1]:42140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QytLZ-0001BX-It for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2011 18:33:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QytKx-0007x8-EZ for qemu-devel@nongnu.org; Wed, 31 Aug 2011 18:32:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QytKw-0006m9-GZ for qemu-devel@nongnu.org; Wed, 31 Aug 2011 18:32:47 -0400 Received: from [188.134.19.124] (port=34544 helo=octofox.metropolis) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QytKw-0006fg-49 for qemu-devel@nongnu.org; Wed, 31 Aug 2011 18:32:46 -0400 Received: from octofox.metropolis (localhost [127.0.0.1]) by octofox.metropolis (8.14.5/8.14.5) with ESMTP id p7VLvrHj028686; Thu, 1 Sep 2011 01:57:53 +0400 Received: (from jcmvbkbc@localhost) by octofox.metropolis (8.14.5/8.14.5/Submit) id p7VLvrs7028685; Thu, 1 Sep 2011 01:57:53 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 1 Sep 2011 01:57:17 +0400 Message-Id: <1314827843-28543-27-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314827843-28543-1-git-send-email-jcmvbkbc@gmail.com> References: <1314827843-28543-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 188.134.19.124 Cc: jcmvbkbc@gmail.com Subject: [Qemu-devel] [PATCH v3 26/32] target-xtensa: implement CPENABLE and PRID SRs 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 Signed-off-by: Max Filippov --- hw/xtensa_sample.c | 1 + target-xtensa/cpu.h | 2 ++ target-xtensa/translate.c | 7 +++++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/hw/xtensa_sample.c b/hw/xtensa_sample.c index 9f7733b..c2ad48a 100644 --- a/hw/xtensa_sample.c +++ b/hw/xtensa_sample.c @@ -51,6 +51,7 @@ static void xtensa_init(ram_addr_t ram_size, exit(1); } qemu_register_reset(xtensa_sample_reset, env); + env->sregs[PRID] = n; } ram_offset = qemu_ram_alloc(NULL, "xtensa.dram", 0x10000); diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index bbb4dfc..fea24e9 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -118,12 +118,14 @@ enum { DEPC = 192, EPS2 = 194, EXCSAVE1 = 209, + CPENABLE = 224, INTSET = 226, INTCLEAR = 227, INTENABLE = 228, PS = 230, EXCCAUSE = 232, CCOUNT = 234, + PRID = 235, EXCVADDR = 238, CCOMPARE = 240, }; diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 38beb6f..87924ca 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -101,12 +101,14 @@ static const char * const sregnames[256] = { [EXCSAVE1 + 4] = "EXCSAVE5", [EXCSAVE1 + 5] = "EXCSAVE6", [EXCSAVE1 + 6] = "EXCSAVE7", + [CPENABLE] = "CPENABLE", [INTSET] = "INTSET", [INTCLEAR] = "INTCLEAR", [INTENABLE] = "INTENABLE", [PS] = "PS", [EXCCAUSE] = "EXCCAUSE", [CCOUNT] = "CCOUNT", + [PRID] = "PRID", [EXCVADDR] = "EXCVADDR", [CCOMPARE] = "CCOMPARE0", [CCOMPARE + 1] = "CCOMPARE1", @@ -476,6 +478,10 @@ static void gen_wsr_ps(DisasContext *dc, uint32_t sr, TCGv_i32 v) gen_jumpi_check_loop_end(dc, -1); } +static void gen_wsr_prid(DisasContext *dc, uint32_t sr, TCGv_i32 v) +{ +} + static void gen_wsr_ccompare(DisasContext *dc, uint32_t sr, TCGv_i32 v) { uint32_t id = sr - CCOMPARE; @@ -502,6 +508,7 @@ static void gen_wsr(DisasContext *dc, uint32_t sr, TCGv_i32 s) [INTCLEAR] = gen_wsr_intclear, [INTENABLE] = gen_wsr_intenable, [PS] = gen_wsr_ps, + [PRID] = gen_wsr_prid, [CCOMPARE] = gen_wsr_ccompare, [CCOMPARE + 1] = gen_wsr_ccompare, [CCOMPARE + 2] = gen_wsr_ccompare,