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

Fix some merge errors.

This commit is contained in:
Stephen Williams 2009-06-25 20:43:09 -07:00
parent b5271137cf
commit 1940de0110
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vvp/array.cc
View File

@ -1163,9 +1163,9 @@ void vvp_fun_arrayport_sa::check_word_change(unsigned long addr)
if (addr != addr_) return; if (addr != addr_) return;
if (vpi_array_is_real(arr_)) { if (vpi_array_is_real(arr_)) {
net_->send_real(net_->out, array_get_word_r(arr_, addr_), 0); net_->send_real(array_get_word_r(arr_, addr_), 0);
} else { } else {
net_->send_vec4(net_->out, array_get_word(arr_, addr_), 0); net_->send_vec4(array_get_word(arr_, addr_), 0);
} }
} }
@ -1250,12 +1250,10 @@ void vvp_fun_arrayport_aa::recv_vec4(vvp_net_ptr_t port, const vvp_vector4_t&bit
addr_valid_flag = vector4_to_value(bit, *addr); addr_valid_flag = vector4_to_value(bit, *addr);
if (! addr_valid_flag) *addr = arr_->array_count; if (! addr_valid_flag) *addr = arr_->array_count;
if (vpi_array_is_real(arr_)) { if (vpi_array_is_real(arr_)) {
port.ptr()->send_real(port.ptr()->out, port.ptr()->send_real(array_get_word_r(arr_, *addr),
array_get_word_r(arr_, *addr),
context); context);
} else { } else {
port.ptr()->send_vec4(port.ptr()->out, port.ptr()->send_vec4(array_get_word(arr_, *addr),
array_get_word(arr_, *addr),
context); context);
} }
break; break;
@ -1282,10 +1280,10 @@ void vvp_fun_arrayport_aa::check_word_change(unsigned long addr)
return; return;
if (vpi_array_is_real(arr_)) { if (vpi_array_is_real(arr_)) {
net_->send_real(net_->out, array_get_word_r(arr_, addr), net_->send_real(array_get_word_r(arr_, addr),
vthread_get_wt_context()); vthread_get_wt_context());
} else { } else {
net_->send_vec4(net_->out, array_get_word(arr_, addr), net_->send_vec4(array_get_word(arr_, addr),
vthread_get_wt_context()); vthread_get_wt_context());
} }
} }