From: Anton Blanchard <anton@samba•org>
To: Segher Boessenkool <segher@kernel•crashing.org>
Cc: benh@kernel•crashing.org, paulus@samba•org, mpe@ellerman•id.au,
ravi.bangoria@linux•vnet.ibm.com, npiggin@gmail•com,
naveen.n.rao@linux•vnet.ibm.com, linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH 1/2] powerpc: Fix emulation of mcrf in emulate_step()
Date: Thu, 15 Jun 2017 16:47:29 +1000 [thread overview]
Message-ID: <20170615164729.09f0f83a@kryten> (raw)
In-Reply-To: <20170615041805.GB16550@gate.crashing.org>
Hi Segher,
> On Thu, Jun 15, 2017 at 09:46:38AM +1000, Anton Blanchard wrote:
> > The mcrf emulation code was looking at the CR fields in the reverse
> > order. It also relied on reserved fields being zero which is
> > somewhat fragile, so fix that too.
>
> It masked out the reserved bits. I find the new code to be less
> readable (but also more correct ;-) ).
Thanks for that, not sure how I missed it :) I'll respin a simpler
patch.
> Maybe there should be (inline)
> helper function to insert/extract CR fields?
That would be nice, there are quite a few places that could use it.
Anton
> Segher
>
>
> > --- a/arch/powerpc/lib/sstep.c
> > +++ b/arch/powerpc/lib/sstep.c
> > @@ -683,8 +683,10 @@ int analyse_instr(struct instruction_op *op,
> > struct pt_regs *regs, case 19:
> > switch ((instr >> 1) & 0x3ff) {
> > case 0: /* mcrf */
> > - rd = (instr >> 21) & 0x1c;
> > - ra = (instr >> 16) & 0x1c;
> > + rd = 7 - ((instr >> 23) & 0x7);
> > + ra = 7 - ((instr >> 18) & 0x7);
> > + rd *= 4;
> > + ra *= 4;
> > val = (regs->ccr >> ra) & 0xf;
> > regs->ccr = (regs->ccr & ~(0xfUL << rd)) |
> > (val << rd); goto instr_done;
>
next prev parent reply other threads:[~2017-06-15 6:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 23:46 [PATCH 1/2] powerpc: Fix emulation of mcrf in emulate_step() Anton Blanchard
2017-06-14 23:46 ` [PATCH 2/2] powerpc: Fix emulation of mfocrf " Anton Blanchard
2017-06-15 17:27 ` Naveen N. Rao
2017-07-13 12:46 ` [2/2] " Michael Ellerman
2017-06-15 4:18 ` [PATCH 1/2] powerpc: Fix emulation of mcrf " Segher Boessenkool
2017-06-15 6:47 ` Anton Blanchard [this message]
2017-06-15 8:41 ` Segher Boessenkool
2017-06-15 17:27 ` Naveen N. Rao
2017-07-13 12:46 ` [1/2] " Michael Ellerman
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=20170615164729.09f0f83a@kryten \
--to=anton@samba$(echo .)org \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=naveen.n.rao@linux$(echo .)vnet.ibm.com \
--cc=npiggin@gmail$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=ravi.bangoria@linux$(echo .)vnet.ibm.com \
--cc=segher@kernel$(echo .)crashing.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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