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

Remove some clang warnings

This commit is contained in:
Cary R 2020-07-27 21:55:52 -07:00
parent 14ade1a9f4
commit fdd902e446
3 changed files with 90 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vvp/vthread.cc
View File

@ -5937,7 +5937,7 @@ bool of_STORE_QDAR_R(vthread_t thr, vvp_code_t cp)
cerr << "Warning: cannot write to an undefined queue<real> index." cerr << "Warning: cannot write to an undefined queue<real> index."
<< endl; << endl;
else else
queue->set_word(adr, value, max_size); queue->set_word_max(adr, value, max_size);
return true; return true;
} }
@ -5960,7 +5960,7 @@ bool of_STORE_QDAR_STR(vthread_t thr, vvp_code_t cp)
cerr << "Warning: cannot write to an undefined queue<string> index." cerr << "Warning: cannot write to an undefined queue<string> index."
<< endl; << endl;
else else
queue->set_word(adr, value, max_size); queue->set_word_max(adr, value, max_size);
return true; return true;
} }
@ -5983,7 +5983,7 @@ bool of_STORE_QDAR_VEC4(vthread_t thr, vvp_code_t cp)
cerr << "Warning: cannot write to an undefined queue<vector[" cerr << "Warning: cannot write to an undefined queue<vector["
<< value.size() << "]> index." << endl; << value.size() << "]> index." << endl;
else else
queue->set_word(adr, value, max_size); queue->set_word_max(adr, value, max_size);
return true; return true;
} }

99
vvp/vvp_darray.cc
View File

@ -410,9 +410,9 @@ vvp_queue::~vvp_queue()
{ {
} }
void vvp_queue::set_word(unsigned, const vvp_vector4_t&, unsigned) void vvp_queue::set_word_max(unsigned, const vvp_vector4_t&, unsigned)
{ {
cerr << "XXXX set_word(vvp_vector4_t) not implemented for " << typeid(*this).name() << endl; cerr << "XXXX set_word_max(vvp_vector4_t) not implemented for " << typeid(*this).name() << endl;
} }
void vvp_queue::push_back(const vvp_vector4_t&, unsigned) void vvp_queue::push_back(const vvp_vector4_t&, unsigned)
@ -425,9 +425,9 @@ void vvp_queue::push_front(const vvp_vector4_t&, unsigned)
cerr << "XXXX push_front(vvp_vector4_t) not implemented for " << typeid(*this).name() << endl; cerr << "XXXX push_front(vvp_vector4_t) not implemented for " << typeid(*this).name() << endl;
} }
void vvp_queue::set_word(unsigned, double, unsigned) void vvp_queue::set_word_max(unsigned, double, unsigned)
{ {
cerr << "XXXX set_word(double) not implemented for " << typeid(*this).name() << endl; cerr << "XXXX set_word_max(double) not implemented for " << typeid(*this).name() << endl;
} }
void vvp_queue::push_back(double, unsigned) void vvp_queue::push_back(double, unsigned)
@ -440,9 +440,9 @@ void vvp_queue::push_front(double, unsigned)
cerr << "XXXX push_front(double) not implemented for " << typeid(*this).name() << endl; cerr << "XXXX push_front(double) not implemented for " << typeid(*this).name() << endl;
} }
void vvp_queue::set_word(unsigned, const string&, unsigned) void vvp_queue::set_word_max(unsigned, const string&, unsigned)
{ {
cerr << "XXXX set_word(string) not implemented for " << typeid(*this).name() << endl; cerr << "XXXX set_word_max(string) not implemented for " << typeid(*this).name() << endl;
} }
void vvp_queue::push_back(const string&, unsigned) void vvp_queue::push_back(const string&, unsigned)
@ -459,16 +459,25 @@ vvp_queue_real::~vvp_queue_real()
{ {
} }
void vvp_queue_real::set_word(unsigned adr, double value, unsigned max_size) void vvp_queue_real::set_word_max(unsigned adr, double value, unsigned max_size)
{
if (adr == queue.size())
if (!max_size || (queue.size() < max_size))
queue.push_back(value);
else
cerr << "Warning: assigning to queue<real>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else
set_word(adr, value);
}
void vvp_queue_real::set_word(unsigned adr, double value)
{ {
if (adr < queue.size()) if (adr < queue.size())
queue[adr] = value; queue[adr] = value;
else if (adr == queue.size()) else
if (!max_size || (queue.size() < max_size)) queue.push_back(value); cerr << "Warning: assigning to queue<real>[" << adr << "] is outside "
else cerr << "Warning: assigning to queue<real>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else cerr << "Warning: assigning to queue<real>[" << adr << "] is outside "
"of size (" << queue.size() << "). " << value "of size (" << queue.size() << "). " << value
<< " was not added." << endl; << " was not added." << endl;
} }
@ -483,8 +492,10 @@ void vvp_queue_real::get_word(unsigned adr, double&value)
void vvp_queue_real::push_back(double value, unsigned max_size) void vvp_queue_real::push_back(double value, unsigned max_size)
{ {
if (!max_size || (queue.size() < max_size)) queue.push_back(value); if (!max_size || (queue.size() < max_size))
else cerr << "Warning: push_back(" << value queue.push_back(value);
else
cerr << "Warning: push_back(" << value
<< ") skipped for already full bounded queue<real> [" << ") skipped for already full bounded queue<real> ["
<< max_size << "]." << endl; << max_size << "]." << endl;
} }
@ -519,16 +530,25 @@ vvp_queue_string::~vvp_queue_string()
{ {
} }
void vvp_queue_string::set_word(unsigned adr, const string&value, unsigned max_size) void vvp_queue_string::set_word_max(unsigned adr, const string&value, unsigned max_size)
{
if (adr == queue.size())
if (!max_size || (queue.size() < max_size))
queue.push_back(value);
else
cerr << "Warning: assigning to queue<string>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else
set_word(adr, value);
}
void vvp_queue_string::set_word(unsigned adr, const string&value)
{ {
if (adr < queue.size()) if (adr < queue.size())
queue[adr] = value; queue[adr] = value;
else if (adr == queue.size()) else
if (!max_size || (queue.size() < max_size)) queue.push_back(value); cerr << "Warning: assigning to queue<string>[" << adr << "] is outside "
else cerr << "Warning: assigning to queue<string>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else cerr << "Warning: assigning to queue<string>[" << adr << "] is outside "
"of size (" << queue.size() << "). " << value "of size (" << queue.size() << "). " << value
<< " was not added." << endl; << " was not added." << endl;
} }
@ -543,8 +563,10 @@ void vvp_queue_string::get_word(unsigned adr, string&value)
void vvp_queue_string::push_back(const string&value, unsigned max_size) void vvp_queue_string::push_back(const string&value, unsigned max_size)
{ {
if (!max_size || (queue.size() < max_size)) queue.push_back(value); if (!max_size || (queue.size() < max_size))
else cerr << "Warning: push_back(\"" << value queue.push_back(value);
else
cerr << "Warning: push_back(\"" << value
<< "\") skipped for already full bounded queue<string> [" << "\") skipped for already full bounded queue<string> ["
<< max_size << "]." << endl; << max_size << "]." << endl;
} }
@ -579,16 +601,25 @@ vvp_queue_vec4::~vvp_queue_vec4()
{ {
} }
void vvp_queue_vec4::set_word(unsigned adr, const vvp_vector4_t&value, unsigned max_size) void vvp_queue_vec4::set_word_max(unsigned adr, const vvp_vector4_t&value, unsigned max_size)
{
if (adr == queue.size())
if (!max_size || (queue.size() < max_size))
queue.push_back(value);
else
cerr << "Warning: assigning to queue<vector>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else
set_word(adr, value);
}
void vvp_queue_vec4::set_word(unsigned adr, const vvp_vector4_t&value)
{ {
if (adr < queue.size()) if (adr < queue.size())
queue[adr] = value; queue[adr] = value;
else if (adr == queue.size()) else
if (!max_size || (queue.size() < max_size)) queue.push_back(value); cerr << "Warning: assigning to queue<vector>[" << adr << "] is outside "
else cerr << "Warning: assigning to queue<vector>[" << adr << "] is"
" outside bound (" << max_size << "). " << value
<< " was not added." << endl;
else cerr << "Warning: assigning to queue<vector>[" << adr << "] is outside "
"of size (" << queue.size() << "). " << value "of size (" << queue.size() << "). " << value
<< " was not added." << endl; << " was not added." << endl;
} }
@ -603,8 +634,10 @@ void vvp_queue_vec4::get_word(unsigned adr, vvp_vector4_t&value)
void vvp_queue_vec4::push_back(const vvp_vector4_t&value, unsigned max_size) void vvp_queue_vec4::push_back(const vvp_vector4_t&value, unsigned max_size)
{ {
if (!max_size || (queue.size() < max_size)) queue.push_back(value); if (!max_size || (queue.size() < max_size))
else cerr << "Warning: push_back(" << value queue.push_back(value);
else
cerr << "Warning: push_back(" << value
<< ") skipped for already full bounded queue<vector[" << ") skipped for already full bounded queue<vector["
<< value.size() << "]> [" << max_size << "]." << endl; << value.size() << "]> [" << max_size << "]." << endl;
} }

15
vvp/vvp_darray.h
View File

@ -154,15 +154,15 @@ class vvp_queue : public vvp_darray {
inline vvp_queue(void) { } inline vvp_queue(void) { }
~vvp_queue(); ~vvp_queue();
virtual void set_word(unsigned adr, const vvp_vector4_t&value, unsigned max_size); virtual void set_word_max(unsigned adr, const vvp_vector4_t&value, unsigned max_size);
virtual void push_back(const vvp_vector4_t&value, unsigned max_size); virtual void push_back(const vvp_vector4_t&value, unsigned max_size);
virtual void push_front(const vvp_vector4_t&value, unsigned max_size); virtual void push_front(const vvp_vector4_t&value, unsigned max_size);
virtual void set_word(unsigned adr, double value, unsigned max_size); virtual void set_word_max(unsigned adr, double value, unsigned max_size);
virtual void push_back(double value, unsigned max_size); virtual void push_back(double value, unsigned max_size);
virtual void push_front(double value, unsigned max_size); virtual void push_front(double value, unsigned max_size);
virtual void set_word(unsigned adr, const std::string&value, unsigned max_size); virtual void set_word_max(unsigned adr, const std::string&value, unsigned max_size);
virtual void push_back(const std::string&value, unsigned max_size); virtual void push_back(const std::string&value, unsigned max_size);
virtual void push_front(const std::string&value, unsigned max_size); virtual void push_front(const std::string&value, unsigned max_size);
@ -177,7 +177,8 @@ class vvp_queue_real : public vvp_queue {
~vvp_queue_real(); ~vvp_queue_real();
size_t get_size(void) const { return queue.size(); }; size_t get_size(void) const { return queue.size(); };
void set_word(unsigned adr, double value, unsigned max_size); void set_word_max(unsigned adr, double value, unsigned max_size);
void set_word(unsigned adr, double value);
void get_word(unsigned adr, double&value); void get_word(unsigned adr, double&value);
void push_back(double value, unsigned max_size); void push_back(double value, unsigned max_size);
void push_front(double value, unsigned max_size); void push_front(double value, unsigned max_size);
@ -195,7 +196,8 @@ class vvp_queue_string : public vvp_queue {
~vvp_queue_string(); ~vvp_queue_string();
size_t get_size(void) const { return queue.size(); }; size_t get_size(void) const { return queue.size(); };
void set_word(unsigned adr, const std::string&value, unsigned max_size); void set_word_max(unsigned adr, const std::string&value, unsigned max_size);
void set_word(unsigned adr, const std::string&value);
void get_word(unsigned adr, std::string&value); void get_word(unsigned adr, std::string&value);
void push_back(const std::string&value, unsigned max_size); void push_back(const std::string&value, unsigned max_size);
void push_front(const std::string&value, unsigned max_size); void push_front(const std::string&value, unsigned max_size);
@ -213,7 +215,8 @@ class vvp_queue_vec4 : public vvp_queue {
~vvp_queue_vec4(); ~vvp_queue_vec4();
size_t get_size(void) const { return queue.size(); }; size_t get_size(void) const { return queue.size(); };
void set_word(unsigned adr, const vvp_vector4_t&value, unsigned max_size); void set_word_max(unsigned adr, const vvp_vector4_t&value, unsigned max_size);
void set_word(unsigned adr, const vvp_vector4_t&value);
void get_word(unsigned adr, vvp_vector4_t&value); void get_word(unsigned adr, vvp_vector4_t&value);
void push_back(const vvp_vector4_t&value, unsigned max_size); void push_back(const vvp_vector4_t&value, unsigned max_size);
void push_front(const vvp_vector4_t&value, unsigned max_size); void push_front(const vvp_vector4_t&value, unsigned max_size);