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

Refactor array store for string/real and skip saving when given an undefined index

This commit is contained in:
Cary R 2020-08-16 19:47:40 -07:00
parent 505ee1a96c
commit 0a69303164
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vvp/vthread.cc
View File

@ -6252,18 +6252,26 @@ bool of_STORE_REAL(vthread_t thr, vvp_code_t cp)
return store<double>(thr, cp); return store<double>(thr, cp);
} }
template <typename ELEM>
static bool storea(vthread_t thr, vvp_code_t cp)
{
unsigned idx = cp->bit_idx[0];
unsigned adr = thr->words[idx].w_int;
ELEM val;
pop_value(thr, val, 0);
if (thr->flags[4] != BIT4_1)
cp->array->set_word(adr, val);
return true;
}
/* /*
* %store/reala <var-label> <index> * %store/reala <var-label> <index>
*/ */
bool of_STORE_REALA(vthread_t thr, vvp_code_t cp) bool of_STORE_REALA(vthread_t thr, vvp_code_t cp)
{ {
unsigned idx = cp->bit_idx[0]; return storea<double>(thr, cp);
unsigned adr = thr->words[idx].w_int;
double val = thr->pop_real();
cp->array->set_word(adr, val);
return true;
} }
bool of_STORE_STR(vthread_t thr, vvp_code_t cp) bool of_STORE_STR(vthread_t thr, vvp_code_t cp)
@ -6276,13 +6284,7 @@ bool of_STORE_STR(vthread_t thr, vvp_code_t cp)
*/ */
bool of_STORE_STRA(vthread_t thr, vvp_code_t cp) bool of_STORE_STRA(vthread_t thr, vvp_code_t cp)
{ {
unsigned idx = cp->bit_idx[0]; return storea<string>(thr, cp);
unsigned adr = thr->words[idx].w_int;
string val = thr->pop_str();
cp->array->set_word(adr, val);
return true;
} }
/* /*