From patchwork Sun Jul 24 17:11:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 106554 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 EDEEAB6F82 for ; Mon, 25 Jul 2011 04:25:25 +1000 (EST) Received: from localhost ([::1]:57521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ql2Ga-0001J7-2t for incoming@patchwork.ozlabs.org; Sun, 24 Jul 2011 13:15:00 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ql2Fy-0007nj-8d for qemu-devel@nongnu.org; Sun, 24 Jul 2011 13:14:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ql2Fg-0005OK-Jq for qemu-devel@nongnu.org; Sun, 24 Jul 2011 13:14:22 -0400 Received: from mail-fx0-f47.google.com ([209.85.161.47]:56785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ql2Fg-0004u6-By for qemu-devel@nongnu.org; Sun, 24 Jul 2011 13:14:04 -0400 Received: by mail-fx0-f47.google.com with SMTP id 11so8353846fxg.34 for ; Sun, 24 Jul 2011 10:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=nONEiU6S2Bp5o1jX7ZobEc3S53Ge8jU8dYluAz5fLsI=; b=vVBKr3TJmb+SWt2S75iheixijHEQmL/k0BUPDeelJ9LOK3tJ7YmACYFzh0cMc/HPSs DTrX2Hji1OiHw5i8nVj0/qksPATBnBsZ6zG3R3L25h1wOo82L3l7kOHHRw0DlOQAIFHT 1VOKTPCfXLjgudb2An4Wx+0SNGVebdNutobHk= Received: by 10.204.144.197 with SMTP id a5mr1007932bkv.281.1311527633949; Sun, 24 Jul 2011 10:13:53 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id t2sm1072661bku.0.2011.07.24.10.13.51 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 24 Jul 2011 10:13:53 -0700 (PDT) Received: by octofox.metropolis (sSMTP sendmail emulation); Sun, 24 Jul 2011 21:13:49 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Sun, 24 Jul 2011 21:11:04 +0400 Message-Id: <1311527469-12963-27-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1311527469-12963-1-git-send-email-jcmvbkbc@gmail.com> References: <1311527469-12963-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.47 Cc: jcmvbkbc@gmail.com Subject: [Qemu-devel] [PATCH v2 26/31] 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 9a805d4..a1d4e6d 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 6d6ad1b..83e4a4f 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", @@ -447,6 +449,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) { TCGv_i32 id = tcg_const_i32(sr - CCOMPARE); @@ -469,6 +475,7 @@ static void gen_wsr(DisasContext *dc, uint32_t sr, TCGv_i32 s) [WINDOW_BASE] = gen_wsr_windowbase, [WINDOW_START] = gen_wsr_windowstart, [PS] = gen_wsr_ps, + [PRID] = gen_wsr_prid, [CCOMPARE] = gen_wsr_ccompare, [CCOMPARE + 1] = gen_wsr_ccompare, [CCOMPARE + 2] = gen_wsr_ccompare,