Received: from eggs.gnu.org ([2001:4830:134:3::10]:44395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7qOd-0005Mp-CL for qemu-devel@nongnu.org; Mon, 27 Jan 2014 12:55:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7qOU-0003ij-Tv for qemu-devel@nongnu.org; Mon, 27 Jan 2014 12:54:55 -0500 From: Tom Musta Date: Mon, 27 Jan 2014 11:54:22 -0600 Message-Id: <1390845264-2532-7-git-send-email-tommusta@gmail.com> In-Reply-To: <1390845264-2532-1-git-send-email-tommusta@gmail.com> References: <1390845264-2532-1-git-send-email-tommusta@gmail.com> Subject: [Qemu-devel] [PATCH 6/8] target-ppc: Store Quadword List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Tom Musta , qemu-ppc@nongnu.org This patch adds support for the Store Quadword instruction in user mode. Prior to Power ISA 2.07, stq was legal only in privileged mode. Support for Little Endian mode is also new in ISA 2.07. Signed-off-by: Tom Musta --- target-ppc/translate.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 15a4d1b..bb1dc82 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -2991,34 +2991,47 @@ static void gen_std(DisasContext *ctx) TCGv EA; rs = rS(ctx->opcode); - if ((ctx->opcode & 0x3) == 0x2) { + if ((ctx->opcode & 0x3) == 0x2) { /* stq */ + int legal_in_user_mode = (ctx->insns_flags2 & PPC2_LSQ_ISA207) != 0; + if (!legal_in_user_mode) { #if defined(CONFIG_USER_ONLY) - gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); -#else - /* stq */ - if (unlikely(ctx->mem_idx == 0)) { gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); return; +#else + if (unlikely(ctx->mem_idx == 0)) { + gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); + return; + } + + if (unlikely(ctx->le_mode)) { + /* Little-endian mode is not handled */ + gen_exception_err(ctx, POWERPC_EXCP_ALIGN, + POWERPC_EXCP_ALIGN_LE); + return; + } +#endif } + if (unlikely(rs & 1)) { gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); return; } - if (unlikely(ctx->le_mode)) { - /* Little-endian mode is not handled */ - gen_exception_err(ctx, POWERPC_EXCP_ALIGN, POWERPC_EXCP_ALIGN_LE); - return; - } gen_set_access_type(ctx, ACCESS_INT); EA = tcg_temp_new(); gen_addr_imm_index(ctx, EA, 0x03); - gen_qemu_st64(ctx, cpu_gpr[rs], EA); - gen_addr_add(ctx, EA, EA, 8); - gen_qemu_st64(ctx, cpu_gpr[rs+1], EA); + + if (unlikely(ctx->le_mode)) { + gen_qemu_st64(ctx, cpu_gpr[rs+1], EA); + gen_addr_add(ctx, EA, EA, 8); + gen_qemu_st64(ctx, cpu_gpr[rs], EA); + } else { + gen_qemu_st64(ctx, cpu_gpr[rs], EA); + gen_addr_add(ctx, EA, EA, 8); + gen_qemu_st64(ctx, cpu_gpr[rs+1], EA); + } tcg_temp_free(EA); -#endif } else { - /* std / stdu */ + /* std / stdu*/ if (Rc(ctx->opcode)) { if (unlikely(rA(ctx->opcode) == 0)) { gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); -- 1.7.1