emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,028 Commits 1 Branch 0 Tags 33 MiB
e3d3d2067d
Commit Graph

16028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Denys Vlasenko
e3d3d2067d bc: remove redundant strdup+free in zbc_parse_call() 
function                                             old     new   delta
zbc_parse_name                                       527     482     -45
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-45)             Total: -45 bytes
   text	   data	    bss	    dec	    hex	filename
 981541	    485	   7296	 989322	  f188a	busybox_old
 981486	    485	   7296	 989267	  f1853	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-19 13:20:02 +01:00
Denys Vlasenko
4796a1d537 bc: delete G.prog.strmb for real 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-19 12:48:16 +01:00
Denys Vlasenko
b80d7aad1b bc: in execution loop, reload stack only after insts which can change it 
Only these functions affect G.prog.exestack:
zbc_program_read
zbc_program_call
zbc_program_return
zbc_program_nquit
zbc_program_execStr

function                                             old     new   delta
zbc_program_exec                                    3995    4093     +98
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 98/0)               Total: 98 bytes
   text	   data	    bss	    dec	    hex	filename
 981364	    485	   7296	 989145	  f17d9	busybox_old
 981462	    485	   7296	 989243	  f183b	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-19 12:35:27 +01:00
Denys Vlasenko
d6e24bd795 bc: simplify bc_array_expand() 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 20:10:48 +01:00
Denys Vlasenko
30a8e0c2f9 bc: code shrink 
function                                             old     new   delta
zbc_program_print                                    684     680      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-4)               Total: -4 bytes
   text	   data	    bss	    dec	    hex	filename
 981368	    485	   7296	 989149	  f17dd	busybox_old
 981364	    485	   7296	 989145	  f17d9	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 19:20:04 +01:00
Denys Vlasenko
694d2982e5 bc: code shrink 
function                                             old     new   delta
bc_program_name                                       67      63      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-4)               Total: -4 bytes
   text	   data	    bss	    dec	    hex	filename
 981372	    485	   7296	 989153	  f17e1	busybox_old
 981368	    485	   7296	 989149	  f17dd	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 19:17:11 +01:00
Denys Vlasenko
7b30bc0222 bc: shrink bc_program_pushVar() 
function                                             old     new   delta
bc_program_pushVar                                   203     198      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 17:14:34 +01:00
Denys Vlasenko
d340143247 bc: get rid of G.prog.ob, G.prog.strmb 
function                                             old     new   delta
zbc_num_printNum                                     489     540     +51
zbc_program_asciify                                  426     473     +47
zbc_program_print                                    686     684      -2
zbc_program_exec                                    4008    3995     -13
zbc_program_assign                                   474     440     -34
bc_vm_init                                           739     663     -76
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/4 up/down: 98/-125)           Total: -27 bytes
   text	   data	    bss	    dec	    hex	filename
 981404	    485	   7296	 989185	  f1801	busybox_old
 981377	    485	   7296	 989158	  f17e6	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 17:00:35 +01:00
Denys Vlasenko
09fe0aaefa bc: do not show -i in --help, it's a NOP (for now) 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 16:32:25 +01:00
Denys Vlasenko
7f2d59c38d bc: style edit, no code changes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 16:24:07 +01:00
Denys Vlasenko
3f940c9c70 bc: shrink bc_program_index() 
function                                             old     new   delta
bc_program_index                                      66      47     -19
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-19)             Total: -19 bytes
   text	   data	    bss	    dec	    hex	filename
 981418	    485	   7296	 989199	  f180f	busybox_old
 981399	    485	   7296	 989180	  f17fc	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 15:49:42 +01:00
Denys Vlasenko
55f3cab7e9 bc: fix "echo -n '#foo' | bc" not eating last 'o' 
function                                             old     new   delta
zdc_parse_expr                                       656     653      -3
bc_lex_lineComment                                    39      36      -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6)               Total: -6 bytes
   text	   data	    bss	    dec	    hex	filename
 981424	    485	   7296	 989205	  f1815	busybox_old
 981418	    485	   7296	 989199	  f180f	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 14:39:33 +01:00
Denys Vlasenko
a199cc95b7 bc: shrink zdc_parse_expr() 
function                                             old     new   delta
zdc_parse_expr                                       656     653      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 14:11:35 +01:00
Denys Vlasenko
07597cd35d bc: optimize zbc_lex_string() 
function                                             old     new   delta
zbc_lex_next                                        2359    2353      -6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 14:03:20 +01:00
Denys Vlasenko
ef271da33f bc: shrink zdc_lex_string() 
This actually fixes a rather obscure bug. This was failing to find
end of the string:

	$ echo -n '[foo]' | dc
	dc: string end could not be found

function                                             old     new   delta
zbc_lex_next                                        2230    2141     -89
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-89)             Total: -89 bytes
   text	   data	    bss	    dec	    hex	filename
 981461	    485	   7296	 989242	  f183a	busybox_old
 981372	    485	   7296	 989153	  f17e1	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 13:48:37 +01:00
Denys Vlasenko
d4258dd321 bc: another for() loop simplified 
function                                             old     new   delta
zbc_program_print                                    688     686      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 13:22:23 +01:00
Denys Vlasenko
5c0c5abba0 bc: simplify another for() loop 
function                                             old     new   delta
zbc_num_d                                            563     557      -6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 13:15:55 +01:00
Denys Vlasenko
6b0fbd14fc bc: rewrite more for() loops 
function                                             old     new   delta
bc_program_name                                       75      67      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 12:55:40 +01:00
Denys Vlasenko
71c82d1d8c bc: rewrite another for() loop 
function                                             old     new   delta
zbc_num_d                                            570     563      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 12:43:21 +01:00
Denys Vlasenko
e2e6ffd3c5 bc: replace signed division / 10 by unsigned 
function                                             old     new   delta
zbc_num_a                                            443     441      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 12:23:16 +01:00
Denys Vlasenko
4113e1f2cd bc: rewrite bc_num_compare() to be readable 
function                                             old     new   delta
bc_num_compare                                        59      51      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 03:30:23 +01:00
Denys Vlasenko
57734c926b bc: fold zbc_num_stream() into its single caller 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 03:30:23 +01:00
Denys Vlasenko
f6e3f8511e bc: get rid of BcNum BcProgram::ib,hexb 
function                                             old     new   delta
zbc_program_num                                      907     943     +36
zbc_program_assign                                   485     474     -11
bc_vm_init                                           757     739     -18
bc_num_ten                                            30       -     -30
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/2 up/down: 36/-59)            Total: -23 bytes
   text	   data	    bss	    dec	    hex	filename
 981532	    485	   7296	 989313	  f1881	busybox_old
 981509	    485	   7296	 989290	  f186a	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 03:30:23 +01:00
Denys Vlasenko
0f31a5c79e bc: fixes to bugs found while testing 64-bit build 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 03:16:48 +01:00
Denys Vlasenko
f4f10720fe bc: fixed from 64-bit compile 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-18 02:23:53 +01:00
Denys Vlasenko
6d3b4bb24d udhcpc: check that 4-byte options are indeed 4-byte, closes 11506 
function                                             old     new   delta
udhcp_get_option32                                     -      27     +27
udhcp_get_option                                     231     248     +17
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0)               Total: 44 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 18:07:18 +01:00
Denys Vlasenko
4b72aebe80 bc: remove "error after expression parsing" check 
It is misplaced: caller knows better what can or cannot follow the expression.
Sometimes even caller's caller: "if (1) return a+b else..." -
parser of "return" does not know that "else" after it is valid,
parser of stmt does not know it either, - only parser of
"if" knows it!

The removed code balked on e.g. "{ print 1 }" statement.

This does not break any valid programs, but starts accepting some
invalid ones, e.g. "print 1 print 2" would work.

function                                             old     new   delta
zcommon_parse_expr                                    40      32      -8
zbc_parse_name                                       509     494     -15
zbc_parse_stmt_possibly_auto                        1678    1638     -40
bc_parse_expr_empty_ok                              2025    1977     -48
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-111)           Total: -111 bytes
   text	   data	    bss	    dec	    hex	filename
 981599	    485	   7296	 989380	  f18c4	busybox_old
 981488	    485	   7296	 989269	  f1855	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 17:00:29 +01:00
Denys Vlasenko
b44a7f1d66 bc: tighten up input NUL handling 
function                                             old     new   delta
static.dc_lex_tokens                                   -      90     +90
bc_error_bad_character                                17      31     +14
static.dc_lex_regs                                     -      13     +13
bc_read_line                                         406     410      +4
bc_program_index                                      64      66      +2
dc_lex_regs                                           13       -     -13
zdc_parse_expr                                       671     656     -15
zbc_lex_next                                        2318    2230     -88
dc_lex_tokens                                         91       -     -91
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 3/2 up/down: 123/-207)          Total: -84 bytes
   text	   data	    bss	    dec	    hex	filename
 981667	    485	   7296	 989448	  f1908	busybox_old
 981599	    485	   7296	 989380	  f18c4	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 11:58:20 +01:00
Denys Vlasenko
e42cc19b51 bc: simplify zdc_parse_string() 
function                                             old     new   delta
bc_program_index                                      64      66      +2
zdc_parse_expr                                       671     656     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 2/-15)             Total: -13 bytes
   text	   data	    bss	    dec	    hex	filename
 981667	    485	   7296	 989448	  f1908	busybox_old
 981655	    485	   7296	 989436	  f18fc	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 11:02:26 +01:00
Denys Vlasenko
59d4ce935e bc: use common strings 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 10:42:31 +01:00
Denys Vlasenko
ec60318f15 bc: tidy up "z-function" macro machinery 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 10:34:02 +01:00
Denys Vlasenko
e4ba4c4371 bc: parse file arguments piecemeal (do not read entire file) 
function                                             old     new   delta
bc_read_line                                         336     406     +70
zbc_vm_execute_FILE                                    -      67     +67
zbc_lex_next                                        2309    2318      +9
zbc_program_exec                                    4002    4008      +6
bc_program_index                                      66      64      -2
bc_vm_run                                            139     124     -15
zbc_vm_file                                          208      32    -176
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 3/3 up/down: 152/-193)          Total: -41 bytes
   text	   data	    bss	    dec	    hex	filename
 981736	    485	   7296	 989517	  f194d	busybox_old
 981667	    485	   7296	 989448	  f1908	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 09:51:43 +01:00
Denys Vlasenko
c5774a3458 bc: move fflush to the _actual_ execution loop 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 01:22:53 +01:00
Denys Vlasenko
51b22b1bce bc: fix typo: defone -> define 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 00:15:35 +01:00
Denys Vlasenko
94f72a387c bc: factor out common code 
function                                             old     new   delta
zbc_parse_stmt_allow_NLINE_before                      -      59     +59
bc_parse_pushJUMP_ZERO                                 -      27     +27
bc_parse_pushJUMP                                      -      27     +27
rewrite_label_to_current                               -      19     +19
zbc_vm_process                                       594     599      +5
zbc_lex_next_and_skip_NLINE                           22       -     -22
zbc_parse_stmt_fail_if_bare_NLINE                     28       -     -28
zbc_parse_stmt_possibly_auto                        1909    1678    -231
------------------------------------------------------------------------------
(add/remove: 4/2 grow/shrink: 1/1 up/down: 137/-281)         Total: -144 bytes
   text	   data	    bss	    dec	    hex	filename
 981879	    485	   7296	 989660	  f19dc	busybox_old
 981755	    485	   7296	 989536	  f1960	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-17 00:07:48 +01:00
Denys Vlasenko
5ebd2a6128 bc: remove use of "BcInstPtr ip" object from loop parsing 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        1964    1909     -55
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-55)             Total: -55 bytes
   text	   data	    bss	    dec	    hex	filename
 981934	    485	   7296	 989715	  f1a13	busybox_old
 981879	    485	   7296	 989660	  f19dc	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 23:35:04 +01:00
Denys Vlasenko
266aa00012 bc: store only index in p->exits, it's the only thing used there 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        1967    1964      -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-3)               Total: -3 bytes
   text	   data	    bss	    dec	    hex	filename
 981937	    485	   7296	 989718	  f1a16	busybox_old
 981934	    485	   7296	 989715	  f1a13	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 23:24:25 +01:00
Denys Vlasenko
8e7686e457 bc: p->exits.func is never zero, do not check for that 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        1978    1967     -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-11)             Total: -11 bytes
   text	   data	    bss	    dec	    hex	filename
 981948	    485	   7296	 989729	  f1a21	busybox_old
 981937	    485	   7296	 989718	  f1a16	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 23:18:28 +01:00
Denys Vlasenko
de24e9d366 bc: remove redundant JUMP generation when parsing 'while' 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2065    2025     -40
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-40)             Total: -40 bytes
   text	   data	    bss	    dec	    hex	filename
 982035	    485	   7296	 989816	  f1a78	busybox_old
 981995	    485	   7296	 989776	  f1a50	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 23:02:22 +01:00
Denys Vlasenko
06ade77002 bc: simplify use of "ip" in loop parsing functions 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2106    2065     -41
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-41)             Total: -41 bytes
   text	   data	    bss	    dec	    hex	filename
 982076	    485	   7296	 989857	  f1aa1	busybox_old
 982035	    485	   7296	 989816	  f1a78	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 22:44:51 +01:00
Denys Vlasenko
146a79d19c bc: shring bc_lib[] 
function                                             old     new   delta
bc_lib                                              1586    1584      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 21:46:11 +01:00
Denys Vlasenko
15850832be bc: shrink zbc_parse_if() a bit more 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2180    2106     -74
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-74)             Total: -74 bytes
   text	   data	    bss	    dec	    hex	filename
 982152	    485	   7296	 989933	  f1aed	busybox_old
 982078	    485	   7296	 989859	  f1aa3	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 21:41:17 +01:00
Denys Vlasenko
6b5b46f817 bc: stop using p->exits when parsing if() 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2180    2138     -42

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 21:29:08 +01:00
Denys Vlasenko
7415633128 bc: preparation to stop using p->exits when parsing if() 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 21:21:27 +01:00
Denys Vlasenko
5d18f6be90 bc: fix "print 1,2,3" parsing 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2245    2180     -65
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-65)             Total: -65 bytes
   text	   data	    bss	    dec	    hex	filename
 982237	    485	   7296	 990018	  f1b42	busybox_old
 982152	    485	   7296	 989933	  f1aed	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 21:08:30 +01:00
Denys Vlasenko
cb18b546f7 bc: disallow empty statement as function body 
$ bc
	define z() <cr>
	<cr>
	bc: no statement after 'define'

function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2239    2245      +6
zbc_vm_process                                       589     594      +5
zbc_parse_stmt_fail_if_bare_NLINE                     25      28      +3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 14/0)               Total: 14 bytes
   text	   data	    bss	    dec	    hex	filename
 982216	    485	   7296	 989997	  f1b2d	busybox_old
 982237	    485	   7296	 990018	  f1b42	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 20:46:15 +01:00
Denys Vlasenko
2e8be023cb bc: allow only one <newline> between if() and stmt 
Attempt to have more than one causes this error message:

	$ bc -q
	if (1)<cr>
	<cr>
	bc: no statement after 'if'

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 20:41:32 +01:00
Denys Vlasenko
e6c40c48d9 bc: simplify bc_parse_pushName(), do not free name in it - avoids one strdup 
function                                             old     new   delta
zbc_parse_name                                       511     509      -2
zdc_parse_register                                    50      43      -7
bc_parse_pushName                                     61      39     -22
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-31)             Total: -31 bytes
   text	   data	    bss	    dec	    hex	filename
 982183	    485	   7296	 989964	  f1b0c	busybox_old
 982152	    485	   7296	 989933	  f1aed	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 20:32:58 +01:00
Denys Vlasenko
563d93c9a4 bc: simplify zbc_parse_break_or_continue(), logic is the same 
function                                             old     new   delta
zbc_parse_stmt_possibly_auto                        2259    2224     -35
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-35)             Total: -35 bytes
   text	   data	    bss	    dec	    hex	filename
 982218	    485	   7296	 989999	  f1b2f	busybox_old
 982183	    485	   7296	 989964	  f1b0c	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 19:47:40 +01:00
Denys Vlasenko
a50576a415 bc: fold zbc_parse_else() into its only caller 
While at it, allow newline between "else" and its body

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2018-12-16 19:21:57 +01:00