diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c index a0b0f3c25..c66c00f67 100644 --- a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c +++ b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c @@ -1128,9 +1128,9 @@ void dump_verilog_mux_basis_module(FILE* fp, /* Prepare the basis subckt name: */ - mux_basis_subckt_name = generate_verilog_mux_subckt_name(spice_mux_model->spice_model, spice_mux_model->size, verilog_mux_basis_posfix); + mux_basis_subckt_name = generate_verilog_mux_basis_subckt_name(spice_mux_model->spice_model, spice_mux_model->size, verilog_mux_basis_posfix); - special_basis_subckt_name = generate_verilog_mux_subckt_name(spice_mux_model->spice_model, spice_mux_model->size, verilog_mux_special_basis_posfix); + special_basis_subckt_name = generate_verilog_mux_basis_subckt_name(spice_mux_model->spice_model, spice_mux_model->size, verilog_mux_special_basis_posfix); /* deteremine the number of inputs of basis subckt */ num_input_basis_subckt = spice_mux_model->spice_mux_arch->num_input_basis; @@ -1647,9 +1647,9 @@ void dump_verilog_cmos_mux_submodule(FILE* fp, char* mux_basis_subckt_name = NULL; char* mux_special_basis_subckt_name = NULL; - mux_basis_subckt_name = generate_verilog_mux_subckt_name(&spice_model, mux_size, verilog_mux_basis_posfix); + mux_basis_subckt_name = generate_verilog_mux_basis_subckt_name(&spice_model, mux_size, verilog_mux_basis_posfix); - mux_special_basis_subckt_name = generate_verilog_mux_subckt_name(&spice_model, mux_size, verilog_mux_special_basis_posfix); + mux_special_basis_subckt_name = generate_verilog_mux_basis_subckt_name(&spice_model, mux_size, verilog_mux_special_basis_posfix); /* Make sure we have a valid file handler*/ if (NULL == fp) { @@ -2156,9 +2156,9 @@ void dump_verilog_rram_mux_submodule(FILE* fp, char* mux_basis_subckt_name = NULL; char* mux_special_basis_subckt_name = NULL; - mux_basis_subckt_name = generate_verilog_mux_subckt_name(&spice_model, mux_size, verilog_mux_basis_posfix); + mux_basis_subckt_name = generate_verilog_mux_basis_subckt_name(&spice_model, mux_size, verilog_mux_basis_posfix); - mux_special_basis_subckt_name = generate_verilog_mux_subckt_name(&spice_model, mux_size, verilog_mux_special_basis_posfix); + mux_special_basis_subckt_name = generate_verilog_mux_basis_subckt_name(&spice_model, mux_size, verilog_mux_special_basis_posfix); /* Make sure we have a valid file handler*/ if (NULL == fp) { diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.c b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.c index 0aba462d8..f280af78d 100644 --- a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.c +++ b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.c @@ -2915,10 +2915,9 @@ char* generate_verilog_mem_subckt_name(t_spice_model* spice_model, return subckt_name; } - /* Generate the subckt name for a MUX module/submodule */ -char* generate_verilog_mux_subckt_name(t_spice_model* spice_model, - int mux_size, char* postfix) { +char* generate_verilog_mux_basis_subckt_name(t_spice_model* spice_model, + int mux_size, char* postfix) { char* mux_subckt_name = NULL; /* If the tgate spice model of this MUX is a MUX2 standard cell, @@ -2928,15 +2927,26 @@ char* generate_verilog_mux_subckt_name(t_spice_model* spice_model, assert ( SPICE_MODEL_GATE_MUX2 == spice_model->design_tech_info.gate_info->type); mux_subckt_name = my_strdup(spice_model->pass_gate_logic->spice_model->name); } else { - mux_subckt_name = (char*)my_malloc(sizeof(char)*(strlen(spice_model->name) + 5 - + strlen(my_itoa(mux_size)) + strlen(postfix) + 1)); - sprintf(mux_subckt_name, "%s_size%d%s", - spice_model->name, mux_size, postfix); + mux_subckt_name = generate_verilog_mux_subckt_name(spice_model, mux_size, postfix); } return mux_subckt_name; } + +/* Generate the subckt name for a MUX module/submodule */ +char* generate_verilog_mux_subckt_name(t_spice_model* spice_model, + int mux_size, char* postfix) { + char* mux_subckt_name = NULL; + + mux_subckt_name = (char*)my_malloc(sizeof(char)*(strlen(spice_model->name) + 5 + + strlen(my_itoa(mux_size)) + strlen(postfix) + 1)); + sprintf(mux_subckt_name, "%s_size%d%s", + spice_model->name, mux_size, postfix); + + return mux_subckt_name; +} + enum e_dump_verilog_port_type convert_spice_model_port_type_to_verilog_port_type(enum e_spice_model_port_type spice_model_port_type) { enum e_dump_verilog_port_type verilog_port_type; diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.h b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.h index a66fd48f2..47b780804 100644 --- a/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.h +++ b/vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_utils.h @@ -221,6 +221,9 @@ char* generate_verilog_mem_subckt_name(t_spice_model* spice_model, t_spice_model* mem_model, char* postfix); +char* generate_verilog_mux_basis_subckt_name(t_spice_model* spice_model, + int mux_size, char* postfix); + char* generate_verilog_mux_subckt_name(t_spice_model* spice_model, int mux_size, char* postfix);