| Message ID | 20200506034050.24806-31-jniethe5@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3920742b92f5ea19a220edb947b6f33c99f501da |
| Headers | show |
| Series | Initial Prefixed Instruction support | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (1bc92fe3175eb26ff37e580c0383d7a9abe06835) |
| snowpatch_ozlabs/build-ppc64le | warning | Build succeeded but added 3 new sparse warnings |
| snowpatch_ozlabs/build-ppc64be | warning | Build succeeded but added 3 new sparse warnings |
| snowpatch_ozlabs/build-ppc64e | fail | Build failed! |
| snowpatch_ozlabs/build-pmac32 | warning | Build succeeded but added 23 new sparse warnings |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 26 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Le 06/05/2020 à 05:40, Jordan Niethe a écrit : > This adds emulation support for the following prefixed Fixed-Point > Arithmetic instructions: > * Prefixed Add Immediate (paddi) Shouldn't this patch go before patch 23 ? Christophe > > Reviewed-by: Balamuruhan S <bala24@linux.ibm.com> > Signed-off-by: Jordan Niethe <jniethe5@gmail.com> > --- > v3: Since we moved the prefixed loads/stores into the load/store switch > statement it no longer makes sense to have paddi in there, so move it > out. > --- > arch/powerpc/lib/sstep.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c > index 6794a7672ad5..964fe7bbfce3 100644 > --- a/arch/powerpc/lib/sstep.c > +++ b/arch/powerpc/lib/sstep.c > @@ -1337,6 +1337,26 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, > > switch (opcode) { > #ifdef __powerpc64__ > + case 1: > + prefix_r = word & (1ul << 20); > + ra = (suffix >> 16) & 0x1f; > + rd = (suffix >> 21) & 0x1f; > + op->reg = rd; > + op->val = regs->gpr[rd]; > + suffixopcode = suffix >> 26; > + prefixtype = (word >> 24) & 0x3; > + switch (prefixtype) { > + case 2: > + if (prefix_r && ra) > + return 0; > + switch (suffixopcode) { > + case 14: /* paddi */ > + op->type = COMPUTE | PREFIXED; > + op->val = mlsd_8lsd_ea(word, suffix, regs); > + goto compute_done; > + } > + } > + break; > case 2: /* tdi */ > if (rd & trap_compare(regs->gpr[ra], (short) word)) > goto trap; >
mpe, and this thanks.
---
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -1343,7 +1343,7 @@ int analyse_instr(struct instruction_op *op,
const struct pt_regs *regs,
rd = (suffix >> 21) & 0x1f;
op->reg = rd;
op->val = regs->gpr[rd];
- suffixopcode = suffix >> 26;
+ suffixopcode = get_op(suffix);
prefixtype = (word >> 24) & 0x3;
switch (prefixtype) {
case 2:
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 6794a7672ad5..964fe7bbfce3 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1337,6 +1337,26 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, switch (opcode) { #ifdef __powerpc64__ + case 1: + prefix_r = word & (1ul << 20); + ra = (suffix >> 16) & 0x1f; + rd = (suffix >> 21) & 0x1f; + op->reg = rd; + op->val = regs->gpr[rd]; + suffixopcode = suffix >> 26; + prefixtype = (word >> 24) & 0x3; + switch (prefixtype) { + case 2: + if (prefix_r && ra) + return 0; + switch (suffixopcode) { + case 14: /* paddi */ + op->type = COMPUTE | PREFIXED; + op->val = mlsd_8lsd_ea(word, suffix, regs); + goto compute_done; + } + } + break; case 2: /* tdi */ if (rd & trap_compare(regs->gpr[ra], (short) word)) goto trap;