diff options
| author |  Jordan Niethe <jniethe5@gmail.com>
| 2020-05-06 13:40:27 +1000 |
|---|---|---|
| committer |  Michael Ellerman <mpe@ellerman.id.au>
| 2020-05-19 00:10:36 +1000 |
| commit | 777e26f0edf8dab58b8dd474d35d83bde0ac6d76 (patch) | |
| tree | 456999d501f63d75634a33dbc57306b244777c9d /arch/powerpc/kernel/vecemu.c | |
| parent | powerpc: Use a macro for creating instructions from u32s (diff) | |
| download | linux-777e26f0edf8dab58b8dd474d35d83bde0ac6d76.tar.gz linux-777e26f0edf8dab58b8dd474d35d83bde0ac6d76.tar.bz2 linux-777e26f0edf8dab58b8dd474d35d83bde0ac6d76.zip | |
powerpc: Use an accessor for instructions
In preparation for introducing a more complicated instruction type to
accommodate prefixed instructions use an accessor for getting an
instruction as a u32.
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200506034050.24806-8-jniethe5@gmail.com
Diffstat (limited to 'arch/powerpc/kernel/vecemu.c')
| -rw-r--r-- | arch/powerpc/kernel/vecemu.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/vecemu.c b/arch/powerpc/kernel/vecemu.c index 4acd3fb2b38e..1f5e3b4c8ae4 100644 --- a/arch/powerpc/kernel/vecemu.c +++ b/arch/powerpc/kernel/vecemu.c @@ -260,21 +260,23 @@ static unsigned int rfin(unsigned int x) int emulate_altivec(struct pt_regs *regs) { - unsigned int instr, i; + unsigned int instr, i, word; unsigned int va, vb, vc, vd; vector128 *vrs; if (get_user(instr, (unsigned int __user *) regs->nip)) return -EFAULT; - if ((instr >> 26) != 4) + + word = ppc_inst_val(instr); + if ((word >> 26) != 4) return -EINVAL; /* not an altivec instruction */ - vd = (instr >> 21) & 0x1f; - va = (instr >> 16) & 0x1f; - vb = (instr >> 11) & 0x1f; - vc = (instr >> 6) & 0x1f; + vd = (word >> 21) & 0x1f; + va = (word >> 16) & 0x1f; + vb = (word >> 11) & 0x1f; + vc = (word >> 6) & 0x1f; vrs = current->thread.vr_state.vr; - switch (instr & 0x3f) { + switch (word & 0x3f) { case 10: switch (vc) { case 0: /* vaddfp */ |