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

vi: move undo_queue_state in globals to other byte-sized members

Browse Source 
function                                             old     new   delta
vi_main                                              278     275      -3
undo_queue_commit                                     62      56      -6
undo_push                                            374     362     -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-21)             Total: -21 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-04-15 23:17:01 +02:00
parent f227726838
commit b65e7f629e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editors/vi.c
View File

@ -352,6 +352,9 @@ struct globals {
#if ENABLE_FEATURE_VI_CRASHME #if ENABLE_FEATURE_VI_CRASHME
char last_input_char; // last char read from user char last_input_char; // last char read from user
#endif #endif
#if ENABLE_FEATURE_VI_UNDO_QUEUE
char undo_queue_state; // One of UNDO_INS, UNDO_DEL, UNDO_EMPTY
#endif
#if ENABLE_FEATURE_VI_DOT_CMD #if ENABLE_FEATURE_VI_DOT_CMD
smallint adding2q; // are we currently adding user input to q smallint adding2q; // are we currently adding user input to q
@ -425,15 +428,6 @@ struct globals {
#define ALLOW_UNDO_QUEUED ALLOW_UNDO #define ALLOW_UNDO_QUEUED ALLOW_UNDO
# endif # endif
# if ENABLE_FEATURE_VI_UNDO_QUEUE
#define UNDO_USE_SPOS 32
#define UNDO_EMPTY 64
char undo_queue_state; // One of UNDO_INS, UNDO_DEL, UNDO_EMPTY
int undo_q;
char *undo_queue_spos; // Start position of queued operation
char undo_queue[CONFIG_FEATURE_VI_UNDO_QUEUE_MAX];
# endif
struct undo_object { struct undo_object {
struct undo_object *prev; // Linking back avoids list traversal (LIFO) struct undo_object *prev; // Linking back avoids list traversal (LIFO)
int start; // Offset where the data should be restored/deleted int start; // Offset where the data should be restored/deleted
@ -441,6 +435,13 @@ struct globals {
uint8_t u_type; // 0=deleted, 1=inserted, 2=swapped uint8_t u_type; // 0=deleted, 1=inserted, 2=swapped
char undo_text[1]; // text that was deleted (if deletion) char undo_text[1]; // text that was deleted (if deletion)
} *undo_stack_tail; } *undo_stack_tail;
# if ENABLE_FEATURE_VI_UNDO_QUEUE
#define UNDO_USE_SPOS 32
#define UNDO_EMPTY 64
char *undo_queue_spos; // Start position of queued operation
int undo_q;
char undo_queue[CONFIG_FEATURE_VI_UNDO_QUEUE_MAX];
# endif
#endif /* ENABLE_FEATURE_VI_UNDO */ #endif /* ENABLE_FEATURE_VI_UNDO */
}; };
#define G (*ptr_to_globals) #define G (*ptr_to_globals)
@ -2071,8 +2072,8 @@ static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at
static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
{ {
#if ENABLE_FEATURE_VI_SETOPTS #if ENABLE_FEATURE_VI_SETOPTS
char *q; char *q;
size_t len; size_t len;
#endif #endif
if (c == 22) { // Is this an ctrl-V? if (c == 22) { // Is this an ctrl-V?
@ -2140,9 +2141,9 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
bias = text_hole_make(p, len); bias = text_hole_make(p, len);
p += bias; p += bias;
q += bias; q += bias;
#if ENABLE_FEATURE_VI_UNDO # if ENABLE_FEATURE_VI_UNDO
undo_push_insert(p, len, undo); undo_push_insert(p, len, undo);
#endif # endif
memcpy(p, q, len); memcpy(p, q, len);
p += len; p += len;
} }