1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add index to the latest NULL_CHECK_STACK for fast matching

Browse Source
This commit is contained in:
TSUYUSATO Kitsune 2022-10-06 17:11:33 +09:00 committed by Yusuke Endoh
parent aefb7e5fa5
commit cbabba9c82
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
regexec.c
View File

@ -978,6 +978,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_TYPE(stack_type) do {\ #define STACK_PUSH_TYPE(stack_type) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = (stack_type);\ stk->type = (stack_type);\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1047,6 +1048,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
# define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\ # define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = (stack_type);\ stk->type = (stack_type);\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.state.pcode = (pat);\ stk->u.state.pcode = (pat);\
stk->u.state.pstr = (s);\ stk->u.state.pstr = (s);\
stk->u.state.pstr_prev = (sprev);\ stk->u.state.pstr_prev = (sprev);\
@ -1056,6 +1058,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
# define STACK_PUSH_ENSURED(stack_type,pat) do {\ # define STACK_PUSH_ENSURED(stack_type,pat) do {\
stk->type = (stack_type);\ stk->type = (stack_type);\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.state.pcode = (pat);\ stk->u.state.pcode = (pat);\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1091,6 +1094,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_REPEAT(id, pat) do {\ #define STACK_PUSH_REPEAT(id, pat) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_REPEAT;\ stk->type = STK_REPEAT;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.repeat.num = (id);\ stk->u.repeat.num = (id);\
stk->u.repeat.pcode = (pat);\ stk->u.repeat.pcode = (pat);\
stk->u.repeat.count = 0;\ stk->u.repeat.count = 0;\
@ -1100,6 +1104,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_REPEAT_INC(sindex) do {\ #define STACK_PUSH_REPEAT_INC(sindex) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_REPEAT_INC;\ stk->type = STK_REPEAT_INC;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.repeat_inc.si = (sindex);\ stk->u.repeat_inc.si = (sindex);\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1107,6 +1112,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_MEM_START(mnum, s) do {\ #define STACK_PUSH_MEM_START(mnum, s) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_MEM_START;\ stk->type = STK_MEM_START;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.mem.num = (mnum);\ stk->u.mem.num = (mnum);\
stk->u.mem.pstr = (s);\ stk->u.mem.pstr = (s);\
stk->u.mem.start = mem_start_stk[mnum];\ stk->u.mem.start = mem_start_stk[mnum];\
@ -1119,6 +1125,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_MEM_END(mnum, s) do {\ #define STACK_PUSH_MEM_END(mnum, s) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_MEM_END;\ stk->type = STK_MEM_END;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.mem.num = (mnum);\ stk->u.mem.num = (mnum);\
stk->u.mem.pstr = (s);\ stk->u.mem.pstr = (s);\
stk->u.mem.start = mem_start_stk[mnum];\ stk->u.mem.start = mem_start_stk[mnum];\
@ -1130,6 +1137,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_MEM_END_MARK(mnum) do {\ #define STACK_PUSH_MEM_END_MARK(mnum) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_MEM_END_MARK;\ stk->type = STK_MEM_END_MARK;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.mem.num = (mnum);\ stk->u.mem.num = (mnum);\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1171,6 +1179,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_NULL_CHECK_START(cnum, s) do {\ #define STACK_PUSH_NULL_CHECK_START(cnum, s) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_NULL_CHECK_START;\ stk->type = STK_NULL_CHECK_START;\
stk->null_check = (OnigStackIndex)(stk - stk_base);\
stk->u.null_check.num = (cnum);\ stk->u.null_check.num = (cnum);\
stk->u.null_check.pstr = (s);\ stk->u.null_check.pstr = (s);\
STACK_INC;\ STACK_INC;\
@ -1179,6 +1188,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_NULL_CHECK_END(cnum) do {\ #define STACK_PUSH_NULL_CHECK_END(cnum) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_NULL_CHECK_END;\ stk->type = STK_NULL_CHECK_END;\
stk->null_check = (OnigStackIndex)(stk - stk_base);\
stk->u.null_check.num = (cnum);\ stk->u.null_check.num = (cnum);\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1186,6 +1196,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_CALL_FRAME(pat) do {\ #define STACK_PUSH_CALL_FRAME(pat) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_CALL_FRAME;\ stk->type = STK_CALL_FRAME;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.call_frame.ret_addr = (pat);\ stk->u.call_frame.ret_addr = (pat);\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
@ -1193,12 +1204,14 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_PUSH_RETURN do {\ #define STACK_PUSH_RETURN do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_RETURN;\ stk->type = STK_RETURN;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
STACK_INC;\ STACK_INC;\
} while(0) } while(0)
#define STACK_PUSH_ABSENT_POS(start, end) do {\ #define STACK_PUSH_ABSENT_POS(start, end) do {\
STACK_ENSURE(1);\ STACK_ENSURE(1);\
stk->type = STK_ABSENT_POS;\ stk->type = STK_ABSENT_POS;\
stk->null_check = stk == stk_base ? 0 : (stk-1)->null_check;\
stk->u.absent_pos.abs_pstr = (start);\ stk->u.absent_pos.abs_pstr = (start);\
stk->u.absent_pos.end_pstr = (end);\ stk->u.absent_pos.end_pstr = (end);\
STACK_INC;\ STACK_INC;\
@ -1362,7 +1375,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
} while(0) } while(0)
#define STACK_NULL_CHECK(isnull,id,s) do {\ #define STACK_NULL_CHECK(isnull,id,s) do {\
OnigStackType* k = stk;\ OnigStackType* k = STACK_AT((stk-1)->null_check)+1;\
while (1) {\ while (1) {\
k--;\ k--;\
STACK_BASE_CHECK(k, "STACK_NULL_CHECK"); \ STACK_BASE_CHECK(k, "STACK_NULL_CHECK"); \
@ -1377,7 +1390,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_NULL_CHECK_REC(isnull,id,s) do {\ #define STACK_NULL_CHECK_REC(isnull,id,s) do {\
int level = 0;\ int level = 0;\
OnigStackType* k = stk;\ OnigStackType* k = STACK_AT((stk-1)->null_check)+1;\
while (1) {\ while (1) {\
k--;\ k--;\
STACK_BASE_CHECK(k, "STACK_NULL_CHECK_REC"); \ STACK_BASE_CHECK(k, "STACK_NULL_CHECK_REC"); \
@ -1397,7 +1410,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
} while(0) } while(0)
#define STACK_NULL_CHECK_MEMST(isnull,id,s,reg) do {\ #define STACK_NULL_CHECK_MEMST(isnull,id,s,reg) do {\
OnigStackType* k = stk;\ OnigStackType* k = STACK_AT((stk-1)->null_check)+1;\
while (1) {\ while (1) {\
k--;\ k--;\
STACK_BASE_CHECK(k, "STACK_NULL_CHECK_MEMST"); \ STACK_BASE_CHECK(k, "STACK_NULL_CHECK_MEMST"); \
@ -1437,7 +1450,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define STACK_NULL_CHECK_MEMST_REC(isnull,id,s,reg) do {\ #define STACK_NULL_CHECK_MEMST_REC(isnull,id,s,reg) do {\
int level = 0;\ int level = 0;\
OnigStackType* k = stk;\ OnigStackType* k = STACK_AT((stk-1)->null_check)+1;\
while (1) {\ while (1) {\
k--;\ k--;\
STACK_BASE_CHECK(k, "STACK_NULL_CHECK_MEMST_REC"); \ STACK_BASE_CHECK(k, "STACK_NULL_CHECK_MEMST_REC"); \

1
regint.h
View File

@ -828,6 +828,7 @@ typedef intptr_t OnigStackIndex;
typedef struct _OnigStackType { typedef struct _OnigStackType {
unsigned int type; unsigned int type;
OnigStackIndex null_check;
union { union {
struct { struct {
UChar *pcode; /* byte code position */ UChar *pcode; /* byte code position */