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

removed changes in strings due to variable refactoring

This commit is contained in:
Stefan Schippers 2020-10-15 17:05:30 +02:00
parent 6d96c8bd61
commit 0eb706a67e
12 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/actions.c
View File

@ -925,7 +925,7 @@ int place_symbol(int pos, const char *symbol_name, double x, double y, int rot,
n=pos;
}
/* 03-02-2000 */
dbg(1, "place_symbol(): checked inst_ptr storage, xctx.sym number i=%d\n", i);
dbg(1, "place_symbol(): checked inst_ptr storage, sym number i=%d\n", i);
xctx.inst[n].ptr = i;
xctx.inst[n].name=NULL;
xctx.inst[n].instname=NULL;
@ -1194,7 +1194,7 @@ void descend_schematic(int instnumber)
prepare_netlist_structs(0);
if(enable_drill) drill_hilight();
}
dbg(1, "descend_schematic(): before xctx.zoom(): prepared_hash_instances=%d\n", prepared_hash_instances);
dbg(1, "descend_schematic(): before zoom(): prepared_hash_instances=%d\n", prepared_hash_instances);
zoom_full(1, 0);
}
}
@ -1545,7 +1545,7 @@ void zoom_box(int what)
xctx.mooz=1/xctx.zoom;
change_linewidth(-1.);
draw();
dbg(1, "zoom_box(): coord: %.16g %.16g %.16g %.16g xctx.zoom=%.16g\n",x1,y1,mousex_snap, mousey_snap,xctx.zoom);
dbg(1, "zoom_box(): coord: %.16g %.16g %.16g %.16g zoom=%.16g\n",x1,y1,mousex_snap, mousey_snap,xctx.zoom);
}
if(what & RUBBER)
{

2
src/draw.c
View File

@ -405,7 +405,7 @@ void draw_string(int layer, int what, const char *str, int rot, int flip, int hc
if(str==NULL || !has_x ) return;
dbg(2, "draw_string(): string=%s\n",str);
if(xscale*FONTWIDTH*xctx.mooz<1) {
dbg(1, "draw_string(): xscale=%.16g xctx.zoom=%.16g \n",xscale,xctx.zoom);
dbg(1, "draw_string(): xscale=%.16g zoom=%.16g \n",xscale,xctx.zoom);
return;
}
else {

2
src/editprop.c
View File

@ -1082,7 +1082,7 @@ void update_symbol(const char *result, int x)
else
name[1]=prefix; /* change prefix if changing symbol type; */
}
dbg(1, "update_symbol(): name=%s, xctx.inst[i].prop_ptr=%s\n", name, xctx.inst[i].prop_ptr);
dbg(1, "update_symbol(): name=%s, inst[i].prop_ptr=%s\n", name, xctx.inst[i].prop_ptr);
my_strdup(89, &ptr,subst_token(xctx.inst[i].prop_ptr, "name", name) );
/* set name of current inst */

4
src/findnet.c
View File

@ -256,7 +256,7 @@ void find_closest_element(double mx,double my)
{
r = i; distance = tmp*0.1;
}
dbg(2, "find_closest_element(): finding closest element, xctx.instances=%d, dist=%.16g\n",i,tmp);
dbg(2, "find_closest_element(): finding closest element, instances=%d, dist=%.16g\n",i,tmp);
}
} /* end for i */
if( r!=-1 )
@ -291,7 +291,7 @@ void find_closest_text(double mx,double my)
if(POINTINSIDE(mx,my,xx1,yy1, xx2, yy2))
{
r = i; distance = 0;
dbg(2, "find_closest_text(): finding closest text, xctx.texts=%d, dist=%.16g\n",i,distance);
dbg(2, "find_closest_text(): finding closest text, texts=%d, dist=%.16g\n",i,distance);
}
} /* end for i */
if( distance <= threshold && r!=-1)

8
src/hash_iterator.c
View File

@ -33,7 +33,7 @@ static unsigned short *wireflag=NULL;
void init_inst_iterator(double x1, double y1, double x2, double y2)
{
dbg(3, "init_inst_iterator(): xctx.instances=%d\n", xctx.instances);
dbg(3, "init_inst_iterator(): instances=%d\n", xctx.instances);
my_realloc(135, &instflag, xctx.instances*sizeof(unsigned short));
memset(instflag, 0, xctx.instances*sizeof(unsigned short));
/* calculate square 4 1st corner of drawing area */
@ -58,7 +58,7 @@ void init_inst_iterator(double x1, double y1, double x2, double y2)
struct instentry *inst_iterator_next()
{
struct instentry *ptr;
dbg(3, "inst_iterator_next(): xctx.instances=%d\n", xctx.instances);
dbg(3, "inst_iterator_next(): instances=%d\n", xctx.instances);
while(1) {
while(instanceptr) {
ptr = instanceptr;
@ -91,7 +91,7 @@ struct instentry *inst_iterator_next()
void init_wire_iterator(double x1, double y1, double x2, double y2)
{
dbg(3, "init_wire_iterator(): xctx.wires=%d\n", xctx.wires);
dbg(3, "init_wire_iterator(): wires=%d\n", xctx.wires);
my_realloc(136, &wireflag, xctx.wires*sizeof(unsigned short));
memset(wireflag, 0, xctx.wires*sizeof(unsigned short));
/* calculate square 4 1st corner of drawing area */
@ -116,7 +116,7 @@ void init_wire_iterator(double x1, double y1, double x2, double y2)
struct wireentry *wire_iterator_next()
{
struct wireentry *ptr;
dbg(3, "wire_iterator_next(): xctx.wires=%d\n", xctx.wires);
dbg(3, "wire_iterator_next(): wires=%d\n", xctx.wires);
while(1) {
while(wireptr) {
ptr = wireptr;

2
src/hilight.c
View File

@ -315,7 +315,7 @@ void hilight_parent_pins(void)
prepare_netlist_structs(0);
i=xctx.previous_instance[xctx.currsch];
inst_number = xctx.sch_inst_number[xctx.currsch+1];
dbg(1, "hilight_parent_pins(): xctx.previous_instance=%d\n", xctx.previous_instance[xctx.currsch]);
dbg(1, "hilight_parent_pins(): previous_instance=%d\n", xctx.previous_instance[xctx.currsch]);
dbg(1, "hilight_parent_pins(): inst_number=%d\n", inst_number);
rects = (xctx.inst[i].ptr+ xctx.sym)->rects[PINLAYER];

14
src/save.c
View File

@ -799,8 +799,8 @@ void read_xschem_file(FILE *fd)
found=0;
for(i=0;i<xctx.symbols;i++)
{
dbg(1, "read_xschem_file(): xctx.sym[i].name=%s, name_embedded=%s\n", xctx.sym[i].name, name_embedded);
dbg(1, "read_xschem_file(): xctx.inst[xctx.instances-1].name=%s\n", xctx.inst[xctx.instances-1].name);
dbg(1, "read_xschem_file(): sym[i].name=%s, name_embedded=%s\n", xctx.sym[i].name, name_embedded);
dbg(1, "read_xschem_file(): inst[instances-1].name=%s\n", xctx.inst[xctx.instances-1].name);
/* symbol has already been loaded: skip [..] */
if(!strcmp(xctx.sym[i].name, xctx.inst[xctx.instances-1].name)) {
found=1; break;
@ -843,7 +843,7 @@ void read_xschem_file(FILE *fd)
if(check_version && !version_found) return;
if(!xctx.file_version[0]) {
my_snprintf(xctx.file_version, S(xctx.file_version), "1.0");
dbg(1, "read_xschem_file(): no xctx.file_version, assuming xctx.file_version=%s\n", xctx.file_version);
dbg(1, "read_xschem_file(): no file_version, assuming file_version=%s\n", xctx.file_version);
}
}
}
@ -909,8 +909,8 @@ int save_schematic(const char *schname) /* 20171020 added return value */
if( strcmp(schname,"") ) my_strncpy(xctx.sch[xctx.currsch], schname, S(xctx.sch[xctx.currsch]));
else return -1;
dbg(1, "save_schematic(): xctx.currsch=%d name=%s\n",xctx.currsch, schname);
dbg(1, "save_schematic(): xctx.sch[xctx.currsch]=%s\n", xctx.sch[xctx.currsch]);
dbg(1, "save_schematic(): currsch=%d name=%s\n",xctx.currsch, schname);
dbg(1, "save_schematic(): sch[currsch]=%s\n", xctx.sch[xctx.currsch]);
dbg(1, "save_schematic(): abs_sym_path=%s\n", abs_sym_path(xctx.sch[xctx.currsch], ""));
my_strncpy(name, xctx.sch[xctx.currsch], S(name));
if(has_x) {
@ -983,7 +983,7 @@ void load_schematic(int load_symbols, const char *filename, int reset_undo) /* 2
tcleval(msg);
my_strncpy(xctx.current_name, rel_sym_path(name), S(xctx.current_name));
dbg(1, "load_schematic(): opening file for loading:%s, filename=%s\n", name, filename);
dbg(1, "load_schematic(): xctx.sch[xctx.currsch]=%s\n", xctx.sch[xctx.currsch]);
dbg(1, "load_schematic(): sch[currsch]=%s\n", xctx.sch[xctx.currsch]);
if(!name[0]) return;
if(event_reporting) {
char n[PATH_MAX];
@ -1447,7 +1447,7 @@ void calc_symbol_bbox(int pos)
tmp.x1=xctx.sym[pos].line[c][i].x1;tmp.y1=xctx.sym[pos].line[c][i].y1;
tmp.x2=xctx.sym[pos].line[c][i].x2;tmp.y2=xctx.sym[pos].line[c][i].y2;
updatebbox(count,&boundbox,&tmp);
dbg(2, "calc_symbol_bbox(): xctx.line[%d][%d]: %g %g %g %g\n",
dbg(2, "calc_symbol_bbox(): line[%d][%d]: %g %g %g %g\n",
c, i, tmp.x1,tmp.y1,tmp.x2,tmp.y2);
}
for(i=0;i<xctx.sym[pos].arcs[c];i++)

2
src/select.c
View File

@ -627,7 +627,7 @@ void select_wire(int i,unsigned short select_mode, int fast)
else
xctx.wire[i].sel = select_mode;
if(select_mode) {
dbg(1, "select(): xctx.wire[%d].end1=%d, ,end2=%d\n", i, xctx.wire[i].end1, xctx.wire[i].end2);
dbg(1, "select(): wire[%d].end1=%d, ,end2=%d\n", i, xctx.wire[i].end1, xctx.wire[i].end2);
if(xctx.wire[i].bus)
drawtempline(gc[SELLAYER], THICK, xctx.wire[i].x1, xctx.wire[i].y1, xctx.wire[i].x2, xctx.wire[i].y2);
else

2
src/store.c
View File

@ -55,7 +55,7 @@ void check_symbol_storage(void)
int i;
if(xctx.symbols >= xctx.maxs)
{
dbg(1, "check_symbol_storage(): more than xctx.maxs, %s\n",
dbg(1, "check_symbol_storage(): more than maxs, %s\n",
xctx.sch[xctx.currsch] );
xctx.maxs=(1 + xctx.symbols / ELEMDEF) * ELEMDEF;
my_realloc(395, &xctx.sym, sizeof(xSymbol)*xctx.maxs);

2
src/token.c
View File

@ -257,7 +257,7 @@ int match_symbol(const char *name) /* never returns -1, if symbol not found loa
found=0;
for(i=0;i<xctx.symbols;i++)
{
/* dbg(1, "match_symbol(): name=%s, xctx.sym[i].name=%s\n",name, xctx.sym[i].name);*/
/* dbg(1, "match_symbol(): name=%s, sym[i].name=%s\n",name, xctx.sym[i].name);*/
if(strcmp(name, xctx.sym[i].name) == 0)
{
dbg(1, "match_symbol(): found matching symbol:%s\n",name);

2
src/verilog_netlist.c
View File

@ -91,7 +91,7 @@ void global_verilog_netlist(int global) /* netlister driver */
unselect_all();
remove_symbols(); /* removed 25122002, readded 04112003 */
dbg(1, "global_verilog_netlist(): xctx.sch[xctx.currsch]=%s\n", xctx.sch[xctx.currsch]);
dbg(1, "global_verilog_netlist(): sch[currsch]=%s\n", xctx.sch[xctx.currsch]);
load_schematic(1,xctx.sch[xctx.currsch] ,0);

2
src/xinit.c
View File

@ -509,7 +509,7 @@ void alloc_xschem_data()
xctx.arc[i]=my_calloc(629, xctx.maxa[i],sizeof(xArc));
if(xctx.arc[i]==NULL){
fprintf(errfp, "Tcl_AppInit(): xctx.arc[] calloc error\n");tcleval( "exit");
fprintf(errfp, "Tcl_AppInit(): arc[] calloc error\n");tcleval( "exit");
}
xctx.poly[i]=my_calloc(630, xctx.maxp[i],sizeof(xPoly));