Use %p name for all LPM functors.
This commit is contained in:
parent
399b3be499
commit
8188e8f3bf
|
|
@ -17,7 +17,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifdef HAVE_CVS_IDENT
|
||||
#ident "$Id: vvp_scope.c,v 1.89 2003/03/10 23:40:54 steve Exp $"
|
||||
#ident "$Id: vvp_scope.c,v 1.90 2003/03/13 06:07:11 steve Exp $"
|
||||
#endif
|
||||
|
||||
# include "vvp_priv.h"
|
||||
|
|
@ -359,9 +359,7 @@ static const char* draw_net_input_drive(ivl_nexus_t nex, ivl_nexus_ptr_t nptr)
|
|||
case IVL_LPM_UFUNC:
|
||||
for (idx = 0 ; idx < ivl_lpm_width(lpm) ; idx += 1)
|
||||
if (ivl_lpm_q(lpm, idx) == nex) {
|
||||
sprintf(result, "L_%s.%s[%u]",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(lpm))),
|
||||
vvp_mangle_id(ivl_lpm_basename(lpm)), idx);
|
||||
sprintf(result, "L_%p[%u]", lpm, idx);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -1037,18 +1035,12 @@ inline static void draw_lpm_ram(ivl_lpm_t net)
|
|||
ivl_nexus_t pin;
|
||||
|
||||
if (clk) {
|
||||
fprintf(vvp_out,
|
||||
"CLK_%s.%s .event posedge, ",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)));
|
||||
fprintf(vvp_out, "CLK_%p .event posedge, ", net);
|
||||
draw_input_from_net(clk);
|
||||
fprintf(vvp_out, ";\n");
|
||||
}
|
||||
|
||||
fprintf(vvp_out,
|
||||
"L_%s.%s .mem/port",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)));
|
||||
fprintf(vvp_out, "L_%p .mem/port", net);
|
||||
fprintf(vvp_out,
|
||||
" M_%s, %d,0, %d,\n ",
|
||||
vvp_memory_label(mem),
|
||||
|
|
@ -1062,9 +1054,7 @@ inline static void draw_lpm_ram(ivl_lpm_t net)
|
|||
}
|
||||
|
||||
if (clk) {
|
||||
fprintf(vvp_out, ",\n CLK_%s.%s, ",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)));
|
||||
fprintf(vvp_out, ",\n CLK_%p, ", net);
|
||||
pin = ivl_lpm_enable(net);
|
||||
if (pin)
|
||||
draw_input_from_net(pin);
|
||||
|
|
@ -1132,9 +1122,7 @@ static void draw_lpm_add(ivl_lpm_t net)
|
|||
assert(0);
|
||||
}
|
||||
|
||||
fprintf(vvp_out, "L_%s.%s .arith/%s %u",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)), type, width);
|
||||
fprintf(vvp_out, "L_%p .arith/%s %u", net, type, width);
|
||||
|
||||
draw_lpm_arith_a_b_inputs(net);
|
||||
|
||||
|
|
@ -1393,13 +1381,9 @@ static void draw_lpm_shiftl(ivl_lpm_t net)
|
|||
selwid = width;
|
||||
|
||||
if (ivl_lpm_type(net) == IVL_LPM_SHIFTR)
|
||||
fprintf(vvp_out, "L_%s.%s .shift/r %u",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)), width);
|
||||
fprintf(vvp_out, "L_%p .shift/r %u", net, width);
|
||||
else
|
||||
fprintf(vvp_out, "L_%s.%s .shift/l %u",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)), width);
|
||||
fprintf(vvp_out, "L_%p .shift/l %u", net, width);
|
||||
|
||||
for (idx = 0 ; idx < width ; idx += 1) {
|
||||
fprintf(vvp_out, ", ");
|
||||
|
|
@ -1424,9 +1408,7 @@ static void draw_lpm_ufunc(ivl_lpm_t net)
|
|||
char comma;
|
||||
ivl_scope_t def = ivl_lpm_define(net);
|
||||
|
||||
fprintf(vvp_out, "L_%s.%s .ufunc TD_%s, %u",
|
||||
vvp_mangle_id(ivl_scope_name(ivl_lpm_scope(net))),
|
||||
vvp_mangle_id(ivl_lpm_basename(net)),
|
||||
fprintf(vvp_out, "L_%p .ufunc TD_%s, %u", net,
|
||||
ivl_scope_name(def),
|
||||
ivl_lpm_width(net));
|
||||
|
||||
|
|
@ -1648,6 +1630,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent)
|
|||
|
||||
/*
|
||||
* $Log: vvp_scope.c,v $
|
||||
* Revision 1.90 2003/03/13 06:07:11 steve
|
||||
* Use %p name for all LPM functors.
|
||||
*
|
||||
* Revision 1.89 2003/03/10 23:40:54 steve
|
||||
* Keep parameter constants for the ivl_target API.
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue