From 2a791bfb38a9948a54c829ed55958a588bca8583 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Thu, 17 Jul 2008 13:41:44 +0100
Subject: [PATCH] Assignment to arrays

---
 tgt-vhdl/stmt.cc        | 16 +++++++++++++---
 tgt-vhdl/vhdl_syntax.cc | 29 +++++++++++++++++------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/tgt-vhdl/stmt.cc b/tgt-vhdl/stmt.cc
index ffc37159a..c6e4deb44 100644
--- a/tgt-vhdl/stmt.cc
+++ b/tgt-vhdl/stmt.cc
@@ -117,6 +117,8 @@ static vhdl_expr *make_assign_rhs(ivl_signal_t sig, vhdl_scope *scope,
    
    if (base == NULL)
       return rhs->cast(decl->get_type());
+   else if (decl->get_type()->get_name() == VHDL_TYPE_ARRAY)
+      return rhs->cast(decl->get_type()->get_base());
    else {
       // Doesn't make sense to part select on something that's
       // not a vector
@@ -142,8 +144,12 @@ static vhdl_var_ref *make_assign_lhs(ivl_signal_t sig, vhdl_scope *scope,
    
    vhdl_type *ltype = new vhdl_type(*decl->get_type());
    vhdl_var_ref *lval_ref = new vhdl_var_ref(signame.c_str(), ltype);
-   if (base)
-      lval_ref->set_slice(base, lval_width - 1);
+   if (base) {
+      if (decl->get_type()->get_name() == VHDL_TYPE_ARRAY)
+         lval_ref->set_slice(base, 0);
+      else
+         lval_ref->set_slice(base, lval_width - 1);
+   }
 
    return lval_ref;
 }
@@ -167,6 +173,8 @@ static T *make_assignment(vhdl_procedural *proc, stmt_container *container,
 
       vhdl_expr *base = NULL;
       ivl_expr_t e_off = ivl_lval_part_off(lval);
+      if (NULL == e_off)
+         e_off = ivl_lval_idx(lval);
       if (e_off) {
          if ((base = translate_expr(e_off)) == NULL)
             return NULL;
@@ -239,7 +247,9 @@ static T *make_assignment(vhdl_procedural *proc, stmt_container *container,
          // internal signals not ports
          if (proc->get_scope()->initializing()
              && ivl_signal_port(sig) == IVL_SIP_NONE
-             && !decl->has_initial() && rhs->constant()) {
+             && !decl->has_initial()
+             && rhs->constant()
+             && decl->get_type()->get_name() != VHDL_TYPE_ARRAY) {
 
             // If this assignment is not in the top-level container
             // it will not be made on all paths through the code
diff --git a/tgt-vhdl/vhdl_syntax.cc b/tgt-vhdl/vhdl_syntax.cc
index 74c106c2b..3773106fe 100644
--- a/tgt-vhdl/vhdl_syntax.cc
+++ b/tgt-vhdl/vhdl_syntax.cc
@@ -507,22 +507,27 @@ vhdl_var_ref::~vhdl_var_ref()
 void vhdl_var_ref::set_slice(vhdl_expr *s, int w)
 {
    assert(type_);
-   
-   vhdl_type_name_t tname = type_->get_name();
-   assert(tname == VHDL_TYPE_UNSIGNED || tname == VHDL_TYPE_SIGNED);
-   
+
    slice_ = s;
    slice_width_ = w;
+      
+   vhdl_type_name_t tname = type_->get_name();
+   if (tname == VHDL_TYPE_ARRAY) {
+      type_ = new vhdl_type(*type_->get_base());
+   }
+   else {
+      assert(tname == VHDL_TYPE_UNSIGNED || tname == VHDL_TYPE_SIGNED);
 
-   if (type_)
-      delete type_;
-
-   if (w > 0)
-      type_ = new vhdl_type(tname, w);
-   else
-      type_ = vhdl_type::std_logic();   
+      if (type_)
+         delete type_;
+      
+      if (w > 0)
+         type_ = new vhdl_type(tname, w);
+      else
+         type_ = vhdl_type::std_logic();   
+   }
 }
-
+   
 void vhdl_var_ref::emit(std::ostream &of, int level) const
 {
    of << name_;