From patchwork Tue May 17 22:32:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 96075 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 1944EB6EE9 for ; Wed, 18 May 2011 08:41:55 +1000 (EST) Received: from localhost ([::1]:35557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSxc-0002ry-CH for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 18:41:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSqf-00083n-9M for qemu-devel@nongnu.org; Tue, 17 May 2011 18:34:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMSqe-0000WY-3B for qemu-devel@nongnu.org; Tue, 17 May 2011 18:34:41 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:37210) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMSqd-0000KZ-UL for qemu-devel@nongnu.org; Tue, 17 May 2011 18:34:40 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so340090ewy.4 for ; Tue, 17 May 2011 15:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=s77YkJWXVW1DB5Ma8siyPRuQmff89vNePvpmETIfDOs=; b=kwGK5XCIhNomUs431Dochl+o4Tlgt+eN5x8PzOE4hXGJx3lJHwAaMoCf2OizNf3g0a XaH3idwDmCDRZ5NO5pTCt1mO/yaxJNMGwKGNcT4KqFqTP3MhVqu6Kjk5LO2tQGfcCcmD MQT8LvVcGOoWHZdT67cGNNVv7KN9ETIXjnQMA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=YHiYpZR+D838TnD4aoEv4Q39ZpBF5Kh6ok1DOqdGPy+iGKTKebd2inGi1yd1nJmDx7 plCwb8vkD/pAPIljrzwYDtZTj9SOgcdFE3AkUlDz0iwYq3hmmzIph7Ij20i88jNZRbM/ 777tdw0I8L6XkGS5NEl8sFU5lb7qqbeGGH5Yk= Received: by 10.14.1.69 with SMTP id 45mr396674eec.215.1305671679601; Tue, 17 May 2011 15:34:39 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id 34sm694926eee.15.2011.05.17.15.34.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2011 15:34:38 -0700 (PDT) Received: by octofox.metropolis (sSMTP sendmail emulation); Wed, 18 May 2011 02:34:35 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 02:32:51 +0400 Message-Id: <1305671572-5899-26-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1305671572-5899-1-git-send-email-jcmvbkbc@gmail.com> References: <1305671572-5899-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.215.45 Cc: Max Filippov Subject: [Qemu-devel] [PATCH 25/26] 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 b818fed..0657b65 100644 --- a/hw/xtensa_sample.c +++ b/hw/xtensa_sample.c @@ -45,6 +45,7 @@ static void xtensa_init(ram_addr_t ram_size, fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } + 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 31d3e7e..de3408f 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 9fcd2aa..8d25bde 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -99,12 +99,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", @@ -416,6 +418,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); @@ -437,6 +443,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,