Skip to content

Commit

Permalink
Bluesim: Fix templated classes for C++20
Browse files Browse the repository at this point in the history 
Earlier C++ standards allowed the constructor and destructor of a
templated class to be declared with a template ID.  To support
compiling with newer C++, that consider this an error, we remove
the template parameter.
  • Loading branch information
@quark17
quark17 committed May 27, 2024
1 parent 1b2c145 commit a8fe68a
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 80 deletions.
46 changes: 23 additions & 23 deletions src/bluesim/bs_prim_mod_bram.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,10 @@ template<typename AT, typename DT, typename ET>
class MOD_BRAM : public Module
{
public:
MOD_BRAM<AT,DT,ET>(tSimStateHdl simHdl, const char* name, Module* parent,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned long long mem_size, unsigned int num_ports)
MOD_BRAM(tSimStateHdl simHdl, const char* name, Module* parent,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned long long mem_size, unsigned int num_ports)
: Module(simHdl, name, parent), pipelined(is_pipelined),
addr_bits(addr_width), data_bits(data_width),
lo_addr(0), hi_addr(mem_size-1),
Expand All @@ -188,11 +188,11 @@ class MOD_BRAM : public Module

init_symbols();
}
MOD_BRAM<AT,DT,ET>(tSimStateHdl simHdl, const char* name, Module* parent,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned int chunk_size, unsigned int num_wens,
unsigned long long mem_size, unsigned int num_ports)
MOD_BRAM(tSimStateHdl simHdl, const char* name, Module* parent,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned int chunk_size, unsigned int num_wens,
unsigned long long mem_size, unsigned int num_ports)
: Module(simHdl, name, parent), pipelined(is_pipelined),
addr_bits(addr_width), data_bits(data_width),
lo_addr(0), hi_addr(mem_size-1),
Expand All @@ -205,12 +205,12 @@ class MOD_BRAM : public Module

init_symbols();
}
MOD_BRAM<AT,DT,ET>(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned long long mem_size,
bool bin_format, unsigned int num_ports)
MOD_BRAM(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned long long mem_size,
bool bin_format, unsigned int num_ports)
: Module(simHdl, name, parent), pipelined(is_pipelined),
addr_bits(addr_width), data_bits(data_width),
lo_addr(0), hi_addr(mem_size-1),
Expand All @@ -225,13 +225,13 @@ class MOD_BRAM : public Module

init_symbols();
}
MOD_BRAM<AT,DT,ET>(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned int chunk_size, unsigned int num_wens,
unsigned long long mem_size,
bool bin_format, unsigned int num_ports)
MOD_BRAM(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
tUInt8 is_pipelined,
unsigned int addr_width, unsigned int data_width,
unsigned int chunk_size, unsigned int num_wens,
unsigned long long mem_size,
bool bin_format, unsigned int num_ports)
: Module(simHdl, name, parent), pipelined(is_pipelined),
addr_bits(addr_width), data_bits(data_width),
lo_addr(0), hi_addr(mem_size-1),
Expand All @@ -246,7 +246,7 @@ class MOD_BRAM : public Module

init_symbols();
}
~MOD_BRAM<AT,DT,ET>() { delete_blocks(top_level,0); delete proxy; }
~MOD_BRAM() { delete_blocks(top_level,0); delete proxy; }

// shared initialization routines
private:
Expand Down
4 changes: 2 additions & 2 deletions src/bluesim/bs_prim_mod_counter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ template<typename T>
class MOD_Counter : public Module
{
public:
MOD_Counter<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& init)
MOD_Counter(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& init)
: Module(simHdl, name, parent),
saved_at(~bk_now(sim_hdl)),
a_at(~bk_now(sim_hdl)), b_at(~bk_now(sim_hdl)),
Expand Down
8 changes: 4 additions & 4 deletions src/bluesim/bs_prim_mod_fifo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ template<typename T>
class MOD_Fifo : public Module
{
public:
MOD_Fifo<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, unsigned int depth,
unsigned int guarded, unsigned int fifo_type)
MOD_Fifo(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, unsigned int depth,
unsigned int guarded, unsigned int fifo_type)
: Module(simHdl, name, parent), bits(width), size(depth),
guard(guarded != 0), type((tFifoType) fifo_type),
enq_at(~bk_now(sim_hdl)), deq_at(~bk_now(sim_hdl)),
Expand Down Expand Up @@ -75,7 +75,7 @@ class MOD_Fifo : public Module
symbols[2].info = SYM_DEF | (8*sizeof(unsigned int)) << 4;
symbols[2].value = (void*)(&size);
}
~MOD_Fifo<T>() { delete[] data; delete proxy; }
~MOD_Fifo() { delete[] data; delete proxy; }
public:
// Note: first < (deq, clear) so we do *not* need to preserve
// the first element to achieve registered behavior. first CF enq,
Expand Down
8 changes: 4 additions & 4 deletions src/bluesim/bs_prim_mod_probe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ template<typename T>
class MOD_Probe : public Module
{
public:
MOD_Probe<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_Probe(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent), __clk_handle_0(BAD_CLOCK_HANDLE),
bits(width), proxy(NULL)
{
Expand Down Expand Up @@ -101,8 +101,8 @@ template<typename T>
class MOD_ProbeWire : public Module
{
public:
MOD_ProbeWire<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_ProbeWire(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent)
{
symbol_count = 0;
Expand Down
54 changes: 27 additions & 27 deletions src/bluesim/bs_prim_mod_reg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class MOD_Reg : public Module
{
public:
// RegN, RegA, CrossingRegN, CrossingRegA
MOD_Reg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
MOD_Reg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
: Module(simHdl, name, parent), bits(width), reset_value(v),
reset_type(async ? ASYNC_RESET_REG : SYNC_RESET_REG),
proxy(NULL)
Expand All @@ -42,8 +42,8 @@ class MOD_Reg : public Module
symbols[0].value = (void*)(&value);
}
// RevertReg
MOD_Reg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v)
MOD_Reg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v)
: Module(simHdl, name, parent), value(v), bits(width),
reset_type(NO_RESET_REG), proxy(NULL)
{
Expand All @@ -58,8 +58,8 @@ class MOD_Reg : public Module
symbols[0].value = (void*)(&value);
}
// RegUN, CrossingRegUN
MOD_Reg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_Reg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent), bits(width), reset_type(NO_RESET_REG),
proxy(NULL)
{
Expand All @@ -81,7 +81,7 @@ class MOD_Reg : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
~MOD_Reg<T>() { delete proxy; }
~MOD_Reg() { delete proxy; }
public:
// read method for single-domain register
const T& METH_read() const { return value; }
Expand Down Expand Up @@ -234,8 +234,8 @@ template<typename T>
class MOD_RegAligned : public Module
{
public:
MOD_RegAligned<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
MOD_RegAligned(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
: Module(simHdl, name, parent), bits(width), reset_value(v),
reset_type(async ? ASYNC_RESET_REG : SYNC_RESET_REG),
__clk_handle_0(BAD_CLOCK_HANDLE), __clk_handle_1(BAD_CLOCK_HANDLE),
Expand All @@ -256,8 +256,8 @@ class MOD_RegAligned : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
MOD_RegAligned<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_RegAligned(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent), bits(width), tick_at(~bk_now(sim_hdl)),
reset_type(NO_RESET_REG), __clk_handle_0(BAD_CLOCK_HANDLE),
__clk_handle_1(BAD_CLOCK_HANDLE), written_at(~bk_now(sim_hdl)),
Expand All @@ -278,7 +278,7 @@ class MOD_RegAligned : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
~MOD_RegAligned<T>() { delete proxy; }
~MOD_RegAligned() { delete proxy; }
public:
const T& METH__read() const { return value; }
void METH__write(const T& x)
Expand Down Expand Up @@ -476,8 +476,8 @@ template<typename T>
class MOD_ConfigReg : public Module
{
public:
MOD_ConfigReg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
MOD_ConfigReg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
: Module(simHdl, name, parent), bits(width), written(~bk_now(sim_hdl)),
reset_value(v),
reset_type(async ? ASYNC_RESET_REG : SYNC_RESET_REG),
Expand All @@ -497,8 +497,8 @@ class MOD_ConfigReg : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
MOD_ConfigReg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_ConfigReg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent), bits(width), written(~bk_now(sim_hdl)),
reset_type(NO_RESET_REG), proxy(NULL)
{
Expand All @@ -518,7 +518,7 @@ class MOD_ConfigReg : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
~MOD_ConfigReg<T>() { delete proxy; }
~MOD_ConfigReg() { delete proxy; }
public:
const T& METH_read() const
{
Expand Down Expand Up @@ -648,8 +648,8 @@ template<typename T>
class MOD_RegTwo : public Module
{
public:
MOD_RegTwo<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
MOD_RegTwo(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
: Module(simHdl, name, parent), bits(width), written(~bk_now(sim_hdl)),
a_at(~bk_now(sim_hdl)), reset_value(v),
reset_type(async ? ASYNC_RESET_REG : SYNC_RESET_REG),
Expand All @@ -663,8 +663,8 @@ class MOD_RegTwo : public Module
in_reset = false;
suppress_write = false;
}
MOD_RegTwo<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_RegTwo(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent), bits(width), written(~bk_now(sim_hdl)),
a_at(~bk_now(sim_hdl)), reset_type(NO_RESET_REG), proxy(NULL)
{
Expand All @@ -678,7 +678,7 @@ class MOD_RegTwo : public Module
in_reset = false;
suppress_write = false;
}
~MOD_RegTwo<T>() { delete proxy; }
~MOD_RegTwo() { delete proxy; }
public:
const T& METH_get() const
{
Expand Down Expand Up @@ -818,8 +818,8 @@ class MOD_CReg : public Module
{
public:
// CRegN, CRegA
MOD_CReg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
MOD_CReg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, const T& v, unsigned int async)
: Module(simHdl, name, parent),
ports(max_ports), // this should eventually be a parameter
__clk_handle_0(BAD_CLOCK_HANDLE),
Expand Down Expand Up @@ -853,8 +853,8 @@ class MOD_CReg : public Module
symbols[0].value = (void*)(&value);
}
// CRegUN
MOD_CReg<T>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
MOD_CReg(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width)
: Module(simHdl, name, parent),
ports(max_ports), // this should eventually be a parameter
__clk_handle_0(BAD_CLOCK_HANDLE),
Expand Down Expand Up @@ -888,7 +888,7 @@ class MOD_CReg : public Module
symbols[0].info = SYM_DEF | bits << 4;
symbols[0].value = (void*)(&value);
}
~MOD_CReg<T>() { delete proxy; }
~MOD_CReg() { delete proxy; }
public:
const T& METH_port0__read() const { return value; }
const T& METH_port1__read() const { return value; }
Expand Down
16 changes: 8 additions & 8 deletions src/bluesim/bs_prim_mod_regfile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ template<typename AT, typename DT>
class MOD_RegFile : public Module
{
public:
MOD_RegFile<AT,DT>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int addr_width, unsigned int data_width,
const AT& lo, const AT& hi)
MOD_RegFile(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int addr_width, unsigned int data_width,
const AT& lo, const AT& hi)
: Module(simHdl, name, parent), addr_bits(addr_width),
data_bits(data_width), lo_addr(lo), hi_addr(hi),
upd_at(~bk_now(sim_hdl)), proxy(NULL)
Expand All @@ -186,10 +186,10 @@ class MOD_RegFile : public Module

init_symbols();
}
MOD_RegFile<AT,DT>(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
unsigned int addr_width, unsigned int data_width,
const AT& lo, const AT& hi, bool bin_format)
MOD_RegFile(tSimStateHdl simHdl, const char* name, Module* parent,
const std::string& memfile,
unsigned int addr_width, unsigned int data_width,
const AT& lo, const AT& hi, bool bin_format)
: Module(simHdl, name, parent), addr_bits(addr_width),
data_bits(data_width), lo_addr(lo), hi_addr(hi),
upd_at(~bk_now(sim_hdl)), proxy(NULL)
Expand All @@ -203,7 +203,7 @@ class MOD_RegFile : public Module

init_symbols();
}
~MOD_RegFile<AT,DT>() { delete_blocks(top_level,0); delete proxy; }
~MOD_RegFile() { delete_blocks(top_level,0); delete proxy; }

// shared initialization routines
private:
Expand Down
12 changes: 6 additions & 6 deletions src/bluesim/bs_prim_mod_synchronizers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,8 +845,8 @@ template<typename T, typename I>
class MOD_SyncFIFO : public Module
{
public:
MOD_SyncFIFO<T,I>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, unsigned int depth, unsigned int hasClr)
MOD_SyncFIFO(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int width, unsigned int depth, unsigned int hasClr)
: Module(simHdl, name, parent), width(width), depth(depth),
src_hi(simHdl, index_size(depth)+1), dst_lo(simHdl, index_size(depth)+1),
hasClear(hasClr),
Expand Down Expand Up @@ -902,7 +902,7 @@ class MOD_SyncFIFO : public Module
symbols[2].info = SYM_DEF | idx_bits << 4;
symbols[2].value = (void*)(&dCountReg);
}
~MOD_SyncFIFO<T,I>() { delete[] data; }
~MOD_SyncFIFO() { delete[] data; }
public:
bool METH_notEmpty()
{
Expand Down Expand Up @@ -1385,8 +1385,8 @@ template<typename AT, typename DT>
class MOD_DualPortRam : public Module
{
public:
MOD_DualPortRam<AT,DT>(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int addr_width, unsigned int data_width)
MOD_DualPortRam(tSimStateHdl simHdl, const char* name, Module* parent,
unsigned int addr_width, unsigned int data_width)
: Module(simHdl, name, parent), addr_bits(addr_width),
data_bits(data_width), written_at(~bk_now(sim_hdl))
{
Expand All @@ -1402,7 +1402,7 @@ class MOD_DualPortRam : public Module
init_val(write_addr, addr_bits);
init_val(prev_value, data_bits);
}
~MOD_DualPortRam<AT,DT>() { delete[] data; }
~MOD_DualPortRam() { delete[] data; }
public:
// Note: the read and write methods of a DualPortRam are
// conflict free. When the edges coincide and a simultaneous
Expand Down
Loading

0 comments on commit a8fe68a

Please sign in to comment.