From 1603df47d02b3a6d58821abbeddb885a01de5360 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 18 Jun 2022 19:50:59 +0200 Subject: [PATCH] vvp: Remove `{send,recv,filter}_long()` The last user was removed in 682ab886d857 ("Implement release and deassign more directly."). Signed-off-by: Lars-Peter Clausen --- vvp/delay.h | 1 - vvp/vvp_net.cc | 44 -------------------------------------------- vvp/vvp_net.h | 9 --------- 3 files changed, 54 deletions(-) diff --git a/vvp/delay.h b/vvp/delay.h index efecf613b..c495bb1e2 100644 --- a/vvp/delay.h +++ b/vvp/delay.h @@ -97,7 +97,6 @@ class vvp_fun_delay : public vvp_net_fun_t, private vvp_gen_event_s { void recv_vec8(vvp_net_ptr_t port, const vvp_vector8_t&bit); void recv_real(vvp_net_ptr_t port, double bit, vvp_context_t); - //void recv_long(vvp_net_ptr_t port, long bit); void recv_vec4_pv(vvp_net_ptr_t ptr, const vvp_vector4_t&bit, unsigned base, unsigned vwid, vvp_context_t ctx); diff --git a/vvp/vvp_net.cc b/vvp/vvp_net.cc index e8d44a6ac..53f73d888 100644 --- a/vvp/vvp_net.cc +++ b/vvp/vvp_net.cc @@ -306,11 +306,6 @@ vvp_net_fil_t::prop_t vvp_net_fil_t::filter_real(double&) return PROP; } -vvp_net_fil_t::prop_t vvp_net_fil_t::filter_long(long&) -{ - return PROP; -} - vvp_net_fil_t::prop_t vvp_net_fil_t::filter_string(const string&) { return PROP; @@ -584,31 +579,6 @@ void vvp_send_real(vvp_net_ptr_t ptr, double val, vvp_context_t context) } } -void vvp_send_long(vvp_net_ptr_t ptr, long val) -{ - while (vvp_net_t*cur = ptr.ptr()) { - vvp_net_ptr_t next_val = cur->port[ptr.port()]; - - if (cur->fun) - cur->fun->recv_long(ptr, val); - - ptr = next_val; - } -} - -void vvp_send_long_pv(vvp_net_ptr_t ptr, long val, - unsigned base, unsigned wid) -{ - while (vvp_net_t*cur = ptr.ptr()) { - vvp_net_ptr_t next_val = cur->port[ptr.port()]; - - if (cur->fun) - cur->fun->recv_long_pv(ptr, val, base, wid); - - ptr = next_val; - } -} - const vvp_vector4_t vvp_vector4_t::nil; void vvp_vector4_t::copy_bits(const vvp_vector4_t&that) @@ -3316,20 +3286,6 @@ void vvp_net_fun_t::recv_real(vvp_net_ptr_t, double bit, vvp_context_t) assert(0); } -void vvp_net_fun_t::recv_long(vvp_net_ptr_t, long) -{ - fprintf(stderr, "internal error: %s: recv_long not implemented\n", - typeid(*this).name()); - assert(0); -} - -void vvp_net_fun_t::recv_long_pv(vvp_net_ptr_t, long, unsigned, unsigned) -{ - fprintf(stderr, "internal error: %s: recv_long_pv not implemented\n", - typeid(*this).name()); - assert(0); -} - void vvp_net_fun_t::recv_string(vvp_net_ptr_t, const std::string&bit, vvp_context_t) { fprintf(stderr, "internal error: %s: recv_string(%s) not implemented\n", diff --git a/vvp/vvp_net.h b/vvp/vvp_net.h index 01ff2f7d4..977b0e963 100644 --- a/vvp/vvp_net.h +++ b/vvp/vvp_net.h @@ -1134,7 +1134,6 @@ class vvp_net_t { void send_vec4(const vvp_vector4_t&val, vvp_context_t context); void send_vec8(const vvp_vector8_t&val); void send_real(double val, vvp_context_t context); - void send_long(long val); void send_string(const std::string&val, vvp_context_t context); void send_object(vvp_object_t val, vvp_context_t context); @@ -1214,7 +1213,6 @@ class vvp_net_fun_t { virtual void recv_vec8(vvp_net_ptr_t port, const vvp_vector8_t&bit); virtual void recv_real(vvp_net_ptr_t port, double bit, vvp_context_t context); - virtual void recv_long(vvp_net_ptr_t port, long bit); virtual void recv_string(vvp_net_ptr_t port, const std::string&bit, vvp_context_t context); virtual void recv_object(vvp_net_ptr_t port, vvp_object_t bit, @@ -1225,8 +1223,6 @@ class vvp_net_fun_t { unsigned base, unsigned vwid, vvp_context_t context); virtual void recv_vec8_pv(vvp_net_ptr_t p, const vvp_vector8_t&bit, unsigned base, unsigned vwid); - virtual void recv_long_pv(vvp_net_ptr_t port, long bit, - unsigned base, unsigned wid); // This method is called when the net is forced or // released. This is very rarely needed; island ports use it @@ -1290,7 +1286,6 @@ class vvp_net_fil_t : public vvp_vpi_callback { virtual prop_t filter_vec8(const vvp_vector8_t&val, vvp_vector8_t&rep, unsigned base, unsigned vwid); virtual prop_t filter_real(double&val); - virtual prop_t filter_long(long&val); virtual prop_t filter_object(vvp_object_t&val); virtual prop_t filter_string(const std::string&val); @@ -1476,7 +1471,6 @@ class vvp_fun_drive : public vvp_net_fun_t { void recv_vec4(vvp_net_ptr_t port, const vvp_vector4_t&bit, vvp_context_t context); - //void recv_long(vvp_net_ptr_t port, long bit); void recv_vec4_pv(vvp_net_ptr_t port, const vvp_vector4_t&bit, unsigned base, unsigned vwid, vvp_context_t); @@ -1607,9 +1601,6 @@ inline void vvp_send_vec4(vvp_net_ptr_t ptr, const vvp_vector4_t&val, vvp_contex extern void vvp_send_vec8(vvp_net_ptr_t ptr, const vvp_vector8_t&val); extern void vvp_send_real(vvp_net_ptr_t ptr, double val, vvp_context_t context); -extern void vvp_send_long(vvp_net_ptr_t ptr, long val); -extern void vvp_send_long_pv(vvp_net_ptr_t ptr, long val, - unsigned base, unsigned width); inline void vvp_send_string(vvp_net_ptr_t ptr, const std::string&val, vvp_context_t context) {