d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix scope limit for cleanup attribute

Browse source 
old implementation use only a global static array for storing
ScopeTracker which have the advantage to be fast, but you can't
use cleanup in a function that have move than SCOPE_TCK_STORE_SIZE
scopes.

I don't want to use only dynarray_* as it would slow down tcc for
every functions, so I keep both stores.
This commit is contained in:
matthias 2019-01-13 18:20:10 +01:00
parent ff38d90d5d
commit 26f0cf0708
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tccgen.c
View file

@ -40,10 +40,13 @@ ST_DATA Sym *global_label_stack;
ST_DATA Sym *local_label_stack; ST_DATA Sym *local_label_stack;
static int local_scope; static int local_scope;
#define SCOPE_TCK_STORE_SIZE 1024 #define SCOPE_TCK_STORE_SIZE 512
ST_DATA ScopeTacker *scope_tracker; ST_DATA ScopeTacker *scope_tracker;
static ScopeTacker scope_tck_store[SCOPE_TCK_STORE_SIZE]; static ScopeTacker scope_tck_store[SCOPE_TCK_STORE_SIZE];
static int scope_tck_idx; static int scope_tck_store_len;
static ScopeTacker **scope_tck_2nd_store;
static int scope_tck_2nd_store_len;
static int in_sizeof; static int in_sizeof;
static int section_sym; static int section_sym;
@ -141,15 +144,15 @@ static void incr_local_scope(void)
ScopeTacker *tmp = scope_tracker; ScopeTacker *tmp = scope_tracker;
++local_scope; ++local_scope;
/* if we have more scopes that SCOPE_TCK_STORE_SIZE */ if (scope_tck_store_len >= SCOPE_TCK_STORE_SIZE) {
/* cleanup will not work at all, but it should be a very rare case */ scope_tracker = tcc_malloc(sizeof(ScopeTacker));
/* and I don't want to add too much complexiy for handeling case */ dynarray_add(&scope_tck_2nd_store,
/* that should not happen */ &scope_tck_2nd_store_len, scope_tracker);
if (scope_tck_idx < SCOPE_TCK_STORE_SIZE) { } else {
scope_tracker = &scope_tck_store[scope_tck_idx]; scope_tracker = &scope_tck_store[scope_tck_store_len];
scope_tracker->prev = tmp; ++scope_tck_store_len;
++scope_tck_idx;
} }
scope_tracker->prev = tmp;
} }
static void decr_local_scope(void) static void decr_local_scope(void)
@ -175,7 +178,9 @@ static void reset_local_scope(void)
} }
scope_tracker = NULL; scope_tracker = NULL;
local_scope = 0; local_scope = 0;
scope_tck_idx = 0; scope_tck_store_len = 0;
if (scope_tck_2nd_store_len)
dynarray_reset(&scope_tck_2nd_store, &scope_tck_2nd_store_len);
} }
int is_scope_a_parent_of(ScopeTacker *parent, ScopeTacker *child) int is_scope_a_parent_of(ScopeTacker *parent, ScopeTacker *child)