powerpc: Unaligned stores and stmw are broken in emulation code
The stmw instruction was incorrectly decoded as an update form instruction and thus the RA register was being clobbered. Also, the utility routine to write memory to unaligned addresses breaks the operation into smaller aligned accesses but was incorrectly incrementing the address by only one; it needs to increment the address by the size of the smaller aligned chunk. Signed-off-by: Tom Musta <tmusta@us.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
f748edafac
commit
17e8de7e18
|
@ -100,8 +100,10 @@ static unsigned long __kprobes dform_ea(unsigned int instr, struct pt_regs *regs
|
|||
ea = (signed short) instr; /* sign-extend */
|
||||
if (ra) {
|
||||
ea += regs->gpr[ra];
|
||||
if (instr & 0x04000000) /* update forms */
|
||||
regs->gpr[ra] = ea;
|
||||
if (instr & 0x04000000) { /* update forms */
|
||||
if ((instr>>26) != 47) /* stmw is not an update form */
|
||||
regs->gpr[ra] = ea;
|
||||
}
|
||||
}
|
||||
|
||||
return truncate_if_32bit(regs->msr, ea);
|
||||
|
@ -279,7 +281,7 @@ static int __kprobes write_mem_unaligned(unsigned long val, unsigned long ea,
|
|||
err = write_mem_aligned(val >> (nb - c) * 8, ea, c);
|
||||
if (err)
|
||||
return err;
|
||||
++ea;
|
||||
ea += c;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue