kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* bignum.c (ones): Use __builtin_popcountl if available.

Browse source 
* internal.h (GCC_VERSION_SINCE): Macro moved from pack.c.

* pack.c: Include internal.h for GCC_VERSION_SINCE.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-04-12 12:01:51 +00:00
parent 3da834800e
commit 16a2acca20
4 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Apr 12 20:59:24 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (ones): Use __builtin_popcountl if available.
* internal.h (GCC_VERSION_SINCE): Macro moved from pack.c.
* pack.c: Include internal.h for GCC_VERSION_SINCE.
Fri Apr 12 18:29:42 2013 Tanaka Akira <akr@fsij.org> Fri Apr 12 18:29:42 2013 Tanaka Akira <akr@fsij.org>
* common.mk: version.o depends on $(srcdir)/include/ruby/version.h * common.mk: version.o depends on $(srcdir)/include/ruby/version.h

30
bignum.c
View file

@ -887,27 +887,31 @@ static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *mo
static inline int static inline int
ones(register unsigned long x) ones(register unsigned long x)
{ {
#if SIZEOF_LONG == 8 #if GCC_VERSION_SINCE(3, 4, 0)
# define MASK_55 0x5555555555555555UL return __builtin_popcountl(x);
# define MASK_33 0x3333333333333333UL
# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
#else #else
# define MASK_55 0x55555555UL # if SIZEOF_LONG == 8
# define MASK_33 0x33333333UL # define MASK_55 0x5555555555555555UL
# define MASK_0f 0x0f0f0f0fUL # define MASK_33 0x3333333333333333UL
#endif # define MASK_0f 0x0f0f0f0f0f0f0f0fUL
# else
# define MASK_55 0x55555555UL
# define MASK_33 0x33333333UL
# define MASK_0f 0x0f0f0f0fUL
# endif
x -= (x >> 1) & MASK_55; x -= (x >> 1) & MASK_55;
x = ((x >> 2) & MASK_33) + (x & MASK_33); x = ((x >> 2) & MASK_33) + (x & MASK_33);
x = ((x >> 4) + x) & MASK_0f; x = ((x >> 4) + x) & MASK_0f;
x += (x >> 8); x += (x >> 8);
x += (x >> 16); x += (x >> 16);
#if SIZEOF_LONG == 8 # if SIZEOF_LONG == 8
x += (x >> 32); x += (x >> 32);
#endif # endif
return (int)(x & 0x7f); return (int)(x & 0x7f);
#undef MASK_0f # undef MASK_0f
#undef MASK_33 # undef MASK_33
#undef MASK_55 # undef MASK_55
#endif
} }
static inline unsigned long static inline unsigned long

6
internal.h
View file

@ -19,6 +19,12 @@ extern "C" {
#endif #endif
#endif #endif
#define GCC_VERSION_SINCE(major, minor, patchlevel) \
(defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
((__GNUC__ > (major)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
#if SIGNEDNESS_OF_TIME_T < 0 /* signed */ #if SIGNEDNESS_OF_TIME_T < 0 /* signed */
# define TIMET_MAX (time_t)((~(unsigned_time_t)0) >> 1) # define TIMET_MAX (time_t)((~(unsigned_time_t)0) >> 1)
# define TIMET_MIN (time_t)(((unsigned_time_t)1) << (sizeof(time_t) * CHAR_BIT - 1)) # define TIMET_MIN (time_t)(((unsigned_time_t)1) << (sizeof(time_t) * CHAR_BIT - 1))

7
pack.c
View file

@ -11,16 +11,11 @@
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/encoding.h" #include "ruby/encoding.h"
#include "internal.h"
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#define GCC_VERSION_SINCE(major, minor, patchlevel) \
(defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
((__GNUC__ > (major)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
/* /*
* It is intentional that the condition for natstr is HAVE_TRUE_LONG_LONG * It is intentional that the condition for natstr is HAVE_TRUE_LONG_LONG
* instead of HAVE_LONG_LONG or LONG_LONG. * instead of HAVE_LONG_LONG or LONG_LONG.