luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inline some commonly called vvp_vector4_t methods.

This commit is contained in:
steve 2005-06-20 01:28:14 +00:00
parent 1b30bac9f3
commit ad78af2f91
2 changed files with 93 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
vvp/vvp_net.cc
View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ident "$Id: vvp_net.cc,v 1.33 2005/06/19 18:42:00 steve Exp $" #ident "$Id: vvp_net.cc,v 1.34 2005/06/20 01:28:14 steve Exp $"
# include "config.h" # include "config.h"
# include "vvp_net.h" # include "vvp_net.h"
@ -137,18 +137,6 @@ ostream& operator<<(ostream&out, vvp_bit4_t bit)
return out; return out;
} }
void vvp_send_vec4(vvp_net_ptr_t ptr, vvp_vector4_t val)
{
while (struct vvp_net_t*cur = ptr.ptr()) {
vvp_net_ptr_t next = cur->port[ptr.port()];
if (cur->fun)
cur->fun->recv_vec4(ptr, val);
ptr = next;
}
}
void vvp_send_vec4_pv(vvp_net_ptr_t ptr, vvp_vector4_t val, void vvp_send_vec4_pv(vvp_net_ptr_t ptr, vvp_vector4_t val,
unsigned base, unsigned wid, unsigned vwid) unsigned base, unsigned wid, unsigned vwid)
{ {
@ -198,13 +186,11 @@ void vvp_send_long(vvp_net_ptr_t ptr, long val)
} }
} }
const unsigned bits_per_word = sizeof (unsigned long) / 2; void vvp_vector4_t::copy_from_(const vvp_vector4_t&that)
vvp_vector4_t::vvp_vector4_t(const vvp_vector4_t&that)
{ {
size_ = that.size_; size_ = that.size_;
if (size_ > bits_per_word) { if (size_ > BITS_PER_WORD) {
unsigned words = (size_+bits_per_word-1) / bits_per_word; unsigned words = (size_+BITS_PER_WORD-1) / BITS_PER_WORD;
bits_ptr_ = new unsigned long[words]; bits_ptr_ = new unsigned long[words];
for (unsigned idx = 0 ; idx < words ; idx += 1) for (unsigned idx = 0 ; idx < words ; idx += 1)
@ -223,8 +209,8 @@ vvp_vector4_t::vvp_vector4_t(unsigned size)
for (unsigned idx = 0 ; idx < sizeof (unsigned long) ; idx += 1) for (unsigned idx = 0 ; idx < sizeof (unsigned long) ; idx += 1)
initial_value_bits = (initial_value_bits << 8) | 0xaa; initial_value_bits = (initial_value_bits << 8) | 0xaa;
if (size_ > bits_per_word) { if (size_ > BITS_PER_WORD) {
unsigned cnt = (size_ + bits_per_word - 1) / bits_per_word; unsigned cnt = (size_ + BITS_PER_WORD - 1) / BITS_PER_WORD;
bits_ptr_ = new unsigned long[cnt]; bits_ptr_ = new unsigned long[cnt];
@ -236,50 +222,13 @@ vvp_vector4_t::vvp_vector4_t(unsigned size)
} }
} }
vvp_vector4_t& vvp_vector4_t::operator= (const vvp_vector4_t&that)
{
if (size_ > bits_per_word)
delete[] bits_ptr_;
size_ = that.size_;
if (size_ > bits_per_word) {
unsigned cnt = (size_ + bits_per_word - 1) / bits_per_word;
bits_ptr_ = new unsigned long[cnt];
for (unsigned idx = 0 ; idx < cnt ; idx += 1)
bits_ptr_[idx] = that.bits_ptr_[idx];
} else {
bits_val_ = that.bits_val_;
}
return *this;
}
void vvp_vector4_t::set_bit(unsigned idx, vvp_bit4_t val)
{
assert(idx < size_);
unsigned wdx = idx / bits_per_word;
unsigned off = idx % bits_per_word;
unsigned long mask = 3UL << (2*off);
if (size_ > bits_per_word) {
bits_ptr_[wdx] &= ~mask;
bits_ptr_[wdx] |= val << (2*off);
} else {
bits_val_ &= ~mask;
bits_val_ |= val << (2*off);
}
}
bool vvp_vector4_t::eeq(const vvp_vector4_t&that) const bool vvp_vector4_t::eeq(const vvp_vector4_t&that) const
{ {
if (size_ != that.size_) if (size_ != that.size_)
return false; return false;
unsigned words = (size_+bits_per_word-1) / bits_per_word; unsigned words = (size_+BITS_PER_WORD-1) / BITS_PER_WORD;
if (words == 1) { if (words == 1) {
if (bits_val_ == that.bits_val_) if (bits_val_ == that.bits_val_)
return true; return true;
@ -1376,6 +1325,9 @@ vvp_bit4_t compare_gtge_signed(const vvp_vector4_t&a,
/* /*
* $Log: vvp_net.cc,v $ * $Log: vvp_net.cc,v $
* Revision 1.34 2005/06/20 01:28:14 steve
* Inline some commonly called vvp_vector4_t methods.
*
* Revision 1.33 2005/06/19 18:42:00 steve * Revision 1.33 2005/06/19 18:42:00 steve
* Optimize the LOAD_VEC implementation. * Optimize the LOAD_VEC implementation.
* *

112
vvp/vvp_net.h
View File

@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ident "$Id: vvp_net.h,v 1.35 2005/06/19 18:42:00 steve Exp $" #ident "$Id: vvp_net.h,v 1.36 2005/06/20 01:28:14 steve Exp $"
# include "config.h" # include "config.h"
# include <stddef.h> # include <stddef.h>
@ -102,7 +102,12 @@ class vvp_vector4_t {
char*as_string(char*buf, size_t buf_len); char*as_string(char*buf, size_t buf_len);
private: private:
enum { BITS_PER_WORD = sizeof(unsigned long)/2 }; // Number of vvp_bit4_t bits that can be shoved into a word.
enum { BITS_PER_WORD = 8*sizeof(unsigned long)/2 };
// Initialize and operator= use this private method to copy
// the data from that object into this object.
void copy_from_(const vvp_vector4_t&that);
unsigned size_; unsigned size_;
union { union {
@ -111,6 +116,11 @@ class vvp_vector4_t {
}; };
}; };
inline vvp_vector4_t::vvp_vector4_t(const vvp_vector4_t&that)
{
copy_from_(that);
}
inline vvp_vector4_t::~vvp_vector4_t() inline vvp_vector4_t::~vvp_vector4_t()
{ {
if (size_ > BITS_PER_WORD) { if (size_ > BITS_PER_WORD) {
@ -118,6 +128,19 @@ inline vvp_vector4_t::~vvp_vector4_t()
} }
} }
inline vvp_vector4_t& vvp_vector4_t::operator= (const vvp_vector4_t&that)
{
if (this == &that)
return *this;
if (size_ > BITS_PER_WORD)
delete[] bits_ptr_;
copy_from_(that);
return *this;
}
inline vvp_bit4_t vvp_vector4_t::value(unsigned idx) const inline vvp_bit4_t vvp_vector4_t::value(unsigned idx) const
{ {
@ -141,6 +164,23 @@ inline vvp_bit4_t vvp_vector4_t::value(unsigned idx) const
return (vvp_bit4_t) (bits & 3); return (vvp_bit4_t) (bits & 3);
} }
inline void vvp_vector4_t::set_bit(unsigned idx, vvp_bit4_t val)
{
assert(idx < size_);
unsigned wdx = idx / BITS_PER_WORD;
unsigned off = idx % BITS_PER_WORD;
unsigned long mask = 3UL << (2*off);
if (size_ > BITS_PER_WORD) {
bits_ptr_[wdx] &= ~mask;
bits_ptr_[wdx] |= val << (2*off);
} else {
bits_val_ &= ~mask;
bits_val_ |= val << (2*off);
}
}
extern vvp_vector4_t operator ~ (const vvp_vector4_t&that); extern vvp_vector4_t operator ~ (const vvp_vector4_t&that);
extern ostream& operator << (ostream&, const vvp_vector4_t&); extern ostream& operator << (ostream&, const vvp_vector4_t&);
@ -399,33 +439,6 @@ struct vvp_net_t {
long fun_flags; long fun_flags;
}; };
extern void vvp_send_vec4(vvp_net_ptr_t ptr, vvp_vector4_t val);
extern void vvp_send_vec8(vvp_net_ptr_t ptr, vvp_vector8_t val);
extern void vvp_send_real(vvp_net_ptr_t ptr, double val);
extern void vvp_send_long(vvp_net_ptr_t ptr, long val);
/*
* Part-vector versions of above functions. This function uses the
* corresponding recv_vec4_pv method in the vvp_net_fun_t functor to
* deliver parts of a vector.
*
* The ptr is the destination input port to write to.
*
* <val> is the vector to be written. The width of this vector must
* exactly match the <wid> vector.
*
* The <base> is where in the receiver the bit vector is to be
* written. This address is given in cannonical units; 0 is the LSB, 1
* is the next bit, and so on.
*
* The <vwid> is the width of the destination vector that this part is
* part of. This is used by intermediate nodes, i.e. resolvers, to
* know how wide to pad with Z, if it needs to transform the part to a
* mirror of the destination vector.
*/
extern void vvp_send_vec4_pv(vvp_net_ptr_t ptr, vvp_vector4_t val,
unsigned base, unsigned wid, unsigned vwid);
/* /*
* Instances of this class represent the functionality of a * Instances of this class represent the functionality of a
* node. vvp_net_t objects hold pointers to the vvp_net_fun_t * node. vvp_net_t objects hold pointers to the vvp_net_fun_t
@ -791,8 +804,49 @@ class vvp_wide_fun_t : public vvp_net_fun_t {
unsigned port_base_; unsigned port_base_;
}; };
inline void vvp_send_vec4(vvp_net_ptr_t ptr, const vvp_vector4_t&val)
{
while (struct vvp_net_t*cur = ptr.ptr()) {
vvp_net_ptr_t next = cur->port[ptr.port()];
if (cur->fun)
cur->fun->recv_vec4(ptr, val);
ptr = next;
}
}
extern void vvp_send_vec8(vvp_net_ptr_t ptr, vvp_vector8_t val);
extern void vvp_send_real(vvp_net_ptr_t ptr, double val);
extern void vvp_send_long(vvp_net_ptr_t ptr, long val);
/*
* Part-vector versions of above functions. This function uses the
* corresponding recv_vec4_pv method in the vvp_net_fun_t functor to
* deliver parts of a vector.
*
* The ptr is the destination input port to write to.
*
* <val> is the vector to be written. The width of this vector must
* exactly match the <wid> vector.
*
* The <base> is where in the receiver the bit vector is to be
* written. This address is given in cannonical units; 0 is the LSB, 1
* is the next bit, and so on.
*
* The <vwid> is the width of the destination vector that this part is
* part of. This is used by intermediate nodes, i.e. resolvers, to
* know how wide to pad with Z, if it needs to transform the part to a
* mirror of the destination vector.
*/
extern void vvp_send_vec4_pv(vvp_net_ptr_t ptr, vvp_vector4_t val,
unsigned base, unsigned wid, unsigned vwid);
/* /*
* $Log: vvp_net.h,v $ * $Log: vvp_net.h,v $
* Revision 1.36 2005/06/20 01:28:14 steve
* Inline some commonly called vvp_vector4_t methods.
*
* Revision 1.35 2005/06/19 18:42:00 steve * Revision 1.35 2005/06/19 18:42:00 steve
* Optimize the LOAD_VEC implementation. * Optimize the LOAD_VEC implementation.
* *