From bb3f3c1f461e52943197e770afe5a9dc621362fb Mon Sep 17 00:00:00 2001 From: steve Date: Tue, 11 Oct 2005 18:30:50 +0000 Subject: [PATCH] Remove obsolete vvp_memory_label function. --- tgt-vvp/draw_vpi.c | 8 +++++--- tgt-vvp/eval_expr.c | 9 ++++++--- tgt-vvp/vvp_priv.h | 10 ++++------ tgt-vvp/vvp_process.c | 11 ++++++----- tgt-vvp/vvp_scope.c | 20 ++++++-------------- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/tgt-vvp/draw_vpi.c b/tgt-vvp/draw_vpi.c index 18289aa89..47794f247 100644 --- a/tgt-vvp/draw_vpi.c +++ b/tgt-vvp/draw_vpi.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: draw_vpi.c,v 1.12 2005/07/11 16:56:51 steve Exp $" +#ident "$Id: draw_vpi.c,v 1.13 2005/10/11 18:30:50 steve Exp $" #endif # include "vvp_priv.h" @@ -212,8 +212,7 @@ static void draw_vpi_taskfunc_args(const char*call_string, case IVL_EX_MEMORY: if (!ivl_expr_oper1(expr)) { - fprintf(vvp_out, ", M_%s", - vvp_memory_label(ivl_expr_memory(expr))); + fprintf(vvp_out, ", M_%p", ivl_expr_memory(expr)) ; continue; } break; @@ -292,6 +291,9 @@ int draw_vpi_rfunc_call(ivl_expr_t fnet) /* * $Log: draw_vpi.c,v $ + * Revision 1.13 2005/10/11 18:30:50 steve + * Remove obsolete vvp_memory_label function. + * * Revision 1.12 2005/07/11 16:56:51 steve * Remove NetVariable and ivl_variable_t structures. * diff --git a/tgt-vvp/eval_expr.c b/tgt-vvp/eval_expr.c index 086534632..f9e695693 100644 --- a/tgt-vvp/eval_expr.c +++ b/tgt-vvp/eval_expr.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: eval_expr.c,v 1.125 2005/09/19 21:45:36 steve Exp $" +#ident "$Id: eval_expr.c,v 1.126 2005/10/11 18:30:50 steve Exp $" #endif # include "vvp_priv.h" @@ -1613,8 +1613,8 @@ static struct vector_info draw_memory_expr(ivl_expr_t exp, unsigned wid) res.base = allocate_vector(wid); res.wid = wid; - fprintf(vvp_out, " %%load/mv %u, M_%s, %u;\n", - res.base, vvp_memory_label(mem), swid); + fprintf(vvp_out, " %%load/mv %u, M_%p, %u;\n", + res.base, mem, swid); /* Pad the signal value with zeros. */ if (swid < wid) @@ -2168,6 +2168,9 @@ struct vector_info draw_eval_expr(ivl_expr_t exp, int stuff_ok_flag) /* * $Log: eval_expr.c,v $ + * Revision 1.126 2005/10/11 18:30:50 steve + * Remove obsolete vvp_memory_label function. + * * Revision 1.125 2005/09/19 21:45:36 steve * Spelling patches from Larry. * diff --git a/tgt-vvp/vvp_priv.h b/tgt-vvp/vvp_priv.h index 2ce93572a..d1c15a79d 100644 --- a/tgt-vvp/vvp_priv.h +++ b/tgt-vvp/vvp_priv.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vvp_priv.h,v 1.37 2005/10/10 04:16:13 steve Exp $" +#ident "$Id: vvp_priv.h,v 1.38 2005/10/11 18:30:50 steve Exp $" #endif # include "vvp_config.h" @@ -44,11 +44,6 @@ extern const char *vvp_mangle_name(const char *); */ extern const char* vvp_signal_label(ivl_signal_t sig); -/* - * This generates a label string for a memory. - */ -extern const char* vvp_memory_label(ivl_memory_t mem); - extern unsigned width_of_nexus(ivl_nexus_t nex); extern ivl_variable_type_t data_type_of_nexus(ivl_nexus_t nex); @@ -233,6 +228,9 @@ extern unsigned thread_count; /* * $Log: vvp_priv.h,v $ + * Revision 1.38 2005/10/11 18:30:50 steve + * Remove obsolete vvp_memory_label function. + * * Revision 1.37 2005/10/10 04:16:13 steve * Remove dead dram_input_from_net and lpm_inputs_a_b * diff --git a/tgt-vvp/vvp_process.c b/tgt-vvp/vvp_process.c index 0af946fde..ea49add6e 100644 --- a/tgt-vvp/vvp_process.c +++ b/tgt-vvp/vvp_process.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vvp_process.c,v 1.117 2005/09/17 01:01:00 steve Exp $" +#ident "$Id: vvp_process.c,v 1.118 2005/10/11 18:30:50 steve Exp $" #endif # include "vvp_priv.h" @@ -120,8 +120,7 @@ static void set_to_lvariable(ivl_lval_t lval, static void set_to_memory_word(ivl_memory_t mem, unsigned idx, unsigned bit, unsigned wid) { - fprintf(vvp_out, " %%set/mv M_%s, %u, %u;\n", - vvp_memory_label(mem), bit, wid); + fprintf(vvp_out, " %%set/mv M_%p, %u, %u;\n", mem, bit, wid); } static void assign_to_lvector(ivl_lval_t lval, unsigned bit, @@ -173,8 +172,7 @@ static void assign_to_memory_word(ivl_memory_t mem, unsigned bit, assert(wid = ivl_memory_width(mem)); fprintf(vvp_out, " %%ix/load 0, %u;\n", wid); - fprintf(vvp_out, " %%assign/mv M_%s, %u, %u;\n", - vvp_memory_label(mem), delay, bit); + fprintf(vvp_out, " %%assign/mv M_%p, %u, %u;\n", mem, delay, bit); } /* @@ -1466,6 +1464,9 @@ int draw_func_definition(ivl_scope_t scope) /* * $Log: vvp_process.c,v $ + * Revision 1.118 2005/10/11 18:30:50 steve + * Remove obsolete vvp_memory_label function. + * * Revision 1.117 2005/09/17 01:01:00 steve * More robust use of precalculated expressions, and * Separate lookaside for written variables that can diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c index 21860e2f3..6c88b0fdf 100644 --- a/tgt-vvp/vvp_scope.c +++ b/tgt-vvp/vvp_scope.c @@ -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.134 2005/10/10 04:16:13 steve Exp $" +#ident "$Id: vvp_scope.c,v 1.135 2005/10/11 18:30:50 steve Exp $" #endif # include "vvp_priv.h" @@ -160,16 +160,6 @@ const char* vvp_signal_label(ivl_signal_t sig) return buf; } -/* - * This makes a string suitable for use as a label for memories. - */ -const char* vvp_memory_label(ivl_memory_t mem) -{ - static char buf[32]; - sprintf(buf, "$%p", mem); - return buf; -} - ivl_signal_type_t signal_type_of_nexus(ivl_nexus_t nex) { unsigned idx; @@ -1296,7 +1286,7 @@ static void draw_lpm_ram(ivl_lpm_t net) net, draw_net_input(clk)); } - fprintf(vvp_out, "L_%p .mem/port M_%s, ", net, vvp_memory_label(mem)); + fprintf(vvp_out, "L_%p .mem/port M_%p, ", net, mem); pin = ivl_lpm_select(net); fprintf(vvp_out, "%s", draw_net_input(pin)); @@ -1921,8 +1911,7 @@ static void draw_mem_in_scope(ivl_memory_t net) int last = root + ivl_memory_size(net) - 1; int msb = ivl_memory_width(net) - 1; int lsb = 0; - fprintf(vvp_out, "M_%s .mem \"%s\", %u,%u, %u,%u;\n", - vvp_memory_label(net), + fprintf(vvp_out, "M_%p .mem \"%s\", %u,%u, %u,%u;\n", net, vvp_mangle_name(ivl_memory_basename(net)), msb, lsb, root, last); } @@ -2021,6 +2010,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) /* * $Log: vvp_scope.c,v $ + * Revision 1.135 2005/10/11 18:30:50 steve + * Remove obsolete vvp_memory_label function. + * * Revision 1.134 2005/10/10 04:16:13 steve * Remove dead dram_input_from_net and lpm_inputs_a_b *