From 42fe46a7db8b134cfe77ac3011e179d9e3ee3e63 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <martinwhitaker@users.sourceforge.net>
Date: Sat, 21 Jul 2007 17:19:24 -0700
Subject: [PATCH] Elaborate memory references with non-zero bases.

This fixes r-value type references to memory words for memories
that have a non-zero base address. Elaborate the expression
needed to get the canonical word index.
---
 elab_expr.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/elab_expr.cc b/elab_expr.cc
index 58251ec95..dbe0f018a 100644
--- a/elab_expr.cc
+++ b/elab_expr.cc
@@ -1197,6 +1197,17 @@ NetExpr* PEIdent::elaborate_expr_net_word_(Design*des, NetScope*scope,
 		  delete word_index;
 		  word_index = tmp;
 	    }
+
+      } else if (word_index) {
+              // If there is a non-zero base to the memory, then build an
+              // expression to calculate the canonical address.
+            if (long base = net->array_first()) {
+
+                  word_index = make_add_expr(word_index, 0-base);
+                  if (NetExpr*tmp = word_index->eval_tree()) {
+                        word_index = tmp;
+                  }
+            }
       }
 
       NetESignal*res = new NetESignal(net, word_index);