From patchwork Thu Jul 13 03:25:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Brown X-Patchwork-Id: 787506 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7LxY4HMbz9s0g for ; Thu, 13 Jul 2017 13:33:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NLJSVgre"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3x7LxY34ZKzDqk6 for ; Thu, 13 Jul 2017 13:33:05 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NLJSVgre"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3x7Lnf3NXSzDqk8 for ; Thu, 13 Jul 2017 13:26:14 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NLJSVgre"; dkim-atps=neutral Received: by mail-pf0-x241.google.com with SMTP id z6so5490240pfk.3 for ; Wed, 12 Jul 2017 20:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QvQ20vYXWypL5GBvF2DZDeeAO3rNJ2nisySxV/468Lk=; b=NLJSVgreFEVIDBAY0dNB8KZZAt1PaMXLXttHYd+UC9QeR9hXOTmc48Z1xQLoq0svfv kk/4mUa4sNGbgi7ZISfAyCpSP9GgcEKRXydeUHSRnwwM/a0870PIzflv+c39zQJ9zr4S FqHyXLCfa6riFON6AFHc6sxstvS4r3LR1q0ZzGenKp6nW+jqdcby7fY+QJFN0RbQykIG VIr38yAegf5Yyktpjw584FWxcRYj+R4V6jrhCg7m/qBtTtjB6YGEnadAkltOKn+13ImB CMSrezI0onQ+/jLdFAJI46HM6X519YFmtQKO0oDqZhZMOdTC5Dn0JgMXfP5qP+O2HYMh 5xDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QvQ20vYXWypL5GBvF2DZDeeAO3rNJ2nisySxV/468Lk=; b=hSEwN418k3iQ0nnm5/kRWOGzUO7ezrhYnXq1qXedmhQgBSJEleXEMlPIpMqMTvxP4K b8TQJbLb9SdvERrad1T7fGdmtPQL2FgFIox0euprBOCxk2ws9SWUvxEnkNnhhPUpJBKb /RSG50ZIqfYoUyLDjqntX6oZVMUY45u4BvnfSWUQyXFJTjKz1e3QCug0fENcwGUiL4aK WX42iTCAOQOoI3YnbGUBv710Oz41znejSK5YxAb+d44Nip7VAWjDqnljNFJrgODYxHWE IMz6T9oiIBqgPnIGr2LSLEIlhqujn3Oho1JJPkl95du6GeQZMcpePdXvIiJFmSuPpnGK JWFw== X-Gm-Message-State: AIVw113qgIyNvi6clDY7Ok4DBAIGxfbbZ2Iau8VmbKhBtovrAPPehUKM vwhiSqvAjCrxovD4 X-Received: by 10.84.229.79 with SMTP id d15mr7878861pln.4.1499916372730; Wed, 12 Jul 2017 20:26:12 -0700 (PDT) Received: from matt.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id v205sm6595363pgb.51.2017.07.12.20.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jul 2017 20:26:12 -0700 (PDT) From: Matt Brown To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 4/5] powerpc/lib/sstep: Add prty instruction emulation Date: Thu, 13 Jul 2017 13:25:47 +1000 Message-Id: <20170713032548.451-4-matthew.brown.dev@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170713032548.451-1-matthew.brown.dev@gmail.com> References: <20170713032548.451-1-matthew.brown.dev@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: anton@samba.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This add emulation for the prtyw and prtyd instructions. Signed-off-by: Matt Brown --- arch/powerpc/lib/sstep.c | 58 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 603654d..3228783 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -652,6 +652,42 @@ static nokprobe_inline void do_bpermd(struct pt_regs *regs, unsigned long v1, regs->gpr[ra] = 0 | perm; } +static nokprobe_inline void do_prtyw(struct pt_regs *regs, unsigned long v, + int ra) +{ + unsigned long low, high, out; + unsigned int i; + + high = 0; + low = 0; + out = 0; + + for (i = 0; i < 8; i++) { + if (v & (1 << (i * 8))) + (i < 4) ? (low++) : (high++); + } + + if (low % 2) + out |= low; + if (high % 2) + out |= (high << 32); + + regs->gpr[ra] = out; +} + +static nokprobe_inline void do_prtyd(struct pt_regs *regs, unsigned long v, + int ra) +{ + unsigned int count, i; + + count = 0; + for (i = 0; i < 8; i++) { + if (v & (1 << (i * 8))) + count++; + } + regs->gpr[ra] = count % 2; +} + static nokprobe_inline int trap_compare(long v1, long v2) { int ret = 0; @@ -1278,16 +1314,15 @@ int analyse_instr(struct instruction_op *op, struct pt_regs *regs, do_popcnt(regs, val, 8, ra); goto logical_done; - case 17076744: /* popcntw */ + case 2101768: /* prtyw */ val = regs->gpr[rd]; - do_popcnt(regs, val, 32, ra); + do_prtyw(regs, val, ra); goto logical_done; -#ifdef __powerpc64__ - case 19173896: /* popcntd */ + + case 2134536: /* prtyd */ val = regs->gpr[rd]; - do_popcnt(regs, val, 64, ra); + do_prtyd(regs, val, ra); goto logical_done; -#endif #ifdef __powerpc64__ case 2396736: /* bpermd */ @@ -1297,6 +1332,17 @@ int analyse_instr(struct instruction_op *op, struct pt_regs *regs, goto logical_done; #endif + case 17076744: /* popcntw */ + val = regs->gpr[rd]; + do_popcnt(regs, val, 32, ra); + goto logical_done; +#ifdef __powerpc64__ + case 19173896: /* popcntd */ + val = regs->gpr[rd]; + do_popcnt(regs, val, 64, ra); + goto logical_done; +#endif + /* * Shift instructions */