luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove hard limit (50) on # of loaded raw files

This commit is contained in:
stefan schippers 2026-03-05 12:43:39 +01:00
parent 0d025550a0
commit f15baf2072
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/save.c
View File

@ -1126,13 +1126,21 @@ int new_rawfile(const char *name, const char *type, const char *sweepvar,
Raw *raw;
int number = (int)floor((end - start) / step) + 1;
/* allocate xctx->extra_raw_arr array */
if(xctx->extra_raw_n >= xctx->extra_raw_size) {
int old_size = xctx->extra_raw_size;
xctx->extra_raw_size += 20;
my_realloc(_ALLOC_ID_, &xctx->extra_raw_arr, sizeof(Raw *) * xctx->extra_raw_size);
memset(xctx->extra_raw_arr + old_size, 0, sizeof(Raw *) * (xctx->extra_raw_size - old_size));
}
/* if not already done insert base raw file (if there is one) into xctx->extra_raw_arr[0] */
if(xctx->raw && xctx->extra_raw_n == 0) {
xctx->extra_raw_arr[xctx->extra_raw_n] = xctx->raw;
xctx->extra_raw_n++;
}
if(xctx->extra_raw_n < MAX_RAW_N && name && type) {
if(xctx->extra_raw_n < xctx->extra_raw_size && name && type) {
for(i = 0; i < xctx->extra_raw_n; i++) {
if(xctx->extra_raw_arr[i]->sim_type &&
!strcmp(xctx->extra_raw_arr[i]->rawfile, name) &&
@ -1216,6 +1224,15 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
dbg(1, "extra_rawfile(): what=%d, no_warning=%d, file=%s, type=%s\n",
what, no_warning, file ? file : "<NULL>", type ? type : "<NULL>");
if(what == 0) return 0;
/* allocate xctx->extra_raw_arr array */
if(xctx->extra_raw_n >= xctx->extra_raw_size) {
int old_size = xctx->extra_raw_size;
xctx->extra_raw_size += 20;
my_realloc(_ALLOC_ID_, &xctx->extra_raw_arr, sizeof(Raw *) * xctx->extra_raw_size);
memset(xctx->extra_raw_arr + old_size, 0, sizeof(Raw *) * (xctx->extra_raw_size - old_size));
}
/* if not already done insert base raw file (if there is one) into xctx->extra_raw_arr[0] */
if(xctx->raw && xctx->extra_raw_n == 0) {
dbg(1, "insert extra_raw_arr[0]\n");
@ -1223,7 +1240,7 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->extra_raw_n++;
}
/* **************** table_read ************* */
if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && (type && !strcmp(type, "table"))) {
if(what == 1 && xctx->extra_raw_n < xctx->extra_raw_size && file && (type && !strcmp(type, "table"))) {
tclvareval("subst {", file, "}", NULL);
my_strncpy(f, tclresult(), S(f));
dbg(1, "extra_rawfile: table_read: f=%s\n", f);
@ -1259,7 +1276,7 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->raw = xctx->extra_raw_arr[xctx->extra_idx];
}
/* **************** read ************* */
} else if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file /* && type*/) {
} else if(what == 1 && xctx->extra_raw_n < xctx->extra_raw_size && file /* && type*/) {
tclvareval("subst {", file, "}", NULL);
my_strncpy(f, tclresult(), S(f));
if(type) {
@ -1360,6 +1377,8 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->extra_prev_idx = 0;
xctx->extra_idx = 0;
xctx->extra_raw_n = 0;
my_free(_ALLOC_ID_, &xctx->extra_raw_arr);
xctx->extra_raw_size = 0;
} else if(file && isonlydigit(file)) {
int n, found = 0;
tclvareval("subst {", file, "}", NULL);
@ -1385,6 +1404,8 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
} else {
tcleval("array unset ngspice::ngspice_data");
xctx->raw = NULL;
my_free(_ALLOC_ID_, &xctx->extra_raw_arr);
xctx->extra_raw_size = 0;
}
} else ret = 0;
} else ret = 0;
@ -1419,6 +1440,8 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
} else {
tcleval("array unset ngspice::ngspice_data");
xctx->raw = NULL;
my_free(_ALLOC_ID_, &xctx->extra_raw_arr);
xctx->extra_raw_size = 0;
}
} else ret = 0;
} else ret = 0;

4
src/xinit.c
View File

@ -497,9 +497,11 @@ static void alloc_xschem_data(const char *top_path, const char *win_path)
xctx->xorigin=CADINITIALX;
xctx->yorigin=CADINITIALY;
xctx->raw = NULL;
xctx->extra_raw_arr = NULL;
xctx->extra_raw_size = 0;
xctx->extra_raw_n = 0;
xctx->extra_idx = 0;
xctx->extra_prev_idx = 0;
xctx->extra_raw_n = 0;
xctx->graph_master = -1;
xctx->graph_cursor1_x = 0;
xctx->graph_cursor2_x = 0;

7
src/xschem.h
View File

@ -288,8 +288,6 @@ extern char win_temp_dir[PATH_MAX];
/* 1215497, 1823231, 2734867, 4102283, 6153409, 9230113, 13845163 */
#define HASHSIZE 31627
#define MAX_RAW_N 50 /* max number of raw files that can be loaded */
/* parameters passed to action functions, see actions.c */
#define END 1 /* endop */
#define START 2 /* begin placing something */
@ -1116,9 +1114,10 @@ typedef struct {
/* data for additional raw files */
int extra_idx; /* current raw file */
int extra_prev_idx; /* previous crrent (to switch back) */
Raw *extra_raw_arr[MAX_RAW_N]; /* array of pointers to Raw structure */
int extra_prev_idx; /* previous current (to switch back) */
Raw **extra_raw_arr; /* array of pointers to Raw structure */
int extra_raw_n; /* number of elements in array */
int extra_raw_size; /* size of raw_arr (will be incremented if needed) */
/* */