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

Handle negative and undefined queue addresses correctly

This commit is contained in:
Cary R 2020-07-23 22:48:11 -07:00
parent f0f045f1f9
commit e94291c88f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vvp/vthread.cc
View File

@ -3663,7 +3663,7 @@ bool of_LOAD_AR(vthread_t thr, vvp_code_t cp)
*/ */
bool of_LOAD_DAR_R(vthread_t thr, vvp_code_t cp) bool of_LOAD_DAR_R(vthread_t thr, vvp_code_t cp)
{ {
unsigned adr = thr->words[3].w_int; int64_t adr = thr->words[3].w_int;
vvp_net_t*net = cp->net; vvp_net_t*net = cp->net;
assert(net); assert(net);
@ -3673,7 +3673,8 @@ bool of_LOAD_DAR_R(vthread_t thr, vvp_code_t cp)
vvp_darray*darray = obj->get_object().peek<vvp_darray>(); vvp_darray*darray = obj->get_object().peek<vvp_darray>();
double word; double word;
if (darray) if (darray &&
(adr >= 0) && (thr->flags[4] == BIT4_0)) // A defined address >= 0
darray->get_word(adr, word); darray->get_word(adr, word);
else else
word = 0.0; word = 0.0;
@ -3684,7 +3685,7 @@ bool of_LOAD_DAR_R(vthread_t thr, vvp_code_t cp)
bool of_LOAD_DAR_STR(vthread_t thr, vvp_code_t cp) bool of_LOAD_DAR_STR(vthread_t thr, vvp_code_t cp)
{ {
unsigned adr = thr->words[3].w_int; int64_t adr = thr->words[3].w_int;
vvp_net_t*net = cp->net; vvp_net_t*net = cp->net;
assert(net); assert(net);
@ -3694,7 +3695,8 @@ bool of_LOAD_DAR_STR(vthread_t thr, vvp_code_t cp)
vvp_darray*darray = obj->get_object().peek<vvp_darray>(); vvp_darray*darray = obj->get_object().peek<vvp_darray>();
string word; string word;
if (darray) if (darray &&
(adr >= 0) && (thr->flags[4] == BIT4_0)) // A defined address >= 0
darray->get_word(adr, word); darray->get_word(adr, word);
else else
word = ""; word = "";
@ -3705,7 +3707,7 @@ bool of_LOAD_DAR_STR(vthread_t thr, vvp_code_t cp)
bool of_LOAD_DAR_VEC4(vthread_t thr, vvp_code_t cp) bool of_LOAD_DAR_VEC4(vthread_t thr, vvp_code_t cp)
{ {
unsigned adr = thr->words[3].w_int; int64_t adr = thr->words[3].w_int;
vvp_net_t*net = cp->net; vvp_net_t*net = cp->net;
assert(net); assert(net);
@ -3715,7 +3717,8 @@ bool of_LOAD_DAR_VEC4(vthread_t thr, vvp_code_t cp)
vvp_darray*darray = obj->get_object().peek<vvp_darray>(); vvp_darray*darray = obj->get_object().peek<vvp_darray>();
vvp_vector4_t word; vvp_vector4_t word;
if (darray) if (darray &&
(adr >= 0) && (thr->flags[4] == BIT4_0)) // A defined address >= 0
darray->get_word(adr, word); darray->get_word(adr, word);
else else
word = vvp_vector4_t(obj->size()); word = vvp_vector4_t(obj->size());