Standardize insert_string functionality across architectures. Added unaligned conditionally compiled code for insert_string and quick_insert_string. Unify sse42 crc32 assembly between insert_string and quick_insert_string. Modified quick_insert_string to work across architectures.

1 files changed, 108 insertions, 0 deletions

diff --git a/insert_string_tpl.h b/insert_string_tpl.h
new file mode 100644
index 0000000..0e90c3b
--- /dev/null
+++ b/insert_string_tpl.h
@@ -0,0 +1,108 @@
+#ifndef INSERT_STRING_H_
+#define INSERT_STRING_H_
+
+/* insert_string.h -- Private insert_string functions shared with more than
+ *                    one insert string implementation
+ *
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ * Authors:
+ *  Wajdi Feghali   <wajdi.k.feghali@intel.com>
+ *  Jim Guilford    <james.guilford@intel.com>
+ *  Vinodh Gopal    <vinodh.gopal@intel.com>
+ *  Erdinc Ozturk   <erdinc.ozturk@intel.com>
+ *  Jim Kukunas     <james.t.kukunas@linux.intel.com>
+ *
+ * Portions are Copyright (C) 2016 12Sided Technology, LLC.
+ * Author:
+ *  Phil Vachon     <pvachon@12sidedtech.com>
+ *
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ */
+
+/* ===========================================================================
+ * Quick insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ */
+
+ZLIB_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, const Pos str) {
+    Pos head;
+    uint32_t val, hm, h = 0;
+
+#ifdef UNALIGNED_OK
+    val = *(uint32_t *)(s->window + str);
+#else
+    val  = ((uint32_t)s->window[str]);
+    val |= ((uint32_t)s->window[str+1] << 8);
+    val |= ((uint32_t)s->window[str+2] << 16);
+    val |= ((uint32_t)s->window[str+3] << 24);
+#endif
+
+    if (s->level >= TRIGGER_LEVEL)
+        val &= 0xFFFFFF;
+
+    UPDATE_HASH(s, h, val);
+    hm = h & s->hash_mask;
+
+    head = s->head[hm];
+    if (head != str) {
+        s->prev[str & s->w_mask] = head;
+        s->head[hm] = str;
+    }
+    return head;
+}
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+
+ZLIB_INTERNAL Pos INSERT_STRING(deflate_state *const s, const Pos str, unsigned int count) {
+    Pos idx, ret;
+    uint8_t *strstart, *strend;
+
+    if (UNLIKELY(count == 0)) {
+        return s->prev[str & s->w_mask];
+    }
+
+    strstart = s->window + str;
+    strend = strstart + count - 1; /* last position */
+
+    for (ret = 0, idx = str; strstart <= strend; idx++, strstart++) {
+        uint32_t val, hm, h = 0;
+
+#ifdef UNALIGNED_OK
+        val = *(uint32_t *)(strstart);
+#else
+        val  = ((uint32_t)(strstart[0]));
+        val |= ((uint32_t)(strstart[1]) << 8);
+        val |= ((uint32_t)(strstart[2]) << 16);
+        val |= ((uint32_t)(strstart[3]) << 24);
+#endif
+
+        if (s->level >= TRIGGER_LEVEL)
+            val &= 0xFFFFFF;
+
+        UPDATE_HASH(s, h, val);
+        hm = h & s->hash_mask;
+
+        Pos head = s->head[hm];
+        if (head != idx) {
+            s->prev[idx & s->w_mask] = head;
+            s->head[hm] = idx;
+            if (strstart == strend)
+                ret = head;
+        } else if (strstart == strend) {
+            ret = idx;
+        }
+    }
+    return ret;
+}
+#endif