From: Jan Kiszka <jan.kiszka@domain.hid>
To: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Cc: xenomai-core <xenomai@xenomai.org>
Subject: Re: [Xenomai-core] [PATCH] optimise syscall mux-code calculation
Date: Sun, 16 Jul 2006 16:47:19 +0200 [thread overview]
Message-ID: <44BA5177.4050000@domain.hid> (raw)
In-Reply-To: <44BA0A33.6060606@domain.hid>
[-- Attachment #1.1: Type: text/plain, Size: 263 bytes --]
Jan Kiszka wrote:
> ...
> Based on this conversion is the optimisation patch -v4. There was
> another quirk hidden in libpthread_rt which binds to RTDM "manually".
> That's now also covered by the patch.
Grr, missing run-quilt-refresh-before-post.
Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: optimise-muxcode-calculation-v4.patch --]
[-- Type: text/x-patch; name="optimise-muxcode-calculation-v4.patch", Size: 8778 bytes --]
---
include/asm-arm/syscall.h | 29 +++++++++++++++--------------
include/asm-blackfin/syscall.h | 6 ++++--
include/asm-i386/syscall.h | 7 ++++---
include/asm-ia64/syscall.h | 25 +++++++++++++------------
include/asm-powerpc/syscall.h | 7 ++++---
include/nucleus/bind.h | 2 +-
src/skins/posix/init.c | 2 +-
7 files changed, 42 insertions(+), 36 deletions(-)
Index: xenomai/include/asm-arm/syscall.h
===================================================================
--- xenomai.orig/include/asm-arm/syscall.h
+++ xenomai/include/asm-arm/syscall.h
@@ -25,7 +25,8 @@
#include <asm-generic/xenomai/syscall.h>
-#define __xn_mux_code(id,op) ((op << 24)|((id << 16) & 0xff0000)|(__xn_sys_mux & 0xffff))
+#define __xn_mux_code(shifted_id,op) ((op << 24)|shifted_id|(__xn_sys_mux & 0xffff))
+#define __xn_mux_shifted_id(id) ((id << 16) & 0xff0000)
#define XENO_ARM_SYSCALL 0x009F0042 /* carefully chosen... */
@@ -130,20 +131,20 @@ static inline int __xn_interrupted_p(str
#define __sys2(x) #x
#define __sys1(x) __sys2(x)
-#define XENOMAI_DO_SYSCALL(nr, id, op, args...) \
- ({ \
- unsigned long __res; \
+#define XENOMAI_DO_SYSCALL(nr, shifted_id, op, args...) \
+ ({ \
+ unsigned long __res; \
register unsigned long __res_r0 __asm__ ("r0"); \
- ASM_INDECL_##nr; \
- \
- LOADARGS_##nr(__xn_mux_code(id,op), args); \
- __asm__ __volatile__ ( \
-" swi " __sys1(XENO_ARM_SYSCALL) \
- : "=r" (__res_r0) \
- : ASM_INPUT_##nr \
- : "memory"); \
- __res = __res_r0; \
- (int) __res; \
+ ASM_INDECL_##nr; \
+ \
+ LOADARGS_##nr(__xn_mux_code(shifted_id,op), args); \
+ __asm__ __volatile__ ( \
+" swi " __sys1(XENO_ARM_SYSCALL) \
+ : "=r" (__res_r0) \
+ : ASM_INPUT_##nr \
+ : "memory"); \
+ __res = __res_r0; \
+ (int) __res; \
})
#define XENOMAI_SYSCALL0(op) XENOMAI_DO_SYSCALL(0,0,op)
Index: xenomai/include/asm-blackfin/syscall.h
===================================================================
--- xenomai.orig/include/asm-blackfin/syscall.h
+++ xenomai/include/asm-blackfin/syscall.h
@@ -26,7 +26,8 @@
marker. Note: watch out for the p0 sign convention used by Linux
(i.e. negative syscall number in orig_p0 meaning "non-syscall
entry"). */
-#define __xn_mux_code(id,op) ((id << 24)|((op << 16) & 0xff0000)|(__xn_sys_mux & 0xffff))
+#define __xn_mux_code(shifted_id,op) (shifted_id|((op << 16) & 0xff0000)|(__xn_sys_mux & 0xffff))
+#define __xn_mux_shifted_id(id) (id << 24)
/* Local syscalls -- the braindamage thing about this arch is the
absence of atomic ops usable from user-space; so we export what
@@ -213,7 +214,8 @@ static inline int __xn_interrupted_p(str
__res; \
})
-#define XENOMAI_DO_SYSCALL(nr, id, op, args...) __emit_syscall##nr(__xn_mux_code(id,op), ##args)
+#define XENOMAI_DO_SYSCALL(nr, shifted_id, op, args...) \
+ __emit_syscall##nr(__xn_mux_code(shifted_id,op), ##args)
#define XENOMAI_SYSCALL0(op) XENOMAI_DO_SYSCALL(0,0,op)
#define XENOMAI_SYSCALL1(op,a1) XENOMAI_DO_SYSCALL(1,0,op,a1)
Index: xenomai/include/asm-i386/syscall.h
===================================================================
--- xenomai.orig/include/asm-i386/syscall.h
+++ xenomai/include/asm-i386/syscall.h
@@ -22,7 +22,8 @@
#include <asm-generic/xenomai/syscall.h>
-#define __xn_mux_code(id,op) ((op << 24)|((id << 16) & 0xff0000)|(__xn_sys_mux & 0x7fff))
+#define __xn_mux_code(shifted_id,op) ((op << 24)|shifted_id|(__xn_sys_mux & 0x7fff))
+#define __xn_mux_shifted_id(id) ((id << 16) & 0xff0000)
#ifdef __KERNEL__
@@ -165,9 +166,9 @@ asm (".L__X'%ebx = 1\n\t"
: "i" (__xn_mux_code(0,op)) ASMFMT_##nr(args) : "memory", "cc"); \
(int) resultvar; })
-#define XENOMAI_SKIN_MUX(nr, id, op, args...) \
+#define XENOMAI_SKIN_MUX(nr, shifted_id, op, args...) \
({ \
- int muxcode = __xn_mux_code(id,op); \
+ int muxcode = __xn_mux_code(shifted_id,op); \
unsigned resultvar; \
asm volatile ( \
LOADARGS_##nr \
Index: xenomai/include/asm-ia64/syscall.h
===================================================================
--- xenomai.orig/include/asm-ia64/syscall.h
+++ xenomai/include/asm-ia64/syscall.h
@@ -23,7 +23,8 @@
#include <asm-generic/xenomai/syscall.h>
-#define __xn_mux_code(id,op) ((op << 24)|(((id << 16) & 0xff0000UL)|(__xn_sys_mux & 0xffffUL)))
+#define __xn_mux_code(shifted_id,op) ((op << 24)|shifted_id|(__xn_sys_mux & 0xffffUL))
+#define __xn_mux_shifted_id(id) ((id << 16) & 0xff0000UL)
#ifdef __KERNEL__
@@ -151,17 +152,17 @@ static inline int __xn_interrupted_p(str
/* Branch registers. */ \
"b6", "b7"
-#define XENOMAI_SKIN_MUX(nr, id, op, args...) \
- ({ \
- register long _r15 asm ("r15") = (__xn_mux_code(id,op)); \
- register long _retval asm ("r8"); \
- register long err asm ("r10"); \
- LOAD_ARGS_##nr (args); \
- __asm __volatile ("break %3;;\n\t" \
- : "=r" (_retval), "=r" (_r15), "=r" (err) \
- : "i" (__BREAK_SYSCALL), "1" (_r15) \
- ASM_ARGS_##nr \
- : "memory" ASM_CLOBBERS_##nr); \
+#define XENOMAI_SKIN_MUX(nr, shifted_id, op, args...) \
+ ({ \
+ register long _r15 asm ("r15") = (__xn_mux_code(shifted_id,op)); \
+ register long _retval asm ("r8"); \
+ register long err asm ("r10"); \
+ LOAD_ARGS_##nr (args); \
+ __asm __volatile ("break %3;;\n\t" \
+ : "=r" (_retval), "=r" (_r15), "=r" (err) \
+ : "i" (__BREAK_SYSCALL), "1" (_r15) \
+ ASM_ARGS_##nr \
+ : "memory" ASM_CLOBBERS_##nr); \
err < 0 ? -_retval : _retval; })
#define XENOMAI_SYS_MUX(nr, op, args...) XENOMAI_SKIN_MUX(nr, 0, op , ##args)
Index: xenomai/include/asm-powerpc/syscall.h
===================================================================
--- xenomai.orig/include/asm-powerpc/syscall.h
+++ xenomai/include/asm-powerpc/syscall.h
@@ -25,7 +25,8 @@
#include <asm-generic/xenomai/syscall.h>
-#define __xn_mux_code(id,op) ((op << 24)|((id << 16) & 0xff0000)|(__xn_sys_mux & 0xffff))
+#define __xn_mux_code(shifted_id,op) ((op << 24)|shifted_id|(__xn_sys_mux & 0xffff))
+#define __xn_mux_shifted_id(id) ((id << 16) & 0xff0000)
#ifdef __KERNEL__
@@ -123,7 +124,7 @@ static inline int __xn_interrupted_p(str
#define ASM_INPUT_4 ASM_INPUT_3, "4" (__sc_6)
#define ASM_INPUT_5 ASM_INPUT_4, "5" (__sc_7)
-#define XENOMAI_DO_SYSCALL(nr, id, op, args...) \
+#define XENOMAI_DO_SYSCALL(nr, shifted_id, op, args...) \
({ \
register unsigned long __sc_0 __asm__ ("r0"); \
register unsigned long __sc_3 __asm__ ("r3"); \
@@ -132,7 +133,7 @@ static inline int __xn_interrupted_p(str
register unsigned long __sc_6 __asm__ ("r6"); \
register unsigned long __sc_7 __asm__ ("r7"); \
\
- LOADARGS_##nr(__xn_mux_code(id,op), args); \
+ LOADARGS_##nr(__xn_mux_code(shifted_id,op), args); \
__asm__ __volatile__ \
("sc \n\t" \
"mfcr %0 " \
Index: xenomai/include/nucleus/bind.h
===================================================================
--- xenomai.orig/include/nucleus/bind.h
+++ xenomai/include/nucleus/bind.h
@@ -101,7 +101,7 @@ xeno_user_skin_init(unsigned skin_magic,
}
#endif /* !XNSKIN_NO_MLOCK_ALERT */
- return muxid;
+ return __xn_mux_shifted_id(muxid);
}
#endif /* _XENO_NUCLEUS_BIND_H */
Index: xenomai/src/skins/posix/init.c
===================================================================
--- xenomai.orig/src/skins/posix/init.c
+++ xenomai/src/skins/posix/init.c
@@ -45,7 +45,7 @@ void __init_posix_interface(void)
muxid = XENOMAI_SYSBIND(RTDM_SKIN_MAGIC,
XENOMAI_FEAT_DEP, XENOMAI_ABI_REV, NULL);
if (muxid > 0) {
- __rtdm_muxid = muxid;
+ __rtdm_muxid = __xn_mux_shifted_id(muxid);
__rtdm_fd_start = FD_SETSIZE - XENOMAI_SKINCALL0(__rtdm_muxid,
__rtdm_fdcount);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
next prev parent reply other threads:[~2006-07-16 14:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-13 11:13 [Xenomai-core] [PATCH] optimise syscall mux-code calculation Jan Kiszka
2006-07-15 2:24 ` Philippe Gerum
2006-07-15 8:06 ` Jan Kiszka
2006-07-15 8:31 ` Philippe Gerum
2006-07-15 8:37 ` Jan Kiszka
2006-07-15 15:11 ` Philippe Gerum
2006-07-15 11:40 ` Jan Kiszka
2006-07-15 12:13 ` Gilles Chanteperdrix
2006-07-15 12:29 ` Jan Kiszka
2006-07-15 15:56 ` Gilles Chanteperdrix
2006-07-16 9:43 ` Jan Kiszka
2006-07-16 14:47 ` Jan Kiszka [this message]
2006-07-19 9:25 ` Philippe Gerum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44BA5177.4050000@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=gilles.chanteperdrix@xenomai.org \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.