From: Matt Brown <matthew.brown.dev@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: anton@samba.org
Subject: [PATCH 4/5] powerpc/lib/sstep: Add prty instruction emulation
Date: Thu, 13 Jul 2017 13:25:47 +1000 [thread overview]
Message-ID: <20170713032548.451-4-matthew.brown.dev@gmail.com> (raw)
In-Reply-To: <20170713032548.451-1-matthew.brown.dev@gmail.com>
This add emulation for the prtyw and prtyd instructions.
Signed-off-by: Matt Brown <matthew.brown.dev@gmail.com>
---
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
*/
--
2.9.3
next prev parent reply other threads:[~2017-07-13 3:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-13 3:25 [PATCH 1/5] powerpc/lib/sstep: Add cmpb instruction emulation Matt Brown
2017-07-13 3:25 ` [PATCH 2/5] powerpc/lib/sstep: Add popcnt " Matt Brown
2017-07-13 3:25 ` [PATCH 3/5] powerpc/lib/sstep: Add bpermd " Matt Brown
2017-07-13 7:16 ` Gabriel Paubert
2017-07-13 7:28 ` Segher Boessenkool
2017-07-14 4:19 ` Matt Brown
2017-07-14 16:17 ` Segher Boessenkool
2017-07-13 3:25 ` Matt Brown [this message]
2017-07-13 7:37 ` [PATCH 4/5] powerpc/lib/sstep: Add prty " Segher Boessenkool
2017-07-14 0:46 ` Matt Brown
2017-07-14 19:02 ` kbuild test robot
2017-07-13 3:25 ` [PATCH 5/5] powerpc/lib/sstep: Add isel " Matt Brown
2017-07-13 7:47 ` Segher Boessenkool
2017-07-14 0:49 ` Matt Brown
2017-07-13 3:51 ` [PATCH 1/5] powerpc/lib/sstep: Add cmpb " Andrew Donnellan
2017-07-13 6:43 ` Segher Boessenkool
2017-07-13 7:10 ` Segher Boessenkool
2017-07-13 6:46 ` Segher Boessenkool
2017-07-24 1:01 [PATCH v2 " Matt Brown
2017-07-24 1:01 ` [PATCH 4/5] powerpc/lib/sstep: Add prty " Matt Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170713032548.451-4-matthew.brown.dev@gmail.com \
--to=matthew.brown.dev@gmail.com \
--cc=anton@samba.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).