parisc/unaligned: Rewrite inline assembly of emulate_ldw()

Convert to use real temp variables instead of clobbering processor
registers.

Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Helge Deller 2022-02-23 17:42:19 +01:00
parent f85b2af1f0
commit e8aa7b17fe

View file

@ -141,27 +141,26 @@ static int emulate_ldh(struct pt_regs *regs, int toreg)
static int emulate_ldw(struct pt_regs *regs, int toreg, int flop) static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)
{ {
unsigned long saddr = regs->ior; unsigned long saddr = regs->ior;
unsigned long val = 0; unsigned long val = 0, temp1, temp2;
ASM_EXCEPTIONTABLE_VAR(ret); ASM_EXCEPTIONTABLE_VAR(ret);
DPRINTF("load " RFMT ":" RFMT " to r%d for 4 bytes\n", DPRINTF("load " RFMT ":" RFMT " to r%d for 4 bytes\n",
regs->isr, regs->ior, toreg); regs->isr, regs->ior, toreg);
__asm__ __volatile__ ( __asm__ __volatile__ (
" zdep %3,28,2,%%r19\n" /* r19=(ofs&3)*8 */ " zdep %4,28,2,%2\n" /* r19=(ofs&3)*8 */
" mtsp %4, %%sr1\n" " mtsp %5, %%sr1\n"
" depw %%r0,31,2,%3\n" " depw %%r0,31,2,%4\n"
"1: ldw 0(%%sr1,%3),%0\n" "1: ldw 0(%%sr1,%4),%0\n"
"2: ldw 4(%%sr1,%3),%%r20\n" "2: ldw 4(%%sr1,%4),%3\n"
" subi 32,%%r19,%%r19\n" " subi 32,%4,%2\n"
" mtctl %%r19,11\n" " mtctl %2,11\n"
" vshd %0,%%r20,%0\n" " vshd %0,%3,%0\n"
"3: \n" "3: \n"
ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)
ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)
: "=r" (val), "+r" (ret) : "+r" (val), "+r" (ret), "=&r" (temp1), "=&r" (temp2)
: "0" (val), "r" (saddr), "r" (regs->isr) : "r" (saddr), "r" (regs->isr) );
: "r19", "r20" );
DPRINTF("val = 0x" RFMT "\n", val); DPRINTF("val = 0x" RFMT "\n", val);