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

Remove possibly undefined behaviour from Noodle.

Browse Source 
Change-Id: I9a7997cea6a48927cb02b00c5dba5009bbf83850
This commit is contained in:
George Wort 2021-07-01 14:19:20 +01:00 committed by Konstantinos Margaritis
parent b48ea2c1a6
commit 7162446358
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hwlm/noodle_engine_sve.hpp
View File

@ -122,17 +122,17 @@ hwlm_error_t scanSingle(const struct noodTable *n, const u8 *buf, size_t len,
svuint8_t chars = getCharMaskSingle(n, noCase); svuint8_t chars = getCharMaskSingle(n, noCase);
size_t scan_len = e - d;
if (scan_len <= svcntb()) {
return scanSingleOnce(n, buf, len, cbi, chars, d, e);
}
// peel off first part to align to the vector size // peel off first part to align to the vector size
const u8 *d1 = ROUNDUP_PTR(d, svcntb_pat(SV_POW2)); const u8 *d1 = ROUNDUP_PTR(d, svcntb_pat(SV_POW2));
if (d != d1) { if (d != d1) {
if (d1 >= e) {
return scanSingleOnce(n, buf, len, cbi, chars, d, e);
} else {
DEBUG_PRINTF("until aligned %p \n", d1); DEBUG_PRINTF("until aligned %p \n", d1);
hwlmcb_rv_t rv = scanSingleOnce(n, buf, len, cbi, chars, d, d1); hwlmcb_rv_t rv = scanSingleOnce(n, buf, len, cbi, chars, d, d1);
RETURN_IF_TERMINATED(rv); RETURN_IF_TERMINATED(rv);
} }
}
return scanSingleLoop(n, buf, len, cbi, chars, d1, e); return scanSingleLoop(n, buf, len, cbi, chars, d1, e);
} }
@ -242,23 +242,24 @@ hwlm_error_t scanDouble(const struct noodTable *n, const u8 *buf, size_t len,
assert(d < e); assert(d < e);
assert(d >= buf); assert(d >= buf);
if (e - d < 2) { size_t scan_len = e - d;
if (scan_len < 2) {
return HWLM_SUCCESS; return HWLM_SUCCESS;
} }
++d; ++d;
svuint16_t chars = getCharMaskDouble(n, noCase); svuint16_t chars = getCharMaskDouble(n, noCase);
if (scan_len <= svcntb()) {
return scanDoubleOnce(n, buf, len, cbi, chars, d, e);
}
// peel off first part to align to the vector size // peel off first part to align to the vector size
const u8 *d1 = ROUNDUP_PTR(d, svcntb_pat(SV_POW2)); const u8 *d1 = ROUNDUP_PTR(d, svcntb_pat(SV_POW2));
if (d != d1) { if (d != d1) {
if (d1 >= e) {
return scanDoubleOnce(n, buf, len, cbi, chars, d, e);
} else {
DEBUG_PRINTF("until aligned %p \n", d1); DEBUG_PRINTF("until aligned %p \n", d1);
hwlmcb_rv_t rv = scanDoubleOnce(n, buf, len, cbi, chars, hwlmcb_rv_t rv = scanDoubleOnce(n, buf, len, cbi, chars,
d, d1); d, d1);
RETURN_IF_TERMINATED(rv); RETURN_IF_TERMINATED(rv);
} }
}
return scanDoubleLoop(n, buf, len, cbi, chars, d1, e); return scanDoubleLoop(n, buf, len, cbi, chars, d1, e);
} }