Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1573)

Unified Diff: third_party/brotli/enc/find_match_length.h

Issue 2537133002: Update brotli to v1.0.0-snapshot. (Closed)
Patch Set: Fixed typo Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/brotli/enc/fast_log.h ('k') | third_party/brotli/enc/hash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/brotli/enc/find_match_length.h
diff --git a/third_party/brotli/enc/find_match_length.h b/third_party/brotli/enc/find_match_length.h
index 1337ec36861d242a146d5f8b97b98199fc646dd2..b3e3d80b982f7f7d1108313af56f79e27cac13da 100644
--- a/third_party/brotli/enc/find_match_length.h
+++ b/third_party/brotli/enc/find_match_length.h
@@ -4,41 +4,42 @@
See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
*/
-// Function to find maximal matching prefixes of strings.
+/* Function to find maximal matching prefixes of strings. */
#ifndef BROTLI_ENC_FIND_MATCH_LENGTH_H_
#define BROTLI_ENC_FIND_MATCH_LENGTH_H_
-
+#include <brotli/types.h>
#include "./port.h"
-#include "./types.h"
-namespace brotli {
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
-// Separate implementation for little-endian 64-bit targets, for speed.
+/* Separate implementation for little-endian 64-bit targets, for speed. */
#if defined(__GNUC__) && defined(_LP64) && defined(IS_LITTLE_ENDIAN)
-static inline size_t FindMatchLengthWithLimit(const uint8_t* s1,
- const uint8_t* s2,
- size_t limit) {
+static BROTLI_INLINE size_t FindMatchLengthWithLimit(const uint8_t* s1,
+ const uint8_t* s2,
+ size_t limit) {
size_t matched = 0;
- size_t limit2 = (limit >> 3) + 1; // + 1 is for pre-decrement in while
- while (PREDICT_TRUE(--limit2)) {
- if (PREDICT_FALSE(BROTLI_UNALIGNED_LOAD64(s2) ==
+ size_t limit2 = (limit >> 3) + 1; /* + 1 is for pre-decrement in while */
+ while (BROTLI_PREDICT_TRUE(--limit2)) {
+ if (BROTLI_PREDICT_FALSE(BROTLI_UNALIGNED_LOAD64(s2) ==
BROTLI_UNALIGNED_LOAD64(s1 + matched))) {
s2 += 8;
matched += 8;
} else {
uint64_t x =
BROTLI_UNALIGNED_LOAD64(s2) ^ BROTLI_UNALIGNED_LOAD64(s1 + matched);
- size_t matching_bits = static_cast<size_t>(__builtin_ctzll(x));
+ size_t matching_bits = (size_t)__builtin_ctzll(x);
matched += matching_bits >> 3;
return matched;
}
}
- limit = (limit & 7) + 1; // + 1 is for pre-decrement in while
+ limit = (limit & 7) + 1; /* + 1 is for pre-decrement in while */
while (--limit) {
- if (PREDICT_TRUE(s1[matched] == *s2)) {
+ if (BROTLI_PREDICT_TRUE(s1[matched] == *s2)) {
++s2;
++matched;
} else {
@@ -48,16 +49,16 @@ static inline size_t FindMatchLengthWithLimit(const uint8_t* s1,
return matched;
}
#else
-static inline size_t FindMatchLengthWithLimit(const uint8_t* s1,
- const uint8_t* s2,
- size_t limit) {
+static BROTLI_INLINE size_t FindMatchLengthWithLimit(const uint8_t* s1,
+ const uint8_t* s2,
+ size_t limit) {
size_t matched = 0;
const uint8_t* s2_limit = s2 + limit;
const uint8_t* s2_ptr = s2;
- // Find out how long the match is. We loop over the data 32 bits at a
- // time until we find a 32-bit block that doesn't match; then we find
- // the first non-matching bit and use that to calculate the total
- // length of the match.
+ /* Find out how long the match is. We loop over the data 32 bits at a
+ time until we find a 32-bit block that doesn't match; then we find
+ the first non-matching bit and use that to calculate the total
+ length of the match. */
while (s2_ptr <= s2_limit - 4 &&
BROTLI_UNALIGNED_LOAD32(s2_ptr) ==
BROTLI_UNALIGNED_LOAD32(s1 + matched)) {
@@ -72,6 +73,8 @@ static inline size_t FindMatchLengthWithLimit(const uint8_t* s1,
}
#endif
-} // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+} /* extern "C" */
+#endif
-#endif // BROTLI_ENC_FIND_MATCH_LENGTH_H_
+#endif /* BROTLI_ENC_FIND_MATCH_LENGTH_H_ */
« no previous file with comments | « third_party/brotli/enc/fast_log.h ('k') | third_party/brotli/enc/hash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698