[PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
- this macro unifies the code to add exception table entries - additionally use ENTRY()/ENDPROC() at more places Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:

committed by
Kyle McMartin

parent
8e9e9844b4
commit
0b3d643f9e
@@ -37,6 +37,7 @@
|
||||
|
||||
#include <asm/assembly.h>
|
||||
#include <asm/errno.h>
|
||||
#include <linux/linkage.h>
|
||||
|
||||
/*
|
||||
* get_sr gets the appropriate space value into
|
||||
@@ -67,8 +68,7 @@
|
||||
* otherwise strlen (i.e. excludes zero byte)
|
||||
*/
|
||||
|
||||
.export lstrncpy_from_user,code
|
||||
lstrncpy_from_user:
|
||||
ENTRY(lstrncpy_from_user)
|
||||
.proc
|
||||
.callinfo NO_CALLS
|
||||
.entry
|
||||
@@ -87,6 +87,7 @@ $lsfu_exit:
|
||||
bv %r0(%r2)
|
||||
nop
|
||||
.exit
|
||||
ENDPROC(lstrncpy_from_user)
|
||||
|
||||
.section .fixup,"ax"
|
||||
3: fixup_branch $lsfu_exit
|
||||
@@ -94,13 +95,8 @@ $lsfu_exit:
|
||||
.previous
|
||||
|
||||
.section __ex_table,"aw"
|
||||
#ifdef __LP64__
|
||||
.dword 1b,3b
|
||||
.dword 2b,3b
|
||||
#else
|
||||
.word 1b,3b
|
||||
.word 2b,3b
|
||||
#endif
|
||||
ASM_ULONG_INSN 1b,3b
|
||||
ASM_ULONG_INSN 2b,3b
|
||||
.previous
|
||||
|
||||
.procend
|
||||
@@ -112,8 +108,7 @@ $lsfu_exit:
|
||||
* otherwise, returns number of bytes not transferred.
|
||||
*/
|
||||
|
||||
.export lclear_user,code
|
||||
lclear_user:
|
||||
ENTRY(lclear_user)
|
||||
.proc
|
||||
.callinfo NO_CALLS
|
||||
.entry
|
||||
@@ -127,6 +122,7 @@ $lclu_done:
|
||||
bv %r0(%r2)
|
||||
copy %r25,%r28
|
||||
.exit
|
||||
ENDPROC(lclear_user)
|
||||
|
||||
.section .fixup,"ax"
|
||||
2: fixup_branch $lclu_done
|
||||
@@ -134,11 +130,7 @@ $lclu_done:
|
||||
.previous
|
||||
|
||||
.section __ex_table,"aw"
|
||||
#ifdef __LP64__
|
||||
.dword 1b,2b
|
||||
#else
|
||||
.word 1b,2b
|
||||
#endif
|
||||
ASM_ULONG_INSN 1b,2b
|
||||
.previous
|
||||
|
||||
.procend
|
||||
@@ -151,8 +143,7 @@ $lclu_done:
|
||||
* else strlen + 1 (i.e. includes zero byte).
|
||||
*/
|
||||
|
||||
.export lstrnlen_user,code
|
||||
lstrnlen_user:
|
||||
ENTRY(lstrnlen_user)
|
||||
.proc
|
||||
.callinfo NO_CALLS
|
||||
.entry
|
||||
@@ -172,6 +163,7 @@ $lslen_done:
|
||||
$lslen_nzero:
|
||||
b $lslen_done
|
||||
ldo 1(%r26),%r26 /* special case for N == 0 */
|
||||
ENDPROC(lstrnlen_user)
|
||||
|
||||
.section .fixup,"ax"
|
||||
3: fixup_branch $lslen_done
|
||||
@@ -179,13 +171,8 @@ $lslen_nzero:
|
||||
.previous
|
||||
|
||||
.section __ex_table,"aw"
|
||||
#ifdef __LP64__
|
||||
.dword 1b,3b
|
||||
.dword 2b,3b
|
||||
#else
|
||||
.word 1b,3b
|
||||
.word 2b,3b
|
||||
#endif
|
||||
ASM_ULONG_INSN 1b,3b
|
||||
ASM_ULONG_INSN 2b,3b
|
||||
.previous
|
||||
|
||||
.procend
|
||||
|
Reference in New Issue
Block a user