Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LkJVM-0000v6-DO for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:45:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LkJVH-0000ti-MO for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:45:55 -0400 Received: from [199.232.76.173] (port=37115 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LkJVH-0000tc-7v for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:45:51 -0400 Received: from mel.act-europe.fr ([212.99.106.210]:41628) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LkJVG-0003Ur-Gd for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:45:50 -0400 From: Tristan Gingold Date: Thu, 19 Mar 2009 15:35:52 +0100 Message-Id: <1237473356-81422-21-git-send-email-gingold@adacore.com> In-Reply-To: <1237473356-81422-20-git-send-email-gingold@adacore.com> References: <1237473356-81422-1-git-send-email-gingold@adacore.com> <1237473356-81422-2-git-send-email-gingold@adacore.com> <1237473356-81422-3-git-send-email-gingold@adacore.com> <1237473356-81422-4-git-send-email-gingold@adacore.com> <1237473356-81422-5-git-send-email-gingold@adacore.com> <1237473356-81422-6-git-send-email-gingold@adacore.com> <1237473356-81422-7-git-send-email-gingold@adacore.com> <1237473356-81422-8-git-send-email-gingold@adacore.com> <1237473356-81422-9-git-send-email-gingold@adacore.com> <1237473356-81422-10-git-send-email-gingold@adacore.com> <1237473356-81422-11-git-send-email-gingold@adacore.com> <1237473356-81422-12-git-send-email-gingold@adacore.com> <1237473356-81422-13-git-send-email-gingold@adacore.com> <1237473356-81422-14-git-send-email-gingold@adacore.com> <1237473356-81422-15-git-send-email-gingold@adacore.com> <1237473356-81422-16-git-send-email-gingold@adacore.com> <1237473356-81422-17-git-send-email-gingold@adacore.com> <1237473356-81422-18-git-send-email-gingold@adacore.com> <1237473356-81422-19-git-send-email-gingold@adacore.com> <1237473356-81422-20-git-send-email-gingold@adacore.com> Subject: [Qemu-devel] [PATCH 20/24] Add alpha_cpu_list. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Tristan Gingold Add alpha_cpu_list and use cpu_model to select the model in cpu_alpha_init. Set implver and amask from the model. Signed-off-by: Tristan Gingold --- target-alpha/cpu.h | 1 + target-alpha/translate.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 629d72b..ae9de3c 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -436,6 +436,7 @@ enum { CPUAlphaState * cpu_alpha_init (const char *cpu_model); int cpu_alpha_exec(CPUAlphaState *s); +void alpha_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); /* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero is returned if the signal was handled by the virtual CPU. */ diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 46ec733..bcd156f 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -2460,17 +2460,53 @@ void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb) gen_intermediate_code_internal(env, tb, 1); } +struct alpha_def { + const char *name; + uint32_t implver; + uint32_t amask; +}; + +static const struct alpha_def alpha_defs[] = { +#if 0 + { "21064", IMPLVER_2106x, 0 }, + { "21164", IMPLVER_21164, 0 }, +#endif + { "21264", IMPLVER_21264, (AMASK_PREFETCH | AMASK_TRAP | AMASK_BWX + | AMASK_FIX) }, +}; + +void alpha_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(alpha_defs); i++) + (*cpu_fprintf)(f, "%s\n", alpha_defs[i].name); +} + CPUAlphaState * cpu_alpha_init (const char *cpu_model) { CPUAlphaState *env; uint64_t hwpcb; + const struct alpha_def *cpu = alpha_defs; + + if (cpu_model != NULL) { + int i; + for (i = 0; i < ARRAY_SIZE(alpha_defs); i++) + if (strcmp (alpha_defs[i].name, cpu_model) == 0) { + cpu = &alpha_defs[i]; + break; + } + if (cpu == NULL) + return NULL; + } env = qemu_mallocz(sizeof(CPUAlphaState)); cpu_exec_init(env); alpha_translate_init(); tlb_flush(env, 1); - /* XXX: should not be hardcoded */ - env->implver = IMPLVER_2106x; + + env->implver = cpu->implver; + env->amask = cpu->amask; env->ps = 0x1F00; #if defined (CONFIG_USER_ONLY) env->ps |= 1 << 3; -- 1.6.2