luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Bug #793 - "breakp.c error: compling without XSPICE failed". 

Additional changes to conditional compilation are needed for
iplot without XSPICE.
This commit is contained in:
Giles Atkinson 2025-06-04 09:47:38 +01:00
parent 30ab455b64
commit 4fcb74779e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/breakp.c
View File

@ -293,7 +293,11 @@ com_iplot(wordlist *wl)
d = TMALLOC(struct dbcomm, 1); d = TMALLOC(struct dbcomm, 1);
d->db_analysis = NULL; d->db_analysis = NULL;
d->db_number = debugnumber++; d->db_number = debugnumber++;
#ifdef XSPICE
d->db_iteration = event_auto_incr ? DB_AUTO_OFFSET : DB_NORMAL; d->db_iteration = event_auto_incr ? DB_AUTO_OFFSET : DB_NORMAL;
#else
d->db_iteration = DB_NORMAL;
#endif
d->db_op = initial_steps; // Field re-use d->db_op = initial_steps; // Field re-use
d->db_value1 = window; // Field re-use d->db_value1 = window; // Field re-use

21
src/frontend/plotting/graf.c
View File

@ -1329,10 +1329,10 @@ void gr_iplot(struct plot *plot)
hit = 0; hit = 0;
for (db = dbs; db; db = db->db_next) { for (db = dbs; db; db = db->db_next) {
if (db->db_type == DB_IPLOT || db->db_type == DB_IPLOTALL) { if (db->db_type == DB_IPLOT || db->db_type == DB_IPLOTALL) {
#ifdef XSPICE
if (db->db_iteration > 0) { if (db->db_iteration > 0) {
double event_node_offset = 0, event_node_spacing;
struct dvec *v; struct dvec *v;
#ifdef XSPICE
double event_node_offset = 0, event_node_spacing;
/* First call: set up event nodes spacing. */ /* First call: set up event nodes spacing. */
@ -1348,7 +1348,7 @@ void gr_iplot(struct plot *plot)
} else { } else {
event_node_spacing = 0; event_node_spacing = 0;
} }
#endif
/* Find any XSPICE event nodes in the node /* Find any XSPICE event nodes in the node
* list and set up plotting. There is a parallel path * list and set up plotting. There is a parallel path
* for pushing new event values into their corresponding * for pushing new event values into their corresponding
@ -1356,9 +1356,11 @@ void gr_iplot(struct plot *plot)
*/ */
for (dc = db; dc; dc = dc->db_also) { for (dc = db; dc; dc = dc->db_also) {
struct dbcomm *dd; struct dbcomm *dd;
char *offp, save_sign; int dup = 0;
int dup = 0; #ifdef XSPICE
char *offp, save_sign;
#endif
if (dc->db_nodename1 == NULL) if (dc->db_nodename1 == NULL)
continue; continue;
@ -1374,6 +1376,7 @@ void gr_iplot(struct plot *plot)
if (dup) if (dup)
continue; continue;
#ifdef XSPICE
/* Check for a nodename that is an expression. */ /* Check for a nodename that is an expression. */
offp = strchr(dc->db_nodename1, '+'); offp = strchr(dc->db_nodename1, '+');
@ -1383,7 +1386,7 @@ void gr_iplot(struct plot *plot)
save_sign = *offp; save_sign = *offp;
*offp = '\0'; // Trim to bare name. *offp = '\0'; // Trim to bare name.
} }
#endif
v = vec_fromplot(dc->db_nodename1, plot); v = vec_fromplot(dc->db_nodename1, plot);
if (v) { if (v) {
dc->db_nodename2 = (char *)v; // Save link to vector. dc->db_nodename2 = (char *)v; // Save link to vector.
@ -1393,6 +1396,7 @@ void gr_iplot(struct plot *plot)
dc->db_nodename1, plot->pl_name); dc->db_nodename1, plot->pl_name);
} }
#ifdef XSPICE
if (v && (v->v_flags & VF_EVENT_NODE)) { if (v && (v->v_flags & VF_EVENT_NODE)) {
/* Ask event simulator to call back with new values. */ /* Ask event simulator to call back with new values. */
@ -1443,10 +1447,11 @@ void gr_iplot(struct plot *plot)
"Offset (%s) ignored for analog node %s\n", "Offset (%s) ignored for analog node %s\n",
offp, dc->db_nodename1); offp, dc->db_nodename1);
} }
#endif
} }
db->db_iteration = 0; db->db_iteration = 0;
} }
#endif
if (db->db_graphid) { if (db->db_graphid) {
GRAPH *gr; GRAPH *gr;