summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid McCullough <davidm@snapgear.com>2001-02-26 03:55:17 +0000
committerDavid McCullough <davidm@snapgear.com>2001-02-26 03:55:17 +0000
commitec656c14290dfe1449d3a03925ab4085bfc71ccd (patch)
tree41d0cb56e64183bc6f2fe5100b0ede3157af384a
parenta7c7b0948eaf319c971e8c9f380df93ecf202eb1 (diff)
Reduced the size of sigsets to the minimal needed. Apart from the size,
it has the added advantage of giving the C++ build of m68k-elf-gcc a clean bill of health.
-rw-r--r--libc/sysdeps/linux/m68k/bits/setjmp.h2
-rw-r--r--libc/sysdeps/linux/m68k/bits/sigset.h76
2 files changed, 12 insertions, 66 deletions
diff --git a/libc/sysdeps/linux/m68k/bits/setjmp.h b/libc/sysdeps/linux/m68k/bits/setjmp.h
index 31a241380..83ce200a1 100644
--- a/libc/sysdeps/linux/m68k/bits/setjmp.h
+++ b/libc/sysdeps/linux/m68k/bits/setjmp.h
@@ -22,6 +22,8 @@
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
+#include <signal.h>
+
typedef struct
{
/* There are eight 4-byte data registers, but D0 is not saved. */
diff --git a/libc/sysdeps/linux/m68k/bits/sigset.h b/libc/sysdeps/linux/m68k/bits/sigset.h
index 66a9c51c5..dcdc924c2 100644
--- a/libc/sysdeps/linux/m68k/bits/sigset.h
+++ b/libc/sysdeps/linux/m68k/bits/sigset.h
@@ -24,11 +24,7 @@ typedef int __sig_atomic_t;
/* A `sigset_t' has a bit for each signal. */
-# define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int)))
-typedef struct
- {
- unsigned long int __val[_SIGSET_NWORDS];
- } __sigset_t;
+typedef unsigned long __sigset_t;
#endif
@@ -47,79 +43,27 @@ typedef struct
# endif
/* Return a mask that includes the bit for SIG only. */
-# define __sigmask(sig) \
- (((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int))))
-
-/* Return the word index for SIG. */
-# define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned long int)))
+# define __sigmask(sig) (1L << ((sig) - 1))
# if defined __GNUC__ && __GNUC__ >= 2
-# define __sigemptyset(set) \
- (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
- sigset_t *__set = (set); \
- while (--__cnt >= 0) __set->__val[__cnt] = 0; \
- 0; }))
-# define __sigfillset(set) \
- (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
- sigset_t *__set = (set); \
- while (--__cnt >= 0) __set->__val[__cnt] = ~0UL; \
- 0; }))
+# define __sigemptyset(set) (*(set) = 0)
+# define __sigfillset(set) (*(set) = ~0)
# ifdef __USE_GNU
/* The POSIX does not specify for handling the whole signal set in one
command. This is often wanted and so we define three more functions
here. */
-# define __sigisemptyset(set) \
- (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
- const sigset_t *__set = (set); \
- int __ret = __set->__val[--__cnt]; \
- while (!__ret && --__cnt >= 0) \
- __ret = __set->__val[__cnt]; \
- __ret == 0; }))
-# define __sigandset(dest, left, right) \
- (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
- sigset_t *__dest = (dest); \
- const sigset_t *__left = (left); \
- const sigset_t *__right = (right); \
- while (--__cnt >= 0) \
- __dest->__val[__cnt] = (__left->__val[__cnt] \
- & __right->__val[__cnt]); \
- 0; }))
-# define __sigorset(dest, left, right) \
- (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
- sigset_t *__dest = (dest); \
- const sigset_t *__left = (left); \
- const sigset_t *__right = (right); \
- while (--__cnt >= 0) \
- __dest->__val[__cnt] = (__left->__val[__cnt] \
- | __right->__val[__cnt]); \
- 0; }))
+# define __sigisemptyset(set) (*(set) == 0)
+# define __sigandset(dest, left, right) (*(dest) = *(left) & *(right))
+# define __sigorset(dest, left, right) (*(dest) = *(left) | *(right))
# endif
# endif
/* These functions needn't check for a bogus signal number -- error
checking is done in the non __ versions. */
-extern int __sigismember (__const __sigset_t *, int);
-extern int __sigaddset (__sigset_t *, int);
-extern int __sigdelset (__sigset_t *, int);
-
-# ifdef __USE_EXTERN_INLINES
-# define __SIGSETFN(NAME, BODY, CONST) \
- _EXTERN_INLINE int \
- NAME (CONST __sigset_t *__set, int __sig) \
- { \
- unsigned long int __mask = __sigmask (__sig); \
- unsigned long int __word = __sigword (__sig); \
- return BODY; \
- }
-
-__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const)
-__SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), )
-__SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
-
-# undef __SIGSETFN
-# endif
-
+# define __sigismember(set, sig) (*(set) & (1L << ((sig)-1)))
+# define __sigaddset(set, sig) (*(set) |= (1L << ((sig)-1)))
+# define __sigdelset(set, sig) (*(set) &= ~(1L << ((sig)-1)))
#endif /* ! _SIGSET_H_fns. */