Changeset 138 in libcf

Timestamp:

07/18/13 14:15:44 (11 years ago)

Author:

cheese

Message:

#1 enhance a few performance of bitwise

File:

• trunk/src/cf_bitwise.c (modified) (2 diffs)

trunk/src/cf_bitwise.c

@@ -120 +120 @@
                        cf_byte  * out)
 {
-    int     result = 0;
-    cf_byte * buf1 = NULL;
-    cf_byte * buf2 = NULL;
-
-    ASSERT_ARGS (!in || !out);
-
-    buf1 = (cf_byte *) calloc (size, 1);
-    buf2 = (cf_byte *) calloc (size, 1);
-
-    if (!buf1 || !buf2)
-        result = CF_ERROR_BITWISE_ALLOCATE_BUFFER;
-    else
-    {
-        CF_Bitwise_ShiftLeft (in, size, offset, buf1);
-        CF_Bitwise_ShiftRight (in, size, size - offset, buf2);
-
-        CF_Bitwise_OR (buf1, buf2, size, out);
-    }
-
-    if (buf1)   free (buf1);
-    if (buf2)   free (buf2);
-
-    return result;
+    cf_byte * buf = NULL;
+
+    ASSERT_ARGS (!in || !out);
+
+    /* make buffer two times of size */
+    buf = (cf_byte *) calloc (size, 2);
+    if (!buf)
+        return CF_ERROR_BITWISE_ALLOCATE_BUFFER;
+
+    CF_Bitwise_ShiftLeft (in, size, offset, buf);
+    CF_Bitwise_ShiftRight (in, size, size - offset, buf + size);
+
+    CF_Bitwise_OR (buf, buf + size, size, out);
+
+    free (buf);
+
+    return CF_OK;
 }
 
@@ -161 +155 @@
                         cf_byte * out)
 {
-    int     result = 0;
-    cf_byte * buf1 = NULL;
-    cf_byte * buf2 = NULL;
-
-    ASSERT_ARGS (!in || !out);
-
-    buf1 = (cf_byte *) calloc (size, 1);
-    buf2 = (cf_byte *) calloc (size, 1);
-
-    if (!buf1 || !buf2)
-        result = CF_ERROR_BITWISE_ALLOCATE_BUFFER;
-    else
-    {
-        CF_Bitwise_ShiftRight (in, size, offset, buf1);
-        CF_Bitwise_ShiftLeft (in, size, size - offset, buf2);
-
-        CF_Bitwise_OR (buf1, buf2, size, out);
-    }
-
-    if (buf1)   free (buf1);
-    if (buf2)   free (buf2);
-
-    return result;
+    cf_byte * buf = NULL;
+
+    ASSERT_ARGS (!in || !out);
+
+    /* make buffer two times of size */
+    buf = (cf_byte *) calloc (size, 2);
+    if (!buf)
+        return CF_ERROR_BITWISE_ALLOCATE_BUFFER;
+
+    CF_Bitwise_ShiftRight (in, size, offset, buf);
+    CF_Bitwise_ShiftLeft (in, size, size - offset, buf + size);
+
+    CF_Bitwise_OR (buf, buf + size, size, out);
+
+    free (buf);
+
+    return CF_OK;
 }