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

Only move constant assignments into initialisation

This commit is contained in:
Nick Gasson 2008-06-21 16:40:18 +01:00
parent c926454a41
commit 75f7c9ae0c
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tgt-vhdl/stmt.cc
View File

@ -138,7 +138,8 @@ static int draw_nbassign(vhdl_process *proc, stmt_container *container,
// then use the uninitialized signal value. // then use the uninitialized signal value.
// The second test ensures that we only try to initialise // The second test ensures that we only try to initialise
// internal signals not ports // internal signals not ports
if (proc->is_initial() && ivl_signal_port(sig) == IVL_SIP_NONE) { if (proc->is_initial() && ivl_signal_port(sig) == IVL_SIP_NONE
&& rhs->constant()) {
decl->set_initial(rhs); decl->set_initial(rhs);
} }
else { else {
@ -181,9 +182,10 @@ static int draw_assign(vhdl_process *proc, stmt_container *container,
return 1; return 1;
vhdl_expr *rhs = rhs_raw->cast(decl->get_type()); vhdl_expr *rhs = rhs_raw->cast(decl->get_type());
// As with non-blocking assignment, push assignments into the // As with non-blocking assignment, push constant assignments
// initialisation if we can // into the initialisation if we can
if (proc->is_initial() && ivl_signal_port(sig) == IVL_SIP_NONE) { if (proc->is_initial() && ivl_signal_port(sig) == IVL_SIP_NONE
&& rhs->constant()) {
decl->set_initial(rhs); decl->set_initial(rhs);
} }
else { else {

2
tgt-vhdl/vhdl_syntax.cc
View File

@ -585,7 +585,7 @@ void vhdl_assign_stmt::emit(std::ofstream &of, int level) const
} }
vhdl_const_bits::vhdl_const_bits(const char *value, int width) vhdl_const_bits::vhdl_const_bits(const char *value, int width)
: vhdl_expr(vhdl_type::nsigned(width)) : vhdl_expr(vhdl_type::nsigned(width), true)
{ {
// Can't rely on value being NULL-terminated // Can't rely on value being NULL-terminated
while (width--) while (width--)

13
tgt-vhdl/vhdl_syntax.hh
View File

@ -29,13 +29,16 @@ class vhdl_arch;
class vhdl_expr : public vhdl_element { class vhdl_expr : public vhdl_element {
public: public:
vhdl_expr(vhdl_type* type) : type_(type) {} vhdl_expr(vhdl_type* type, bool isconst=false)
: type_(type), isconst_(isconst) {}
virtual ~vhdl_expr(); virtual ~vhdl_expr();
const vhdl_type *get_type() const { return type_; } const vhdl_type *get_type() const { return type_; }
bool constant() const { return isconst_; }
virtual vhdl_expr *cast(const vhdl_type *to); virtual vhdl_expr *cast(const vhdl_type *to);
private: private:
vhdl_type *type_; vhdl_type *type_;
bool isconst_;
}; };
@ -114,7 +117,7 @@ private:
class vhdl_const_string : public vhdl_expr { class vhdl_const_string : public vhdl_expr {
public: public:
vhdl_const_string(const char *value) vhdl_const_string(const char *value)
: vhdl_expr(vhdl_type::string()), value_(value) {} : vhdl_expr(vhdl_type::string(), true), value_(value) {}
void emit(std::ofstream &of, int level) const; void emit(std::ofstream &of, int level) const;
private: private:
@ -134,7 +137,7 @@ private:
class vhdl_const_bit : public vhdl_expr { class vhdl_const_bit : public vhdl_expr {
public: public:
vhdl_const_bit(char bit) vhdl_const_bit(char bit)
: vhdl_expr(vhdl_type::std_logic()), bit_(bit) {} : vhdl_expr(vhdl_type::std_logic(), true), bit_(bit) {}
void emit(std::ofstream &of, int level) const; void emit(std::ofstream &of, int level) const;
private: private:
char bit_; char bit_;
@ -147,7 +150,7 @@ enum time_unit_t {
class vhdl_const_time : public vhdl_expr { class vhdl_const_time : public vhdl_expr {
public: public:
vhdl_const_time(int64_t value, time_unit_t units) vhdl_const_time(int64_t value, time_unit_t units)
: vhdl_expr(vhdl_type::time()), value_(value), units_(units) {} : vhdl_expr(vhdl_type::time(), true), value_(value), units_(units) {}
void emit(std::ofstream &of, int level) const; void emit(std::ofstream &of, int level) const;
private: private:
int64_t value_; int64_t value_;
@ -157,7 +160,7 @@ private:
class vhdl_const_int : public vhdl_expr { class vhdl_const_int : public vhdl_expr {
public: public:
vhdl_const_int(int64_t value) vhdl_const_int(int64_t value)
: vhdl_expr(vhdl_type::integer()), value_(value) {} : vhdl_expr(vhdl_type::integer(), true), value_(value) {}
void emit(std::ofstream &of, int level) const; void emit(std::ofstream &of, int level) const;
private: private:
int64_t value_; int64_t value_;