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

Fix C style casts in mcsheng_compile.cpp

Browse Source
This commit is contained in:
Konstantinos Margaritis 2024-05-16 15:57:39 +03:00
parent 8339534a44
commit 1290733c89
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/nfa/mcsheng_compile.cpp
View File

@ -144,11 +144,11 @@ u8 dfa_info::getAlphaShift() const {
static static
mstate_aux *getAux(NFA *n, dstate_id_t i) { mstate_aux *getAux(NFA *n, dstate_id_t i) {
const mcsheng *m = (mcsheng *)getMutableImplNfa(n); const mcsheng *m = reinterpret_cast<const mcsheng *>(getMutableImplNfa(n));
mstate_aux *aux_base = (mstate_aux *)((char *)n + m->aux_offset); mstate_aux *aux_base = reinterpret_cast<mstate_aux *>(reinterpret_cast<u8 *>(n) + m->aux_offset);
mstate_aux *aux = aux_base + i; mstate_aux *aux = aux_base + i;
assert((const char *)aux < (const char *)n + m->length); assert(reinterpret_cast<const char *>(aux) < reinterpret_cast<const char *>(n) + m->length);
return aux; return aux;
} }
@ -192,8 +192,8 @@ void createShuffleMasks(mcsheng *m, const dfa_info &info,
} }
for (u32 i = 0; i < N_CHARS; i++) { for (u32 i = 0; i < N_CHARS; i++) {
assert(info.alpha_remap[i] != info.alpha_remap[TOP]); assert(info.alpha_remap[i] != info.alpha_remap[TOP]);
memcpy((u8 *)&m->sheng_masks[i], memcpy(reinterpret_cast<u8 *>(&m->sheng_masks[i]),
(u8 *)masks[info.alpha_remap[i]].data(), sizeof(m128)); reinterpret_cast<u8 *>(masks[info.alpha_remap[i]].data()), sizeof(m128));
} }
m->sheng_end = sheng_end; m->sheng_end = sheng_end;
m->sheng_accel_limit = sheng_end - 1; m->sheng_accel_limit = sheng_end - 1;
@ -223,7 +223,7 @@ void populateBasicInfo(size_t state_size, const dfa_info &info,
nfa->type = MCSHENG_NFA_16; nfa->type = MCSHENG_NFA_16;
} }
mcsheng *m = (mcsheng *)getMutableImplNfa(nfa); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa));
for (u32 i = 0; i < 256; i++) { for (u32 i = 0; i < 256; i++) {
m->remap[i] = verify_u8(info.alpha_remap[i]); m->remap[i] = verify_u8(info.alpha_remap[i]);
} }
@ -244,11 +244,11 @@ void populateBasicInfo(size_t state_size, const dfa_info &info,
static static
mstate_aux *getAux64(NFA *n, dstate_id_t i) { mstate_aux *getAux64(NFA *n, dstate_id_t i) {
const mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(n); const mcsheng64 *m = reinterpret_cast<const mcsheng64 *>(getMutableImplNfa(n));
mstate_aux *aux_base = (mstate_aux *)((char *)n + m->aux_offset); mstate_aux *aux_base = reinterpret_cast<mstate_aux *>(reinterpret_cast<u8 *>(n) + m->aux_offset);
mstate_aux *aux = aux_base + i; mstate_aux *aux = aux_base + i;
assert((const char *)aux < (const char *)n + m->length); assert(reinterpret_cast<const char *>(aux) < reinterpret_cast<const char *>(n) + m->length);
return aux; return aux;
} }
@ -292,8 +292,8 @@ void createShuffleMasks64(mcsheng64 *m, const dfa_info &info,
} }
for (u32 i = 0; i < N_CHARS; i++) { for (u32 i = 0; i < N_CHARS; i++) {
assert(info.alpha_remap[i] != info.alpha_remap[TOP]); assert(info.alpha_remap[i] != info.alpha_remap[TOP]);
memcpy((u8 *)&m->sheng_succ_masks[i], memcpy(reinterpret_cast<u8 *>(&m->sheng_succ_masks[i]),
(u8 *)masks[info.alpha_remap[i]].data(), sizeof(m512)); reinterpret_cast<u8 *>(masks[info.alpha_remap[i]].data()), sizeof(m512));
} }
m->sheng_end = sheng_end; m->sheng_end = sheng_end;
m->sheng_accel_limit = sheng_end - 1; m->sheng_accel_limit = sheng_end - 1;
@ -323,7 +323,7 @@ void populateBasicInfo64(size_t state_size, const dfa_info &info,
nfa->type = MCSHENG_64_NFA_16; nfa->type = MCSHENG_64_NFA_16;
} }
mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(nfa); mcsheng64 *m = reinterpret_cast<mcsheng64 *>(getMutableImplNfa(nfa));
for (u32 i = 0; i < 256; i++) { for (u32 i = 0; i < 256; i++) {
m->remap[i] = verify_u8(info.alpha_remap[i]); m->remap[i] = verify_u8(info.alpha_remap[i]);
} }
@ -650,7 +650,7 @@ void fill_in_aux_info(NFA *nfa, const dfa_info &info,
const vector<u32> &reports_eod, const vector<u32> &reports_eod,
u32 report_base_offset, u32 report_base_offset,
const raw_report_info &ri) { const raw_report_info &ri) {
mcsheng *m = (mcsheng *)getMutableImplNfa(nfa); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa));
vector<u32> reportOffsets; vector<u32> reportOffsets;
@ -667,7 +667,7 @@ void fill_in_aux_info(NFA *nfa, const dfa_info &info,
assert(accel_offset <= accel_end_offset); assert(accel_offset <= accel_end_offset);
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
info.strat.buildAccel(i, accel_escape_info.at(i), info.strat.buildAccel(i, accel_escape_info.at(i),
(void *)((char *)m + this_aux->accel_offset)); reinterpret_cast<void *>(reinterpret_cast<char *>(m) + this_aux->accel_offset));
} }
} }
} }
@ -692,7 +692,7 @@ static
void fill_in_succ_table_16(NFA *nfa, const dfa_info &info, void fill_in_succ_table_16(NFA *nfa, const dfa_info &info,
dstate_id_t sheng_end, dstate_id_t sheng_end,
UNUSED dstate_id_t sherman_base) { UNUSED dstate_id_t sherman_base) {
u16 *succ_table = (u16 *)((char *)nfa + sizeof(NFA) + sizeof(mcsheng)); u16 *succ_table = reinterpret_cast<u16 *>(reinterpret_cast<char *>(nfa) + sizeof(NFA) + sizeof(mcsheng));
u8 alphaShift = info.getAlphaShift(); u8 alphaShift = info.getAlphaShift();
assert(alphaShift <= 8); assert(alphaShift <= 8);
@ -724,7 +724,7 @@ void fill_in_aux_info64(NFA *nfa, const dfa_info &info,
const vector<u32> &reports_eod, const vector<u32> &reports_eod,
u32 report_base_offset, u32 report_base_offset,
const raw_report_info &ri) { const raw_report_info &ri) {
mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(nfa); mcsheng64 *m = reinterpret_cast<mcsheng64 *>(getMutableImplNfa(nfa));
vector<u32> reportOffsets; vector<u32> reportOffsets;
@ -741,7 +741,7 @@ void fill_in_aux_info64(NFA *nfa, const dfa_info &info,
assert(accel_offset <= accel_end_offset); assert(accel_offset <= accel_end_offset);
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
info.strat.buildAccel(i, accel_escape_info.at(i), info.strat.buildAccel(i, accel_escape_info.at(i),
(void *)((char *)m + this_aux->accel_offset)); reinterpret_cast<void *>(reinterpret_cast<char *>(m) + this_aux->accel_offset));
} }
} }
} }
@ -766,7 +766,7 @@ static
void fill_in_succ_table_64_16(NFA *nfa, const dfa_info &info, void fill_in_succ_table_64_16(NFA *nfa, const dfa_info &info,
dstate_id_t sheng_end, dstate_id_t sheng_end,
UNUSED dstate_id_t sherman_base) { UNUSED dstate_id_t sherman_base) {
u16 *succ_table = (u16 *)((char *)nfa + sizeof(NFA) + sizeof(mcsheng64)); u16 *succ_table = reinterpret_cast<u16 *>(reinterpret_cast<char *>(nfa) + sizeof(NFA) + sizeof(mcsheng64));
u8 alphaShift = info.getAlphaShift(); u8 alphaShift = info.getAlphaShift();
assert(alphaShift <= 8); assert(alphaShift <= 8);
@ -956,8 +956,8 @@ bool is_cyclic_near(const raw_dfa &raw, dstate_id_t root) {
static static
void fill_in_sherman(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) { void fill_in_sherman(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) {
char *nfa_base = (char *)nfa; char *nfa_base = reinterpret_cast<char *>(nfa);
mcsheng *m = (mcsheng *)getMutableImplNfa(nfa); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa));
char *sherman_table = nfa_base + m->sherman_offset; char *sherman_table = nfa_base + m->sherman_offset;
assert(ISALIGNED_16(sherman_table)); assert(ISALIGNED_16(sherman_table));
@ -978,10 +978,10 @@ void fill_in_sherman(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) {
assert(len <= 9); assert(len <= 9);
dstate_id_t d = info.states[i].daddy; dstate_id_t d = info.states[i].daddy;
*(u8 *)(curr_sherman_entry + SHERMAN_TYPE_OFFSET) = SHERMAN_STATE; *(reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_TYPE_OFFSET)) = SHERMAN_STATE;
*(u8 *)(curr_sherman_entry + SHERMAN_LEN_OFFSET) = len; *(reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_LEN_OFFSET)) = len;
*(u16 *)(curr_sherman_entry + SHERMAN_DADDY_OFFSET) = info.implId(d); *(reinterpret_cast<u16 *>(curr_sherman_entry + SHERMAN_DADDY_OFFSET)) = info.implId(d);
u8 *chars = (u8 *)(curr_sherman_entry + SHERMAN_CHARS_OFFSET); u8 *chars = reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_CHARS_OFFSET);
for (u16 s = 0; s < info.impl_alpha_size; s++) { for (u16 s = 0; s < info.impl_alpha_size; s++) {
if (info.states[i].next[s] != info.states[d].next[s]) { if (info.states[i].next[s] != info.states[d].next[s]) {
@ -989,7 +989,7 @@ void fill_in_sherman(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) {
} }
} }
u16 *states = (u16 *)(curr_sherman_entry + SHERMAN_STATES_OFFSET(len)); u16 *states = reinterpret_cast<u16 *>(curr_sherman_entry + SHERMAN_STATES_OFFSET(len));
for (u16 s = 0; s < info.impl_alpha_size; s++) { for (u16 s = 0; s < info.impl_alpha_size; s++) {
if (info.states[i].next[s] != info.states[d].next[s]) { if (info.states[i].next[s] != info.states[d].next[s]) {
DEBUG_PRINTF("s overrider %hu dad %hu char next %hu\n", fs, DEBUG_PRINTF("s overrider %hu dad %hu char next %hu\n", fs,
@ -997,7 +997,7 @@ void fill_in_sherman(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) {
info.implId(info.states[i].next[s])); info.implId(info.states[i].next[s]));
u16 entry_val = info.implId(info.states[i].next[s]); u16 entry_val = info.implId(info.states[i].next[s]);
entry_val |= get_edge_flags(nfa, entry_val); entry_val |= get_edge_flags(nfa, entry_val);
unaligned_store_u16((u8 *)states++, entry_val); unaligned_store_u16(reinterpret_cast<u8 *>(states++), entry_val);
} }
} }
} }
@ -1063,7 +1063,7 @@ bytecode_ptr<NFA> mcshengCompile16(dfa_info &info, dstate_id_t sheng_end,
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size); auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size);
mcsheng *m = (mcsheng *)getMutableImplNfa(nfa.get()); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa.get()));
populateBasicInfo(sizeof(u16), info, total_size, aux_offset, accel_offset, populateBasicInfo(sizeof(u16), info, total_size, aux_offset, accel_offset,
accel_escape_info.size(), arb, single, nfa.get()); accel_escape_info.size(), arb, single, nfa.get());
@ -1091,7 +1091,7 @@ bytecode_ptr<NFA> mcshengCompile16(dfa_info &info, dstate_id_t sheng_end,
static static
void fill_in_succ_table_8(NFA *nfa, const dfa_info &info, void fill_in_succ_table_8(NFA *nfa, const dfa_info &info,
dstate_id_t sheng_end) { dstate_id_t sheng_end) {
u8 *succ_table = (u8 *)nfa + sizeof(NFA) + sizeof(mcsheng); u8 *succ_table = reinterpret_cast<u8 *>(reinterpret_cast<char *>(nfa) + sizeof(NFA) + sizeof(mcsheng));
u8 alphaShift = info.getAlphaShift(); u8 alphaShift = info.getAlphaShift();
assert(alphaShift <= 8); assert(alphaShift <= 8);
@ -1114,8 +1114,8 @@ void fill_in_succ_table_8(NFA *nfa, const dfa_info &info,
static static
void fill_in_sherman64(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) { void fill_in_sherman64(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit) {
char *nfa_base = (char *)nfa; char *nfa_base = reinterpret_cast<char *>(nfa);
mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(nfa); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa));
char *sherman_table = nfa_base + m->sherman_offset; char *sherman_table = nfa_base + m->sherman_offset;
assert(ISALIGNED_16(sherman_table)); assert(ISALIGNED_16(sherman_table));
@ -1136,10 +1136,10 @@ void fill_in_sherman64(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit)
assert(len <= 9); assert(len <= 9);
dstate_id_t d = info.states[i].daddy; dstate_id_t d = info.states[i].daddy;
*(u8 *)(curr_sherman_entry + SHERMAN_TYPE_OFFSET) = SHERMAN_STATE; *(reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_TYPE_OFFSET)) = SHERMAN_STATE;
*(u8 *)(curr_sherman_entry + SHERMAN_LEN_OFFSET) = len; *(reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_LEN_OFFSET)) = len;
*(u16 *)(curr_sherman_entry + SHERMAN_DADDY_OFFSET) = info.implId(d); *(reinterpret_cast<u16 *>(curr_sherman_entry + SHERMAN_DADDY_OFFSET)) = info.implId(d);
u8 *chars = (u8 *)(curr_sherman_entry + SHERMAN_CHARS_OFFSET); u8 *chars = reinterpret_cast<u8 *>(curr_sherman_entry + SHERMAN_CHARS_OFFSET);
for (u16 s = 0; s < info.impl_alpha_size; s++) { for (u16 s = 0; s < info.impl_alpha_size; s++) {
if (info.states[i].next[s] != info.states[d].next[s]) { if (info.states[i].next[s] != info.states[d].next[s]) {
@ -1147,7 +1147,7 @@ void fill_in_sherman64(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit)
} }
} }
u16 *states = (u16 *)(curr_sherman_entry + SHERMAN_STATES_OFFSET(len)); u16 *states = reinterpret_cast<u16 *>(curr_sherman_entry + SHERMAN_STATES_OFFSET(len));
for (u16 s = 0; s < info.impl_alpha_size; s++) { for (u16 s = 0; s < info.impl_alpha_size; s++) {
if (info.states[i].next[s] != info.states[d].next[s]) { if (info.states[i].next[s] != info.states[d].next[s]) {
DEBUG_PRINTF("s overrider %hu dad %hu char next %hu\n", fs, DEBUG_PRINTF("s overrider %hu dad %hu char next %hu\n", fs,
@ -1155,7 +1155,7 @@ void fill_in_sherman64(NFA *nfa, const dfa_info &info, UNUSED u16 sherman_limit)
info.implId(info.states[i].next[s])); info.implId(info.states[i].next[s]));
u16 entry_val = info.implId(info.states[i].next[s]); u16 entry_val = info.implId(info.states[i].next[s]);
entry_val |= get_edge_flags64(nfa, entry_val); entry_val |= get_edge_flags64(nfa, entry_val);
unaligned_store_u16((u8 *)states++, entry_val); unaligned_store_u16(reinterpret_cast<u8 *>(states++), entry_val);
} }
} }
} }
@ -1221,7 +1221,7 @@ bytecode_ptr<NFA> mcsheng64Compile16(dfa_info&info, dstate_id_t sheng_end,
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size); auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size);
mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(nfa.get()); mcsheng64 *m = reinterpret_cast<mcsheng64 *>(getMutableImplNfa(nfa.get()));
populateBasicInfo64(sizeof(u16), info, total_size, aux_offset, accel_offset, populateBasicInfo64(sizeof(u16), info, total_size, aux_offset, accel_offset,
accel_escape_info.size(), arb, single, nfa.get()); accel_escape_info.size(), arb, single, nfa.get());
@ -1249,7 +1249,7 @@ bytecode_ptr<NFA> mcsheng64Compile16(dfa_info&info, dstate_id_t sheng_end,
static static
void fill_in_succ_table_64_8(NFA *nfa, const dfa_info &info, void fill_in_succ_table_64_8(NFA *nfa, const dfa_info &info,
dstate_id_t sheng_end) { dstate_id_t sheng_end) {
u8 *succ_table = (u8 *)nfa + sizeof(NFA) + sizeof(mcsheng64); u8 *succ_table = reinterpret_cast<u8 *>(reinterpret_cast<char *>(nfa) + sizeof(NFA) + sizeof(mcsheng));
u8 alphaShift = info.getAlphaShift(); u8 alphaShift = info.getAlphaShift();
assert(alphaShift <= 8); assert(alphaShift <= 8);
@ -1347,7 +1347,7 @@ bytecode_ptr<NFA> mcshengCompile8(dfa_info &info, dstate_id_t sheng_end,
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size); auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size);
mcsheng *m = (mcsheng *)getMutableImplNfa(nfa.get()); mcsheng *m = reinterpret_cast<mcsheng *>(getMutableImplNfa(nfa.get()));
allocateImplId8(info, sheng_end, accel_escape_info, &m->accel_limit_8, allocateImplId8(info, sheng_end, accel_escape_info, &m->accel_limit_8,
&m->accept_limit_8); &m->accept_limit_8);
@ -1400,7 +1400,7 @@ bytecode_ptr<NFA> mcsheng64Compile8(dfa_info &info, dstate_id_t sheng_end,
assert(ISALIGNED_N(accel_offset, alignof(union AccelAux))); assert(ISALIGNED_N(accel_offset, alignof(union AccelAux)));
auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size); auto nfa = make_zeroed_bytecode_ptr<NFA>(total_size);
mcsheng64 *m = (mcsheng64 *)getMutableImplNfa(nfa.get()); mcsheng64 *m = reinterpret_cast<mcsheng64 *>(getMutableImplNfa(nfa.get()));
allocateImplId8(info, sheng_end, accel_escape_info, &m->accel_limit_8, allocateImplId8(info, sheng_end, accel_escape_info, &m->accel_limit_8,
&m->accept_limit_8); &m->accept_limit_8);