Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lm8s9-00033l-2W for qemu-devel@nongnu.org; Tue, 24 Mar 2009 11:49:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lm8s4-0002ys-VN for qemu-devel@nongnu.org; Tue, 24 Mar 2009 11:49:00 -0400 Received: from [199.232.76.173] (port=33166 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lm8s4-0002yk-QZ for qemu-devel@nongnu.org; Tue, 24 Mar 2009 11:48:56 -0400 Received: from mx20.gnu.org ([199.232.41.8]:51824) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lm8s3-0003ke-RY for qemu-devel@nongnu.org; Tue, 24 Mar 2009 11:48:56 -0400 Received: from mel.act-europe.fr ([212.99.106.210]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lm8s1-0000Px-Ki for qemu-devel@nongnu.org; Tue, 24 Mar 2009 11:48:53 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id A5A0E290017 for ; Tue, 24 Mar 2009 16:48:07 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RonrJGhfLMIW for ; Tue, 24 Mar 2009 16:48:07 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) by mel.act-europe.fr (Postfix) with ESMTP id 74CE629006B for ; Tue, 24 Mar 2009 16:48:07 +0100 (CET) From: Tristan Gingold Date: Tue, 24 Mar 2009 16:48:06 +0100 Message-Id: <1237909687-31711-25-git-send-email-gingold@adacore.com> In-Reply-To: <1237909687-31711-24-git-send-email-gingold@adacore.com> References: <1237909687-31711-1-git-send-email-gingold@adacore.com> <1237909687-31711-2-git-send-email-gingold@adacore.com> <1237909687-31711-3-git-send-email-gingold@adacore.com> <1237909687-31711-4-git-send-email-gingold@adacore.com> <1237909687-31711-5-git-send-email-gingold@adacore.com> <1237909687-31711-6-git-send-email-gingold@adacore.com> <1237909687-31711-7-git-send-email-gingold@adacore.com> <1237909687-31711-8-git-send-email-gingold@adacore.com> <1237909687-31711-9-git-send-email-gingold@adacore.com> <1237909687-31711-10-git-send-email-gingold@adacore.com> <1237909687-31711-11-git-send-email-gingold@adacore.com> <1237909687-31711-12-git-send-email-gingold@adacore.com> <1237909687-31711-13-git-send-email-gingold@adacore.com> <1237909687-31711-14-git-send-email-gingold@adacore.com> <1237909687-31711-15-git-send-email-gingold@adacore.com> <1237909687-31711-16-git-send-email-gingold@adacore.com> <1237909687-31711-17-git-send-email-gingold@adacore.com> <1237909687-31711-18-git-send-email-gingold@adacore.com> <1237909687-31711-19-git-send-email-gingold@adacore.com> <1237909687-31711-20-git-send-email-gingold@adacore.com> <1237909687-31711-21-git-send-email-gingold@adacore.com> <1237909687-31711-22-git-send-email-gingold@adacore.com> <1237909687-31711-23-git-send-email-gingold@adacore.com> <1237909687-31711-24-git-send-email-gingold@adacore.com> Subject: [Qemu-devel] [PATCH 24/25] Correctly decode hw_ld/hw_st opcodes for all alpha implementations. 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 Allow privilegied pal_code only in kernel mode. Signed-off-by: Tristan Gingold --- target-alpha/translate.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/target-alpha/translate.c b/target-alpha/translate.c index b705d28..67410b3 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -52,6 +52,7 @@ struct DisasContext { int pal_mode; #endif uint32_t amask; + uint32_t implver; }; /* global register indexes */ @@ -103,6 +104,20 @@ static void alpha_translate_init(void) done_init = 1; } +static inline int get_mxcr_iprn(DisasContext *ctx, uint32_t insn) +{ + switch (ctx->implver) { + case IMPLVER_2106x: + return insn & 0xff; + case IMPLVER_21164: + return insn & 0xffff; + case IMPLVER_21264: + return (insn >> 8) & 0xff; + default: + abort(); + } +} + static always_inline void gen_excp (DisasContext *ctx, int exception, int error_code) { @@ -689,7 +704,7 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) #if !defined (CONFIG_USER_ONLY) } else if (palcode < 0x40) { /* Privileged PAL code */ - if (ctx->mem_idx & 1) + if (ctx->mem_idx != MMU_KERNEL_IDX) goto invalid_opc; else gen_excp(ctx, EXCP_CALL_PALP + ((palcode & 0x3F) << 6), 0); @@ -1748,7 +1763,7 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) if (!ctx->pal_mode) goto invalid_opc; if (ra != 31) { - TCGv tmp = tcg_const_i32(insn & 0xFF); + TCGv tmp = tcg_const_i32(get_mxcr_iprn(ctx, insn)); gen_helper_mfpr(cpu_ir[ra], tmp, cpu_ir[ra]); tcg_temp_free(tmp); } @@ -2063,9 +2078,9 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) if (!ctx->pal_mode) goto invalid_opc; else { - TCGv tmp1 = tcg_const_i32(insn & 0xFF); - if (ra != 31) - gen_helper_mtpr(tmp1, cpu_ir[ra]); + TCGv tmp1 = tcg_const_i32(get_mxcr_iprn(ctx, insn)); + if (rb != 31) + gen_helper_mtpr(tmp1, cpu_ir[rb]); else { TCGv tmp2 = tcg_const_i64(0); gen_helper_mtpr(tmp1, tmp2); @@ -2088,8 +2103,8 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) gen_helper_hw_rei(); } else { TCGv tmp; - - if (ra != 31) { + + if (rb != 31) { tmp = tcg_temp_new(); tcg_gen_addi_i64(tmp, cpu_ir[rb], (((int64_t)insn << 51) >> 51)); } else @@ -2097,7 +2112,7 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) gen_helper_hw_ret(tmp); tcg_temp_free(tmp); } - ret = 2; + ret = 3; break; #endif case 0x1F: @@ -2352,6 +2367,7 @@ static always_inline void gen_intermediate_code_internal (CPUState *env, gen_opc_end = gen_opc_buf + OPC_MAX_SIZE; ctx.pc = pc_start; ctx.amask = env->amask; + ctx.implver = env->implver; #if defined (CONFIG_USER_ONLY) ctx.mem_idx = 0; #else -- 1.6.2