parisc/unaligned: Tweak inline assembly of emulate_ldh()
Helge Deller
maintainerPATCH 1/4 parisc/unaligned: Tweak inline assembly of emulate_ldh()
Convert to use real temp variables instead of clobbering processor registers.
Signed-off-by Helge Deller <[email protected]>
--- arch/parisc/kernel/unaligned.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/parisc/kernel/unaligned.c +5 -6
@@ -113,7 +113,7 @@ int unaligned_enabled __read_mostly = 1;static int emulate_ldh (struct pt_regs *regs,int toreg) {unsigned long saddr = regs->ior; -unsigned long val =0 ; +unsigned long val =0 , temp1;ASM_EXCEPTIONTABLE_VAR (ret); DPRINTF("load " RFMT ":" RFMT " to r%d for 2 bytes\n",
@@ -121,15 +121,14 @@ static int emulate_ldh(struct pt_regs *regs, int toreg) __asm__ __volatile__ (" mtsp %4, %%sr1\n" -"1: ldbs 0(%%sr1,%3), %%r20\n" +"1: ldbs 0(%%sr1,%3), %2\n" "2: ldbs 1(%%sr1,%3), %0\n" -" depw %%r20, 23, 24, %0\n" +" depw %2, 23, 24, %0\n" "3: \n" ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b) - : "=r" (val), "+r" (ret) - : "0" (val), "r" (saddr), "r" (regs->isr) - : "r20" ); + : "+r" (val), "+r" (ret), "=&r" (temp1) + : "r" (saddr), "r" (regs->isr) );DPRINTF ("val = 0x" RFMT "\n" , val);
--
2.34.1
Helge Deller
maintainerPATCH 2/4 parisc/unaligned: Tweak inline assembly of emulate_ldw()
Convert to use real temp variables instead of clobbering processor registers.
Signed-off-by Helge Deller <[email protected]>
--- arch/parisc/kernel/unaligned.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
arch/parisc/kernel/unaligned.c +11 -12
@@ -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) {unsigned long saddr = regs->ior; -unsigned long val =0 ; +unsigned long val =0 , temp1, temp2;ASM_EXCEPTIONTABLE_VAR (ret);DPRINTF ("load " RFMT ":" RFMT " to r%d for 4 bytes\n" , regs->isr, regs->ior, toreg); __asm__ __volatile__ ( -" zdep %3,28,2,%%r19\n" /* r19=(ofs&3)*8 */ -" mtsp %4, %%sr1\n" -" depw %%r0,31,2,%3\n" -"1: ldw 0(%%sr1,%3),%0\n" -"2: ldw 4(%%sr1,%3),%%r20\n" -" subi 32,%%r19,%%r19\n" -" mtctl %%r19,11\n" -" vshd %0,%%r20,%0\n" +" zdep %4,28,2,%2\n" /* r19=(ofs&3)*8 */ +" mtsp %5, %%sr1\n" +" depw %%r0,31,2,%4\n" +"1: ldw 0(%%sr1,%4),%0\n" +"2: ldw 4(%%sr1,%4),%3\n" +" subi 32,%4,%2\n" +" mtctl %2,11\n" +" vshd %0,%3,%0\n" "3: \n" ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b) - : "=r" (val), "+r" (ret) - : "0" (val), "r" (saddr), "r" (regs->isr) - : "r19", "r20" ); + : "+r" (val), "+r" (ret), "=&r" (temp1), "=&r" (temp2) + : "r" (saddr), "r" (regs->isr) );DPRINTF ("val = 0x" RFMT "\n" , val);
--
2.34.1
Helge Deller
maintainerPATCH 3/4 parisc/unaligned: Tweak 32-bit inline assembly of emulate_ldd()
In reply to Helge DellerConvert to use real temp variables instead of clobbering processor registers.
Signed-off-by Helge Deller <[email protected]>
--- arch/parisc/kernel/unaligned.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
arch/parisc/kernel/unaligned.c +13 -15
@@ -201,26 +201,24 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop) : "r19", "r20" );#else { -unsigned long valh=0 ,vall=0 ; +unsigned long shift, temp1; __asm__ __volatile__ ( -" zdep %5,29,2,%%r19\n" /* r19=(ofs&3)*8 */ -" mtsp %6, %%sr1\n" -" dep %%r0,31,2,%5\n" -"1: ldw 0(%%sr1,%5),%0\n" -"2: ldw 4(%%sr1,%5),%1\n" -"3: ldw 8(%%sr1,%5),%%r20\n" -" subi 32,%%r19,%%r19\n" -" mtsar %%r19\n" -" vshd %0,%1,%0\n" -" vshd %1,%%r20,%1\n" +" zdep %2,29,2,%3\n" /* r19=(ofs&3)*8 */ +" mtsp %5, %%sr1\n" +" dep %%r0,31,2,%2\n" +"1: ldw 0(%%sr1,%2),%0\n" +"2: ldw 4(%%sr1,%2),%R0\n" +"3: ldw 8(%%sr1,%2),%4\n" +" subi 32,%3,%3\n" +" mtsar %3\n" +" vshd %0,%R0,%0\n" +" vshd %R0,%4,%R0\n" "4: \n" ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 4b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 4b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b) - : "=r" (valh), "=r" (vall), "+r" (ret) - : "0" (valh), "1" (vall), "r" (saddr), "r" (regs->isr) - : "r19", "r20" ); - val=((__u64 )valh<<32 )|(__u64 )vall; + : "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1) + : "r" (regs->isr) ); }#endif
--
2.34.1
Helge Deller
maintainerPATCH 4/4 parisc/unaligned: Tweak 32-bit inline assembly of emulate_sth()
In reply to Helge DellerConvert to use real temp variables instead of clobbering processor registers.
Signed-off-by Helge Deller <[email protected]>
--- arch/parisc/kernel/unaligned.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
arch/parisc/kernel/unaligned.c +7 -8
@@ -234,7 +234,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)static int emulate_sth (struct pt_regs *regs,int frreg) { -unsigned long val = regs->gr[frreg]; +unsigned long val = regs->gr[frreg], temp1;ASM_EXCEPTIONTABLE_VAR (ret);if (!frreg)
@@ -244,16 +244,15 @@ static int emulate_sth(struct pt_regs *regs, int frreg) val, regs->isr, regs->ior); __asm__ __volatile__ ( -" mtsp %3, %%sr1\n" -" extrw,u %1, 23, 8, %%r19\n" -"1: stb %1, 1(%%sr1, %2)\n" -"2: stb %%r19, 0(%%sr1, %2)\n" +" mtsp %4, %%sr1\n" +" extrw,u %2, 23, 8, %1\n" +"1: stb %1, 0(%%sr1, %3)\n" +"2: stb %2, 1(%%sr1, %3)\n" "3: \n" ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b) - : "+r" (ret) - : "r" (val), "r" (regs->ior), "r" (regs->isr) - : "r19" ); + : "+r" (ret), "=&r" (temp1) + : "r" (val), "r" (regs->ior), "r" (regs->isr) );return ret; }
--
2.34.1