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

vvp implementation of copy from vec4 to vec2 can use subarray method.

This commit is contained in:
Stephen Williams 2014-12-02 14:52:37 -08:00
parent b83144c552
commit a57e0a1e3f
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vvp/vvp_net.cc
View File

@ -1006,7 +1006,7 @@ void vvp_vector4_t::resize(unsigned newsize, vvp_bit4_t pad_bit)
} }
unsigned long* vvp_vector4_t::subarray(unsigned adr, unsigned wid) const unsigned long* vvp_vector4_t::subarray(unsigned adr, unsigned wid, bool xz_to_0) const
{ {
const unsigned BIT2_PER_WORD = 8*sizeof(unsigned long); const unsigned BIT2_PER_WORD = 8*sizeof(unsigned long);
unsigned awid = (wid + BIT2_PER_WORD - 1) / (BIT2_PER_WORD); unsigned awid = (wid + BIT2_PER_WORD - 1) / (BIT2_PER_WORD);
@ -1027,7 +1027,12 @@ unsigned long* vvp_vector4_t::subarray(unsigned adr, unsigned wid) const
atmp &= (1UL << wid) - 1; atmp &= (1UL << wid) - 1;
btmp &= (1UL << wid) - 1; btmp &= (1UL << wid) - 1;
} }
if (btmp) goto x_out; if (btmp) {
if (xz_to_0)
atmp &= ~btmp;
else
goto x_out;
}
val[0] = atmp; val[0] = atmp;
@ -1054,7 +1059,12 @@ unsigned long* vvp_vector4_t::subarray(unsigned adr, unsigned wid) const
atmp &= (1UL << trans) - 1; atmp &= (1UL << trans) - 1;
btmp &= (1UL << trans) - 1; btmp &= (1UL << trans) - 1;
} }
if (btmp) goto x_out; if (btmp) {
if (xz_to_0)
atmp &= ~btmp;
else
goto x_out;
}
val[val_ptr] |= atmp << val_off; val[val_ptr] |= atmp << val_off;
adr += trans; adr += trans;
@ -2109,24 +2119,9 @@ void vvp_vector2_t::copy_from_that_(const vvp_vector4_t&that)
return; return;
} }
vec_ = new unsigned long[words]; // Use the subarray method with the xz_to_0 flag set so that
for (unsigned idx = 0 ; idx < words ; idx += 1) // we get values even when there are xz bits.
vec_[idx] = 0; vec_ = that.subarray(0, wid_, true);
for (unsigned idx = 0 ; idx < that.size() ; idx += 1) {
unsigned addr = idx / BITS_PER_WORD;
unsigned shift = idx % BITS_PER_WORD;
switch (that.value(idx)) {
case BIT4_0:
case BIT4_X:
case BIT4_Z:
break;
case BIT4_1:
vec_[addr] |= 1UL << shift;
break;
}
}
} }
void vvp_vector2_t::copy_from_that_(const vvp_vector2_t&that) void vvp_vector2_t::copy_from_that_(const vvp_vector2_t&that)

2
vvp/vvp_net.h
View File

@ -254,7 +254,7 @@ class vvp_vector4_t {
// Get the 2-value bits for the subvector. This returns a new // Get the 2-value bits for the subvector. This returns a new
// array of longs, or a nil pointer if an XZ bit was detected // array of longs, or a nil pointer if an XZ bit was detected
// in the array. // in the array.
unsigned long*subarray(unsigned idx, unsigned size) const; unsigned long*subarray(unsigned idx, unsigned size, bool xz_to_0 =false) const;
void setarray(unsigned idx, unsigned size, const unsigned long*val); void setarray(unsigned idx, unsigned size, const unsigned long*val);
// Set a 4-value bit or subvector into the vector. Return true // Set a 4-value bit or subvector into the vector. Return true