github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-05 22:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SystemC BITS_PER_DIGIT in VL_ASSIGN_SBW (#5170)

Browse Source 
The BITS_PER_DIGIT macro value differs between SystemC versions,
thus referencing it directly is required.
This commit is contained in:
Bartłomiej Chmiel 2024-06-11 02:45:49 +02:00 committed by GitHub
parent e9f59e44a5
commit 13114f2efe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/verilated_funcs.h
View File

@ -508,19 +508,18 @@ static inline void VL_ASSIGNBIT_WO(int bit, WDataOutP owp) VL_MT_SAFE {
{ (svar).write(rd); } { (svar).write(rd); }
#define VL_ASSIGN_SBQ(obits, svar, rd) \ #define VL_ASSIGN_SBQ(obits, svar, rd) \
{ (svar).write(rd); } { (svar).write(rd); }
#define VL_SC_BITS_PER_DIGIT 30 // This comes from sc_nbdefs.h BITS_PER_DIGIT
#define VL_ASSIGN_SBW(obits, svar, rwp) \ #define VL_ASSIGN_SBW(obits, svar, rwp) \
{ \ { \
sc_dt::sc_biguint<(obits)> _butemp; \ sc_dt::sc_biguint<(obits)> _butemp; \
int32_t lsb = 0; \ int32_t lsb = 0; \
uint32_t* chunkp = _butemp.get_raw(); \ uint32_t* chunkp = _butemp.get_raw(); \
while (lsb + VL_SC_BITS_PER_DIGIT < (obits)) { \ while (lsb + BITS_PER_DIGIT < (obits)) { \
static_assert(std::is_same<IData, EData>::value, "IData and EData mismatch"); \ static_assert(std::is_same<IData, EData>::value, "IData and EData mismatch"); \
const uint32_t data = VL_SEL_IWII(lsb + VL_SC_BITS_PER_DIGIT + 1, (rwp).data(), lsb, \ const uint32_t data \
VL_SC_BITS_PER_DIGIT); \ = VL_SEL_IWII(lsb + BITS_PER_DIGIT + 1, (rwp).data(), lsb, BITS_PER_DIGIT); \
*chunkp = data & VL_MASK_E(VL_SC_BITS_PER_DIGIT); \ *chunkp = data & VL_MASK_E(BITS_PER_DIGIT); \
++chunkp; \ ++chunkp; \
lsb += VL_SC_BITS_PER_DIGIT; \ lsb += BITS_PER_DIGIT; \
} \ } \
if (lsb < (obits)) { \ if (lsb < (obits)) { \
const uint32_t msb_data = VL_SEL_IWII((obits) + 1, (rwp).data(), lsb, (obits)-lsb); \ const uint32_t msb_data = VL_SEL_IWII((obits) + 1, (rwp).data(), lsb, (obits)-lsb); \