Fixed more extend vs. extend_u0 issues

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index c701c2fa061f4e18c3603326bb64b0f610d61c81..0c9c9be73b816d441195b50983abb8fccb758a80 100644 (file)
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -961,7 +961,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
                        return sig;
                }
 
-       // just pass thru the signal. the parent will evaluate the is_signed property and inperpret the SigSpec accordingly
+       // just pass thru the signal. the parent will evaluate the is_signed property and interpret the SigSpec accordingly
        case AST_TO_SIGNED:
        case AST_TO_UNSIGNED: {
                        RTLIL::SigSpec sig = children[0]->genRTLIL();
@@ -1346,7 +1346,7 @@ RTLIL::SigSpec AstNode::genWidthRTLIL(int width, RTLIL::SigSpec *subst_from,  RT
        genRTLIL_subst_to = backup_subst_to;
 
        if (width >= 0)
-               widthExtend(this, sig, width, is_signed);
+               sig.extend_u0(width, is_signed);
 
        return sig;
 }

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 7b5ae064cc5fb9a2d76a825376b58427bd481acb..449ade4349858c40e3605915f758596376133b4b 100644 (file)
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -441,7 +441,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
                int width = children[1]->range_left - children[1]->range_right + 1;
                if (width != int(children[0]->bits.size())) {
                        RTLIL::SigSpec sig(children[0]->bits);
-                       sig.extend(width, children[0]->is_signed);
+                       sig.extend_u0(width, children[0]->is_signed);
                        delete children[0];
                        children[0] = mkconst_bits(sig.as_const().bits, children[0]->is_signed);
                }

diff --git a/kernel/calc.cc b/kernel/calc.cc
index e998e5b3a62cdb72389384e3cb6a95147c39342b..605b1c13a0db74f2df993d8438b9b976ab100fb3 100644 (file)
--- a/kernel/calc.cc
+++ b/kernel/calc.cc
@@ -33,6 +33,17 @@ static void extend(RTLIL::Const &arg, int width, bool is_signed)
                arg.bits.push_back(padding);
 }
 
+static void extend_u0(RTLIL::Const &arg, int width, bool is_signed)
+{
+       RTLIL::State padding = RTLIL::State::S0;
+
+       if (arg.bits.size() > 0 && is_signed)
+               padding = arg.bits.back();
+
+       while (int(arg.bits.size()) < width)
+               arg.bits.push_back(padding);
+}
+
 static BigInteger const2big(const RTLIL::Const &val, bool as_signed, int &undef_bit_pos)
 {
        BigInteger result = 0, this_bit = 1;
@@ -117,7 +128,7 @@ RTLIL::Const RTLIL::const_not(const RTLIL::Const &arg1, const RTLIL::Const&, boo
                result_len = arg1.bits.size();
 
        RTLIL::Const arg1_ext = arg1;
-       extend(arg1_ext, result_len, signed1);
+       extend_u0(arg1_ext, result_len, signed1);
 
        RTLIL::Const result(RTLIL::State::Sx, result_len);
        for (size_t i = 0; i < size_t(result_len); i++) {
@@ -138,8 +149,8 @@ static RTLIL::Const logic_wrapper(RTLIL::State(*logic_func)(RTLIL::State, RTLIL:
        if (result_len < 0)
                result_len = std::max(arg1.bits.size(), arg2.bits.size());
 
-       extend(arg1, result_len, signed1);
-       extend(arg2, result_len, signed2);
+       extend_u0(arg1, result_len, signed1);
+       extend_u0(arg2, result_len, signed2);
 
        RTLIL::Const result(RTLIL::State::Sx, result_len);
        for (size_t i = 0; i < size_t(result_len); i++) {
@@ -338,11 +349,9 @@ RTLIL::Const RTLIL::const_eq(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
        RTLIL::Const arg2_ext = arg2;
        RTLIL::Const result(RTLIL::State::S0, result_len);
 
-       while (arg1_ext.bits.size() < arg2_ext.bits.size())
-               arg1_ext.bits.push_back(signed1 && signed2 && arg1_ext.bits.size() > 0 ? arg1_ext.bits.back() : RTLIL::State::S0);
-
-       while (arg2_ext.bits.size() < arg1_ext.bits.size())
-               arg2_ext.bits.push_back(signed1 && signed2 && arg2_ext.bits.size() > 0 ? arg2_ext.bits.back() : RTLIL::State::S0);
+       int width = std::max(arg1_ext.bits.size(), arg2_ext.bits.size());
+       extend_u0(arg1_ext, width, signed1 && signed2);
+       extend_u0(arg2_ext, width, signed1 && signed2);
 
        RTLIL::State matched_status = RTLIL::State::S1;
        for (size_t i = 0; i < arg1_ext.bits.size(); i++) {