Skip to content

L
linux
Commit 24bfa6a9 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files
Options

powerpc: EX_TABLE macro for exception tables 

This macro is taken from s390, and allows more flexibility in
changing exception table format.

mpe: Put it in ppc_asm.h and only define one version using
stringinfy_in_c(). Add some empty definitions and headers to keep the
selftests happy.
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 997e2001
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 327 deletions
arch/powerpc/include/asm/futex.h
View file @ 24bfa6a9
...@@ -23,10 +23,8 @@ ...@@ -23,10 +23,8 @@
"4: li %1,%3\n" \ "4: li %1,%3\n" \
"b 3b\n" \ "b 3b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 4b) \
".align 3\n" \ EX_TABLE(2b, 4b) \
PPC_LONG "1b,4b,2b,4b\n" \
".previous" \
: "=&r" (oldval), "=&r" (ret) \ : "=&r" (oldval), "=&r" (ret) \
: "b" (uaddr), "i" (-EFAULT), "r" (oparg) \ : "b" (uaddr), "i" (-EFAULT), "r" (oparg) \
: "cr0", "memory") : "cr0", "memory")
...@@ -104,11 +102,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, ...@@ -104,11 +102,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
"3: .section .fixup,\"ax\"\n\ "3: .section .fixup,\"ax\"\n\
4: li %0,%6\n\ 4: li %0,%6\n\
b 3b\n\ b 3b\n\
.previous\n\ .previous\n"
.section __ex_table,\"a\"\n\ EX_TABLE(1b, 4b)
.align 3\n\ EX_TABLE(2b, 4b)
" PPC_LONG "1b,4b,2b,4b\n\
.previous" \
: "+r" (ret), "=&r" (prev), "+m" (*uaddr) : "+r" (ret), "=&r" (prev), "+m" (*uaddr)
: "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT) : "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT)
: "cc", "memory"); : "cc", "memory");
......
arch/powerpc/include/asm/io.h
View file @ 24bfa6a9
...@@ -33,6 +33,7 @@ extern struct pci_dev *isa_bridge_pcidev; ...@@ -33,6 +33,7 @@ extern struct pci_dev *isa_bridge_pcidev;
#include <asm/synch.h> #include <asm/synch.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/ppc_asm.h>
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
...@@ -458,13 +459,10 @@ static inline unsigned int name(unsigned int port) \ ...@@ -458,13 +459,10 @@ static inline unsigned int name(unsigned int port) \
"5: li %0,-1\n" \ "5: li %0,-1\n" \
" b 4b\n" \ " b 4b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(0b, 5b) \
" .align 2\n" \ EX_TABLE(1b, 5b) \
" .long 0b,5b\n" \ EX_TABLE(2b, 5b) \
" .long 1b,5b\n" \ EX_TABLE(3b, 5b) \
" .long 2b,5b\n" \
" .long 3b,5b\n" \
".previous" \
: "=&r" (x) \ : "=&r" (x) \
: "r" (port + _IO_BASE) \ : "r" (port + _IO_BASE) \
: "memory"); \ : "memory"); \
...@@ -479,11 +477,8 @@ static inline void name(unsigned int val, unsigned int port) \ ...@@ -479,11 +477,8 @@ static inline void name(unsigned int val, unsigned int port) \
"0:" op " %0,0,%1\n" \ "0:" op " %0,0,%1\n" \
"1: sync\n" \ "1: sync\n" \
"2:\n" \ "2:\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(0b, 2b) \
" .align 2\n" \ EX_TABLE(1b, 2b) \
" .long 0b,2b\n" \
" .long 1b,2b\n" \
".previous" \
: : "r" (val), "r" (port + _IO_BASE) \ : : "r" (val), "r" (port + _IO_BASE) \
: "memory"); \ : "memory"); \
} }
......
arch/powerpc/include/asm/ppc_asm.h
View file @ 24bfa6a9
...@@ -780,4 +780,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) ...@@ -780,4 +780,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/*
* Helper macro for exception table entries
*/
#define EX_TABLE(_fault, _target) \
stringify_in_c(.section __ex_table,"a";)\
PPC_LONG_ALIGN stringify_in_c(;) \
PPC_LONG stringify_in_c(_fault;) \
PPC_LONG stringify_in_c(_target;) \
stringify_in_c(.previous)
#endif /* _ASM_POWERPC_PPC_ASM_H */ #endif /* _ASM_POWERPC_PPC_ASM_H */
arch/powerpc/include/asm/uaccess.h
View file @ 24bfa6a9
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm-compat.h> #include <asm/asm-compat.h>
#include <asm/ppc_asm.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -132,10 +133,7 @@ extern long __put_user_bad(void); ...@@ -132,10 +133,7 @@ extern long __put_user_bad(void);
"3: li %0,%3\n" \ "3: li %0,%3\n" \
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 3b) \
PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err) \ : "=r" (err) \
: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err)) : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
...@@ -152,11 +150,8 @@ extern long __put_user_bad(void); ...@@ -152,11 +150,8 @@ extern long __put_user_bad(void);
"4: li %0,%3\n" \ "4: li %0,%3\n" \
" b 3b\n" \ " b 3b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 4b) \
PPC_LONG_ALIGN "\n" \ EX_TABLE(2b, 4b) \
PPC_LONG "1b,4b\n" \
PPC_LONG "2b,4b\n" \
".previous" \
: "=r" (err) \ : "=r" (err) \
: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err)) : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
...@@ -215,10 +210,7 @@ extern long __get_user_bad(void); ...@@ -215,10 +210,7 @@ extern long __get_user_bad(void);
" li %1,0\n" \ " li %1,0\n" \
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 3b) \
PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err), "=r" (x) \ : "=r" (err), "=r" (x) \
: "b" (addr), "i" (-EFAULT), "0" (err)) : "b" (addr), "i" (-EFAULT), "0" (err))
...@@ -237,11 +229,8 @@ extern long __get_user_bad(void); ...@@ -237,11 +229,8 @@ extern long __get_user_bad(void);
" li %1+1,0\n" \ " li %1+1,0\n" \
" b 3b\n" \ " b 3b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 4b) \
PPC_LONG_ALIGN "\n" \ EX_TABLE(2b, 4b) \
PPC_LONG "1b,4b\n" \
PPC_LONG "2b,4b\n" \
".previous" \
: "=r" (err), "=&r" (x) \ : "=r" (err), "=&r" (x) \
: "b" (addr), "i" (-EFAULT), "0" (err)) : "b" (addr), "i" (-EFAULT), "0" (err))
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
......
arch/powerpc/include/asm/word-at-a-time.h
View file @ 24bfa6a9
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/asm-compat.h> #include <asm/asm-compat.h>
#include <asm/ppc_asm.h>
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
...@@ -193,10 +194,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr) ...@@ -193,10 +194,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
#endif #endif
"b 2b\n" "b 2b\n"
".previous\n" ".previous\n"
".section __ex_table,\"a\"\n\t" EX_TABLE(1b, 3b)
PPC_LONG_ALIGN "\n\t"
PPC_LONG "1b,3b\n"
".previous"
: [tmp] "=&b" (tmp), [offset] "=&r" (offset), [ret] "=&r" (ret) : [tmp] "=&b" (tmp), [offset] "=&r" (offset), [ret] "=&r" (ret)
: [addr] "b" (addr), "m" (*(unsigned long *)addr)); : [addr] "b" (addr), "m" (*(unsigned long *)addr));
......
arch/powerpc/lib/checksum_32.S
View file @ 24bfa6a9
...@@ -103,17 +103,14 @@ EXPORT_SYMBOL(__csum_partial) ...@@ -103,17 +103,14 @@ EXPORT_SYMBOL(__csum_partial)
adde r12,r12,r10 adde r12,r12,r10
#define CSUM_COPY_16_BYTES_EXCODE(n) \ #define CSUM_COPY_16_BYTES_EXCODE(n) \
.section __ex_table,"a"; \ EX_TABLE(8 ## n ## 0b, src_error); \
.align 2; \ EX_TABLE(8 ## n ## 1b, src_error); \
.long 8 ## n ## 0b,src_error; \ EX_TABLE(8 ## n ## 2b, src_error); \
.long 8 ## n ## 1b,src_error; \ EX_TABLE(8 ## n ## 3b, src_error); \
.long 8 ## n ## 2b,src_error; \ EX_TABLE(8 ## n ## 4b, dst_error); \
.long 8 ## n ## 3b,src_error; \ EX_TABLE(8 ## n ## 5b, dst_error); \
.long 8 ## n ## 4b,dst_error; \ EX_TABLE(8 ## n ## 6b, dst_error); \
.long 8 ## n ## 5b,dst_error; \ EX_TABLE(8 ## n ## 7b, dst_error);
.long 8 ## n ## 6b,dst_error; \
.long 8 ## n ## 7b,dst_error; \
.text
.text .text
.stabs "arch/powerpc/lib/",N_SO,0,0,0f .stabs "arch/powerpc/lib/",N_SO,0,0,0f
...@@ -263,14 +260,11 @@ dst_error: ...@@ -263,14 +260,11 @@ dst_error:
stw r0,0(r8) stw r0,0(r8)
blr blr
.section __ex_table,"a" EX_TABLE(70b, src_error);
.align 2 EX_TABLE(71b, dst_error);
.long 70b,src_error EX_TABLE(72b, src_error);
.long 71b,dst_error EX_TABLE(73b, dst_error);
.long 72b,src_error EX_TABLE(54b, dst_error);
.long 73b,dst_error
.long 54b,dst_error
.text
/* /*
* this stuff handles faults in the cacheline loop and branches to either * this stuff handles faults in the cacheline loop and branches to either
...@@ -291,12 +285,11 @@ dst_error: ...@@ -291,12 +285,11 @@ dst_error:
#endif #endif
#endif #endif
.section __ex_table,"a" EX_TABLE(30b, src_error);
.align 2 EX_TABLE(31b, dst_error);
.long 30b,src_error EX_TABLE(40b, src_error);
.long 31b,dst_error EX_TABLE(41b, dst_error);
.long 40b,src_error EX_TABLE(50b, src_error);
.long 41b,dst_error EX_TABLE(51b, dst_error);
.long 50b,src_error
.long 51b,dst_error
EXPORT_SYMBOL(csum_partial_copy_generic) EXPORT_SYMBOL(csum_partial_copy_generic)
arch/powerpc/lib/checksum_64.S
View file @ 24bfa6a9
...@@ -182,34 +182,22 @@ EXPORT_SYMBOL(__csum_partial) ...@@ -182,34 +182,22 @@ EXPORT_SYMBOL(__csum_partial)
.macro srcnr .macro srcnr
100: 100:
.section __ex_table,"a" EX_TABLE(100b,.Lsrc_error_nr)
.align 3
.llong 100b,.Lsrc_error_nr
.previous
.endm .endm
.macro source .macro source
150: 150:
.section __ex_table,"a" EX_TABLE(150b,.Lsrc_error)
.align 3
.llong 150b,.Lsrc_error
.previous
.endm .endm
.macro dstnr .macro dstnr
200: 200:
.section __ex_table,"a" EX_TABLE(200b,.Ldest_error_nr)
.align 3
.llong 200b,.Ldest_error_nr
.previous
.endm .endm
.macro dest .macro dest
250: 250:
.section __ex_table,"a" EX_TABLE(250b,.Ldest_error)
.align 3
.llong 250b,.Ldest_error
.previous
.endm .endm
/* /*
......
arch/powerpc/lib/copy_32.S
View file @ 24bfa6a9
...@@ -49,17 +49,14 @@ ...@@ -49,17 +49,14 @@
9 ## n ## 1: \ 9 ## n ## 1: \
addi r5,r5,-(16 * n); \ addi r5,r5,-(16 * n); \
b 105f; \ b 105f; \
.section __ex_table,"a"; \ EX_TABLE(8 ## n ## 0b,9 ## n ## 0b); \
.align 2; \ EX_TABLE(8 ## n ## 1b,9 ## n ## 0b); \
.long 8 ## n ## 0b,9 ## n ## 0b; \ EX_TABLE(8 ## n ## 2b,9 ## n ## 0b); \
.long 8 ## n ## 1b,9 ## n ## 0b; \ EX_TABLE(8 ## n ## 3b,9 ## n ## 0b); \
.long 8 ## n ## 2b,9 ## n ## 0b; \ EX_TABLE(8 ## n ## 4b,9 ## n ## 1b); \
.long 8 ## n ## 3b,9 ## n ## 0b; \ EX_TABLE(8 ## n ## 5b,9 ## n ## 1b); \
.long 8 ## n ## 4b,9 ## n ## 1b; \ EX_TABLE(8 ## n ## 6b,9 ## n ## 1b); \
.long 8 ## n ## 5b,9 ## n ## 1b; \ EX_TABLE(8 ## n ## 7b,9 ## n ## 1b)
.long 8 ## n ## 6b,9 ## n ## 1b; \
.long 8 ## n ## 7b,9 ## n ## 1b; \
.text
.text .text
.stabs "arch/powerpc/lib/",N_SO,0,0,0f .stabs "arch/powerpc/lib/",N_SO,0,0,0f
...@@ -323,13 +320,10 @@ _GLOBAL(__copy_tofrom_user) ...@@ -323,13 +320,10 @@ _GLOBAL(__copy_tofrom_user)
73: stwu r9,4(r6) 73: stwu r9,4(r6)
bdnz 72b bdnz 72b
.section __ex_table,"a" EX_TABLE(70b,100f)
.align 2 EX_TABLE(71b,101f)
.long 70b,100f EX_TABLE(72b,102f)
.long 71b,101f EX_TABLE(73b,103f)
.long 72b,102f
.long 73b,103f
.text
58: srwi. r0,r5,LG_CACHELINE_BYTES /* # complete cachelines */ 58: srwi. r0,r5,LG_CACHELINE_BYTES /* # complete cachelines */
clrlwi r5,r5,32-LG_CACHELINE_BYTES clrlwi r5,r5,32-LG_CACHELINE_BYTES
...@@ -364,10 +358,7 @@ _GLOBAL(__copy_tofrom_user) ...@@ -364,10 +358,7 @@ _GLOBAL(__copy_tofrom_user)
53: dcbt r3,r4 53: dcbt r3,r4
54: dcbz r11,r6 54: dcbz r11,r6
.section __ex_table,"a" EX_TABLE(54b,105f)
.align 2
.long 54b,105f
.text
/* the main body of the cacheline loop */ /* the main body of the cacheline loop */
COPY_16_BYTES_WITHEX(0) COPY_16_BYTES_WITHEX(0)
#if L1_CACHE_BYTES >= 32 #if L1_CACHE_BYTES >= 32
...@@ -500,15 +491,13 @@ _GLOBAL(__copy_tofrom_user) ...@@ -500,15 +491,13 @@ _GLOBAL(__copy_tofrom_user)
bdnz 114b bdnz 114b
120: blr 120: blr
.section __ex_table,"a" EX_TABLE(30b,108b)
.align 2 EX_TABLE(31b,109b)
.long 30b,108b EX_TABLE(40b,110b)
.long 31b,109b EX_TABLE(41b,111b)
.long 40b,110b EX_TABLE(130b,132b)
.long 41b,111b EX_TABLE(131b,120b)
.long 130b,132b EX_TABLE(112b,120b)
.long 131b,120b EX_TABLE(114b,120b)
.long 112b,120b
.long 114b,120b
.text
EXPORT_SYMBOL(__copy_tofrom_user) EXPORT_SYMBOL(__copy_tofrom_user)
arch/powerpc/lib/copyuser_64.S
View file @ 24bfa6a9
...@@ -394,70 +394,66 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) ...@@ -394,70 +394,66 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
192: 192:
blr /* #bytes not copied in r3 */ blr /* #bytes not copied in r3 */
.section __ex_table,"a" EX_TABLE(20b,120b)
.align 3 EX_TABLE(220b,320b)
.llong 20b,120b EX_TABLE(21b,121b)
.llong 220b,320b EX_TABLE(221b,321b)
.llong 21b,121b EX_TABLE(70b,170b)
.llong 221b,321b EX_TABLE(270b,370b)
.llong 70b,170b EX_TABLE(22b,122b)
.llong 270b,370b EX_TABLE(222b,322b)
.llong 22b,122b EX_TABLE(71b,171b)
.llong 222b,322b EX_TABLE(271b,371b)
.llong 71b,171b EX_TABLE(72b,172b)
.llong 271b,371b EX_TABLE(272b,372b)
.llong 72b,172b EX_TABLE(244b,344b)
.llong 272b,372b EX_TABLE(245b,345b)
.llong 244b,344b EX_TABLE(23b,123b)
.llong 245b,345b EX_TABLE(73b,173b)
.llong 23b,123b EX_TABLE(44b,144b)
.llong 73b,173b EX_TABLE(74b,174b)
.llong 44b,144b EX_TABLE(45b,145b)
.llong 74b,174b EX_TABLE(75b,175b)
.llong 45b,145b EX_TABLE(24b,124b)
.llong 75b,175b EX_TABLE(25b,125b)
.llong 24b,124b EX_TABLE(26b,126b)
.llong 25b,125b EX_TABLE(27b,127b)
.llong 26b,126b EX_TABLE(28b,128b)
.llong 27b,127b EX_TABLE(29b,129b)
.llong 28b,128b EX_TABLE(30b,130b)
.llong 29b,129b EX_TABLE(31b,131b)
.llong 30b,130b EX_TABLE(32b,132b)
.llong 31b,131b EX_TABLE(76b,176b)
.llong 32b,132b EX_TABLE(33b,133b)
.llong 76b,176b EX_TABLE(77b,177b)
.llong 33b,133b EX_TABLE(78b,178b)
.llong 77b,177b EX_TABLE(79b,179b)
.llong 78b,178b EX_TABLE(80b,180b)
.llong 79b,179b EX_TABLE(34b,134b)
.llong 80b,180b EX_TABLE(94b,194b)
.llong 34b,134b EX_TABLE(95b,195b)
.llong 94b,194b EX_TABLE(96b,196b)
.llong 95b,195b EX_TABLE(35b,135b)
.llong 96b,196b EX_TABLE(81b,181b)
.llong 35b,135b EX_TABLE(36b,136b)
.llong 81b,181b EX_TABLE(82b,182b)
.llong 36b,136b EX_TABLE(37b,137b)
.llong 82b,182b EX_TABLE(83b,183b)
.llong 37b,137b EX_TABLE(38b,138b)
.llong 83b,183b EX_TABLE(39b,139b)
.llong 38b,138b EX_TABLE(84b,184b)
.llong 39b,139b EX_TABLE(85b,185b)
.llong 84b,184b EX_TABLE(40b,140b)
.llong 85b,185b EX_TABLE(86b,186b)
.llong 40b,140b EX_TABLE(41b,141b)
.llong 86b,186b EX_TABLE(87b,187b)
.llong 41b,141b EX_TABLE(42b,142b)
.llong 87b,187b EX_TABLE(88b,188b)
.llong 42b,142b EX_TABLE(43b,143b)
.llong 88b,188b EX_TABLE(89b,189b)
.llong 43b,143b EX_TABLE(90b,190b)
.llong 89b,189b EX_TABLE(91b,191b)
.llong 90b,190b EX_TABLE(92b,192b)
.llong 91b,191b
.llong 92b,192b
.text
/* /*
* Routine to copy a whole page of data, optimized for POWER4. * Routine to copy a whole page of data, optimized for POWER4.
...@@ -598,78 +594,77 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) ...@@ -598,78 +594,77 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
li r5,4096 li r5,4096
b .Ldst_aligned b .Ldst_aligned
.section __ex_table,"a" EX_TABLE(20b,100b)
.align 3 EX_TABLE(21b,100b)
.llong 20b,100b EX_TABLE(22b,100b)
.llong 21b,100b EX_TABLE(23b,100b)
.llong 22b,100b EX_TABLE(24b,100b)
.llong 23b,100b EX_TABLE(25b,100b)
.llong 24b,100b EX_TABLE(26b,100b)
.llong 25b,100b EX_TABLE(27b,100b)
.llong 26b,100b EX_TABLE(28b,100b)
.llong 27b,100b EX_TABLE(29b,100b)
.llong 28b,100b EX_TABLE(30b,100b)
.llong 29b,100b EX_TABLE(31b,100b)
.llong 30b,100b EX_TABLE(32b,100b)
.llong 31b,100b EX_TABLE(33b,100b)
.llong 32b,100b EX_TABLE(34b,100b)
.llong 33b,100b EX_TABLE(35b,100b)
.llong 34b,100b EX_TABLE(36b,100b)
.llong 35b,100b EX_TABLE(37b,100b)
.llong 36b,100b EX_TABLE(38b,100b)
.llong 37b,100b EX_TABLE(39b,100b)
.llong 38b,100b EX_TABLE(40b,100b)
.llong 39b,100b EX_TABLE(41b,100b)
.llong 40b,100b EX_TABLE(42b,100b)
.llong 41b,100b EX_TABLE(43b,100b)
.llong 42b,100b EX_TABLE(44b,100b)
.llong 43b,100b EX_TABLE(45b,100b)
.llong 44b,100b EX_TABLE(46b,100b)
.llong 45b,100b EX_TABLE(47b,100b)
.llong 46b,100b EX_TABLE(48b,100b)
.llong 47b,100b EX_TABLE(49b,100b)
.llong 48b,100b EX_TABLE(50b,100b)
.llong 49b,100b EX_TABLE(51b,100b)
.llong 50b,100b EX_TABLE(52b,100b)
.llong 51b,100b EX_TABLE(53b,100b)
.llong 52b,100b EX_TABLE(54b,100b)
.llong 53b,100b EX_TABLE(55b,100b)
.llong 54b,100b EX_TABLE(56b,100b)
.llong 55b,100b EX_TABLE(57b,100b)
.llong 56b,100b EX_TABLE(58b,100b)
.llong 57b,100b EX_TABLE(59b,100b)
.llong 58b,100b EX_TABLE(60b,100b)
.llong 59b,100b EX_TABLE(61b,100b)
.llong 60b,100b EX_TABLE(62b,100b)
.llong 61b,100b EX_TABLE(63b,100b)
.llong 62b,100b EX_TABLE(64b,100b)
.llong 63b,100b EX_TABLE(65b,100b)
.llong 64b,100b EX_TABLE(66b,100b)
.llong 65b,100b EX_TABLE(67b,100b)
.llong 66b,100b EX_TABLE(68b,100b)
.llong 67b,100b EX_TABLE(69b,100b)
.llong 68b,100b EX_TABLE(70b,100b)
.llong 69b,100b EX_TABLE(71b,100b)
.llong 70b,100b EX_TABLE(72b,100b)
.llong 71b,100b EX_TABLE(73b,100b)
.llong 72b,100b EX_TABLE(74b,100b)
.llong 73b,100b EX_TABLE(75b,100b)
.llong 74b,100b EX_TABLE(76b,100b)
.llong 75b,100b EX_TABLE(77b,100b)
.llong 76b,100b EX_TABLE(78b,100b)
.llong 77b,100b EX_TABLE(79b,100b)
.llong 78b,100b EX_TABLE(80b,100b)
.llong 79b,100b EX_TABLE(81b,100b)
.llong 80b,100b EX_TABLE(82b,100b)
.llong 81b,100b EX_TABLE(83b,100b)
.llong 82b,100b EX_TABLE(84b,100b)
.llong 83b,100b EX_TABLE(85b,100b)
.llong 84b,100b EX_TABLE(86b,100b)
.llong 85b,100b EX_TABLE(87b,100b)
.llong 86b,100b EX_TABLE(88b,100b)
.llong 87b,100b EX_TABLE(89b,100b)
.llong 88b,100b EX_TABLE(90b,100b)
.llong 89b,100b EX_TABLE(91b,100b)
.llong 90b,100b
.llong 91b,100b
EXPORT_SYMBOL(__copy_tofrom_user) EXPORT_SYMBOL(__copy_tofrom_user)
arch/powerpc/lib/copyuser_power7.S
View file @ 24bfa6a9
...@@ -29,35 +29,23 @@ ...@@ -29,35 +29,23 @@
.macro err1 .macro err1
100: 100:
.section __ex_table,"a" EX_TABLE(100b,.Ldo_err1)
.align 3
.llong 100b,.Ldo_err1
.previous
.endm .endm
.macro err2 .macro err2
200: 200:
.section __ex_table,"a" EX_TABLE(200b,.Ldo_err2)
.align 3
.llong 200b,.Ldo_err2
.previous
.endm .endm
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
.macro err3 .macro err3
300: 300:
.section __ex_table,"a" EX_TABLE(300b,.Ldo_err3)
.align 3
.llong 300b,.Ldo_err3
.previous
.endm .endm
.macro err4 .macro err4
400: 400:
.section __ex_table,"a" EX_TABLE(400b,.Ldo_err4)
.align 3
.llong 400b,.Ldo_err4
.previous
.endm .endm
......
arch/powerpc/lib/ldstfp.S
View file @ 24bfa6a9
...@@ -21,18 +21,12 @@ ...@@ -21,18 +21,12 @@
#define STKFRM (PPC_MIN_STKFRM + 16) #define STKFRM (PPC_MIN_STKFRM + 16)
.macro extab instr,handler
.section __ex_table,"a"
PPC_LONG \instr,\handler
.previous
.endm
.macro inst32 op .macro inst32 op
reg = 0 reg = 0
.rept 32 .rept 32
20: \op reg,0,r4 20: \op reg,0,r4
b 3f b 3f
extab 20b,99f EX_TABLE(20b,99f)
reg = reg + 1 reg = reg + 1
.endr .endr
.endm .endm
...@@ -100,7 +94,7 @@ _GLOBAL(do_lfs) ...@@ -100,7 +94,7 @@ _GLOBAL(do_lfs)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
/* Load FP reg N from double at *p. N is in r3, p in r4. */ /* Load FP reg N from double at *p. N is in r3, p in r4. */
_GLOBAL(do_lfd) _GLOBAL(do_lfd)
...@@ -127,7 +121,7 @@ _GLOBAL(do_lfd) ...@@ -127,7 +121,7 @@ _GLOBAL(do_lfd)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
/* Store FP reg N to float at *p. N is in r3, p in r4. */ /* Store FP reg N to float at *p. N is in r3, p in r4. */
_GLOBAL(do_stfs) _GLOBAL(do_stfs)
...@@ -154,7 +148,7 @@ _GLOBAL(do_stfs) ...@@ -154,7 +148,7 @@ _GLOBAL(do_stfs)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
/* Store FP reg N to double at *p. N is in r3, p in r4. */ /* Store FP reg N to double at *p. N is in r3, p in r4. */
_GLOBAL(do_stfd) _GLOBAL(do_stfd)
...@@ -181,7 +175,7 @@ _GLOBAL(do_stfd) ...@@ -181,7 +175,7 @@ _GLOBAL(do_stfd)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
/* Get the contents of vrN into v0; N is in r3. */ /* Get the contents of vrN into v0; N is in r3. */
...@@ -248,7 +242,7 @@ _GLOBAL(do_lvx) ...@@ -248,7 +242,7 @@ _GLOBAL(do_lvx)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
/* Store vector reg N to *p. N is in r3, p in r4. */ /* Store vector reg N to *p. N is in r3, p in r4. */
_GLOBAL(do_stvx) _GLOBAL(do_stvx)
...@@ -276,7 +270,7 @@ _GLOBAL(do_stvx) ...@@ -276,7 +270,7 @@ _GLOBAL(do_stvx)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
#ifdef CONFIG_VSX #ifdef CONFIG_VSX
...@@ -344,7 +338,7 @@ _GLOBAL(do_lxvd2x) ...@@ -344,7 +338,7 @@ _GLOBAL(do_lxvd2x)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
/* Store VSX reg N to vector doubleword *p. N is in r3, p in r4. */ /* Store VSX reg N to vector doubleword *p. N is in r3, p in r4. */
_GLOBAL(do_stxvd2x) _GLOBAL(do_stxvd2x)
...@@ -372,7 +366,7 @@ _GLOBAL(do_stxvd2x) ...@@ -372,7 +366,7 @@ _GLOBAL(do_stxvd2x)
mr r3,r9 mr r3,r9
addi r1,r1,STKFRM addi r1,r1,STKFRM
blr blr
extab 2b,3b EX_TABLE(2b,3b)
#endif /* CONFIG_VSX */ #endif /* CONFIG_VSX */
......
arch/powerpc/lib/sstep.c
View file @ 24bfa6a9
...@@ -493,10 +493,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long), ...@@ -493,10 +493,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),
"3: li %0,%4\n" \ "3: li %0,%4\n" \
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 3b) \
PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err), "=r" (cr) \ : "=r" (err), "=r" (cr) \
: "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)) : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err))
...@@ -508,10 +505,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long), ...@@ -508,10 +505,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),
"3: li %0,%3\n" \ "3: li %0,%3\n" \
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 3b) \
PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err), "=r" (x) \ : "=r" (err), "=r" (x) \
: "r" (addr), "i" (-EFAULT), "0" (err)) : "r" (addr), "i" (-EFAULT), "0" (err))
...@@ -523,10 +517,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long), ...@@ -523,10 +517,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),
"3: li %0,%3\n" \ "3: li %0,%3\n" \
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ EX_TABLE(1b, 3b) \
PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err) \ : "=r" (err) \
: "r" (addr), "i" (-EFAULT), "0" (err)) : "r" (addr), "i" (-EFAULT), "0" (err))
......
arch/powerpc/lib/string.S
View file @ 24bfa6a9
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/export.h> #include <asm/export.h>
.section __ex_table,"a"
PPC_LONG_ALIGN
.text .text
/* This clears out any unused part of the destination buffer, /* This clears out any unused part of the destination buffer,
...@@ -125,10 +123,9 @@ _GLOBAL(__clear_user) ...@@ -125,10 +123,9 @@ _GLOBAL(__clear_user)
92: mfctr r3 92: mfctr r3
blr blr
.section __ex_table,"a" EX_TABLE(11b, 90b)
PPC_LONG 11b,90b EX_TABLE(1b, 91b)
PPC_LONG 1b,91b EX_TABLE(8b, 92b)
PPC_LONG 8b,92b
.text
EXPORT_SYMBOL(__clear_user) EXPORT_SYMBOL(__clear_user)
#endif #endif
arch/powerpc/lib/string_64.S
View file @ 24bfa6a9
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/linkage.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/export.h> #include <asm/export.h>
...@@ -41,26 +42,17 @@ PPC64_CACHES: ...@@ -41,26 +42,17 @@ PPC64_CACHES:
.macro err1 .macro err1
100: 100:
.section __ex_table,"a" EX_TABLE(100b,.Ldo_err1)
.align 3
.llong 100b,.Ldo_err1
.previous
.endm .endm
.macro err2 .macro err2
200: 200:
.section __ex_table,"a" EX_TABLE(200b,.Ldo_err2)
.align 3
.llong 200b,.Ldo_err2
.previous
.endm .endm
.macro err3 .macro err3
300: 300:
.section __ex_table,"a" EX_TABLE(300b,.Ldo_err3)
.align 3
.llong 300b,.Ldo_err3
.previous
.endm .endm
.Ldo_err1: .Ldo_err1:
......
arch/powerpc/sysdev/fsl_rio.c
View file @ 24bfa6a9
...@@ -80,10 +80,8 @@ ...@@ -80,10 +80,8 @@
"3: li %1,-1\n" \ "3: li %1,-1\n" \
" li %0,%3\n" \ " li %0,%3\n" \
" b 2b\n" \ " b 2b\n" \
".section __ex_table,\"a\"\n" \ ".previous\n" \
PPC_LONG_ALIGN "\n" \ EX_TABLE(1b, 3b) \
PPC_LONG "1b,3b\n" \
".text" \
: "=r" (err), "=r" (x) \ : "=r" (err), "=r" (x) \
: "b" (addr), "i" (-EFAULT), "0" (err)) : "b" (addr), "i" (-EFAULT), "0" (err))
......
arch/powerpc/sysdev/tsi108_pci.c
View file @ 24bfa6a9
...@@ -137,10 +137,8 @@ void tsi108_clear_pci_error(u32 pci_cfg_base) ...@@ -137,10 +137,8 @@ void tsi108_clear_pci_error(u32 pci_cfg_base)
".section .fixup,\"ax\"\n" \ ".section .fixup,\"ax\"\n" \
"3: li %0,-1\n" \ "3: li %0,-1\n" \
" b 2b\n" \ " b 2b\n" \
".section __ex_table,\"a\"\n" \ ".previous\n" \
" .align 2\n" \ EX_TABLE(1b, 3b) \
" .long 1b,3b\n" \
".text" \
: "=r"(x) : "r"(addr)) : "=r"(x) : "r"(addr))
int int
......
tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
View file @ 24bfa6a9
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#define PPC_MTOCRF(A, B) mtocrf A, B #define PPC_MTOCRF(A, B) mtocrf A, B
#define EX_TABLE(x, y)
FUNC_START(enter_vmx_usercopy) FUNC_START(enter_vmx_usercopy)
li r3,1 li r3,1
blr blr
......
tools/testing/selftests/powerpc/primitives/asm/ppc_asm.h 0 → 120000
View file @ 24bfa6a9
../../../../../../arch/powerpc/include/asm/ppc_asm.h
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7