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

cleanup debug messages

This commit is contained in:
Stefan Schippers 2020-11-16 02:25:43 +01:00
parent 2d01eee04b
commit 90f6d7ee90
7 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/actions.c
View File

@ -183,14 +183,14 @@ const char *add_ext(const char *f, const char *ext)
if((p=strrchr(f,'.'))) { if((p=strrchr(f,'.'))) {
my_strncpy(ff, f, (p-f) + 1); my_strncpy(ff, f, (p-f) + 1);
p = ff + (p-f); p = ff + (p-f);
dbg(1, "add_ext() 1: ff=%s\n", ff); dbg(1, "add_ext(): 1: ff=%s\n", ff);
} else { } else {
i = my_strncpy(ff, f, S(ff)); i = my_strncpy(ff, f, S(ff));
p = ff+i; p = ff+i;
dbg(1, "add_ext() 2: ff=%s\n", ff); dbg(1, "add_ext(): 2: ff=%s\n", ff);
} }
my_strncpy(p, ext, S(ff)-(p-ff)); my_strncpy(p, ext, S(ff)-(p-ff));
dbg(1, "add_ext() 3: ff=%s\n", ff); dbg(1, "add_ext(): 3: ff=%s\n", ff);
return ff; return ff;
} }
@ -794,7 +794,7 @@ void attach_labels_to_inst() /* offloaded from callback.c 20171005 */
if(!do_all_inst && !strcmp(tclgetvar("do_all_inst"),"1")) do_all_inst=1; if(!do_all_inst && !strcmp(tclgetvar("do_all_inst"),"1")) do_all_inst=1;
dbg(1, " 200711 1--> %s %.16g %.16g %s\n", dbg(1, "attach_labels_to_inst(): 1--> %s %.16g %.16g %s\n",
xctx->inst[selectedgroup[j].n].name, xctx->inst[selectedgroup[j].n].name,
xctx->inst[selectedgroup[j].n].x0, xctx->inst[selectedgroup[j].n].x0,
xctx->inst[selectedgroup[j].n].y0, xctx->inst[selectedgroup[j].n].y0,
@ -810,7 +810,7 @@ void attach_labels_to_inst() /* offloaded from callback.c 20171005 */
for(i=0;i<npin;i++) { for(i=0;i<npin;i++) {
my_strdup(8, &labname,get_tok_value(rct[i].prop_ptr,"name",1)); my_strdup(8, &labname,get_tok_value(rct[i].prop_ptr,"name",1));
dbg(1,"200711 2 --> labname=%s\n", labname); dbg(1,"attach_labels_to_inst(): 2 --> labname=%s\n", labname);
pinx0 = (rct[i].x1+rct[i].x2)/2; pinx0 = (rct[i].x1+rct[i].x2)/2;
piny0 = (rct[i].y1+rct[i].y2)/2; piny0 = (rct[i].y1+rct[i].y2)/2;
@ -883,7 +883,7 @@ void attach_labels_to_inst() /* offloaded from callback.c 20171005 */
first_call=0; first_call=0;
} }
} }
dbg(1, "%d %.16g %.16g %s\n", i, pinx0, piny0,labname); dbg(1, "attach_labels_to_inst(): %d %.16g %.16g %s\n", i, pinx0, piny0,labname);
} }
} }
my_free(707, &prop); my_free(707, &prop);
@ -1161,7 +1161,7 @@ void descend_schematic(int instnumber)
if(save_ok==-1) return; if(save_ok==-1) return;
} }
dbg(1, "type of instance: %s\n", (xctx->inst[selectedgroup[0].n].ptr+ xctx->sym)->type); dbg(1, "descend_schematic(): type of instance: %s\n", (xctx->inst[selectedgroup[0].n].ptr+ xctx->sym)->type);
if( /* do not descend if not subcircuit */ if( /* do not descend if not subcircuit */
(xctx->inst[selectedgroup[0].n].ptr+ xctx->sym)->type && (xctx->inst[selectedgroup[0].n].ptr+ xctx->sym)->type &&
@ -1214,9 +1214,9 @@ void descend_schematic(int instnumber)
if(inst_number < 0 ) inst_number += inst_mult+1; if(inst_number < 0 ) inst_number += inst_mult+1;
if(inst_number <1 || inst_number > inst_mult) inst_number = 1; /* any invalid number->descend to leftmost inst */ if(inst_number <1 || inst_number > inst_mult) inst_number = 1; /* any invalid number->descend to leftmost inst */
} }
dbg(1," inst_number=%d\n", inst_number); dbg(1,"descend_schematic(): inst_number=%d\n", inst_number);
my_strcat(15, &xctx->sch_path[xctx->currsch+1], find_nth(str, ',', inst_number)); my_strcat(15, &xctx->sch_path[xctx->currsch+1], find_nth(str, ',', inst_number));
dbg(1," inst_number=%d\n", inst_number); dbg(1,"descend_schematic(): inst_number=%d\n", inst_number);
my_strcat(16, &xctx->sch_path[xctx->currsch+1], "."); my_strcat(16, &xctx->sch_path[xctx->currsch+1], ".");
xctx->sch_inst_number[xctx->currsch+1] = inst_number; xctx->sch_inst_number[xctx->currsch+1] = inst_number;
dbg(1, "descend_schematic(): current path: %s\n", xctx->sch_path[xctx->currsch+1]); dbg(1, "descend_schematic(): current path: %s\n", xctx->sch_path[xctx->currsch+1]);

4
src/expandlabel.y
View File

@ -75,7 +75,7 @@ static char *expandlabel_strdup(char *src)
{ {
ptr=NULL; ptr=NULL;
my_strdup(122, &ptr,src); my_strdup(122, &ptr,src);
dbg(3, "expandlabel_strdup: duplicated %lu string %s\n",(unsigned long)ptr,src); dbg(3, "expandlabel_strdup(): duplicated %lu string %s\n",(unsigned long)ptr,src);
return ptr; return ptr;
} }
} }
@ -112,7 +112,7 @@ static char *my_strmult2(int n, char *s)
register char *pos,*prev; register char *pos,*prev;
char *str, *ss; char *str, *ss;
dbg(3, "my_strmult2: n=%d s=%s\n", n, s); dbg(3, "my_strmult2(): n=%d s=%s\n", n, s);
if(n==0) return expandlabel_strdup(""); if(n==0) return expandlabel_strdup("");
len=strlen(s); len=strlen(s);
prev=s; prev=s;

14
src/hilight.c
View File

@ -266,7 +266,7 @@ struct hilight_hashentry *bus_hilight_lookup(const char *token, int value, int r
{ {
*string_ptr='\0'; /* set end string at comma position.... */ *string_ptr='\0'; /* set end string at comma position.... */
/* insert one bus element at a time in hash table */ /* insert one bus element at a time in hash table */
dbg(2, "bus_hilight_lookup: inserting: %s, value:%d\n", start,value); dbg(2, "bus_hilight_lookup(): inserting: %s, value:%d\n", start,value);
ptr1=hilight_lookup(start, value, remove); ptr1=hilight_lookup(start, value, remove);
if(ptr1 && !ptr2) { if(ptr1 && !ptr2) {
ptr2=ptr1; /*return first non null entry */ ptr2=ptr1; /*return first non null entry */
@ -323,14 +323,14 @@ void hilight_net_pin_mismatches(void)
symbol = xctx->sym + xctx->inst[j].ptr; symbol = xctx->sym + xctx->inst[j].ptr;
npin = symbol->rects[PINLAYER]; npin = symbol->rects[PINLAYER];
rct=symbol->rect[PINLAYER]; rct=symbol->rect[PINLAYER];
dbg(1, "\n"); dbg(1, "delete_hilight_net(): \n");
for(i=0;i<npin;i++) { for(i=0;i<npin;i++) {
my_strdup(24, &labname,get_tok_value(rct[i].prop_ptr,"name",0)); my_strdup(24, &labname,get_tok_value(rct[i].prop_ptr,"name",0));
my_strdup(25, &lab, expandlabel(labname, &mult)); my_strdup(25, &lab, expandlabel(labname, &mult));
my_strdup(26, &netname, net_name(j,i,&mult, 0)); my_strdup(26, &netname, net_name(j,i,&mult, 0));
dbg(1, "i=%d labname=%s explabname = %s net = %s\n", i, labname, lab, netname); dbg(1, "delete_hilight_net(): i=%d labname=%s explabname = %s net = %s\n", i, labname, lab, netname);
if(netname && strcmp(lab, netname)) { if(netname && strcmp(lab, netname)) {
dbg(1, "hilight: %s\n", netname); dbg(1, "delete_hilight_net(): hilight: %s\n", netname);
bus_hilight_lookup(netname, hilight_color, XINSERT); bus_hilight_lookup(netname, hilight_color, XINSERT);
if(incr_hilight) hilight_color++; if(incr_hilight) hilight_color++;
} }
@ -408,7 +408,7 @@ void hilight_child_pins(void)
inst_number = xctx->sch_inst_number[xctx->currsch]; inst_number = xctx->sch_inst_number[xctx->currsch];
for(j=0;j<rects;j++) for(j=0;j<rects;j++)
{ {
dbg(1, "inst_number=%d\n", inst_number); dbg(1, "hilight_child_pins(): inst_number=%d\n", inst_number);
if(!xctx->inst[i].node[j]) continue; if(!xctx->inst[i].node[j]) continue;
my_strdup(508, &net_node, expandlabel(xctx->inst[i].node[j], &net_mult)); my_strdup(508, &net_node, expandlabel(xctx->inst[i].node[j], &net_mult));
@ -418,9 +418,9 @@ void hilight_child_pins(void)
my_strdup(521, &pin_node, expandlabel(pin_name, &mult)); my_strdup(521, &pin_node, expandlabel(pin_name, &mult));
dbg(1, "hilight_child_pins(): pin_node=%s\n", pin_node); dbg(1, "hilight_child_pins(): pin_node=%s\n", pin_node);
for(k = 1; k<=mult; k++) { for(k = 1; k<=mult; k++) {
dbg(1, "hilight_child_pins():looking nth net:%d, k=%d, inst_number=%d, mult=%d\n", dbg(1, "hilight_child_pins(): looking nth net:%d, k=%d, inst_number=%d, mult=%d\n",
(inst_number-1)*mult+k, k, inst_number, mult); (inst_number-1)*mult+k, k, inst_number, mult);
dbg(1, "hilight_child_pins():looking net:%s\n", find_nth(net_node, ',', dbg(1, "hilight_child_pins(): looking net:%s\n", find_nth(net_node, ',',
((inst_number - 1) * mult + k - 1) % net_mult + 1)); ((inst_number - 1) * mult + k - 1) % net_mult + 1));
xctx->currsch--; xctx->currsch--;
entry = bus_hilight_lookup(find_nth(net_node, ',', ((inst_number - 1) * mult + k - 1) % net_mult + 1), 0, XLOOKUP); entry = bus_hilight_lookup(find_nth(net_node, ',', ((inst_number - 1) * mult + k - 1) % net_mult + 1), 0, XLOOKUP);

4
src/netlist.c
View File

@ -71,7 +71,7 @@ void del_inst_table(void)
for(j=0;j<NBOXES;j++) for(j=0;j<NBOXES;j++)
insttable[i][j] = delinstentry(insttable[i][j]); insttable[i][j] = delinstentry(insttable[i][j]);
prepared_hash_instances=0; prepared_hash_instances=0;
dbg(1, "cleared object hash table\n"); dbg(1, "del_inst_table(): cleared object hash table\n");
} }
/* what: /* what:
@ -749,7 +749,7 @@ void prepare_netlist_structs(int for_netlist)
if (!(inst[i].node[0])) { if (!(inst[i].node[0])) {
my_strdup(65, &inst[i].node[0], get_tok_value((inst[i].ptr+ xctx->sym)->templ, "lab",1)); my_strdup(65, &inst[i].node[0], get_tok_value((inst[i].ptr+ xctx->sym)->templ, "lab",1));
dbg(1, "no lab attr on instance, pick from symbol: %s\n", inst[i].node[0]); dbg(1, "prepare_netlist_structs(): no lab attr on instance, pick from symbol: %s\n", inst[i].node[0]);
} }
/* handle global nodes (global=1 set as symbol property) 28032003 */ /* handle global nodes (global=1 set as symbol property) 28032003 */
if (!strcmp(type,"label") && global_node && !strcmp(global_node, "true")) { if (!strcmp(type,"label") && global_node && !strcmp(global_node, "true")) {

28
src/save.c
View File

@ -123,11 +123,11 @@ const char *create_tmpdir(char *prefix)
for(i=0; i<5;i++) { for(i=0; i<5;i++) {
my_snprintf(str, S(str), "%s%s", tclgetvar("XSCHEM_TMP_DIR"), random_string(prefix)); my_snprintf(str, S(str), "%s%s", tclgetvar("XSCHEM_TMP_DIR"), random_string(prefix));
if(stat(str, &buf) && !mkdir(str, 0700) ) { /* dir must not exist */ if(stat(str, &buf) && !mkdir(str, 0700) ) { /* dir must not exist */
dbg(1, "created dir: %s\n", str); dbg(1, "create_tmpdir(): created dir: %s\n", str);
return str; return str;
break; break;
} }
dbg(1, "failed to create %s\n", str); dbg(1, "create_tmpdir(): failed to create %s\n", str);
} }
fprintf(errfp, "create_tmpdir(): failed to create %s, aborting\n", str); fprintf(errfp, "create_tmpdir(): failed to create %s, aborting\n", str);
return NULL; /* failed to create random dir 5 times */ return NULL; /* failed to create random dir 5 times */
@ -150,11 +150,11 @@ FILE *open_tmpfile(char *prefix, char **filename)
my_snprintf(str, S(str), "%s%s", tclgetvar("XSCHEM_TMP_DIR"), random_string(prefix)); my_snprintf(str, S(str), "%s%s", tclgetvar("XSCHEM_TMP_DIR"), random_string(prefix));
*filename = str; *filename = str;
if(stat(str, &buf) && (fd = fopen(str, "w")) ) { /* file must not exist */ if(stat(str, &buf) && (fd = fopen(str, "w")) ) { /* file must not exist */
dbg(1, "created file: %s\n", str); dbg(1, "open_tmpfile(): created file: %s\n", str);
return fd; return fd;
break; break;
} }
dbg(1, "failed to create %s\n", str); dbg(1, "open_tmpfile(): failed to create %s\n", str);
} }
fprintf(errfp, "open_tmpfile(): failed to create %s, aborting\n", str); fprintf(errfp, "open_tmpfile(): failed to create %s, aborting\n", str);
return NULL; /* failed to create random filename 5 times */ return NULL; /* failed to create random filename 5 times */
@ -524,14 +524,14 @@ static void load_inst(int k, FILE *fd)
if(!tmp) return; if(!tmp) return;
dbg(1, "load_inst(): tmp=%s\n", tmp); dbg(1, "load_inst(): tmp=%s\n", tmp);
my_strncpy(name, tmp, S(name)); my_strncpy(name, tmp, S(name));
dbg(1, "load_inst() 1: name=%s\n", name); dbg(1, "load_inst(): 1: name=%s\n", name);
if(!strcmp(xctx->file_version,"1.0") ) { if(!strcmp(xctx->file_version,"1.0") ) {
dbg(1, "load_inst(): add_ext(name,\".sym\") = %s\n", add_ext(name, ".sym") ); dbg(1, "load_inst(): add_ext(name,\".sym\") = %s\n", add_ext(name, ".sym") );
my_strncpy(name, add_ext(name, ".sym"), S(name)); my_strncpy(name, add_ext(name, ".sym"), S(name));
} }
xctx->inst[i].name=NULL; xctx->inst[i].name=NULL;
my_strdup2(56, &xctx->inst[i].name, name); my_strdup2(56, &xctx->inst[i].name, name);
dbg(1, "load_inst() 2: name=%s\n", name); dbg(1, "load_inst(): 2: name=%s\n", name);
if(fscanf(fd, "%lf %lf %d %d",&xctx->inst[i].x0, &xctx->inst[i].y0,&xctx->inst[i].rot, &xctx->inst[i].flip) < 4) { if(fscanf(fd, "%lf %lf %d %d",&xctx->inst[i].x0, &xctx->inst[i].y0,&xctx->inst[i].rot, &xctx->inst[i].flip) < 4) {
fprintf(errfp,"WARNING: missing fields for INSTANCE object, ignoring.\n"); fprintf(errfp,"WARNING: missing fields for INSTANCE object, ignoring.\n");
@ -1675,7 +1675,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
ORDER(ll[c][i].x1, ll[c][i].y1, ll[c][i].x2, ll[c][i].y2); ORDER(ll[c][i].x1, ll[c][i].y1, ll[c][i].x2, ll[c][i].y2);
ll[c][i].prop_ptr=NULL; ll[c][i].prop_ptr=NULL;
load_ascii_string( &ll[c][i].prop_ptr, lcc[level].fd); load_ascii_string( &ll[c][i].prop_ptr, lcc[level].fd);
dbg(2, "l_d_s(): loaded line: ptr=%lx\n", (unsigned long)ll[c]); dbg(2, "l_s_d(): loaded line: ptr=%lx\n", (unsigned long)ll[c]);
if(!strcmp(get_tok_value(ll[c][i].prop_ptr,"bus", 0), "true") ) if(!strcmp(get_tok_value(ll[c][i].prop_ptr,"bus", 0), "true") )
ll[c][i].bus = 1; ll[c][i].bus = 1;
else else
@ -1731,7 +1731,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
pp[c][i].dash = 0; pp[c][i].dash = 0;
pp[c][i].sel = 0; pp[c][i].sel = 0;
dbg(2, "l_d_s(): loaded polygon: ptr=%lx\n", (unsigned long)pp[c]); dbg(2, "l_s_d(): loaded polygon: ptr=%lx\n", (unsigned long)pp[c]);
lastp[c]++; lastp[c]++;
break; break;
case 'A': case 'A':
@ -1776,7 +1776,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
} else } else
aa[c][i].dash = 0; aa[c][i].dash = 0;
aa[c][i].sel = 0; aa[c][i].sel = 0;
dbg(2, "l_d_s(): loaded arc: ptr=%lx\n", (unsigned long)aa[c]); dbg(2, "l_s_d(): loaded arc: ptr=%lx\n", (unsigned long)aa[c]);
lasta[c]++; lasta[c]++;
break; break;
case 'B': case 'B':
@ -1801,7 +1801,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
RECTORDER(bb[c][i].x1, bb[c][i].y1, bb[c][i].x2, bb[c][i].y2); RECTORDER(bb[c][i].x1, bb[c][i].y1, bb[c][i].x2, bb[c][i].y2);
bb[c][i].prop_ptr=NULL; bb[c][i].prop_ptr=NULL;
load_ascii_string( &bb[c][i].prop_ptr, lcc[level].fd); load_ascii_string( &bb[c][i].prop_ptr, lcc[level].fd);
dbg(2, "l_d_s(): loaded rect: ptr=%lx\n", (unsigned long)bb[c]); dbg(2, "l_s_d(): loaded rect: ptr=%lx\n", (unsigned long)bb[c]);
dash = get_tok_value(bb[c][i].prop_ptr,"dash", 0); dash = get_tok_value(bb[c][i].prop_ptr,"dash", 0);
if( strcmp(dash, "") ) { if( strcmp(dash, "") ) {
int d = atoi(dash); int d = atoi(dash);
@ -1835,7 +1835,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
my_snprintf(lay, S(lay), " layer=%d", WIRELAYER); my_snprintf(lay, S(lay), " layer=%d", WIRELAYER);
my_strcat(1163, &tt[i].prop_ptr, lay); my_strcat(1163, &tt[i].prop_ptr, lay);
} }
dbg(1, "l_d_s(): loaded text : t=%s p=%s\n", tt[i].txt_ptr, tt[i].prop_ptr ? tt[i].prop_ptr : "NULL"); dbg(1, "l_s_d(): loaded text : t=%s p=%s\n", tt[i].txt_ptr, tt[i].prop_ptr ? tt[i].prop_ptr : "NULL");
my_strdup(351, &tt[i].font, get_tok_value(tt[i].prop_ptr, "font", 0)); my_strdup(351, &tt[i].font, get_tok_value(tt[i].prop_ptr, "font", 0));
str = get_tok_value(tt[i].prop_ptr, "hcenter", 0); str = get_tok_value(tt[i].prop_ptr, "hcenter", 0);
tt[i].hcenter = strcmp(str, "true") ? 0 : 1; tt[i].hcenter = strcmp(str, "true") ? 0 : 1;
@ -1871,7 +1871,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
ORDER(ll[WIRELAYER][i].x1, ll[WIRELAYER][i].y1, ll[WIRELAYER][i].x2, ll[WIRELAYER][i].y2); ORDER(ll[WIRELAYER][i].x1, ll[WIRELAYER][i].y1, ll[WIRELAYER][i].x2, ll[WIRELAYER][i].y2);
ll[WIRELAYER][i].prop_ptr=NULL; ll[WIRELAYER][i].prop_ptr=NULL;
load_ascii_string( &ll[WIRELAYER][i].prop_ptr, lcc[level].fd); load_ascii_string( &ll[WIRELAYER][i].prop_ptr, lcc[level].fd);
dbg(2, "l_d_s(): loaded line: ptr=%lx\n", (unsigned long)ll[WIRELAYER]); dbg(2, "l_s_d(): loaded line: ptr=%lx\n", (unsigned long)ll[WIRELAYER]);
ll[WIRELAYER][i].dash = 0; ll[WIRELAYER][i].dash = 0;
if(!strcmp(get_tok_value(ll[WIRELAYER][i].prop_ptr, "bus", 0), "true")) if(!strcmp(get_tok_value(ll[WIRELAYER][i].prop_ptr, "bus", 0), "true"))
ll[WIRELAYER][i].bus = 1; ll[WIRELAYER][i].bus = 1;
@ -1882,7 +1882,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
break; break;
case 'C': case 'C':
load_ascii_string(&symname, lcc[level].fd); load_ascii_string(&symname, lcc[level].fd);
dbg(1, "C line: symname=%s\n", symname); dbg(1, "l_s_d(): C line: symname=%s\n", symname);
if (fscanf(lcc[level].fd, "%lf %lf %d %d", &inst_x0, &inst_y0, &inst_rot, &inst_flip) < 4) { if (fscanf(lcc[level].fd, "%lf %lf %d %d", &inst_x0, &inst_y0, &inst_rot, &inst_flip) < 4) {
fprintf(errfp, "WARNING: missing fields for COMPONENT object, ignoring\n"); fprintf(errfp, "WARNING: missing fields for COMPONENT object, ignoring\n");
read_line(lcc[level].fd, 0); read_line(lcc[level].fd, 0);
@ -2027,7 +2027,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
} else { } else {
symbol[symbols].flags &= ~EMBEDDED; symbol[symbols].flags &= ~EMBEDDED;
} }
dbg(2, "l_d_s(): finished parsing file\n"); dbg(2, "l_s_d(): finished parsing file\n");
for(c=0;c<cadlayers;c++) for(c=0;c<cadlayers;c++)
{ {
symbol[symbols].arcs[c] = lasta[c]; symbol[symbols].arcs[c] = lasta[c];

18
src/scheduler.c
View File

@ -37,7 +37,7 @@ void statusmsg(char str[],int n)
{ {
my_snprintf(s, S(s), ".statusbar.1 configure -text $infowindow_text", str); my_snprintf(s, S(s), ".statusbar.1 configure -text $infowindow_text", str);
dbg(3, "statusmsg(): n = %d, %s\n", n, s); dbg(3, "statusmsg(): n = %d, %s\n", n, s);
dbg(3, " --> $infowindow_text = %s\n", tclgetvar("infowindow_text")); dbg(3, "statusmsg(): -> $infowindow_text = %s\n", tclgetvar("infowindow_text"));
tcleval(s); tcleval(s);
} }
@ -98,7 +98,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
} }
else if(!strcmp(argv[1],"set_netlist_dir") && argc==3) { else if(!strcmp(argv[1],"set_netlist_dir") && argc==3) {
dbg(1, "xschem set_netlist_dir: argv[2] = %s\n", argv[2]); dbg(1, "scheduler(): xschem set_netlist_dir: argv[2] = %s\n", argv[2]);
my_strdup(0, &netlist_dir, argv[2]); my_strdup(0, &netlist_dir, argv[2]);
} }
@ -154,7 +154,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
else if(!strcmp(argv[1],"fullscreen")) else if(!strcmp(argv[1],"fullscreen"))
{ {
dbg(1, "scheduler: xschem fullscreen, fullscreen=%d\n", fullscreen); dbg(1, "scheduler(): xschem fullscreen, fullscreen=%d\n", fullscreen);
toggle_fullscreen(); toggle_fullscreen();
Tcl_ResetResult(interp); Tcl_ResetResult(interp);
} }
@ -262,7 +262,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
else if(!strcmp(argv[1],"zoom_box")) else if(!strcmp(argv[1],"zoom_box"))
{ {
double x1, y1, x2, y2, yy1, factor; double x1, y1, x2, y2, yy1, factor;
dbg(1, "xschem zoom_box: argc=%d, argv[2]=%s\n", argc, argv[2]); dbg(1, "scheduler(): xschem zoom_box: argc=%d, argv[2]=%s\n", argc, argv[2]);
if(argc==6 || argc == 7) { if(argc==6 || argc == 7) {
x1 = atof(argv[2]); x1 = atof(argv[2]);
y1 = atof(argv[3]); y1 = atof(argv[3]);
@ -649,7 +649,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
Tcl_AppendResult(interp, tmp, NULL); Tcl_AppendResult(interp, tmp, NULL);
} else if(strstr(argv[4], "cell::") ) { } else if(strstr(argv[4], "cell::") ) {
tmp = get_tok_value( (xctx->inst[i].ptr+ xctx->sym)->prop_ptr, argv[4]+6, 0); tmp = get_tok_value( (xctx->inst[i].ptr+ xctx->sym)->prop_ptr, argv[4]+6, 0);
dbg(1, "xschem getprop: looking up instance %d prop cell::|%s| : |%s|\n", i, argv[4]+6, tmp); dbg(1, "scheduler(): xschem getprop: looking up instance %d prop cell::|%s| : |%s|\n", i, argv[4]+6, tmp);
Tcl_AppendResult(interp, tmp, NULL); Tcl_AppendResult(interp, tmp, NULL);
} else { } else {
Tcl_AppendResult(interp, get_tok_value(xctx->inst[i].prop_ptr, argv[4], 0), NULL); Tcl_AppendResult(interp, get_tok_value(xctx->inst[i].prop_ptr, argv[4], 0), NULL);
@ -928,7 +928,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
} }
else saveas(NULL, SCHEMATIC); else saveas(NULL, SCHEMATIC);
} else if(!strcmp(argv[1],"save")) { } else if(!strcmp(argv[1],"save")) {
dbg(1, "xschem(): saving: current schematic\n"); dbg(1, "scheduler(): saving: current schematic\n");
if(!strcmp(xctx->sch[xctx->currsch],"")) { /* 20170622 check if unnamed schematic, use saveas in this case... */ if(!strcmp(xctx->sch[xctx->currsch],"")) { /* 20170622 check if unnamed schematic, use saveas in this case... */
saveas(NULL, SCHEMATIC); saveas(NULL, SCHEMATIC);
@ -1236,7 +1236,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
else if(!strcmp(argv[1],"load_symbol") ) else if(!strcmp(argv[1],"load_symbol") )
{ {
if(argc==3) { if(argc==3) {
dbg(1, "xschem(): load: filename=%s\n", argv[2]); dbg(1, "scheduler(): load: filename=%s\n", argv[2]);
delete_hilight_net(); delete_hilight_net();
xctx->currsch = 0; xctx->currsch = 0;
unselect_all(); unselect_all();
@ -1254,7 +1254,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
tcleval("catch { ngspice::resetdata }"); tcleval("catch { ngspice::resetdata }");
if(argc==3) { if(argc==3) {
if(!has_x || !modified || !save(1) ) { /* save(1)==1 --> user cancel */ if(!has_x || !modified || !save(1) ) { /* save(1)==1 --> user cancel */
dbg(1, "xschem(): load: filename=%s\n", argv[2]); dbg(1, "scheduler(): load: filename=%s\n", argv[2]);
delete_hilight_net(); delete_hilight_net();
xctx->currsch = 0; xctx->currsch = 0;
unselect_all(); unselect_all();
@ -1859,7 +1859,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
int slen = strlen(s); int slen = strlen(s);
if (s[slen - 1] == '/') s[slen - 1] = '\0'; if (s[slen - 1] == '/') s[slen - 1] = '\0';
strcpy(win_temp_dir, s); strcpy(win_temp_dir, s);
dbg(2, "win_temp_dir is %s\n", win_temp_dir); dbg(2, "scheduler(): win_temp_dir is %s\n", win_temp_dir);
Tcl_AppendResult(interp, s, NULL); Tcl_AppendResult(interp, s, NULL);
} }
} }

22
src/token.c
View File

@ -113,7 +113,7 @@ static struct inst_hashentry *inst_hash_lookup(struct inst_hashentry **table, ch
} else if(remove == XINSERT) { } else if(remove == XINSERT) {
entry->value = value; entry->value = value;
} }
/* dbg(1, "inst_hash_lookup: returning: %s , %d\n", entry->token, entry->value); */ /* dbg(1, "inst_hash_lookup(): returning: %s , %d\n", entry->token, entry->value); */
return entry; /* found matching entry, return the address */ return entry; /* found matching entry, return the address */
} }
preventry=&entry->next; /* descend into the list. */ preventry=&entry->next; /* descend into the list. */
@ -208,7 +208,7 @@ void check_unique_names(int rename)
else start = comma_pos; else start = comma_pos;
comma_pos = strchr(start, ','); comma_pos = strchr(start, ',');
if(comma_pos) *comma_pos = '\0'; if(comma_pos) *comma_pos = '\0';
dbg(1, "check_unique_names: checking %s\n", start); dbg(1, "check_unique_names(): checking %s\n", start);
if( (entry = inst_hash_lookup(table, start, i, XINSERT_NOREPLACE, strlen(start)) ) && entry->value != i) { if( (entry = inst_hash_lookup(table, start, i, XINSERT_NOREPLACE, strlen(start)) ) && entry->value != i) {
xctx->inst[i].flags |=4; xctx->inst[i].flags |=4;
hilight_nets=1; hilight_nets=1;
@ -652,7 +652,7 @@ char *get_pin_attr_from_inst(int inst, int pin, const char *attr)
const char *str; const char *str;
dbg(1, "get_pin_attr_from_inst: inst=%d pin=%d attr=%s\n", inst, pin, attr); dbg(1, "get_pin_attr_from_inst(): inst=%d pin=%d attr=%s\n", inst, pin, attr);
pin_attr_value = NULL; pin_attr_value = NULL;
str = get_tok_value((xctx->inst[inst].ptr+ xctx->sym)->rect[PINLAYER][pin].prop_ptr,"name",0); str = get_tok_value((xctx->inst[inst].ptr+ xctx->sym)->rect[PINLAYER][pin].prop_ptr,"name",0);
if(str[0]) { if(str[0]) {
@ -668,7 +668,7 @@ char *get_pin_attr_from_inst(int inst, int pin, const char *attr)
pnumber = my_malloc(52, attr_size + 100); pnumber = my_malloc(52, attr_size + 100);
my_snprintf(pnumber, attr_size + 100, "%s(%d)", attr, pin); my_snprintf(pnumber, attr_size + 100, "%s(%d)", attr, pin);
str = get_tok_value(xctx->inst[inst].prop_ptr, pnumber, 0); str = get_tok_value(xctx->inst[inst].prop_ptr, pnumber, 0);
dbg(1, "get_pin_attr_from_inst: pnumber=%s\n", pnumber); dbg(1, "get_pin_attr_from_inst(): pnumber=%s\n", pnumber);
my_free(983, &pnumber); my_free(983, &pnumber);
if(get_tok_size) my_strdup2(40, &pin_attr_value, str); if(get_tok_size) my_strdup2(40, &pin_attr_value, str);
} }
@ -775,7 +775,7 @@ const char *subst_token(const char *s, const char *tok, const char *new_val)
my_strdup2(458, &result, s); my_strdup2(458, &result, s);
return result; return result;
} }
dbg(1, "subst_token(%s, %s, %s)\n", s, tok, new_val); dbg(1, "subst_token(): %s, %s, %s\n", s, tok, new_val);
sizetok = size = CADCHUNKALLOC; sizetok = size = CADCHUNKALLOC;
my_realloc(1152, &result, size); my_realloc(1152, &result, size);
my_realloc(1153, &token, sizetok); my_realloc(1153, &token, sizetok);
@ -1457,7 +1457,7 @@ void print_spice_element(FILE *fd, int inst)
} }
no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER]; no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER];
s=format; s=format;
dbg(1, "print_spice_element: name=%s, format=%s netlist_count=%d\n",name,format, netlist_count); dbg(1, "print_spice_element(): name=%s, format=%s netlist_count=%d\n",name,format, netlist_count);
/* begin parsing format string */ /* begin parsing format string */
while(1) while(1)
{ {
@ -1479,7 +1479,7 @@ void print_spice_element(FILE *fd, int inst)
( (!space && c != '$' && c != '@') && escape ) ( (!space && c != '$' && c != '@') && escape )
) )
) { ) {
dbg(1, "print_spice_element: c=%c, space=%d, escape=%d roken_pos=%d\n", c, space, escape, token_pos); dbg(1, "print_spice_element(): c=%c, space=%d, escape=%d roken_pos=%d\n", c, space, escape, token_pos);
state=TOK_SEP; state=TOK_SEP;
} }
STR_ALLOC(&token, token_pos, &sizetok); STR_ALLOC(&token, token_pos, &sizetok);
@ -1618,7 +1618,7 @@ void print_spice_element(FILE *fd, int inst)
tclcmd = my_malloc(488, s); tclcmd = my_malloc(488, s);
Tcl_ResetResult(interp); Tcl_ResetResult(interp);
my_snprintf(tclcmd, s, "tclpropeval {%s} {%s} {%s}", token, name, xctx->inst[inst].name); my_snprintf(tclcmd, s, "tclpropeval {%s} {%s} {%s}", token, name, xctx->inst[inst].name);
dbg(1, "tclpropeval {%s} {%s} {%s}", token, name, xctx->inst[inst].name); dbg(1, "print_spice_element(): tclpropeval {%s} {%s} {%s}", token, name, xctx->inst[inst].name);
res = tcleval(tclcmd); res = tcleval(tclcmd);
tmp = strlen(res) + 100; /* always make room for some extra chars tmp = strlen(res) + 100; /* always make room for some extra chars
@ -1778,7 +1778,7 @@ void print_tedax_element(FILE *fd, int inst)
if(format) { if(format) {
s=format; s=format;
dbg(1, "print_tedax_element: name=%s, tedax_format=%s netlist_count=%d\n",name,format, netlist_count); dbg(1, "print_tedax_element(): name=%s, tedax_format=%s netlist_count=%d\n",name,format, netlist_count);
/* begin parsing format string */ /* begin parsing format string */
while(1) while(1)
{ {
@ -2171,7 +2171,7 @@ void print_vhdl_primitive(FILE *fd, int inst) /* netlist primitives, 20071217 *
} }
no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER]; no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER];
s=format; s=format;
dbg(1, "print_vhdl_primitive: name=%s, format=%s netlist_count=%d\n",name,format, netlist_count); dbg(1, "print_vhdl_primitive(): name=%s, format=%s netlist_count=%d\n",name,format, netlist_count);
fprintf(fd, "---- start primitive "); fprintf(fd, "---- start primitive ");
lab=expandlabel(name, &tmp); lab=expandlabel(name, &tmp);
@ -2344,7 +2344,7 @@ void print_verilog_primitive(FILE *fd, int inst) /* netlist switch level primiti
} }
no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER]; no_of_pins= (xctx->inst[inst].ptr+ xctx->sym)->rects[PINLAYER];
s=format; s=format;
dbg(1, "print_verilog_primitive: name=%s, format=%s netlist_count=%d\n",name,format, netlist_count); dbg(1, "print_verilog_primitive(): name=%s, format=%s netlist_count=%d\n",name,format, netlist_count);
fprintf(fd, "---- start primitive "); fprintf(fd, "---- start primitive ");
lab=expandlabel(name, &tmp); lab=expandlabel(name, &tmp);