Skip to content

Commit 1969d61

Browse files
committed
ODIN_II: Fix coverity issue CID 200815
1 parent 849e708 commit 1969d61

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

ODIN_II/SRC/output_blif.cpp

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -438,17 +438,24 @@ void define_logical_function(nnode_t *node, FILE *out)
438438
/* now hookup the input wires with their respective ports. [1+i] to skip output spot. */
439439
/* Just print the driver_pin->name NOT driver_pin->node->name -- KEN */
440440
nnet_t *net = node->input_pins[i]->net;
441-
if (net && net->driver_pin)
441+
if (net)
442442
{
443-
if (net->driver_pin->name != NULL)
443+
if(net->driver_pin)
444444
{
445-
if ((net->driver_pin->node->type == MULTIPLY) ||
446-
(net->driver_pin->node->type == HARD_IP) ||
447-
(net->driver_pin->node->type == MEMORY) ||
448-
(net->driver_pin->node->type == ADD) ||
449-
(net->driver_pin->node->type == MINUS) )
445+
if (net->driver_pin->name != NULL)
450446
{
451-
fprintf(out, " %s", net->driver_pin->name);
447+
if ((net->driver_pin->node->type == MULTIPLY) ||
448+
(net->driver_pin->node->type == HARD_IP) ||
449+
(net->driver_pin->node->type == MEMORY) ||
450+
(net->driver_pin->node->type == ADD) ||
451+
(net->driver_pin->node->type == MINUS) )
452+
{
453+
fprintf(out, " %s", net->driver_pin->name);
454+
}
455+
else
456+
{
457+
fprintf(out, " %s", net->driver_pin->node->name);
458+
}
452459
}
453460
else
454461
{
@@ -457,16 +464,13 @@ void define_logical_function(nnode_t *node, FILE *out)
457464
}
458465
else
459466
{
460-
fprintf(out, " %s", net->driver_pin->node->name);
467+
int line_number = node->related_ast_node?node->related_ast_node->line_number:0;
468+
warning_message(NETLIST_ERROR, line_number, -1, "Net %s driving node %s is itself undriven.", net->name, node->name);
469+
470+
fprintf(out, " %s", "unconn");
461471
}
462472
}
463-
else
464-
{
465-
int line_number = node->related_ast_node?node->related_ast_node->line_number:0;
466-
warning_message(NETLIST_ERROR, line_number, -1, "Net %s driving node %s is itself undriven.", net->name, node->name);
467473

468-
fprintf(out, " %s", "unconn");
469-
}
470474
}
471475
/* now print the output */
472476
fprintf(out, " %s", node->name);

0 commit comments

Comments
 (0)