From patchwork Wed May 4 00:59:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 93947 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 19A70B6EFF for ; Wed, 4 May 2011 11:04:47 +1000 (EST) Received: from localhost ([::1]:57782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQWC-0003D3-CL for incoming@patchwork.ozlabs.org; Tue, 03 May 2011 21:04:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQRz-0004YT-Ps for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHQRy-0000kj-U9 for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:23 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:56465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHQRy-0000ZL-NQ for qemu-devel@nongnu.org; Tue, 03 May 2011 21:00:22 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so221435ewy.4 for ; Tue, 03 May 2011 18:00:22 -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:mime-version:content-type :content-transfer-encoding; bh=x6nlRn5FUflc0ZZdqUS8yZgLbat51iQcFSHlJ2OiMKM=; b=JYmSPmbyMKYdLARr0ncXFVsHBZ//J9dgS+MySYInNtC3MOrf48nhvRkYceU2i2OEpN KX6lRusZ1A+5NoPUOAByGQfRIXODPFN6d/smTksUrDjWlfyS2JWKDdmgkS4n4C/1c8pM /v9xUi1eVnCqBDs/DPA9b3b1IVj2vxHemoOSo= 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 :mime-version:content-type:content-transfer-encoding; b=TpOX8Frm7tcgATJj2R1N/sUR14bdueaLQqj6KYNBnOXr6vKiKZs4S1+Py/9dRPldI8 AYYmKcYZcPRTatGrUQ/i25CF+AKZj52kE/8Nt8LH441jCWC7jdGDB5JcXk1q4KU2sR2J E+FY6+ECpJhbI5rW2uP/fqybAJHWOfahTKIjA= Received: by 10.213.108.147 with SMTP id f19mr1729575ebp.9.1304470822179; Tue, 03 May 2011 18:00:22 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id u16sm440729eei.9.2011.05.03.18.00.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 May 2011 18:00:21 -0700 (PDT) Received: by octofox.metropolis (sSMTP sendmail emulation); Wed, 4 May 2011 05:00:19 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 4 May 2011 04:59:10 +0400 Message-Id: <1304470768-16924-10-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> References: <1304470768-16924-1-git-send-email-jcmvbkbc@gmail.com> MIME-Version: 1.0 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] [RFC 10/28] target-xtensa: add special and user registers 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 Special Registers hold the majority of the state added to the processor by the options. See ISA, 5.3 for details. User Registers hold state added in support of designer’s TIE and in some cases of options that Tensilica provides. See ISA, 5.4 for details. Only registers mapped in sregnames or uregnames are considered valid. Signed-off-by: Max Filippov --- target-xtensa/cpu.h | 7 ++++++ target-xtensa/translate.c | 47 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index cf19fce..e99e3bb 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -99,6 +99,12 @@ enum { XTENSA_OPTIN_TRACE_PORT, }; +enum { + THREADPTR = 231, + FCR = 232, + FSR = 233, +}; + typedef struct XtensaConfig { const char *name; uint64_t options; @@ -109,6 +115,7 @@ typedef struct CPUXtensaState { uint32_t regs[16]; uint32_t pc; uint32_t sregs[256]; + uint32_t uregs[256]; CPU_COMMON } CPUXtensaState; diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index f4d74e0..f1f01bc 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -51,9 +51,20 @@ typedef struct DisasContext { static TCGv_ptr cpu_env; static TCGv_i32 cpu_pc; static TCGv_i32 cpu_R[16]; +static TCGv_i32 cpu_SR[256]; +static TCGv_i32 cpu_UR[256]; #include "gen-icount.h" +static const char * const sregnames[256] = { +}; + +static const char * const uregnames[256] = { + [THREADPTR] = "THREADPTR", + [FCR] = "FCR", + [FSR] = "FSR", +}; + void xtensa_translate_init(void) { static const char * const regnames[] = { @@ -73,6 +84,22 @@ void xtensa_translate_init(void) offsetof(CPUState, regs[i]), regnames[i]); } + + for (i = 0; i < 256; ++i) { + if (sregnames[i]) { + cpu_SR[i] = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, sregs[i]), + sregnames[i]); + } + } + + for (i = 0; i < 256; ++i) { + if (uregnames[i]) { + cpu_UR[i] = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, uregs[i]), + uregnames[i]); + } + } } static void gen_exception(int excp) @@ -737,9 +764,25 @@ void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb) void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags) { - int i; + int i, j; + + cpu_fprintf(f, "PC=%08x\n\n", env->pc); + + for (i = j = 0; i < 256; ++i) + if (sregnames[i]) { + cpu_fprintf(f, "%s=%08x%c", sregnames[i], env->sregs[i], + (j++ % 4) == 3 ? '\n' : ' '); + } + + cpu_fprintf(f, (j % 4) == 0 ? "\n" : "\n\n"); + + for (i = j = 0; i < 256; ++i) + if (uregnames[i]) { + cpu_fprintf(f, "%s=%08x%c", uregnames[i], env->uregs[i], + (j++ % 4) == 3 ? '\n' : ' '); + } - cpu_fprintf(f, "PC=%08x\n", env->pc); + cpu_fprintf(f, (j % 4) == 0 ? "\n" : "\n\n"); for (i = 0; i < 16; ++i) cpu_fprintf(f, "A%02d=%08x%c", i, env->regs[i],