Skip to content

Commit e5db6a7

Browse files
groeckhdeller
authored andcommitted
parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
Convert to use real temp variables instead of clobbering processor registers. This aligns the 64-bit inline assembly code with the 32-bit assembly code which was rewritten with commit 427c107 ("parisc/unaligned: Rewrite 32-bit inline assembly of emulate_ldd()"). While at it, fix comment in 32-bit rewrite code. Temporary variables are now used for both 32-bit and 64-bit code, so move their declarations to the function header. No functional change intended. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Cc: stable@vger.kernel.org # v6.0+ Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 0b9ec15 commit e5db6a7

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

arch/parisc/kernel/unaligned.c

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)
169169
static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
170170
{
171171
unsigned long saddr = regs->ior;
172+
unsigned long shift, temp1;
172173
__u64 val = 0;
173174
ASM_EXCEPTIONTABLE_VAR(ret);
174175

@@ -180,25 +181,22 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
180181

181182
#ifdef CONFIG_64BIT
182183
__asm__ __volatile__ (
183-
" depd,z %3,60,3,%%r19\n" /* r19=(ofs&7)*8 */
184-
" mtsp %4, %%sr1\n"
185-
" depd %%r0,63,3,%3\n"
186-
"1: ldd 0(%%sr1,%3),%0\n"
187-
"2: ldd 8(%%sr1,%3),%%r20\n"
188-
" subi 64,%%r19,%%r19\n"
189-
" mtsar %%r19\n"
190-
" shrpd %0,%%r20,%%sar,%0\n"
184+
" depd,z %2,60,3,%3\n" /* shift=(ofs&7)*8 */
185+
" mtsp %5, %%sr1\n"
186+
" depd %%r0,63,3,%2\n"
187+
"1: ldd 0(%%sr1,%2),%0\n"
188+
"2: ldd 8(%%sr1,%2),%4\n"
189+
" subi 64,%3,%3\n"
190+
" mtsar %3\n"
191+
" shrpd %0,%4,%%sar,%0\n"
191192
"3: \n"
192193
ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1")
193194
ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1")
194-
: "=r" (val), "+r" (ret)
195-
: "0" (val), "r" (saddr), "r" (regs->isr)
196-
: "r19", "r20" );
195+
: "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1)
196+
: "r" (regs->isr) );
197197
#else
198-
{
199-
unsigned long shift, temp1;
200198
__asm__ __volatile__ (
201-
" zdep %2,29,2,%3\n" /* r19=(ofs&3)*8 */
199+
" zdep %2,29,2,%3\n" /* shift=(ofs&3)*8 */
202200
" mtsp %5, %%sr1\n"
203201
" dep %%r0,31,2,%2\n"
204202
"1: ldw 0(%%sr1,%2),%0\n"
@@ -214,7 +212,6 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
214212
ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b, "%1")
215213
: "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1)
216214
: "r" (regs->isr) );
217-
}
218215
#endif
219216

220217
DPRINTF("val = 0x%llx\n", val);

0 commit comments

Comments
 (0)