bit-twiddle 0.0.4 → 0.1.1

data/ext/bit_twiddle/extconf.rb

@@ -7,15 +7,23 @@ if ENV['CC']
   RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
 end
 
-$CFLAGS << ' -Wall -Werror -O3 -march=native -mtune=native -std=c99 '
+$CFLAGS << ' -Wall ' # turn on all warnings for more thorough code checking
+# for clang; generated Makefile contains GCC-specific -W options which clang doesn't understand
+$CFLAGS << ' -Wno-unknown-warning-option '
+# for clang; ruby.h contains __error__ and __deprecated__, which clang chokes on
+$CFLAGS << ' -Wno-unknown-attributes -Wno-ignored-attributes '
+$CFLAGS << ' -Werror ' # convert all warnings to errors so we can't ignore them
+$CFLAGS << ' -O3 -march=native -mtune=native ' # full optimization
+$CFLAGS << ' -std=c99 ' # use a modern version of the C standard
 
 if RUBY_ENGINE == 'rbx'
   raise "bit-twiddle does not support Rubinius. Sorry!"
-elsif RUBY_VERSION < '2.2.0'
-  check_sizeof 'BDIGIT'
-  $CFLAGS << " -I#{File.join(dir, 'ruby21')} "
-else
+elsif RUBY_VERSION < '2.3.0'
   $CFLAGS << " -I#{File.join(dir, 'ruby22')} "
+elsif RUBY_VERSION < '3.0.0'
+  $CFLAGS << " -I#{File.join(dir, 'ruby23')} "
+else
+  $CFLAGS << " -I#{File.join(dir, 'ruby30')} "
 end
 
 check_sizeof 'short'
@@ -23,6 +31,11 @@ check_sizeof 'int'
 check_sizeof 'long'
 check_sizeof 'long long'
 
+# if we already have ulong, HAVE_TYPE_ULONG will be defined as a macro
+have_type 'ulong'
+# likewise for uchar
+have_type 'uchar'
+
 checking_for("whether >> on a signed long is arithmetic shift or logical shift", "%s") do
   is_arith = try_static_assert("(-1L >> (sizeof(long)/8)) == -1L")
   $defs.push("-DRSHIFT_IS_ARITH=#{is_arith ? '1' : '0'}")
@@ -35,4 +48,4 @@ checking_for("presence of __builtin_bswap16", "%s") do
   have_bswap16 ? "oh yeah" : "nope...but we can sure fix that"
 end
 
-create_makefile 'bit_twiddle'
+create_makefile 'bit_twiddle'

data/ext/bit_twiddle/ruby23/bt_bignum.h

@@ -0,0 +1,52 @@
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT SIZEOF_SHORT
+#else
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT (SIZEOF_LONG/2)
+#  define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
+#endif
+#ifndef SIZEOF_ACTUAL_BDIGIT
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
+#endif
+
+#define BIGNUM_EMBED_LEN_NUMBITS 3
+#if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
+#  define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT)
+#else
+#  define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
+#endif
+
+struct RBignum {
+    struct RBasic basic;
+    union {
+        struct {
+            size_t len;
+            BDIGIT *digits;
+        } heap;
+        BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
+    } as;
+};
+
+#define BIGNUM_EMBED_FLAG FL_USER2
+#define BIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
+#define BIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+BIGNUM_EMBED_LEN_NUMBITS)
+#define RBIGNUM_LEN(b) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
+     (long)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \
+            (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \
+     RBIGNUM(b)->as.heap.len)
+/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
+#define RBIGNUM_DIGITS(b) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
+     RBIGNUM(b)->as.ary : \
+     RBIGNUM(b)->as.heap.digits)
+
+#define RBIGNUM(obj) (R_CAST(RBignum)(obj))

data/ext/bit_twiddle/ruby30/bt_bignum.h

@@ -0,0 +1,83 @@
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT SIZEOF_SHORT
+#else
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT (SIZEOF_LONG/2)
+#  define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
+#endif
+#ifndef SIZEOF_ACTUAL_BDIGIT
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
+#endif
+
+#define RBIGNUM(obj) ((struct RBignum *)(obj))
+#define BIGNUM_SIGN_BIT FL_USER1
+#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2)
+#define BIGNUM_EMBED_LEN_NUMBITS 3
+#define BIGNUM_EMBED_LEN_MASK \
+    (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT)
+#define BIGNUM_EMBED_LEN_SHIFT \
+    (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */
+#ifndef BIGNUM_EMBED_LEN_MAX
+# if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
+#  define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT)
+# else
+#  define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
+# endif
+#endif
+
+struct RBignum {
+    struct RBasic basic;
+    union {
+        struct {
+            size_t len;
+            BDIGIT *digits;
+        } heap;
+        BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
+    } as;
+};
+
+static inline size_t BIGNUM_LEN(VALUE b);
+static inline BDIGIT *BIGNUM_DIGITS(VALUE b);
+static inline bool BIGNUM_EMBED_P(VALUE b);
+
+static inline size_t
+BIGNUM_LEN(VALUE b)
+{
+    if (! BIGNUM_EMBED_P(b)) {
+        return RBIGNUM(b)->as.heap.len;
+    }
+    else {
+        size_t ret = RBASIC(b)->flags;
+        ret &= BIGNUM_EMBED_LEN_MASK;
+        ret >>= BIGNUM_EMBED_LEN_SHIFT;
+        return ret;
+    }
+}
+
+/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
+static inline BDIGIT *
+BIGNUM_DIGITS(VALUE b)
+{
+    if (BIGNUM_EMBED_P(b)) {
+        return RBIGNUM(b)->as.ary;
+    }
+    else {
+        return RBIGNUM(b)->as.heap.digits;
+    }
+}
+
+static inline bool
+BIGNUM_EMBED_P(VALUE b)
+{
+    return FL_TEST_RAW(b, BIGNUM_EMBED_FLAG);
+}
+
+#define RBIGNUM_DIGITS BIGNUM_DIGITS
+#define RBIGNUM_LEN BIGNUM_LEN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bit-twiddle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Alex Dowad
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: Fast (native) bitwise operations for Ruby, in addition to the ones provided
   by the standard library
 email: alexinbeijing@gmail.com
@@ -92,16 +92,16 @@ files:
 - README.md
 - ext/bit_twiddle/bit_twiddle.c
 - ext/bit_twiddle/extconf.rb
-- ext/bit_twiddle/ruby21/bt_bignum.h
 - ext/bit_twiddle/ruby22/bt_bignum.h
+- ext/bit_twiddle/ruby23/bt_bignum.h
+- ext/bit_twiddle/ruby30/bt_bignum.h
 - lib/bit-twiddle.rb
 - lib/bit-twiddle/core_ext.rb
-- lib/bit_twiddle.so
 homepage: http://github.com/alexdowad/bit-twiddle
 licenses:
 - None (Public Domain)
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,17 +109,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Fast bitwise operations for Ruby
 test_files: []
-has_rdoc: 

data/ext/bit_twiddle/ruby21/bt_bignum.h

@@ -1 +0,0 @@
-/* nothing special needed for MRI Ruby 1.9.3 - 2.1 */