[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/11] count-one-bits: better 'inline'
From: |
Paul Eggert |
Subject: |
[PATCH 03/11] count-one-bits: better 'inline' |
Date: |
Mon, 29 Oct 2012 00:14:42 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 |
* lib/count-one-bits.c: New file.
* lib/count-one-bits.h (COUNT_ONE_BITS_INLINE):
New macro. Replace all uses of 'static inline' with it.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* m4/count-one-bits.m4 (gl_COUNT_ONE_BITS):
Do not require AC_C_INLINE.
* modules/count-one-bits (Files, lib_SOURCES):
Add lib/count-one-bits.c.
(Depends-on): Add extern-inline.
---
ChangeLog | 11 +++++++++++
lib/count-one-bits.c | 3 +++
lib/count-one-bits.h | 15 +++++++++++----
m4/count-one-bits.m4 | 5 +----
modules/count-one-bits | 3 +++
5 files changed, 29 insertions(+), 8 deletions(-)
create mode 100644 lib/count-one-bits.c
diff --git a/ChangeLog b/ChangeLog
index 15914d1..eae370e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2012-10-28 Paul Eggert <address@hidden>
+ count-one-bits: better 'inline'
+ * lib/count-one-bits.c: New file.
+ * lib/count-one-bits.h (COUNT_ONE_BITS_INLINE):
+ New macro. Replace all uses of 'static inline' with it.
+ Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
+ * m4/count-one-bits.m4 (gl_COUNT_ONE_BITS):
+ Do not require AC_C_INLINE.
+ * modules/count-one-bits (Files, lib_SOURCES):
+ Add lib/count-one-bits.c.
+ (Depends-on): Add extern-inline.
+
count-leading-zeros: better 'inline'
* lib/count-leading-zeros.c: New file.
* lib/count-leading-zeros.h (COUNT_LEADING_ZEROS_INLINE):
diff --git a/lib/count-one-bits.c b/lib/count-one-bits.c
new file mode 100644
index 0000000..b15aec4
--- /dev/null
+++ b/lib/count-one-bits.c
@@ -0,0 +1,3 @@
+#include <config.h>
+#define COUNT_ONE_BITS_INLINE _GL_EXTERN_INLINE
+#include "count-one-bits.h"
diff --git a/lib/count-one-bits.h b/lib/count-one-bits.h
index 1881122..644f4cb 100644
--- a/lib/count-one-bits.h
+++ b/lib/count-one-bits.h
@@ -22,6 +22,11 @@
#include <stdlib.h>
#include "verify.h"
+_GL_INLINE_HEADER_BEGIN
+#ifndef COUNT_ONE_BITS_INLINE
+# define COUNT_ONE_BITS_INLINE _GL_INLINE
+#endif
+
/* Expand the code which computes the number of 1-bits of the local
variable 'x' of type TYPE (an unsigned integer type) and returns it
from the current function. */
@@ -40,7 +45,7 @@
/* Compute and return the number of 1-bits set in the least
significant 32 bits of X. */
-static inline int
+COUNT_ONE_BITS_INLINE int
count_one_bits_32 (unsigned int x)
{
x = ((x & 0xaaaaaaaaU) >> 1) + (x & 0x55555555U);
@@ -52,14 +57,14 @@ count_one_bits_32 (unsigned int x)
#endif
/* Compute and return the number of 1-bits set in X. */
-static inline int
+COUNT_ONE_BITS_INLINE int
count_one_bits (unsigned int x)
{
COUNT_ONE_BITS (__builtin_popcount, unsigned int);
}
/* Compute and return the number of 1-bits set in X. */
-static inline int
+COUNT_ONE_BITS_INLINE int
count_one_bits_l (unsigned long int x)
{
COUNT_ONE_BITS (__builtin_popcountl, unsigned long int);
@@ -67,11 +72,13 @@ count_one_bits_l (unsigned long int x)
#if HAVE_UNSIGNED_LONG_LONG_INT
/* Compute and return the number of 1-bits set in X. */
-static inline int
+COUNT_ONE_BITS_INLINE int
count_one_bits_ll (unsigned long long int x)
{
COUNT_ONE_BITS (__builtin_popcountll, unsigned long long int);
}
#endif
+_GL_INLINE_HEADER_END
+
#endif /* COUNT_ONE_BITS_H */
diff --git a/m4/count-one-bits.m4 b/m4/count-one-bits.m4
index 884392a..f42373a 100644
--- a/m4/count-one-bits.m4
+++ b/m4/count-one-bits.m4
@@ -1,4 +1,4 @@
-# count-one-bits.m4 serial 2
+# count-one-bits.m4 serial 3
dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,4 @@ AC_DEFUN([gl_COUNT_ONE_BITS],
dnl We don't need (and can't compile) count_one_bits_ll
dnl unless the type 'unsigned long long int' exists.
AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-
- dnl Prerequisites of lib/count-one-bits.h.
- AC_REQUIRE([AC_C_INLINE])
])
diff --git a/modules/count-one-bits b/modules/count-one-bits
index b836bfa..3922d85 100644
--- a/modules/count-one-bits
+++ b/modules/count-one-bits
@@ -2,16 +2,19 @@ Description:
Counts the number of 1-bits in a word.
Files:
+lib/count-one-bits.c
lib/count-one-bits.h
m4/count-one-bits.m4
Depends-on:
+extern-inline
verify
configure.ac:
gl_COUNT_ONE_BITS
Makefile.am:
+lib_SOURCES += count-one-bits.c
Include:
"count-one-bits.h"
--
1.7.11.7
- [PATCH 03/11] count-one-bits: better 'inline',
Paul Eggert <=