From 33c9591a4b8654f9d424f0ab3e703a78159c381c Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 29 Apr 2012 11:34:25 -0400
Subject: [PATCH] Internals: Move widthPow2. No functional change.

---
 src/V3Ast.cpp      | 9 ---------
 src/V3Ast.h        | 1 -
 src/V3AstNodes.cpp | 9 +++++++++
 src/V3EmitC.cpp    | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index f223e58c2..f8a24422f 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -230,15 +230,6 @@ string AstNode::quoteName(const string& namein) {
     return out;
 }
 
-int AstNode::widthPow2() const {
-    // I.e.  width 30 returns 32, width 32 returns 32.
-    uint32_t width = this->width();
-    for (int p2=30; p2>=0; p2--) {
-	if (width > (1UL<<p2)) return (1UL<<(p2+1));
-    }
-    return 1;
-}
-
 //######################################################################
 // Insertion
 
diff --git a/src/V3Ast.h b/src/V3Ast.h
index 0f665272a..f6a69730d 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -981,7 +981,6 @@ public:
     int		width() const;
     int		widthMin() const;
     int		widthWords() const { return VL_WORDS_I(width()); }
-    int		widthPow2() const;
     bool	isQuad() const { return (width()>VL_WORDSIZE && width()<=VL_QUADSIZE); }
     bool	isWide() const { return (width()>VL_QUADSIZE); }
     bool	isDouble() const;
diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index 3e8d1e886..923859376 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -326,6 +326,15 @@ pair<uint32_t,uint32_t> AstNodeDType::dimensions() {
     return make_pair(packed, unpacked);
 }
 
+int AstNodeDType::widthPow2() const {
+    // I.e.  width 30 returns 32, width 32 returns 32.
+    uint32_t width = this->width();
+    for (int p2=30; p2>=0; p2--) {
+	if (width > (1UL<<p2)) return (1UL<<(p2+1));
+    }
+    return 1;
+}
+
 // Special operators
 int AstArraySel::dimension(AstNode* nodep) {
     // How many dimensions is this reference from the base variable?
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index 2e31bf40b..9eabad98e 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -487,7 +487,7 @@ public:
 	    visit(nodep->castNodeUniop(), vup);
 	} else {
 	    putbs("VL_REDXOR_");
-	    puts(cvtToStr(nodep->lhsp()->widthPow2()));
+	    puts(cvtToStr(nodep->lhsp()->dtypep()->widthPow2()));
 	    puts("(");
 	    nodep->lhsp()->iterateAndNext(*this);
 	    puts(")");