github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

check for partial matches at end of dverm

Browse Source
This commit is contained in:
Alex Coyte 2016-11-17 09:41:23 +11:00 committed by Matthew Barr
parent 16aa22a361
commit f605ca0dc1
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/nfa/vermicelli.h
View File

@ -74,9 +74,7 @@ const u8 *vermicelliExec(char c, char nocase, const u8 *buf,
} }
buf += VERM_BOUNDARY - min; buf += VERM_BOUNDARY - min;
if (buf >= buf_end) { assert(buf < buf_end);
return buf_end;
}
} }
// Aligned loops from here on in // Aligned loops from here on in
@ -129,9 +127,7 @@ const u8 *nvermicelliExec(char c, char nocase, const u8 *buf,
} }
buf += VERM_BOUNDARY - min; buf += VERM_BOUNDARY - min;
if (buf >= buf_end) { assert(buf < buf_end);
return buf_end;
}
} }
// Aligned loops from here on in // Aligned loops from here on in
@ -172,9 +168,7 @@ const u8 *vermicelliDoubleExec(char c1, char c2, char nocase, const u8 *buf,
} }
buf += VERM_BOUNDARY - min; buf += VERM_BOUNDARY - min;
if (buf >= buf_end) { assert(buf < buf_end);
return buf_end - 1;
}
} }
// Aligned loops from here on in // Aligned loops from here on in
@ -190,9 +184,18 @@ const u8 *vermicelliDoubleExec(char c1, char c2, char nocase, const u8 *buf,
ptr = nocase ? dvermPreconditionNocase(chars1, chars2, ptr = nocase ? dvermPreconditionNocase(chars1, chars2,
buf_end - VERM_BOUNDARY) buf_end - VERM_BOUNDARY)
: dvermPrecondition(chars1, chars2, buf_end - VERM_BOUNDARY); : dvermPrecondition(chars1, chars2, buf_end - VERM_BOUNDARY);
/* buf_end - 1 to be conservative in case last byte is a partial match */
return ptr ? ptr : buf_end - 1;
if (ptr) {
return ptr;
}
/* check for partial match at end */
u8 mask = nocase ? CASE_CLEAR : 0xff;
if ((buf_end[-1] & mask) == c1) {
return buf_end - 1;
}
return buf_end;
} }
static really_inline static really_inline
@ -220,9 +223,7 @@ const u8 *vermicelliDoubleMaskedExec(char c1, char c2, char m1, char m2,
} }
buf += VERM_BOUNDARY - min; buf += VERM_BOUNDARY - min;
if (buf >= buf_end) { assert(buf < buf_end);
return buf_end - 1;
}
} }
// Aligned loops from here on in // Aligned loops from here on in
@ -235,9 +236,17 @@ const u8 *vermicelliDoubleMaskedExec(char c1, char c2, char m1, char m2,
// Tidy up the mess at the end // Tidy up the mess at the end
ptr = dvermPreconditionMasked(chars1, chars2, mask1, mask2, ptr = dvermPreconditionMasked(chars1, chars2, mask1, mask2,
buf_end - VERM_BOUNDARY); buf_end - VERM_BOUNDARY);
/* buf_end - 1 to be conservative in case last byte is a partial match */
return ptr ? ptr : buf_end - 1;
if (ptr) {
return ptr;
}
/* check for partial match at end */
if ((buf_end[-1] & m1) == c1) {
return buf_end - 1;
}
return buf_end;
} }
// Reverse vermicelli scan. Provides exact semantics and returns (buf - 1) if // Reverse vermicelli scan. Provides exact semantics and returns (buf - 1) if

22
unit/internal/vermicelli.cpp
View File

@ -126,23 +126,25 @@ TEST(DoubleVermicelli, ExecNoMatch1) {
const u8 *rv = vermicelliDoubleExec('a', 'b', 0, (u8 *)t1 + i, const u8 *rv = vermicelliDoubleExec('a', 'b', 0, (u8 *)t1 + i,
(u8 *)t1 + strlen(t1) - j); (u8 *)t1 + strlen(t1) - j);
ASSERT_EQ(((size_t)t1 + strlen(t1) - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1 + strlen(t1) - j), (size_t)rv);
rv = vermicelliDoubleExec('B', 'b', 0, (u8 *)t1 + i, rv = vermicelliDoubleExec('B', 'b', 0, (u8 *)t1 + i,
(u8 *)t1 + strlen(t1) - j); (u8 *)t1 + strlen(t1) - j);
ASSERT_EQ(((size_t)t1 + strlen(t1) - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1 + strlen(t1) - j), (size_t)rv);
rv = vermicelliDoubleExec('A', 'B', 1, (u8 *)t1 + i, rv = vermicelliDoubleExec('A', 'B', 1, (u8 *)t1 + i,
(u8 *)t1 + strlen(t1) - j); (u8 *)t1 + strlen(t1) - j);
ASSERT_EQ(((size_t)t1 + strlen(t1) - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1 + strlen(t1) - j), (size_t)rv);
/* partial match */
rv = vermicelliDoubleExec('b', 'B', 0, (u8 *)t1 + i, rv = vermicelliDoubleExec('b', 'B', 0, (u8 *)t1 + i,
(u8 *)t1 + strlen(t1) - j); (u8 *)t1 + strlen(t1) - j);
ASSERT_EQ(((size_t)t1 + strlen(t1) - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1 + strlen(t1) - j - 1), (size_t)rv);
/* partial match */
rv = vermicelliDoubleExec('B', 'A', 1, (u8 *)t1 + i, rv = vermicelliDoubleExec('B', 'A', 1, (u8 *)t1 + i,
(u8 *)t1 + strlen(t1) - j); (u8 *)t1 + strlen(t1) - j);
@ -353,20 +355,22 @@ TEST(DoubleVermicelliMasked, ExecNoMatch1) {
t1_raw + i, t1_raw + i,
t1_raw + t1.length() - i - j); t1_raw + t1.length() - i - j);
ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j), (size_t)rv);
rv = vermicelliDoubleMaskedExec('B', 'b', 0xff, CASE_CLEAR,
rv = vermicelliDoubleMaskedExec('B', 'B', 0xff, CASE_CLEAR,
t1_raw + i, t1_raw + i,
t1_raw + t1.length() - i - j); t1_raw + t1.length() - i - j);
ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j), (size_t)rv);
rv = vermicelliDoubleMaskedExec('A', 'B', CASE_CLEAR, CASE_CLEAR, rv = vermicelliDoubleMaskedExec('A', 'B', CASE_CLEAR, CASE_CLEAR,
t1_raw + i, t1_raw + i,
t1_raw + t1.length() -i - j); t1_raw + t1.length() -i - j);
ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j), (size_t)rv);
rv = vermicelliDoubleMaskedExec('b', 'B', CASE_CLEAR, 0xff, /* partial match */
rv = vermicelliDoubleMaskedExec('B', 'B', CASE_CLEAR, 0xff,
t1_raw + i, t1_raw + i,
t1_raw + t1.length() - i - j); t1_raw + t1.length() - i - j);
@ -376,7 +380,7 @@ TEST(DoubleVermicelliMasked, ExecNoMatch1) {
t1_raw + i, t1_raw + i,
t1_raw + t1.length() - i - j); t1_raw + t1.length() - i - j);
ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j - 1), (size_t)rv); ASSERT_EQ(((size_t)t1_raw + t1.length() - i - j), (size_t)rv);
} }
} }
} }