crc-turbo 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a49a016f795553e23b9b023b621e9390685ebbe
-  data.tar.gz: 0d42b72af55e038705b6a74cbda02a7333b9a782
+  metadata.gz: c6264e617f1b52dbff8f4905030bd1a7d4df20fb
+  data.tar.gz: d8181645b2fc56467c113f8ac04a3eccfaee9a9d
 SHA512:
-  metadata.gz: a368f931fe8d8959a4491347f4fab9012ce30349f719eb80db795e4813c59cb8f02176b46df26a408b19a1d6c518eef7e78b2f0433bfb6254231a381a95e3d34
-  data.tar.gz: e75bc2d1dbf6054a4a5d526aae24719da7a4b82db57ee4ddeb257395457e41082eaa9fb1f5055041c04fd35acae16f3f684583285a55413f6e4b01fd172234f4
+  metadata.gz: 55eb3f257d636dbef6292bcd3ff31e8b0f3e496cbb349ae6ee9e8e61d20a57a825919ebf43f43986ec775ab74de87fa627fd1af4e0f75e3688173b89d09668ca
+  data.tar.gz: c59df1da5c3c1c19f9efe325df24bdfe14f8d7d19f542534013dbbcbc05e0ace71f527f0045e0a294ccdce10a05896c92539b3bc0edc4b173d4ec9bf16079687

data/HISTORY.ja.md

@@ -2,7 +2,13 @@ This document is written in Japanese.
 
 # crc-turbo for ruby の更新履歴
 
-## crc-0.3
+
+## crc-0.4 (TRYOUT)
+
+  * crc-0.4 に追従
+
+
+## crc-0.3 (平成28年7月31日 日曜日)
 
   * crc-0.3 に追従して、CRC::BasicCRC と CRC::Generator を CRC に統合
 

data/README.md

@@ -1,21 +1,25 @@
 
-# crc-turbo - CRC generator for ruby
+# crc-turbo - C written accelerator for ruby CRC calcurator
 
-This is a C extention for "crc" gem library.
+C written accelerator for "crc" gem library.
 
-Just install this, and to do "require 'crc'" only. Additional other work is not required.
+Just install this, and to do ``require "crc"`` only.
+
+Additional other work is not required.
 
 
 ## Summary
 
   * package name: crc-turbo
-  * author: dearblue (mailto:dearblue@users.osdn.me)
-  * report issue to: <https://osdn.jp/projects/rutsubo/ticket/>
+  * author: dearblue (mailto:dearblue@users.noreply.github.com)
+  * report issue to: <https://github.com/dearblue/ruby-crc/issues>
   * how to install: ``gem install crc-turbo``
-  * version: 0.3
-  * release quality: thechnical preview
-  * licensing: BSD-2-Clause<br>any parts are under Creative Commons License Zero (CC0 / Public Domain).
-  * dependency gems: crc-0.3 (<https://rubygems/gems/crc>)
+  * version: 0.4
+  * production quality: TECHNICAL PREVIEW
+  * licensing:
+      * ***BSD-2-Clause : MAIN LICENSE***
+      * Creative Commons License Zero (CC0 / Public Domain) : ``ext/crc/crc_imps.h``
+  * dependency gems: crc-0.4 (<https://rubygems/gems/crc>)
   * dependency external C libraries: none
   * bundled external C libraries: none
 

data/ext/crc/crc_imps.h

@@ -1,8 +1,8 @@
 /*
- * author:: dearblue <dearblue@users.osdn.me>
+ * author:: dearblue <dearblue@users.noreply.github.com>
  * license:: Creative Commons License Zero (CC0 / Public Domain)
  *
- * This is a general CRC generator.
+ * This is a general CRC calcurator.
  *
  * It's used slice-by-16 algorithm with byte-order free.
  * This is based on the Intel's slice-by-eight algorithm.

data/ext/crc/crcturbo.c

@@ -16,16 +16,16 @@ enum {
     TABLE_NOTREADY = 0x1000,
 };
 
-//#define SNNIPET(BITSIZE, AS, TYPE, TOUINT, CONVUINT)
-#define SWITCH_BY_TYPE(TYPE, SNNIPET)                                                            \
-    switch ((TYPE)) {                                                                            \
-    case TYPE_UINT8_T:   { SNNIPET(  8,   as8,   uint8_t,   to_uint8,   conv_uint8); break; }    \
-    case TYPE_UINT16_T:  { SNNIPET( 16,  as16,  uint16_t,  to_uint16,  conv_uint16); break; }    \
-    case TYPE_UINT32_T:  { SNNIPET( 32,  as32,  uint32_t,  to_uint32,  conv_uint32); break; }    \
-    case TYPE_UINT64_T:  { SNNIPET( 64,  as64,  uint64_t,  to_uint64,  conv_uint64); break; }    \
- /* case TYPE_UINT128_T: { SNNIPET(128, as128, uint128_t, to_uint128, conv_uint128); break; } */ \
-    default: { rb_bug(" [INVALID TYPE FLAGS: 0x%02X] ", (TYPE)); }                               \
-    }                                                                                            \
+//#define SNNIPET(BITSIZE, TYPE, TOUINT, CONVUINT)
+#define SWITCH_BY_TYPE(TYPE, SNNIPET)                                                     \
+    switch ((TYPE)) {                                                                     \
+    case TYPE_UINT8_T:   { SNNIPET(  8,   uint8_t,   to_uint8,   conv_uint8); break; }    \
+    case TYPE_UINT16_T:  { SNNIPET( 16,  uint16_t,  to_uint16,  conv_uint16); break; }    \
+    case TYPE_UINT32_T:  { SNNIPET( 32,  uint32_t,  to_uint32,  conv_uint32); break; }    \
+    case TYPE_UINT64_T:  { SNNIPET( 64,  uint64_t,  to_uint64,  conv_uint64); break; }    \
+ /* case TYPE_UINT128_T: { SNNIPET(128, uint128_t, to_uint128, conv_uint128); break; } */ \
+    default: { rb_bug(" [INVALID TYPE FLAGS: 0x%02X] ", (TYPE)); }                        \
+    }                                                                                     \
 
 static inline uint8_t
 to_uint8(VALUE num)
@@ -309,27 +309,13 @@ bitsize_to_type(int bitsize)
  *
  */
 
-typedef struct anyuint_t
-{
-    union {
-        uint8_t as8;
-        uint16_t as16;
-        uint32_t as32;
-        uint64_t as64;
-#ifdef HAVE_TYPE_UINT128_T
-        uint128_t as128;
-#endif
-    };
-} anyuint_t;
-
 struct crc_module
 {
     uint32_t bitsize:10;
     uint32_t type:10;
     uint32_t reflect_input:1;
     uint32_t reflect_output:1;
-
-    anyuint_t bitmask, polynomial, initial, xorout;
+    uint64_t bitmask, polynomial, initial, xorout;
     const void *table; /* entity is String buffer as instance variable */
 };
 
@@ -413,11 +399,11 @@ ext_s_new(int argc, VALUE argv[], VALUE crc)
          * 例えば uint8_t に対して << 8 をすると何もしないため、
          * これへの対処を目的とする。
          */
-#define SNNIPET_INIT_MOD(BITSIZE, AS, TYPE, TOUINT, CONVUINT)  \
-        p->bitmask.AS = ~(~(TYPE)0 << 1 << (bitsize - 1));     \
-        p->polynomial.AS = p->bitmask.AS & TOUINT(poly);       \
-        p->initial.AS = p->bitmask.AS & TOUINT(init);          \
-        p->xorout.AS = p->bitmask.AS & TOUINT(xorout);         \
+#define SNNIPET_INIT_MOD(BITSIZE, TYPE, TOUINT, CONVUINT)   \
+        p->bitmask = ~(~(uint64_t)0 << 1 << (bitsize - 1)); \
+        p->polynomial = p->bitmask & TOUINT(poly);          \
+        p->initial = p->bitmask & TOUINT(init);             \
+        p->xorout = p->bitmask & TOUINT(xorout);            \
 
         SWITCH_BY_TYPE(p->type, SNNIPET_INIT_MOD);
 
@@ -425,8 +411,7 @@ ext_s_new(int argc, VALUE argv[], VALUE crc)
         rb_ivar_set(newcrc, ext_iv_module, crcmod);
         rb_ivar_set(newcrc, ext_iv_name, name);
 
-        rb_extend_object(newcrc, rb_const_get(cCRC, rb_intern("ModuleClass")));
-        rb_define_alias(rb_singleton_class(newcrc), "[]", "new");
+        rb_extend_object(newcrc, rb_const_get(cCRC, rb_intern("Calcurator")));
 
         return newcrc;
     }
@@ -443,8 +428,8 @@ ext_bitmask(VALUE t)
 {
     struct crc_module *p = get_module(t);
 
-#define SNNIPET_BITMASK(BITSIZE, AS, TYPE, TOUINT, CONVUINT) \
-    return CONVUINT(p->bitmask.AS);                          \
+#define SNNIPET_BITMASK(BITSIZE, TYPE, TOUINT, CONVUINT) \
+    return CONVUINT(p->bitmask);                         \
 
     SWITCH_BY_TYPE(p->type, SNNIPET_BITMASK);
 }
@@ -454,8 +439,8 @@ ext_polynomial(VALUE t)
 {
     struct crc_module *p = get_module(t);
 
-#define SNNIPET_POLYNOMIAL(BITSIZE, AS, TYPE, TOUINT, CONVUINT) \
-    return CONVUINT(p->polynomial.AS);                          \
+#define SNNIPET_POLYNOMIAL(BITSIZE, TYPE, TOUINT, CONVUINT) \
+    return CONVUINT(p->polynomial);                         \
 
     SWITCH_BY_TYPE(p->type, SNNIPET_POLYNOMIAL);
 }
@@ -465,8 +450,8 @@ ext_initial_crc(VALUE t)
 {
     struct crc_module *p = get_module(t);
 
-#define SNNIPET_INITIAL_CRC(BITSIZE, AS, TYPE, TOUINT, CONVUINT) \
-    return CONVUINT(p->initial.AS);                              \
+#define SNNIPET_INITIAL_CRC(BITSIZE, TYPE, TOUINT, CONVUINT) \
+    return CONVUINT(p->initial);                             \
 
     SWITCH_BY_TYPE(p->type, SNNIPET_INITIAL_CRC);
 }
@@ -497,8 +482,8 @@ ext_xor_output(VALUE t)
 {
     struct crc_module *p = get_module(t);
 
-#define SNNIPET_XOR_OUTPUT(BITSIZE, AS, TYPE, TOUINT, CONVUINT) \
-    return CONVUINT(p->xorout.AS);                              \
+#define SNNIPET_XOR_OUTPUT(BITSIZE, TYPE, TOUINT, CONVUINT) \
+    return CONVUINT(p->xorout);                             \
 
     SWITCH_BY_TYPE(p->type, SNNIPET_XOR_OUTPUT);
 }
@@ -536,13 +521,13 @@ ext_update(VALUE t, VALUE seq, VALUE state)
         rb_str_set_len(tablebuf, tablebytes);
         void *table = RSTRING_PTR(tablebuf);
         if (p->reflect_input) {
-#define SNNIPET_BUILD_REFTABLE(BITSIZE, AS, TYPE, TOUINT, CONVUINT)                       \
-            crc_build_reflect_tables_u##BITSIZE(p->bitsize, table, p->polynomial.AS, 16); \
+#define SNNIPET_BUILD_REFTABLE(BITSIZE, TYPE, TOUINT, CONVUINT)                        \
+            crc_build_reflect_tables_u##BITSIZE(p->bitsize, table, p->polynomial, 16); \
 
             SWITCH_BY_TYPE(p->type, SNNIPET_BUILD_REFTABLE);
         } else {
-#define SNNIPET_BUILD_TABLE(BITSIZE, AS, TYPE, TOUINT, CONVUINT)                  \
-            crc_build_tables_u##BITSIZE(p->bitsize, table, p->polynomial.AS, 16); \
+#define SNNIPET_BUILD_TABLE(BITSIZE, TYPE, TOUINT, CONVUINT)                   \
+            crc_build_tables_u##BITSIZE(p->bitsize, table, p->polynomial, 16); \
 
             SWITCH_BY_TYPE(p->type, SNNIPET_BUILD_TABLE);
         }
@@ -552,15 +537,15 @@ ext_update(VALUE t, VALUE seq, VALUE state)
     }
 
     if (p->reflect_input) {
-#define SNNIPET_REFUPDATE(BITSIZE, AS, TYPE, TOUINT, CONVUINT)      \
-        return CONVUINT(crc_reflect_update_u##BITSIZE(              \
-                    p->bitsize, p->table, q, qq, TOUINT(state)));   \
+#define SNNIPET_REFUPDATE(BITSIZE, TYPE, TOUINT, CONVUINT)        \
+        return CONVUINT(crc_reflect_update_u##BITSIZE(            \
+                    p->bitsize, p->table, q, qq, TOUINT(state))); \
 
         SWITCH_BY_TYPE(p->type, SNNIPET_REFUPDATE);
     } else {
-#define SNNIPET_UPDATE(BITSIZE, AS, TYPE, TOUINT, CONVUINT)         \
-        return CONVUINT(crc_update_u##BITSIZE(                      \
-                    p->bitsize, p->table, q, qq, TOUINT(state)));   \
+#define SNNIPET_UPDATE(BITSIZE, TYPE, TOUINT, CONVUINT)           \
+        return CONVUINT(crc_update_u##BITSIZE(                    \
+                    p->bitsize, p->table, q, qq, TOUINT(state))); \
 
         SWITCH_BY_TYPE(p->type, SNNIPET_UPDATE);
     }

data/gemstub.rb

@@ -1,19 +1,20 @@
 GEMSTUB = Gem::Specification.new do |s|
   s.name = "crc-turbo"
-  s.version = "0.3"
-  s.summary = "general CRC generator"
+  s.version = "0.4"
+  s.summary = "C written accelerator for \"crc\" gem library"
   s.description = <<EOS
-This is a C extention for "crc" gem library.
-Just install this, and to do "require 'crc'" only. Additional other work is not required.
+C written accelerator for "crc" gem library.
+Just install this, and to do ``require "crc"`` only.
+Additional other work is not required.
 EOS
-  s.homepage = "https://osdn.jp/projects/rutsubo/"
+  s.homepage = "https://github.com/dearblue/ruby-crc-turbo"
   s.licenses = ["BSD-2-Clause", "CC0-1.0"]
   s.author = "dearblue"
-  s.email = "dearblue@users.osdn.me"
+  s.email = "dearblue@users.noreply.github.com"
 
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.2"
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "crc", "~> 0.3"
+  s.add_runtime_dependency "crc", "~> 0.4.A"
 end
 
 EXTMAP["crc"] = "crc/_turbo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crc-turbo
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - dearblue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,18 +30,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.A
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.A
 description: |
-  This is a C extention for "crc" gem library.
-  Just install this, and to do "require 'crc'" only. Additional other work is not required.
-email: dearblue@users.osdn.me
+  C written accelerator for "crc" gem library.
+  Just install this, and to do ``require "crc"`` only.
+  Additional other work is not required.
+email: dearblue@users.noreply.github.com
 executables: []
 extensions:
 - ext/crc/extconf.rb
@@ -60,7 +61,7 @@ files:
 - ext/crc/crcturbo.c
 - ext/crc/extconf.rb
 - gemstub.rb
-homepage: https://osdn.jp/projects/rutsubo/
+homepage: https://github.com/dearblue/ruby-crc-turbo
 licenses:
 - BSD-2-Clause
 - CC0-1.0
@@ -77,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -85,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: general CRC generator
+summary: C written accelerator for "crc" gem library
 test_files: []