From patchwork Fri Oct 4 13:23:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Musta X-Patchwork-Id: 280626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66ABE2C00A1 for ; Fri, 4 Oct 2013 23:59:47 +1000 (EST) Received: from localhost ([::1]:48175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VS5uz-0004Xz-KS for incoming@patchwork.ozlabs.org; Fri, 04 Oct 2013 09:59:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VS5Ml-0000uO-LQ for qemu-devel@nongnu.org; Fri, 04 Oct 2013 09:24:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VS5Md-0005hL-8J for qemu-devel@nongnu.org; Fri, 04 Oct 2013 09:24:23 -0400 Received: from mail-qc0-x236.google.com ([2607:f8b0:400d:c01::236]:53405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VS5MM-0005d7-0V; Fri, 04 Oct 2013 09:23:58 -0400 Received: by mail-qc0-f182.google.com with SMTP id n4so2663816qcx.41 for ; Fri, 04 Oct 2013 06:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=46aRIHMgaZUVAs+0KRhhjltyphUbfcl9rrqr/kl0DoY=; b=u69Pt6igHJx9S6zacM1i/0wpbWxkY0t4EHZq1RlRLc55xXK6UizI54JqeIGnmjh5Zj ek3ntNlX7+twsfAg4naZdGHqDhWtoBA4ueKUsShmb8N8BgW+14zV1mF6zev6d3AqGdPq zWEVApVAQrmZc3Oye8q0RvqHSkAQzTDRVHr5kCfI1SHP5/FhzOhJo/Bz/okZ8B3Zd9kI fNLnNSLN3DEzSaw7FKauazDpdLoOYM/RCkxDRtEXpXI9YdH7znDVyHaLPS/6f8c5zmBD Ezeig4WWdxcK+zzUpJIGvRnsXHbthee3LMIM7KXR3ozFsdZhqYJ4JwKJM+vDkc4rVXzw JCDw== X-Received: by 10.229.174.3 with SMTP id r3mr17389595qcz.10.1380893037589; Fri, 04 Oct 2013 06:23:57 -0700 (PDT) Received: from [9.10.80.128] (rchp4.rochester.ibm.com. [129.42.161.36]) by mx.google.com with ESMTPSA id w8sm19108474yhg.8.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 06:23:57 -0700 (PDT) Message-ID: <524EC167.1010902@gmail.com> Date: Fri, 04 Oct 2013 08:23:51 -0500 From: Tom Musta User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: qemu-ppc@nongnu.org References: <524EBE04.8050207@gmail.com> In-Reply-To: <524EBE04.8050207@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::236 X-Mailman-Approved-At: Fri, 04 Oct 2013 09:52:38 -0400 Cc: Tom Musta , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 10/13] Add xxmrgh/xxmrgl 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 This patch adds the VSX Merge High Word and VSX Merge Low Word instructions. Signed-off-by: Tom Musta --- target-ppc/translate.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) @@ -9798,6 +9840,8 @@ VSX_LOGICAL(xxlandc, 0x8, 0x11, PPC2_VSX), VSX_LOGICAL(xxlor, 0x8, 0x12, PPC2_VSX), VSX_LOGICAL(xxlxor, 0x8, 0x13, PPC2_VSX), VSX_LOGICAL(xxlnor, 0x8, 0x14, PPC2_VSX), +GEN_XX3FORM(xxmrghw, 0x08, 0x02, PPC2_VSX), +GEN_XX3FORM(xxmrglw, 0x08, 0x06, PPC2_VSX), GEN_XX3FORM_DM(xxpermdi, 0x08, 0x01), diff --git a/target-ppc/translate.c b/target-ppc/translate.c index f1ce4fe..bd62c62 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -7286,6 +7286,48 @@ VSX_LOGICAL(xxlor, tcg_gen_or_tl) VSX_LOGICAL(xxlxor, tcg_gen_xor_tl) VSX_LOGICAL(xxlnor, tcg_gen_nor_tl) +#define VSX_XXMRG(name, high) \ +static void glue(gen_, name)(DisasContext * ctx) \ + { \ + TCGv_i64 a0, a1, b0, b1; \ + if (unlikely(!ctx->vsx_enabled)) { \ + gen_exception(ctx, POWERPC_EXCP_VSXU); \ + return; \ + } \ + a0 = tcg_temp_new(); \ + a1 = tcg_temp_new(); \ + b0 = tcg_temp_new(); \ + b1 = tcg_temp_new(); \ + if (high) { \ + tcg_gen_mov_i64(a0, cpu_vsrh(xA(ctx->opcode))); \ + tcg_gen_mov_i64(a1, cpu_vsrh(xA(ctx->opcode))); \ + tcg_gen_mov_i64(b0, cpu_vsrh(xB(ctx->opcode))); \ + tcg_gen_mov_i64(b1, cpu_vsrh(xB(ctx->opcode))); \ + } else { \ + tcg_gen_mov_i64(a0, cpu_vsrl(xA(ctx->opcode))); \ + tcg_gen_mov_i64(a1, cpu_vsrl(xA(ctx->opcode))); \ + tcg_gen_mov_i64(b0, cpu_vsrl(xB(ctx->opcode))); \ + tcg_gen_mov_i64(b1, cpu_vsrl(xB(ctx->opcode))); \ + } \ + tcg_gen_andi_i64(a0, a0, 0xFFFFFFFF00000000ul); \ + tcg_gen_shli_i64(a1, a1, 32); \ + tcg_gen_shri_i64(b0, b0, 32); \ + tcg_gen_andi_i64(b0, b0, 0x00000000FFFFFFFFul); \ + tcg_gen_andi_i64(b1, b1, 0x00000000FFFFFFFFul); \ + tcg_gen_or_i64(a0, a0, b0); \ + tcg_gen_or_i64(a1, a1, b1); \ + tcg_gen_mov_i64(cpu_vsrh(xT(ctx->opcode)), a0); \ + tcg_gen_mov_i64(cpu_vsrl(xT(ctx->opcode)), a1); \ + tcg_temp_free(a0); \ + tcg_temp_free(a1); \ + tcg_temp_free(b0); \ + tcg_temp_free(b1); \ + } + +VSX_XXMRG(xxmrghw, 1) +VSX_XXMRG(xxmrglw, 0) + + /*** SPE extension ***/ /* Register moves */