This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v3 2/9] aarch64: Share code in syscall-cancel.h
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Cc: marcus dot shawcroft at gmail dot com, Richard Henderson <rth at redhat dot com>
- Date: Sun, 25 May 2014 12:41:42 -0700
- Subject: [PATCH v3 2/9] aarch64: Share code in syscall-cancel.h
- Authentication-results: sourceware.org; auth=none
- References: <1401046909-25821-1-git-send-email-rth at twiddle dot net>
From: Richard Henderson <rth@redhat.com>
Fold nocancel and error handling paths.
---
.../unix/sysv/linux/aarch64/nptl/sysdep-cancel.h | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
index 26d4c0e..41502de 100644
--- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
@@ -27,24 +27,17 @@
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
.section ".text"; \
- .type __##syscall_name##_nocancel,%function; \
- .globl __##syscall_name##_nocancel; \
-__##syscall_name##_nocancel: \
- cfi_startproc; \
+ENTRY (__##syscall_name##_nocancel); \
+.Lpseudo_nocancel: \
DO_CALL (syscall_name, args); \
+.Lpseudo_finish: \
cmn x0, 4095; \
b.cs .Lsyscall_error; \
- PSEUDO_RET; \
- cfi_endproc; \
+ .subsection 2; \
.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
ENTRY (name); \
SINGLE_THREAD_P; \
- bne .Lpseudo_cancel; \
- DO_CALL (syscall_name, 0); \
- cmn x0, 4095; \
- b.cs .Lsyscall_error; \
- PSEUDO_RET; \
-.Lpseudo_cancel: \
+ beq .Lpseudo_nocancel; \
DOCARGS_##args; /* save syscall args etc. around CENABLE. */ \
CENABLE; \
mov x16, x0; /* put mask in safe place. */ \
@@ -60,8 +53,15 @@ ENTRY (name); \
ldr x30, [sp], 16; \
cfi_adjust_cfa_offset (-16); \
cfi_restore (x30); \
- cmn x0, 4095; \
- b.cs .Lsyscall_error;
+ b .Lpseudo_finish; \
+ cfi_endproc; \
+ .size name, .-name; \
+ .previous
+
+# undef PSEUDO_END
+# define PSEUDO_END(name) \
+ SYSCALL_ERROR_HANDLER; \
+ cfi_endproc
# define DOCARGS_0 \
str x30, [sp, -16]!; \
--
1.9.0