emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awk: match(): code shrink

Browse Source 
function                                             old     new   delta
do_match                                               -     165    +165
exec_builtin_match                                   202       -    -202
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/0 up/down: 165/-202)          Total: -37 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-07-03 12:20:36 +02:00
parent 0e3ef4efb0
commit 90404ed2f6
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editors/awk.c
View File

@ -2497,26 +2497,24 @@ static NOINLINE int do_mktime(const char *ds)
} }
/* Reduce stack usage in exec_builtin() by keeping match() code separate */ /* Reduce stack usage in exec_builtin() by keeping match() code separate */
static NOINLINE void exec_builtin_match(node *an1, const char *as0, var *res) static NOINLINE var *do_match(node *an1, const char *as0)
{ {
regmatch_t pmatch[1]; regmatch_t pmatch[1];
regex_t sreg, *re; regex_t sreg, *re;
int n; int n, start, len;
re = as_regex(an1, &sreg); re = as_regex(an1, &sreg);
n = regexec(re, as0, 1, pmatch, 0); n = regexec(re, as0, 1, pmatch, 0);
if (n == 0) {
pmatch[0].rm_so++;
pmatch[0].rm_eo++;
} else {
pmatch[0].rm_so = 0;
pmatch[0].rm_eo = -1;
}
if (re == &sreg) if (re == &sreg)
regfree(re); regfree(re);
setvar_i(newvar("RSTART"), pmatch[0].rm_so); start = 0;
setvar_i(newvar("RLENGTH"), pmatch[0].rm_eo - pmatch[0].rm_so); len = -1;
setvar_i(res, pmatch[0].rm_so); if (n == 0) {
start = pmatch[0].rm_so + 1;
len = pmatch[0].rm_eo - pmatch[0].rm_so;
}
setvar_i(newvar("RLENGTH"), len);
return setvar_i(newvar("RSTART"), start);
} }
/* Reduce stack usage in evaluate() by keeping builtins' code separate */ /* Reduce stack usage in evaluate() by keeping builtins' code separate */
@ -2686,7 +2684,7 @@ static NOINLINE var *exec_builtin(node *op, var *res)
break; break;
case B_ma: case B_ma:
exec_builtin_match(an[1], as[0], res); res = do_match(an[1], as[0]);
break; break;
case B_ge: case B_ge: