diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp index 933f8d88e..73275f9c7 100644 --- a/include/verilated_fst_c.cpp +++ b/include/verilated_fst_c.cpp @@ -204,7 +204,7 @@ void VerilatedFst::declare(vluint32_t code, const char* name, int dtypenum, fstV std::stringstream name_ss; name_ss << symbol_name; - if (array) name_ss << "(" << arraynum << ")"; + if (array) name_ss << "[" << arraynum << "]"; std::string name_str = name_ss.str(); if (dtypenum > 0) { diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp index 2630967f3..1a21bdbf2 100644 --- a/include/verilated_vcd_c.cpp +++ b/include/verilated_vcd_c.cpp @@ -431,9 +431,9 @@ void VerilatedVcd::dumpHeader() { for (; *np && *np != ' ' && *np != '\t'; np++) { if (*np == '[') { - printStr("("); + printStr("["); } else if (*np == ']') { - printStr(")"); + printStr("]"); } else if (!(*np & '\x80')) { *m_writep++ = *np; } @@ -532,7 +532,7 @@ void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep, decl += " "; decl += basename; if (array) { - VL_SNPRINTF(buf, bufsize, "(%d)", arraynum); + VL_SNPRINTF(buf, bufsize, "[%d]", arraynum); decl += buf; hiername += buf; } diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index 3bbe20f31..066aa51ce 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -253,7 +253,7 @@ private: VL_RESTORER(m_traShowname); VL_RESTORER(m_traValuep); { - m_traShowname += string("(") + cvtToStr(i) + string(")"); + m_traShowname += string("[") + cvtToStr(i) + string("]"); m_traValuep = new AstArraySel( nodep->fileline(), m_traValuep->cloneTree(true), i - nodep->lo()); @@ -278,7 +278,7 @@ private: VL_RESTORER(m_traShowname); VL_RESTORER(m_traValuep); { - m_traShowname += string("(") + cvtToStr(i) + string(")"); + m_traShowname += string("[") + cvtToStr(i) + string("]"); m_traValuep = new AstSel(nodep->fileline(), m_traValuep->cloneTree(true), (i - nodep->lo()) * subtypep->width(), subtypep->width()); diff --git a/test_regress/t/t_split_var_2_trace.out b/test_regress/t/t_split_var_2_trace.out index 7bbee9244..f03a9303f 100644 --- a/test_regress/t/t_split_var_2_trace.out +++ b/test_regress/t/t_split_var_2_trace.out @@ -1,28 +1,27 @@ $version Generated by VerilatedVcd $end -$date Mon Aug 24 21:54:18 2020 - $end -$timescale 1ps $end +$date Wed Aug 11 12:35:42 2021 $end +$timescale 1ps $end $scope module top $end - $var wire 1 U" clk $end + $var wire 1 T" clk $end $scope module t $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 X" NUMSUB [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 1 U" clk $end - $var wire 64 Z" expc [63:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 x! out(0) [7:0] $end - $var wire 8 y! out(1) [7:0] $end - $var wire 8 z! out(2) [7:0] $end - $var wire 8 {! out(3) [7:0] $end - $var wire 8 |! out(4) [7:0] $end - $var wire 8 }! out(5) [7:0] $end - $var wire 8 ~! out(6) [7:0] $end - $var wire 8 !" out(7) [7:0] $end - $var wire 8 "" out(8) [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 W" NUMSUB [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 1 T" clk $end + $var wire 64 Y" expc [63:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 w! out[0] [7:0] $end + $var wire 8 x! out[1] [7:0] $end + $var wire 8 y! out[2] [7:0] $end + $var wire 8 z! out[3] [7:0] $end + $var wire 8 {! out[4] [7:0] $end + $var wire 8 |! out[5] [7:0] $end + $var wire 8 }! out[6] [7:0] $end + $var wire 8 ~! out[7] [7:0] $end + $var wire 8 !" out[8] [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 8 $" through_tmp [7:0] $end + $var wire 8 #" through_tmp [7:0] $end $scope module always_block $end $var wire 1 . failed $end $scope module unnamedblk1 $end @@ -30,43 +29,43 @@ $timescale 1ps $end $upscope $end $upscope $end $scope module delay0 $end - $var wire 32 u! c [31:0] $end - $var wire 1 U" clk $end - $var wire 1 z" unpack_sig0(10) $end - $var wire 1 {" unpack_sig0(11) $end - $var wire 1 |" unpack_sig0(12) $end - $var wire 1 e! unpack_sig0(13) $end - $var wire 1 f! unpack_sig0(14) $end - $var wire 1 g! unpack_sig0(15) $end - $var wire 1 h! unpack_sig0(16) $end - $var wire 1 i! unpack_sig1(13) $end - $var wire 1 j! unpack_sig1(14) $end - $var wire 1 k! unpack_sig1(15) $end - $var wire 1 l! unpack_sig1(16) $end - $var wire 1 }" unpack_sig2(10) $end - $var wire 1 ~" unpack_sig2(11) $end - $var wire 1 !# unpack_sig2(12) $end - $var wire 1 m! unpack_sig2(13) $end - $var wire 1 n! unpack_sig2(14) $end - $var wire 1 o! unpack_sig2(15) $end - $var wire 1 p! unpack_sig2(16) $end - $var wire 1 q! unpack_sig3(13) $end - $var wire 1 r! unpack_sig3(14) $end - $var wire 1 s! unpack_sig3(15) $end - $var wire 1 t! unpack_sig3(16) $end + $var wire 32 t! c [31:0] $end + $var wire 1 T" clk $end + $var wire 1 y" unpack_sig0(10) $end + $var wire 1 z" unpack_sig0(11) $end + $var wire 1 {" unpack_sig0(12) $end + $var wire 1 d! unpack_sig0(13) $end + $var wire 1 e! unpack_sig0(14) $end + $var wire 1 f! unpack_sig0(15) $end + $var wire 1 g! unpack_sig0(16) $end + $var wire 1 h! unpack_sig1(13) $end + $var wire 1 i! unpack_sig1(14) $end + $var wire 1 j! unpack_sig1(15) $end + $var wire 1 k! unpack_sig1(16) $end + $var wire 1 |" unpack_sig2(10) $end + $var wire 1 }" unpack_sig2(11) $end + $var wire 1 ~" unpack_sig2(12) $end + $var wire 1 l! unpack_sig2(13) $end + $var wire 1 m! unpack_sig2(14) $end + $var wire 1 n! unpack_sig2(15) $end + $var wire 1 o! unpack_sig2(16) $end + $var wire 1 p! unpack_sig3(13) $end + $var wire 1 q! unpack_sig3(14) $end + $var wire 1 r! unpack_sig3(15) $end + $var wire 1 s! unpack_sig3(16) $end $upscope $end $scope module i_t_array_rev $end $var wire 1 ' arrd(0) $end $var wire 1 ( arrd(1) $end - $var wire 1 U" clk $end - $var wire 32 "# cyc [31:0] $end - $var wire 1 v! localbkw(0) $end - $var wire 1 w! localbkw(1) $end + $var wire 1 T" clk $end + $var wire 32 !# cyc [31:0] $end + $var wire 1 u! localbkw(0) $end + $var wire 1 v! localbkw(1) $end $var wire 1 ) y0 $end $var wire 1 * y1 $end $scope module arr_rev_u $end - $var wire 1 + arrbkw(0) $end - $var wire 1 , arrbkw(1) $end + $var wire 1 + arrbkw[0] $end + $var wire 1 , arrbkw[1] $end $var wire 1 ) y0 $end $var wire 1 * y1 $end $upscope $end @@ -78,312 +77,312 @@ $timescale 1ps $end $var wire 32 & var3 [30:-1] $end $upscope $end $scope module shifter0 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 \" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 [" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end $var wire 8 0 out [7:0] $end $var wire 3 - shift [2:0] $end $var wire 8 2 tmp(-1) [7:0] $end $var wire 8 1 tmp(-2) [7:0] $end - $var wire 8 Y" tmp(-3) [7:0] $end - $var wire 8 3 tmp(0) [7:0] $end + $var wire 8 X" tmp(-3) [7:0] $end + $var wire 8 0 tmp(0) [7:0] $end $upscope $end $scope module shifter1 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 \" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 4 out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 [" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 3 out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 8 5 tmp(-1) [7:0] $end + $var wire 8 4 tmp(-1) [7:0] $end $var wire 8 1 tmp(-2) [7:0] $end - $var wire 8 Y" tmp(-3) [7:0] $end - $var wire 8 4 tmp(0) [7:0] $end + $var wire 8 X" tmp(-3) [7:0] $end + $var wire 8 3 tmp(0) [7:0] $end $upscope $end $scope module shifter2 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 ]" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 6 out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 \" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 5 out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 8 Y" tmp(1) [7:0] $end - $var wire 8 7 tmp(2) [7:0] $end - $var wire 8 8 tmp(3) [7:0] $end - $var wire 8 6 tmp(4) [7:0] $end + $var wire 8 X" tmp(1) [7:0] $end + $var wire 8 6 tmp(2) [7:0] $end + $var wire 8 7 tmp(3) [7:0] $end + $var wire 8 5 tmp(4) [7:0] $end $upscope $end $scope module shifter3 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 V" N [31:0] $end - $var wire 32 ]" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 %" out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 U" N [31:0] $end + $var wire 32 \" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 $" out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 8 Y" tmp0(1)(1) [7:0] $end - $var wire 8 Y" tmp0(1)(2) [7:0] $end - $var wire 8 Y" tmp0(1)(3) [7:0] $end + $var wire 8 X" tmp0(1)(1) [7:0] $end + $var wire 8 X" tmp0(1)(2) [7:0] $end + $var wire 8 X" tmp0(1)(3) [7:0] $end $var wire 8 1 tmp0(2)(1) [7:0] $end $var wire 8 1 tmp0(2)(2) [7:0] $end $var wire 8 1 tmp0(2)(3) [7:0] $end - $var wire 8 9 tmp0(3)(1) [7:0] $end - $var wire 8 : tmp0(3)(2) [7:0] $end - $var wire 8 ; tmp0(3)(3) [7:0] $end - $var wire 8 < tmp0(4)(1) [7:0] $end - $var wire 8 = tmp0(4)(2) [7:0] $end - $var wire 8 > tmp0(4)(3) [7:0] $end - $var wire 8 ? tmp1(1)(1) [7:0] $end - $var wire 8 @ tmp1(1)(2) [7:0] $end - $var wire 8 A tmp1(1)(3) [7:0] $end - $var wire 8 B tmp1(2)(1) [7:0] $end - $var wire 8 C tmp1(2)(2) [7:0] $end - $var wire 8 D tmp1(2)(3) [7:0] $end - $var wire 8 E tmp1(3)(1) [7:0] $end - $var wire 8 F tmp1(3)(2) [7:0] $end - $var wire 8 G tmp1(3)(3) [7:0] $end - $var wire 8 H tmp1(4)(1) [7:0] $end - $var wire 8 I tmp1(4)(2) [7:0] $end - $var wire 8 J tmp1(4)(3) [7:0] $end - $var wire 8 M! tmp10(1)(1) [7:0] $end - $var wire 8 N! tmp10(1)(2) [7:0] $end - $var wire 8 O! tmp10(1)(3) [7:0] $end - $var wire 8 P! tmp10(2)(1) [7:0] $end - $var wire 8 Q! tmp10(2)(2) [7:0] $end - $var wire 8 R! tmp10(2)(3) [7:0] $end - $var wire 8 S! tmp10(3)(1) [7:0] $end - $var wire 8 T! tmp10(3)(2) [7:0] $end - $var wire 8 U! tmp10(3)(3) [7:0] $end - $var wire 8 V! tmp10(4)(1) [7:0] $end - $var wire 8 W! tmp10(4)(2) [7:0] $end - $var wire 8 X! tmp10(4)(3) [7:0] $end - $var wire 8 &" tmp12(-1)(1)(1) [7:0] $end - $var wire 8 '" tmp12(-1)(1)(2) [7:0] $end - $var wire 8 (" tmp12(-1)(1)(3) [7:0] $end - $var wire 8 )" tmp12(-1)(2)(1) [7:0] $end - $var wire 8 *" tmp12(-1)(2)(2) [7:0] $end - $var wire 8 +" tmp12(-1)(2)(3) [7:0] $end - $var wire 8 ," tmp12(-1)(3)(1) [7:0] $end - $var wire 8 -" tmp12(-1)(3)(2) [7:0] $end - $var wire 8 ." tmp12(-1)(3)(3) [7:0] $end - $var wire 8 %" tmp12(-1)(4)(1) [7:0] $end - $var wire 8 /" tmp12(-1)(4)(2) [7:0] $end - $var wire 8 0" tmp12(-1)(4)(3) [7:0] $end - $var wire 8 1" tmp12(0)(1)(1) [7:0] $end - $var wire 8 2" tmp12(0)(1)(2) [7:0] $end - $var wire 8 3" tmp12(0)(1)(3) [7:0] $end - $var wire 8 4" tmp12(0)(2)(1) [7:0] $end - $var wire 8 5" tmp12(0)(2)(2) [7:0] $end - $var wire 8 6" tmp12(0)(2)(3) [7:0] $end - $var wire 8 7" tmp12(0)(3)(1) [7:0] $end - $var wire 8 8" tmp12(0)(3)(2) [7:0] $end - $var wire 8 9" tmp12(0)(3)(3) [7:0] $end - $var wire 8 :" tmp12(0)(4)(1) [7:0] $end - $var wire 8 ;" tmp12(0)(4)(2) [7:0] $end - $var wire 8 <" tmp12(0)(4)(3) [7:0] $end - $var wire 8 j" tmp13(1)(1) [7:0] $end - $var wire 8 k" tmp13(1)(2) [7:0] $end - $var wire 8 l" tmp13(1)(3) [7:0] $end - $var wire 8 m" tmp13(2)(1) [7:0] $end - $var wire 8 n" tmp13(2)(2) [7:0] $end - $var wire 8 o" tmp13(2)(3) [7:0] $end - $var wire 8 p" tmp13(3)(1) [7:0] $end - $var wire 8 q" tmp13(3)(2) [7:0] $end - $var wire 8 r" tmp13(3)(3) [7:0] $end - $var wire 8 s" tmp13(4)(1) [7:0] $end - $var wire 8 t" tmp13(4)(2) [7:0] $end - $var wire 8 u" tmp13(4)(3) [7:0] $end - $var wire 8 K tmp2(1)(1) [7:0] $end - $var wire 8 L tmp2(1)(2) [7:0] $end - $var wire 8 M tmp2(1)(3) [7:0] $end - $var wire 8 N tmp2(2)(1) [7:0] $end - $var wire 8 O tmp2(2)(2) [7:0] $end - $var wire 8 P tmp2(2)(3) [7:0] $end - $var wire 8 Q tmp2(3)(1) [7:0] $end - $var wire 8 R tmp2(3)(2) [7:0] $end - $var wire 8 S tmp2(3)(3) [7:0] $end - $var wire 8 T tmp2(4)(1) [7:0] $end - $var wire 8 U tmp2(4)(2) [7:0] $end - $var wire 8 V tmp2(4)(3) [7:0] $end - $var wire 8 W tmp3(1)(1) [7:0] $end - $var wire 8 X tmp3(1)(2) [7:0] $end - $var wire 8 Y tmp3(1)(3) [7:0] $end - $var wire 8 Z tmp3(2)(1) [7:0] $end - $var wire 8 [ tmp3(2)(2) [7:0] $end - $var wire 8 \ tmp3(2)(3) [7:0] $end - $var wire 8 ] tmp3(3)(1) [7:0] $end - $var wire 8 ^ tmp3(3)(2) [7:0] $end - $var wire 8 _ tmp3(3)(3) [7:0] $end - $var wire 8 ` tmp3(4)(1) [7:0] $end - $var wire 8 a tmp3(4)(2) [7:0] $end - $var wire 8 b tmp3(4)(3) [7:0] $end - $var wire 8 c tmp4(1)(1) [7:0] $end - $var wire 8 d tmp4(1)(2) [7:0] $end - $var wire 8 e tmp4(1)(3) [7:0] $end - $var wire 8 f tmp4(2)(1) [7:0] $end - $var wire 8 g tmp4(2)(2) [7:0] $end - $var wire 8 h tmp4(2)(3) [7:0] $end - $var wire 8 i tmp4(3)(1) [7:0] $end - $var wire 8 j tmp4(3)(2) [7:0] $end - $var wire 8 k tmp4(3)(3) [7:0] $end - $var wire 8 l tmp4(4)(1) [7:0] $end - $var wire 8 m tmp4(4)(2) [7:0] $end - $var wire 8 n tmp4(4)(3) [7:0] $end - $var wire 8 o tmp5(1)(1) [7:0] $end - $var wire 8 p tmp5(1)(2) [7:0] $end - $var wire 8 q tmp5(1)(3) [7:0] $end - $var wire 8 r tmp5(2)(1) [7:0] $end - $var wire 8 s tmp5(2)(2) [7:0] $end - $var wire 8 t tmp5(2)(3) [7:0] $end - $var wire 8 u tmp5(3)(1) [7:0] $end - $var wire 8 v tmp5(3)(2) [7:0] $end - $var wire 8 w tmp5(3)(3) [7:0] $end - $var wire 8 x tmp5(4)(1) [7:0] $end - $var wire 8 y tmp5(4)(2) [7:0] $end - $var wire 8 z tmp5(4)(3) [7:0] $end - $var wire 8 { tmp6(1)(1) [7:0] $end - $var wire 8 | tmp6(1)(2) [7:0] $end - $var wire 8 } tmp6(1)(3) [7:0] $end - $var wire 8 ~ tmp6(2)(1) [7:0] $end - $var wire 8 !! tmp6(2)(2) [7:0] $end - $var wire 8 "! tmp6(2)(3) [7:0] $end - $var wire 8 #! tmp6(3)(1) [7:0] $end - $var wire 8 $! tmp6(3)(2) [7:0] $end - $var wire 8 %! tmp6(3)(3) [7:0] $end - $var wire 8 &! tmp6(4)(1) [7:0] $end - $var wire 8 '! tmp6(4)(2) [7:0] $end - $var wire 8 (! tmp6(4)(3) [7:0] $end - $var wire 8 )! tmp7(2)(1) [7:0] $end - $var wire 8 *! tmp7(2)(2) [7:0] $end - $var wire 8 +! tmp7(2)(3) [7:0] $end - $var wire 8 ,! tmp7(3)(1) [7:0] $end - $var wire 8 -! tmp7(3)(2) [7:0] $end - $var wire 8 .! tmp7(3)(3) [7:0] $end - $var wire 8 /! tmp7(4)(1) [7:0] $end - $var wire 8 0! tmp7(4)(2) [7:0] $end - $var wire 8 1! tmp7(4)(3) [7:0] $end - $var wire 8 2! tmp7(5)(1) [7:0] $end - $var wire 8 3! tmp7(5)(2) [7:0] $end - $var wire 8 4! tmp7(5)(3) [7:0] $end - $var wire 8 ^" tmp8(0)(1) [7:0] $end - $var wire 8 _" tmp8(0)(2) [7:0] $end - $var wire 8 `" tmp8(0)(3) [7:0] $end - $var wire 8 a" tmp8(1)(1) [7:0] $end - $var wire 8 b" tmp8(1)(2) [7:0] $end - $var wire 8 c" tmp8(1)(3) [7:0] $end - $var wire 8 5! tmp8(2)(1) [7:0] $end - $var wire 8 6! tmp8(2)(2) [7:0] $end - $var wire 8 7! tmp8(2)(3) [7:0] $end - $var wire 8 8! tmp8(3)(1) [7:0] $end - $var wire 8 9! tmp8(3)(2) [7:0] $end - $var wire 8 :! tmp8(3)(3) [7:0] $end - $var wire 8 ;! tmp8(4)(1) [7:0] $end - $var wire 8 ! tmp8(5)(1) [7:0] $end - $var wire 8 ?! tmp8(5)(2) [7:0] $end - $var wire 8 @! tmp8(5)(3) [7:0] $end - $var wire 8 d" tmp8(6)(1) [7:0] $end - $var wire 8 e" tmp8(6)(2) [7:0] $end - $var wire 8 f" tmp8(6)(3) [7:0] $end - $var wire 8 g" tmp8(7)(1) [7:0] $end - $var wire 8 h" tmp8(7)(2) [7:0] $end - $var wire 8 i" tmp8(7)(3) [7:0] $end - $var wire 8 A! tmp9(4)(1) [7:0] $end - $var wire 8 B! tmp9(4)(2) [7:0] $end - $var wire 8 C! tmp9(4)(3) [7:0] $end - $var wire 8 D! tmp9(5)(1) [7:0] $end - $var wire 8 E! tmp9(5)(2) [7:0] $end - $var wire 8 F! tmp9(5)(3) [7:0] $end - $var wire 8 G! tmp9(6)(1) [7:0] $end - $var wire 8 H! tmp9(6)(2) [7:0] $end - $var wire 8 I! tmp9(6)(3) [7:0] $end - $var wire 8 J! tmp9(7)(1) [7:0] $end - $var wire 8 K! tmp9(7)(2) [7:0] $end - $var wire 8 L! tmp9(7)(3) [7:0] $end + $var wire 8 8 tmp0(3)(1) [7:0] $end + $var wire 8 9 tmp0(3)(2) [7:0] $end + $var wire 8 : tmp0(3)(3) [7:0] $end + $var wire 8 ; tmp0(4)(1) [7:0] $end + $var wire 8 < tmp0(4)(2) [7:0] $end + $var wire 8 = tmp0(4)(3) [7:0] $end + $var wire 8 > tmp1(1)(1) [7:0] $end + $var wire 8 ? tmp1(1)(2) [7:0] $end + $var wire 8 @ tmp1(1)(3) [7:0] $end + $var wire 8 A tmp1(2)(1) [7:0] $end + $var wire 8 B tmp1(2)(2) [7:0] $end + $var wire 8 C tmp1(2)(3) [7:0] $end + $var wire 8 D tmp1(3)(1) [7:0] $end + $var wire 8 E tmp1(3)(2) [7:0] $end + $var wire 8 F tmp1(3)(3) [7:0] $end + $var wire 8 G tmp1(4)(1) [7:0] $end + $var wire 8 H tmp1(4)(2) [7:0] $end + $var wire 8 I tmp1(4)(3) [7:0] $end + $var wire 8 L! tmp10(1)(1) [7:0] $end + $var wire 8 M! tmp10(1)(2) [7:0] $end + $var wire 8 N! tmp10(1)(3) [7:0] $end + $var wire 8 O! tmp10(2)(1) [7:0] $end + $var wire 8 P! tmp10(2)(2) [7:0] $end + $var wire 8 Q! tmp10(2)(3) [7:0] $end + $var wire 8 R! tmp10(3)(1) [7:0] $end + $var wire 8 S! tmp10(3)(2) [7:0] $end + $var wire 8 T! tmp10(3)(3) [7:0] $end + $var wire 8 U! tmp10(4)(1) [7:0] $end + $var wire 8 V! tmp10(4)(2) [7:0] $end + $var wire 8 W! tmp10(4)(3) [7:0] $end + $var wire 8 %" tmp12(-1)(1)(1) [7:0] $end + $var wire 8 &" tmp12(-1)(1)(2) [7:0] $end + $var wire 8 '" tmp12(-1)(1)(3) [7:0] $end + $var wire 8 (" tmp12(-1)(2)(1) [7:0] $end + $var wire 8 )" tmp12(-1)(2)(2) [7:0] $end + $var wire 8 *" tmp12(-1)(2)(3) [7:0] $end + $var wire 8 +" tmp12(-1)(3)(1) [7:0] $end + $var wire 8 ," tmp12(-1)(3)(2) [7:0] $end + $var wire 8 -" tmp12(-1)(3)(3) [7:0] $end + $var wire 8 $" tmp12(-1)(4)(1) [7:0] $end + $var wire 8 ." tmp12(-1)(4)(2) [7:0] $end + $var wire 8 /" tmp12(-1)(4)(3) [7:0] $end + $var wire 8 0" tmp12(0)(1)(1) [7:0] $end + $var wire 8 1" tmp12(0)(1)(2) [7:0] $end + $var wire 8 2" tmp12(0)(1)(3) [7:0] $end + $var wire 8 3" tmp12(0)(2)(1) [7:0] $end + $var wire 8 4" tmp12(0)(2)(2) [7:0] $end + $var wire 8 5" tmp12(0)(2)(3) [7:0] $end + $var wire 8 6" tmp12(0)(3)(1) [7:0] $end + $var wire 8 7" tmp12(0)(3)(2) [7:0] $end + $var wire 8 8" tmp12(0)(3)(3) [7:0] $end + $var wire 8 9" tmp12(0)(4)(1) [7:0] $end + $var wire 8 :" tmp12(0)(4)(2) [7:0] $end + $var wire 8 ;" tmp12(0)(4)(3) [7:0] $end + $var wire 8 i" tmp13(1)(1) [7:0] $end + $var wire 8 j" tmp13(1)(2) [7:0] $end + $var wire 8 k" tmp13(1)(3) [7:0] $end + $var wire 8 l" tmp13(2)(1) [7:0] $end + $var wire 8 m" tmp13(2)(2) [7:0] $end + $var wire 8 n" tmp13(2)(3) [7:0] $end + $var wire 8 o" tmp13(3)(1) [7:0] $end + $var wire 8 p" tmp13(3)(2) [7:0] $end + $var wire 8 q" tmp13(3)(3) [7:0] $end + $var wire 8 r" tmp13(4)(1) [7:0] $end + $var wire 8 s" tmp13(4)(2) [7:0] $end + $var wire 8 t" tmp13(4)(3) [7:0] $end + $var wire 8 J tmp2[1][1] [7:0] $end + $var wire 8 K tmp2[1][2] [7:0] $end + $var wire 8 L tmp2[1][3] [7:0] $end + $var wire 8 M tmp2[2][1] [7:0] $end + $var wire 8 N tmp2[2][2] [7:0] $end + $var wire 8 O tmp2[2][3] [7:0] $end + $var wire 8 P tmp2[3][1] [7:0] $end + $var wire 8 Q tmp2[3][2] [7:0] $end + $var wire 8 R tmp2[3][3] [7:0] $end + $var wire 8 S tmp2[4][1] [7:0] $end + $var wire 8 T tmp2[4][2] [7:0] $end + $var wire 8 U tmp2[4][3] [7:0] $end + $var wire 8 V tmp3(1)(1) [7:0] $end + $var wire 8 W tmp3(1)(2) [7:0] $end + $var wire 8 X tmp3(1)(3) [7:0] $end + $var wire 8 Y tmp3(2)(1) [7:0] $end + $var wire 8 Z tmp3(2)(2) [7:0] $end + $var wire 8 [ tmp3(2)(3) [7:0] $end + $var wire 8 \ tmp3(3)(1) [7:0] $end + $var wire 8 ] tmp3(3)(2) [7:0] $end + $var wire 8 ^ tmp3(3)(3) [7:0] $end + $var wire 8 _ tmp3(4)(1) [7:0] $end + $var wire 8 ` tmp3(4)(2) [7:0] $end + $var wire 8 a tmp3(4)(3) [7:0] $end + $var wire 8 b tmp4(1)(1) [7:0] $end + $var wire 8 c tmp4(1)(2) [7:0] $end + $var wire 8 d tmp4(1)(3) [7:0] $end + $var wire 8 e tmp4(2)(1) [7:0] $end + $var wire 8 f tmp4(2)(2) [7:0] $end + $var wire 8 g tmp4(2)(3) [7:0] $end + $var wire 8 h tmp4(3)(1) [7:0] $end + $var wire 8 i tmp4(3)(2) [7:0] $end + $var wire 8 j tmp4(3)(3) [7:0] $end + $var wire 8 k tmp4(4)(1) [7:0] $end + $var wire 8 l tmp4(4)(2) [7:0] $end + $var wire 8 m tmp4(4)(3) [7:0] $end + $var wire 8 n tmp5[1][1] [7:0] $end + $var wire 8 o tmp5[1][2] [7:0] $end + $var wire 8 p tmp5[1][3] [7:0] $end + $var wire 8 q tmp5[2][1] [7:0] $end + $var wire 8 r tmp5[2][2] [7:0] $end + $var wire 8 s tmp5[2][3] [7:0] $end + $var wire 8 t tmp5[3][1] [7:0] $end + $var wire 8 u tmp5[3][2] [7:0] $end + $var wire 8 v tmp5[3][3] [7:0] $end + $var wire 8 w tmp5[4][1] [7:0] $end + $var wire 8 x tmp5[4][2] [7:0] $end + $var wire 8 y tmp5[4][3] [7:0] $end + $var wire 8 z tmp6(1)(1) [7:0] $end + $var wire 8 { tmp6(1)(2) [7:0] $end + $var wire 8 | tmp6(1)(3) [7:0] $end + $var wire 8 } tmp6(2)(1) [7:0] $end + $var wire 8 ~ tmp6(2)(2) [7:0] $end + $var wire 8 !! tmp6(2)(3) [7:0] $end + $var wire 8 "! tmp6(3)(1) [7:0] $end + $var wire 8 #! tmp6(3)(2) [7:0] $end + $var wire 8 $! tmp6(3)(3) [7:0] $end + $var wire 8 %! tmp6(4)(1) [7:0] $end + $var wire 8 &! tmp6(4)(2) [7:0] $end + $var wire 8 '! tmp6(4)(3) [7:0] $end + $var wire 8 (! tmp7(2)(1) [7:0] $end + $var wire 8 )! tmp7(2)(2) [7:0] $end + $var wire 8 *! tmp7(2)(3) [7:0] $end + $var wire 8 +! tmp7(3)(1) [7:0] $end + $var wire 8 ,! tmp7(3)(2) [7:0] $end + $var wire 8 -! tmp7(3)(3) [7:0] $end + $var wire 8 .! tmp7(4)(1) [7:0] $end + $var wire 8 /! tmp7(4)(2) [7:0] $end + $var wire 8 0! tmp7(4)(3) [7:0] $end + $var wire 8 1! tmp7(5)(1) [7:0] $end + $var wire 8 2! tmp7(5)(2) [7:0] $end + $var wire 8 3! tmp7(5)(3) [7:0] $end + $var wire 8 ]" tmp8(0)(1) [7:0] $end + $var wire 8 ^" tmp8(0)(2) [7:0] $end + $var wire 8 _" tmp8(0)(3) [7:0] $end + $var wire 8 `" tmp8(1)(1) [7:0] $end + $var wire 8 a" tmp8(1)(2) [7:0] $end + $var wire 8 b" tmp8(1)(3) [7:0] $end + $var wire 8 4! tmp8(2)(1) [7:0] $end + $var wire 8 5! tmp8(2)(2) [7:0] $end + $var wire 8 6! tmp8(2)(3) [7:0] $end + $var wire 8 7! tmp8(3)(1) [7:0] $end + $var wire 8 8! tmp8(3)(2) [7:0] $end + $var wire 8 9! tmp8(3)(3) [7:0] $end + $var wire 8 :! tmp8(4)(1) [7:0] $end + $var wire 8 ;! tmp8(4)(2) [7:0] $end + $var wire 8 ! tmp8(5)(2) [7:0] $end + $var wire 8 ?! tmp8(5)(3) [7:0] $end + $var wire 8 c" tmp8(6)(1) [7:0] $end + $var wire 8 d" tmp8(6)(2) [7:0] $end + $var wire 8 e" tmp8(6)(3) [7:0] $end + $var wire 8 f" tmp8(7)(1) [7:0] $end + $var wire 8 g" tmp8(7)(2) [7:0] $end + $var wire 8 h" tmp8(7)(3) [7:0] $end + $var wire 8 @! tmp9(4)(1) [7:0] $end + $var wire 8 A! tmp9(4)(2) [7:0] $end + $var wire 8 B! tmp9(4)(3) [7:0] $end + $var wire 8 C! tmp9(5)(1) [7:0] $end + $var wire 8 D! tmp9(5)(2) [7:0] $end + $var wire 8 E! tmp9(5)(3) [7:0] $end + $var wire 8 F! tmp9(6)(1) [7:0] $end + $var wire 8 G! tmp9(6)(2) [7:0] $end + $var wire 8 H! tmp9(6)(3) [7:0] $end + $var wire 8 I! tmp9(7)(1) [7:0] $end + $var wire 8 J! tmp9(7)(2) [7:0] $end + $var wire 8 K! tmp9(7)(3) [7:0] $end $upscope $end $scope module shifter4 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 v" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 Y! out [7:0] $end - $var wire 24 x" pad [23:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 u" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 X! out [7:0] $end + $var wire 24 w" pad [23:0] $end $var wire 3 - shift [2:0] $end - $var wire 32 w" tmp(2) [31:0] $end - $var wire 32 Z! tmp(3) [31:0] $end - $var wire 32 [! tmp(4) [31:0] $end - $var wire 32 \! tmp(5) [31:0] $end + $var wire 32 v" tmp(2) [31:0] $end + $var wire 32 Y! tmp(3) [31:0] $end + $var wire 32 Z! tmp(4) [31:0] $end + $var wire 32 [! tmp(5) [31:0] $end $upscope $end $scope module shifter5 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 y" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 ]! out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 x" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 \! out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 32 ^! tmp [31:0] $end + $var wire 32 ]! tmp [31:0] $end $upscope $end $scope module shifter6 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 y" OFFSET [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 _! out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 x" OFFSET [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 ^! out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 32 `! tmp [31:0] $end + $var wire 32 _! tmp [31:0] $end $upscope $end $scope module shifter7 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 a! out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 `! out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 32 b! tmp [31:0] $end + $var wire 32 a! tmp [31:0] $end $upscope $end $scope module shifter8 $end - $var wire 32 V" DEPTH [31:0] $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 Y" in [7:0] $end - $var wire 8 c! out [7:0] $end + $var wire 32 U" DEPTH [31:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 X" in [7:0] $end + $var wire 8 b! out [7:0] $end $var wire 3 - shift [2:0] $end - $var wire 32 d! tmp [0:31] $end + $var wire 32 c! tmp [0:31] $end $upscope $end $scope module though0 $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 #" in [7:0] $end - $var wire 8 $" out [7:0] $end - $var wire 1 =" unpack_tmp(0) $end - $var wire 1 >" unpack_tmp(1) $end - $var wire 1 ?" unpack_tmp(2) $end - $var wire 1 @" unpack_tmp(3) $end - $var wire 1 A" unpack_tmp(4) $end - $var wire 1 B" unpack_tmp(5) $end - $var wire 1 C" unpack_tmp(6) $end - $var wire 1 D" unpack_tmp(7) $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 "" in [7:0] $end + $var wire 8 #" out [7:0] $end + $var wire 1 <" unpack_tmp(0) $end + $var wire 1 =" unpack_tmp(1) $end + $var wire 1 >" unpack_tmp(2) $end + $var wire 1 ?" unpack_tmp(3) $end + $var wire 1 @" unpack_tmp(4) $end + $var wire 1 A" unpack_tmp(5) $end + $var wire 1 B" unpack_tmp(6) $end + $var wire 1 C" unpack_tmp(7) $end $scope module i_pack2unpack $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 8 #" in [7:0] $end - $var wire 1 E" out(0) $end - $var wire 1 F" out(1) $end - $var wire 1 G" out(2) $end - $var wire 1 H" out(3) $end - $var wire 1 I" out(4) $end - $var wire 1 J" out(5) $end - $var wire 1 K" out(6) $end - $var wire 1 L" out(7) $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 8 "" in [7:0] $end + $var wire 1 D" out[0] $end + $var wire 1 E" out[1] $end + $var wire 1 F" out[2] $end + $var wire 1 G" out[3] $end + $var wire 1 H" out[4] $end + $var wire 1 I" out[5] $end + $var wire 1 J" out[6] $end + $var wire 1 K" out[7] $end $upscope $end $scope module i_unpack2pack $end - $var wire 32 W" WIDTH [31:0] $end - $var wire 1 M" in(0) $end - $var wire 1 N" in(1) $end - $var wire 1 O" in(2) $end - $var wire 1 P" in(3) $end - $var wire 1 Q" in(4) $end - $var wire 1 R" in(5) $end - $var wire 1 S" in(6) $end - $var wire 1 T" in(7) $end - $var wire 8 $" out [7:0] $end + $var wire 32 V" WIDTH [31:0] $end + $var wire 1 L" in[0] $end + $var wire 1 M" in[1] $end + $var wire 1 N" in[2] $end + $var wire 1 O" in[3] $end + $var wire 1 P" in[4] $end + $var wire 1 Q" in[5] $end + $var wire 1 R" in[6] $end + $var wire 1 S" in[7] $end + $var wire 8 #" out [7:0] $end $upscope $end $upscope $end $upscope $end @@ -540,18 +539,18 @@ b10001110 U! b10001110 V! b10001110 W! b10001110 X! -b10001110 Y! +b00000000000000000000000010001110 Y! b00000000000000000000000010001110 Z! b00000000000000000000000010001110 [! -b00000000000000000000000010001110 \! -b10001110 ]! -b10001110100011101000111010001110 ^! -b10001110 _! -b10001110100011101000111010001110 `! -b10001110 a! -b10001110100011101000111010001110 b! -b10001110 c! -b10001110100011101000111010001110 d! +b10001110 \! +b10001110100011101000111010001110 ]! +b10001110 ^! +b10001110100011101000111010001110 _! +b10001110 `! +b10001110100011101000111010001110 a! +b10001110 b! +b10001110100011101000111010001110 c! +0d! 0e! 0f! 0g! @@ -567,10 +566,10 @@ b10001110100011101000111010001110 d! 0q! 0r! 0s! -0t! -b00000000000000000000000000000000 u! +b00000000000000000000000000000000 t! +0u! 0v! -0w! +b10001110 w! b10001110 x! b10001110 y! b10001110 z! @@ -605,39 +604,39 @@ b10001110 8" b10001110 9" b10001110 :" b10001110 ;" -b10001110 <" -1=" +1<" +0=" 0>" 0?" -0@" +1@" 1A" 1B" -1C" +0C" 0D" -0E" +1E" 1F" 1G" -1H" +0H" 0I" 0J" -0K" -1L" -0M" +1K" +0L" +1M" 1N" 1O" -1P" +0P" 0Q" 0R" -0S" -1T" -0U" -b00000000000000000000000000000011 V" -b00000000000000000000000000001000 W" -b00000000000000000000000000001001 X" -b10001110 Y" -b1000111001000111101000111101000111101000011101000011101000011101 Z" -b11111111111111111111111111111101 \" -b00000000000000000000000000000001 ]" +1S" +0T" +b00000000000000000000000000000011 U" +b00000000000000000000000000001000 V" +b00000000000000000000000000001001 W" +b10001110 X" +b1000111001000111101000111101000111101000011101000011101000011101 Y" +b11111111111111111111111111111101 [" +b00000000000000000000000000000001 \" +b00000000 ]" b00000000 ^" b00000000 _" b00000000 `" @@ -661,18 +660,17 @@ b00000000 q" b00000000 r" b00000000 s" b00000000 t" -b00000000 u" -b00000000000000000000000000000010 v" -b00000000000000000000000010001110 w" -b000000000000000000000000 x" -b11111111111111111111111111111110 y" +b00000000000000000000000000000010 u" +b00000000000000000000000010001110 v" +b000000000000000000000000 w" +b11111111111111111111111111111110 x" +0y" 0z" 0{" 0|" 0}" 0~" -0!# -b00000000000000000000000000000000 "# +b00000000000000000000000000000000 !# #10 b001 - b00000000000000000000000000001001 / @@ -690,7 +688,7 @@ b01000111 : b01000111 ; b01000111 < b01000111 = -b01000111 > +b01000111 A b01000111 B b01000111 C b01000111 D @@ -699,7 +697,7 @@ b01000111 F b01000111 G b01000111 H b01000111 I -b01000111 J +b01000111 M b01000111 N b01000111 O b01000111 P @@ -708,7 +706,7 @@ b01000111 R b01000111 S b01000111 T b01000111 U -b01000111 V +b01000111 Y b01000111 Z b01000111 [ b01000111 \ @@ -717,7 +715,7 @@ b01000111 ^ b01000111 _ b01000111 ` b01000111 a -b01000111 b +b01000111 e b01000111 f b01000111 g b01000111 h @@ -726,7 +724,7 @@ b01000111 j b01000111 k b01000111 l b01000111 m -b01000111 n +b01000111 q b01000111 r b01000111 s b01000111 t @@ -735,7 +733,7 @@ b01000111 v b01000111 w b01000111 x b01000111 y -b01000111 z +b01000111 } b01000111 ~ b01000111 !! b01000111 "! @@ -744,7 +742,7 @@ b01000111 $! b01000111 %! b01000111 &! b01000111 '! -b01000111 (! +b01000111 +! b01000111 ,! b01000111 -! b01000111 .! @@ -753,7 +751,7 @@ b01000111 0! b01000111 1! b01000111 2! b01000111 3! -b01000111 4! +b01000111 7! b01000111 8! b01000111 9! b01000111 :! @@ -762,7 +760,7 @@ b01000111 ! b01000111 ?! -b01000111 @! +b01000111 C! b01000111 D! b01000111 E! b01000111 F! @@ -771,7 +769,7 @@ b01000111 H! b01000111 I! b01000111 J! b01000111 K! -b01000111 L! +b01000111 O! b01000111 P! b01000111 Q! b01000111 R! @@ -781,24 +779,24 @@ b01000111 U! b01000111 V! b01000111 W! b01000111 X! -b01000111 Y! +b00000000000000000000000001000111 Y! b00000000000000000000000001000111 Z! b00000000000000000000000001000111 [! -b00000000000000000000000001000111 \! -b01000111 ]! -b10001110010001110100011101000111 ^! -b01000111 _! -b10001110010001110100011101000111 `! -b01000111 a! -b10001110010001110100011101000111 b! -b01000111 c! -b10001110010001110100011101000111 d! -1e! -1i! -1m! -1q! -b00000000000000000000000000000001 u! -1w! +b01000111 \! +b10001110010001110100011101000111 ]! +b01000111 ^! +b10001110010001110100011101000111 _! +b01000111 `! +b10001110010001110100011101000111 a! +b01000111 b! +b10001110010001110100011101000111 c! +1d! +1h! +1l! +1p! +b00000000000000000000000000000001 t! +1v! +b01000111 w! b01000111 x! b01000111 y! b01000111 z! @@ -810,7 +808,7 @@ b01000111 !" b01000111 "" b01000111 #" b01000111 $" -b01000111 %" +b01000111 (" b01000111 )" b01000111 *" b01000111 +" @@ -818,7 +816,7 @@ b01000111 ," b01000111 -" b01000111 ." b01000111 /" -b01000111 0" +b01000111 3" b01000111 4" b01000111 5" b01000111 6" @@ -827,22 +825,21 @@ b01000111 8" b01000111 9" b01000111 :" b01000111 ;" -b01000111 <" -0=" -1>" -0A" +0<" +1=" +0@" +1C" 1D" -1E" -0H" -1K" -0L" -1M" -0P" -1S" -0T" -1U" +0G" +1J" +0K" +1L" +0O" +1R" +0S" +1T" #15 -0U" +0T" #20 b010 - b10100011 0 @@ -851,122 +848,122 @@ b10100011 2 b10100011 3 b10100011 4 b10100011 5 -b10100011 6 -b10001110 7 +b10001110 6 +b10100011 7 b10100011 8 b10100011 9 b10100011 : b10100011 ; b10100011 < b10100011 = -b10100011 > +b10001110 A b10001110 B b10001110 C -b10001110 D +b10100011 D b10100011 E b10100011 F b10100011 G b10100011 H b10100011 I -b10100011 J +b10001110 M b10001110 N b10001110 O -b10001110 P +b10100011 P b10100011 Q b10100011 R b10100011 S b10100011 T b10100011 U -b10100011 V +b10001110 Y b10001110 Z b10001110 [ -b10001110 \ +b10100011 \ b10100011 ] b10100011 ^ b10100011 _ b10100011 ` b10100011 a -b10100011 b +b10001110 e b10001110 f b10001110 g -b10001110 h +b10100011 h b10100011 i b10100011 j b10100011 k b10100011 l b10100011 m -b10100011 n +b10001110 q b10001110 r b10001110 s -b10001110 t +b10100011 t b10100011 u b10100011 v b10100011 w b10100011 x b10100011 y -b10100011 z +b10001110 } b10001110 ~ b10001110 !! -b10001110 "! +b10100011 "! b10100011 #! b10100011 $! b10100011 %! b10100011 &! b10100011 '! -b10100011 (! +b10001110 +! b10001110 ,! b10001110 -! -b10001110 .! +b10100011 .! b10100011 /! b10100011 0! b10100011 1! b10100011 2! b10100011 3! -b10100011 4! +b10001110 7! b10001110 8! b10001110 9! -b10001110 :! +b10100011 :! b10100011 ;! b10100011 ! b10100011 ?! -b10100011 @! +b10001110 C! b10001110 D! b10001110 E! -b10001110 F! +b10100011 F! b10100011 G! b10100011 H! b10100011 I! b10100011 J! b10100011 K! -b10100011 L! +b10001110 O! b10001110 P! b10001110 Q! -b10001110 R! +b10100011 R! b10100011 S! b10100011 T! b10100011 U! b10100011 V! b10100011 W! b10100011 X! -b10100011 Y! -b00000000000000000000000010001110 Z! +b00000000000000000000000010001110 Y! +b00000000000000000000000010100011 Z! b00000000000000000000000010100011 [! -b00000000000000000000000010100011 \! -b10100011 ]! -b10001110100011101010001110100011 ^! -b10100011 _! -b10001110100011101010001110100011 `! -b10100011 a! -b10001110100011101010001110100011 b! -b10100011 c! -b10001110100011101010001110100011 d! -1f! -1j! -1n! -1r! -b00000000000000000000000000000010 u! +b10100011 \! +b10001110100011101010001110100011 ]! +b10100011 ^! +b10001110100011101010001110100011 _! +b10100011 `! +b10001110100011101010001110100011 a! +b10100011 b! +b10001110100011101010001110100011 c! +1e! +1i! +1m! +1q! +b00000000000000000000000000000010 t! +b10100011 w! b10100011 x! b10100011 y! b10100011 z! @@ -978,39 +975,38 @@ b10100011 !" b10100011 "" b10100011 #" b10100011 $" -b10100011 %" +b10001110 (" b10001110 )" b10001110 *" -b10001110 +" +b10100011 +" b10100011 ," b10100011 -" b10100011 ." b10100011 /" -b10100011 0" +b10001110 3" b10001110 4" b10001110 5" -b10001110 6" +b10100011 6" b10100011 7" b10100011 8" b10100011 9" b10100011 :" b10100011 ;" -b10100011 <" -1=" -0>" -1?" -0B" -0G" -1J" -0K" -1L" -0O" -1R" -0S" +1<" +0=" +1>" +0A" +0F" +1I" +0J" +1K" +0N" +1Q" +0R" +1S" 1T" -1U" #25 -0U" +0T" #30 b011 - b11010001 0 @@ -1019,122 +1015,122 @@ b11010001 2 b11010001 3 b11010001 4 b11010001 5 -b11010001 6 -b01000111 7 +b01000111 6 +b11010001 7 b11010001 8 b11010001 9 b11010001 : b11010001 ; b11010001 < b11010001 = -b11010001 > +b01000111 A b01000111 B b01000111 C -b01000111 D +b11010001 D b11010001 E b11010001 F b11010001 G b11010001 H b11010001 I -b11010001 J +b01000111 M b01000111 N b01000111 O -b01000111 P +b11010001 P b11010001 Q b11010001 R b11010001 S b11010001 T b11010001 U -b11010001 V +b01000111 Y b01000111 Z b01000111 [ -b01000111 \ +b11010001 \ b11010001 ] b11010001 ^ b11010001 _ b11010001 ` b11010001 a -b11010001 b +b01000111 e b01000111 f b01000111 g -b01000111 h +b11010001 h b11010001 i b11010001 j b11010001 k b11010001 l b11010001 m -b11010001 n +b01000111 q b01000111 r b01000111 s -b01000111 t +b11010001 t b11010001 u b11010001 v b11010001 w b11010001 x b11010001 y -b11010001 z +b01000111 } b01000111 ~ b01000111 !! -b01000111 "! +b11010001 "! b11010001 #! b11010001 $! b11010001 %! b11010001 &! b11010001 '! -b11010001 (! +b01000111 +! b01000111 ,! b01000111 -! -b01000111 .! +b11010001 .! b11010001 /! b11010001 0! b11010001 1! b11010001 2! b11010001 3! -b11010001 4! +b01000111 7! b01000111 8! b01000111 9! -b01000111 :! +b11010001 :! b11010001 ;! b11010001 ! b11010001 ?! -b11010001 @! +b01000111 C! b01000111 D! b01000111 E! -b01000111 F! +b11010001 F! b11010001 G! b11010001 H! b11010001 I! b11010001 J! b11010001 K! -b11010001 L! +b01000111 O! b01000111 P! b01000111 Q! -b01000111 R! +b11010001 R! b11010001 S! b11010001 T! b11010001 U! b11010001 V! b11010001 W! b11010001 X! -b11010001 Y! -b00000000000000000000000001000111 Z! +b00000000000000000000000001000111 Y! +b00000000000000000000000011010001 Z! b00000000000000000000000011010001 [! -b00000000000000000000000011010001 \! -b11010001 ]! -b10001110010001111101000111010001 ^! -b11010001 _! -b10001110010001111101000111010001 `! -b11010001 a! -b10001110010001111101000111010001 b! -b11010001 c! -b10001110010001111101000111010001 d! -1g! -1k! -1o! -1s! -b00000000000000000000000000000011 u! +b11010001 \! +b10001110010001111101000111010001 ]! +b11010001 ^! +b10001110010001111101000111010001 _! +b11010001 `! +b10001110010001111101000111010001 a! +b11010001 b! +b10001110010001111101000111010001 c! +1f! +1j! +1n! +1r! +b00000000000000000000000000000011 t! +b11010001 w! b11010001 x! b11010001 y! b11010001 z! @@ -1146,163 +1142,162 @@ b11010001 !" b11010001 "" b11010001 #" b11010001 $" -b11010001 %" +b01000111 (" b01000111 )" b01000111 *" -b01000111 +" +b11010001 +" b11010001 ," b11010001 -" b11010001 ." b11010001 /" -b11010001 0" +b01000111 3" b01000111 4" b01000111 5" -b01000111 6" +b11010001 6" b11010001 7" b11010001 8" b11010001 9" b11010001 :" b11010001 ;" -b11010001 <" -1>" -0?" -1@" -0C" -0F" -1I" -0J" -1K" -0N" -1Q" -0R" -1S" -1U" +1=" +0>" +1?" +0B" +0E" +1H" +0I" +1J" +0M" +1P" +0Q" +1R" +1T" #35 -0U" +0T" #40 b100 - b11101000 0 b10001110 1 b10001110 2 b11101000 3 -b11101000 4 -b10001110 5 -b11101000 6 +b10001110 4 +b11101000 5 +b10001110 6 b10001110 7 b10001110 8 b10001110 9 b10001110 : -b10001110 ; +b11101000 ; b11101000 < b11101000 = -b11101000 > +b10001110 A b10001110 B b10001110 C b10001110 D b10001110 E b10001110 F -b10001110 G +b11101000 G b11101000 H b11101000 I -b11101000 J +b10001110 M b10001110 N b10001110 O b10001110 P b10001110 Q b10001110 R -b10001110 S +b11101000 S b11101000 T b11101000 U -b11101000 V +b10001110 Y b10001110 Z b10001110 [ b10001110 \ b10001110 ] b10001110 ^ -b10001110 _ +b11101000 _ b11101000 ` b11101000 a -b11101000 b +b10001110 e b10001110 f b10001110 g b10001110 h b10001110 i b10001110 j -b10001110 k +b11101000 k b11101000 l b11101000 m -b11101000 n +b10001110 q b10001110 r b10001110 s b10001110 t b10001110 u b10001110 v -b10001110 w +b11101000 w b11101000 x b11101000 y -b11101000 z +b10001110 } b10001110 ~ b10001110 !! b10001110 "! b10001110 #! b10001110 $! -b10001110 %! +b11101000 %! b11101000 &! b11101000 '! -b11101000 (! +b10001110 +! b10001110 ,! b10001110 -! b10001110 .! b10001110 /! b10001110 0! -b10001110 1! +b11101000 1! b11101000 2! b11101000 3! -b11101000 4! +b10001110 7! b10001110 8! b10001110 9! b10001110 :! b10001110 ;! b10001110 ! b11101000 ?! -b11101000 @! +b10001110 C! b10001110 D! b10001110 E! b10001110 F! b10001110 G! b10001110 H! -b10001110 I! +b11101000 I! b11101000 J! b11101000 K! -b11101000 L! +b10001110 O! b10001110 P! b10001110 Q! b10001110 R! b10001110 S! b10001110 T! -b10001110 U! +b11101000 U! b11101000 V! b11101000 W! b11101000 X! -b11101000 Y! +b00000000000000000000000010001110 Y! b00000000000000000000000010001110 Z! -b00000000000000000000000010001110 [! -b00000000000000000000000011101000 \! -b11101000 ]! -b10001110100011101000111011101000 ^! -b11101000 _! -b10001110100011101000111011101000 `! -b11101000 a! -b10001110100011101000111011101000 b! -b11101000 c! -b10001110100011101000111011101000 d! -1h! -1l! -1p! -1t! -b00000000000000000000000000000100 u! +b00000000000000000000000011101000 [! +b11101000 \! +b10001110100011101000111011101000 ]! +b11101000 ^! +b10001110100011101000111011101000 _! +b11101000 `! +b10001110100011101000111011101000 a! +b11101000 b! +b10001110100011101000111011101000 c! +1g! +1k! +1o! +1s! +b00000000000000000000000000000100 t! +b11101000 w! b11101000 x! b11101000 y! b11101000 z! @@ -1314,159 +1309,158 @@ b11101000 !" b11101000 "" b11101000 #" b11101000 $" -b11101000 %" +b10001110 (" b10001110 )" b10001110 *" b10001110 +" b10001110 ," b10001110 -" -b10001110 ." +b11101000 ." b11101000 /" -b11101000 0" +b10001110 3" b10001110 4" b10001110 5" b10001110 6" b10001110 7" b10001110 8" -b10001110 9" +b11101000 9" b11101000 :" b11101000 ;" -b11101000 <" -1?" -0@" -1A" +1>" +0?" +1@" +0C" 0D" -0E" -1H" -0I" -1J" -0M" -1P" -0Q" -1R" -1U" +1G" +0H" +1I" +0L" +1O" +0P" +1Q" +1T" #45 -0U" +0T" #50 b101 - b01110100 0 b01000111 1 b01000111 2 b01110100 3 -b01110100 4 -b01000111 5 -b01110100 6 +b01000111 4 +b01110100 5 +b01000111 6 b01000111 7 b01000111 8 b01000111 9 b01000111 : -b01000111 ; +b01110100 ; b01110100 < b01110100 = -b01110100 > +b01000111 A b01000111 B b01000111 C b01000111 D b01000111 E b01000111 F -b01000111 G +b01110100 G b01110100 H b01110100 I -b01110100 J +b01000111 M b01000111 N b01000111 O b01000111 P b01000111 Q b01000111 R -b01000111 S +b01110100 S b01110100 T b01110100 U -b01110100 V +b01000111 Y b01000111 Z b01000111 [ b01000111 \ b01000111 ] b01000111 ^ -b01000111 _ +b01110100 _ b01110100 ` b01110100 a -b01110100 b +b01000111 e b01000111 f b01000111 g b01000111 h b01000111 i b01000111 j -b01000111 k +b01110100 k b01110100 l b01110100 m -b01110100 n +b01000111 q b01000111 r b01000111 s b01000111 t b01000111 u b01000111 v -b01000111 w +b01110100 w b01110100 x b01110100 y -b01110100 z +b01000111 } b01000111 ~ b01000111 !! b01000111 "! b01000111 #! b01000111 $! -b01000111 %! +b01110100 %! b01110100 &! b01110100 '! -b01110100 (! +b01000111 +! b01000111 ,! b01000111 -! b01000111 .! b01000111 /! b01000111 0! -b01000111 1! +b01110100 1! b01110100 2! b01110100 3! -b01110100 4! +b01000111 7! b01000111 8! b01000111 9! b01000111 :! b01000111 ;! b01000111 ! b01110100 ?! -b01110100 @! +b01000111 C! b01000111 D! b01000111 E! b01000111 F! b01000111 G! b01000111 H! -b01000111 I! +b01110100 I! b01110100 J! b01110100 K! -b01110100 L! +b01000111 O! b01000111 P! b01000111 Q! b01000111 R! b01000111 S! b01000111 T! -b01000111 U! +b01110100 U! b01110100 V! b01110100 W! b01110100 X! -b01110100 Y! +b00000000000000000000000001000111 Y! b00000000000000000000000001000111 Z! -b00000000000000000000000001000111 [! -b00000000000000000000000001110100 \! -b01110100 ]! -b10001110010001110100011101110100 ^! -b01110100 _! -b10001110010001110100011101110100 `! -b01110100 a! -b10001110010001110100011101110100 b! -b01110100 c! -b10001110010001110100011101110100 d! -b00000000000000000000000000000101 u! +b00000000000000000000000001110100 [! +b01110100 \! +b10001110010001110100011101110100 ]! +b01110100 ^! +b10001110010001110100011101110100 _! +b01110100 `! +b10001110010001110100011101110100 a! +b01110100 b! +b10001110010001110100011101110100 c! +b00000000000000000000000000000101 t! +b01110100 w! b01110100 x! b01110100 y! b01110100 z! @@ -1478,159 +1472,158 @@ b01110100 !" b01110100 "" b01110100 #" b01110100 $" -b01110100 %" +b01000111 (" b01000111 )" b01000111 *" b01000111 +" b01000111 ," b01000111 -" -b01000111 ." +b01110100 ." b01110100 /" -b01110100 0" +b01000111 3" b01000111 4" b01000111 5" b01000111 6" b01000111 7" b01000111 8" -b01000111 9" +b01110100 9" b01110100 :" b01110100 ;" -b01110100 <" -0=" -1@" -0A" -1B" -1G" -0H" -1I" -0L" -1O" -0P" -1Q" -0T" -1U" +0<" +1?" +0@" +1A" +1F" +0G" +1H" +0K" +1N" +0O" +1P" +0S" +1T" #55 -0U" +0T" #60 b110 - b00111010 0 b10001110 1 b10100011 2 b00111010 3 -b00111010 4 -b10100011 5 -b00111010 6 -b10001110 7 +b10100011 4 +b00111010 5 +b10001110 6 +b10100011 7 b10100011 8 b10100011 9 b10100011 : -b10100011 ; +b00111010 ; b00111010 < b00111010 = -b00111010 > +b10001110 A b10001110 B b10001110 C -b10001110 D +b10100011 D b10100011 E b10100011 F -b10100011 G +b00111010 G b00111010 H b00111010 I -b00111010 J +b10001110 M b10001110 N b10001110 O -b10001110 P +b10100011 P b10100011 Q b10100011 R -b10100011 S +b00111010 S b00111010 T b00111010 U -b00111010 V +b10001110 Y b10001110 Z b10001110 [ -b10001110 \ +b10100011 \ b10100011 ] b10100011 ^ -b10100011 _ +b00111010 _ b00111010 ` b00111010 a -b00111010 b +b10001110 e b10001110 f b10001110 g -b10001110 h +b10100011 h b10100011 i b10100011 j -b10100011 k +b00111010 k b00111010 l b00111010 m -b00111010 n +b10001110 q b10001110 r b10001110 s -b10001110 t +b10100011 t b10100011 u b10100011 v -b10100011 w +b00111010 w b00111010 x b00111010 y -b00111010 z +b10001110 } b10001110 ~ b10001110 !! -b10001110 "! +b10100011 "! b10100011 #! b10100011 $! -b10100011 %! +b00111010 %! b00111010 &! b00111010 '! -b00111010 (! +b10001110 +! b10001110 ,! b10001110 -! -b10001110 .! +b10100011 .! b10100011 /! b10100011 0! -b10100011 1! +b00111010 1! b00111010 2! b00111010 3! -b00111010 4! +b10001110 7! b10001110 8! b10001110 9! -b10001110 :! +b10100011 :! b10100011 ;! b10100011 ! b00111010 ?! -b00111010 @! +b10001110 C! b10001110 D! b10001110 E! -b10001110 F! +b10100011 F! b10100011 G! b10100011 H! -b10100011 I! +b00111010 I! b00111010 J! b00111010 K! -b00111010 L! +b10001110 O! b10001110 P! b10001110 Q! -b10001110 R! +b10100011 R! b10100011 S! b10100011 T! -b10100011 U! +b00111010 U! b00111010 V! b00111010 W! b00111010 X! -b00111010 Y! -b00000000000000000000000010001110 Z! -b00000000000000000000000010100011 [! -b00000000000000000000000000111010 \! -b00111010 ]! -b10001110100011101010001100111010 ^! -b00111010 _! -b10001110100011101010001100111010 `! -b00111010 a! -b10001110100011101010001100111010 b! -b00111010 c! -b10001110100011101010001100111010 d! -b00000000000000000000000000000110 u! +b00000000000000000000000010001110 Y! +b00000000000000000000000010100011 Z! +b00000000000000000000000000111010 [! +b00111010 \! +b10001110100011101010001100111010 ]! +b00111010 ^! +b10001110100011101010001100111010 _! +b00111010 `! +b10001110100011101010001100111010 a! +b00111010 b! +b10001110100011101010001100111010 c! +b00000000000000000000000000000110 t! +b00111010 w! b00111010 x! b00111010 y! b00111010 z! @@ -1642,159 +1635,158 @@ b00111010 !" b00111010 "" b00111010 #" b00111010 $" -b00111010 %" +b10001110 (" b10001110 )" b10001110 *" -b10001110 +" +b10100011 +" b10100011 ," b10100011 -" -b10100011 ." +b00111010 ." b00111010 /" -b00111010 0" +b10001110 3" b10001110 4" b10001110 5" -b10001110 6" +b10100011 6" b10100011 7" b10100011 8" -b10100011 9" +b00111010 9" b00111010 :" b00111010 ;" -b00111010 <" -0>" -1A" -0B" -1C" -1F" -0G" -1H" -0K" -1N" -0O" -1P" -0S" -1U" +0=" +1@" +0A" +1B" +1E" +0F" +1G" +0J" +1M" +0N" +1O" +0R" +1T" #65 -0U" +0T" #70 b111 - b00011101 0 b01000111 1 b11010001 2 b00011101 3 -b00011101 4 -b11010001 5 -b00011101 6 -b01000111 7 +b11010001 4 +b00011101 5 +b01000111 6 +b11010001 7 b11010001 8 b11010001 9 b11010001 : -b11010001 ; +b00011101 ; b00011101 < b00011101 = -b00011101 > +b01000111 A b01000111 B b01000111 C -b01000111 D +b11010001 D b11010001 E b11010001 F -b11010001 G +b00011101 G b00011101 H b00011101 I -b00011101 J +b01000111 M b01000111 N b01000111 O -b01000111 P +b11010001 P b11010001 Q b11010001 R -b11010001 S +b00011101 S b00011101 T b00011101 U -b00011101 V +b01000111 Y b01000111 Z b01000111 [ -b01000111 \ +b11010001 \ b11010001 ] b11010001 ^ -b11010001 _ +b00011101 _ b00011101 ` b00011101 a -b00011101 b +b01000111 e b01000111 f b01000111 g -b01000111 h +b11010001 h b11010001 i b11010001 j -b11010001 k +b00011101 k b00011101 l b00011101 m -b00011101 n +b01000111 q b01000111 r b01000111 s -b01000111 t +b11010001 t b11010001 u b11010001 v -b11010001 w +b00011101 w b00011101 x b00011101 y -b00011101 z +b01000111 } b01000111 ~ b01000111 !! -b01000111 "! +b11010001 "! b11010001 #! b11010001 $! -b11010001 %! +b00011101 %! b00011101 &! b00011101 '! -b00011101 (! +b01000111 +! b01000111 ,! b01000111 -! -b01000111 .! +b11010001 .! b11010001 /! b11010001 0! -b11010001 1! +b00011101 1! b00011101 2! b00011101 3! -b00011101 4! +b01000111 7! b01000111 8! b01000111 9! -b01000111 :! +b11010001 :! b11010001 ;! b11010001 ! b00011101 ?! -b00011101 @! +b01000111 C! b01000111 D! b01000111 E! -b01000111 F! +b11010001 F! b11010001 G! b11010001 H! -b11010001 I! +b00011101 I! b00011101 J! b00011101 K! -b00011101 L! +b01000111 O! b01000111 P! b01000111 Q! -b01000111 R! +b11010001 R! b11010001 S! b11010001 T! -b11010001 U! +b00011101 U! b00011101 V! b00011101 W! b00011101 X! -b00011101 Y! -b00000000000000000000000001000111 Z! -b00000000000000000000000011010001 [! -b00000000000000000000000000011101 \! -b00011101 ]! -b10001110010001111101000100011101 ^! -b00011101 _! -b10001110010001111101000100011101 `! -b00011101 a! -b10001110010001111101000100011101 b! -b00011101 c! -b10001110010001111101000100011101 d! -b00000000000000000000000000000111 u! +b00000000000000000000000001000111 Y! +b00000000000000000000000011010001 Z! +b00000000000000000000000000011101 [! +b00011101 \! +b10001110010001111101000100011101 ]! +b00011101 ^! +b10001110010001111101000100011101 _! +b00011101 `! +b10001110010001111101000100011101 a! +b00011101 b! +b10001110010001111101000100011101 c! +b00000000000000000000000000000111 t! +b00011101 w! b00011101 x! b00011101 y! b00011101 z! @@ -1806,39 +1798,38 @@ b00011101 !" b00011101 "" b00011101 #" b00011101 $" -b00011101 %" +b01000111 (" b01000111 )" b01000111 *" -b01000111 +" +b11010001 +" b11010001 ," b11010001 -" -b11010001 ." +b00011101 ." b00011101 /" -b00011101 0" +b01000111 3" b01000111 4" b01000111 5" -b01000111 6" +b11010001 6" b11010001 7" b11010001 8" -b11010001 9" +b00011101 9" b00011101 :" b00011101 ;" -b00011101 <" -0?" -1B" -0C" +0>" +1A" +0B" +1C" 1D" -1E" -0F" -1G" -0J" -1M" -0N" -1O" -0R" -1U" +0E" +1F" +0I" +1L" +0M" +1N" +0Q" +1T" #75 -0U" +0T" #80 b000 - b10001110 0 @@ -1855,7 +1846,7 @@ b10001110 : b10001110 ; b10001110 < b10001110 = -b10001110 > +b10001110 A b10001110 B b10001110 C b10001110 D @@ -1864,7 +1855,7 @@ b10001110 F b10001110 G b10001110 H b10001110 I -b10001110 J +b10001110 M b10001110 N b10001110 O b10001110 P @@ -1873,7 +1864,7 @@ b10001110 R b10001110 S b10001110 T b10001110 U -b10001110 V +b10001110 Y b10001110 Z b10001110 [ b10001110 \ @@ -1882,7 +1873,7 @@ b10001110 ^ b10001110 _ b10001110 ` b10001110 a -b10001110 b +b10001110 e b10001110 f b10001110 g b10001110 h @@ -1891,7 +1882,7 @@ b10001110 j b10001110 k b10001110 l b10001110 m -b10001110 n +b10001110 q b10001110 r b10001110 s b10001110 t @@ -1900,7 +1891,7 @@ b10001110 v b10001110 w b10001110 x b10001110 y -b10001110 z +b10001110 } b10001110 ~ b10001110 !! b10001110 "! @@ -1909,7 +1900,7 @@ b10001110 $! b10001110 %! b10001110 &! b10001110 '! -b10001110 (! +b10001110 +! b10001110 ,! b10001110 -! b10001110 .! @@ -1918,7 +1909,7 @@ b10001110 0! b10001110 1! b10001110 2! b10001110 3! -b10001110 4! +b10001110 7! b10001110 8! b10001110 9! b10001110 :! @@ -1927,7 +1918,7 @@ b10001110 ! b10001110 ?! -b10001110 @! +b10001110 C! b10001110 D! b10001110 E! b10001110 F! @@ -1936,7 +1927,7 @@ b10001110 H! b10001110 I! b10001110 J! b10001110 K! -b10001110 L! +b10001110 O! b10001110 P! b10001110 Q! b10001110 R! @@ -1946,19 +1937,19 @@ b10001110 U! b10001110 V! b10001110 W! b10001110 X! -b10001110 Y! +b00000000000000000000000010001110 Y! b00000000000000000000000010001110 Z! b00000000000000000000000010001110 [! -b00000000000000000000000010001110 \! -b10001110 ]! -b10001110100011101000111010001110 ^! -b10001110 _! -b10001110100011101000111010001110 `! -b10001110 a! -b10001110100011101000111010001110 b! -b10001110 c! -b10001110100011101000111010001110 d! -b00000000000000000000000000001000 u! +b10001110 \! +b10001110100011101000111010001110 ]! +b10001110 ^! +b10001110100011101000111010001110 _! +b10001110 `! +b10001110100011101000111010001110 a! +b10001110 b! +b10001110100011101000111010001110 c! +b00000000000000000000000000001000 t! +b10001110 w! b10001110 x! b10001110 y! b10001110 z! @@ -1970,7 +1961,7 @@ b10001110 !" b10001110 "" b10001110 #" b10001110 $" -b10001110 %" +b10001110 (" b10001110 )" b10001110 *" b10001110 +" @@ -1978,7 +1969,7 @@ b10001110 ," b10001110 -" b10001110 ." b10001110 /" -b10001110 0" +b10001110 3" b10001110 4" b10001110 5" b10001110 6" @@ -1987,17 +1978,16 @@ b10001110 8" b10001110 9" b10001110 :" b10001110 ;" -b10001110 <" -1=" -0@" -1C" +1<" +0?" +1B" +0C" 0D" -0E" -1F" -0I" -1L" -0M" -1N" -0Q" +1E" +0H" +1K" +0L" +1M" +0P" +1S" 1T" -1U" diff --git a/test_regress/t/t_trace_complex.out b/test_regress/t/t_trace_complex.out index 74c7eb8c7..62c142c2b 100644 --- a/test_regress/t/t_trace_complex.out +++ b/test_regress/t/t_trace_complex.out @@ -1,7 +1,6 @@ $version Generated by VerilatedVcd $end -$date Mon Nov 16 17:48:27 2020 - $end -$timescale 1ps $end +$date Wed Aug 11 12:40:46 2021 $end +$timescale 1ps $end $scope module top $end $var wire 1 = clk $end @@ -12,24 +11,24 @@ $timescale 1ps $end $var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 = clk $end $var wire 32 $ cyc [31:0] $end - $var wire 8 E unpacked_array(-1) [7:0] $end - $var wire 8 D unpacked_array(-2) [7:0] $end - $var wire 8 F unpacked_array(0) [7:0] $end - $var real 64 1 v_arr_real(0) $end - $var real 64 3 v_arr_real(1) $end + $var wire 8 E unpacked_array[-1] [7:0] $end + $var wire 8 D unpacked_array[-2] [7:0] $end + $var wire 8 F unpacked_array[0] [7:0] $end + $var real 64 1 v_arr_real[0] $end + $var real 64 3 v_arr_real[1] $end $var wire 2 ( v_arrp [2:1] $end $var wire 4 ) v_arrp_arrp [3:0] $end $var wire 4 * v_arrp_strp [3:0] $end - $var wire 1 > v_arru(1) $end - $var wire 1 ? v_arru(2) $end - $var wire 2 + v_arru_arrp(3) [2:1] $end - $var wire 2 , v_arru_arrp(4) [2:1] $end - $var wire 1 @ v_arru_arru(3)(1) $end - $var wire 1 A v_arru_arru(3)(2) $end - $var wire 1 B v_arru_arru(4)(1) $end - $var wire 1 C v_arru_arru(4)(2) $end - $var wire 2 - v_arru_strp(3) [1:0] $end - $var wire 2 . v_arru_strp(4) [1:0] $end + $var wire 1 > v_arru[1] $end + $var wire 1 ? v_arru[2] $end + $var wire 2 + v_arru_arrp[3] [2:1] $end + $var wire 2 , v_arru_arrp[4] [2:1] $end + $var wire 1 @ v_arru_arru[3][1] $end + $var wire 1 A v_arru_arru[3][2] $end + $var wire 1 B v_arru_arru[4][1] $end + $var wire 1 C v_arru_arru[4][2] $end + $var wire 2 - v_arru_strp[3] [1:0] $end + $var wire 2 . v_arru_strp[4] [1:0] $end $var wire 3 9 v_enumb [2:0] $end $var wire 6 : v_enumb2_str [5:0] $end $var wire 32 7 v_enumed [31:0] $end diff --git a/test_regress/t/t_trace_complex.pl b/test_regress/t/t_trace_complex.pl index 49c306eb5..8400cbf09 100755 --- a/test_regress/t/t_trace_complex.pl +++ b/test_regress/t/t_trace_complex.pl @@ -23,10 +23,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); diff --git a/test_regress/t/t_trace_complex_fst.out b/test_regress/t/t_trace_complex_fst.out index d57c690c6..3fbfab803 100644 --- a/test_regress/t/t_trace_complex_fst.out +++ b/test_regress/t/t_trace_complex_fst.out @@ -1,5 +1,5 @@ $date - Mon Nov 16 17:51:08 2020 + Wed Aug 11 12:40:48 2021 $end $version @@ -19,19 +19,19 @@ $var logic 2 % v_unip_strp $end $var logic 2 & v_arrp $end $var logic 4 ' v_arrp_arrp $end $var logic 4 ( v_arrp_strp $end -$var logic 1 ) v_arru(1) $end -$var logic 1 * v_arru(2) $end -$var logic 1 + v_arru_arru(3)(1) $end -$var logic 1 , v_arru_arru(3)(2) $end -$var logic 1 - v_arru_arru(4)(1) $end -$var logic 1 . v_arru_arru(4)(2) $end -$var logic 2 / v_arru_arrp(3) $end -$var logic 2 0 v_arru_arrp(4) $end -$var logic 2 1 v_arru_strp(3) $end -$var logic 2 2 v_arru_strp(4) $end +$var logic 1 ) v_arru[1] $end +$var logic 1 * v_arru[2] $end +$var logic 1 + v_arru_arru[3][1] $end +$var logic 1 , v_arru_arru[3][2] $end +$var logic 1 - v_arru_arru[4][1] $end +$var logic 1 . v_arru_arru[4][2] $end +$var logic 2 / v_arru_arrp[3] $end +$var logic 2 0 v_arru_arrp[4] $end +$var logic 2 1 v_arru_strp[3] $end +$var logic 2 2 v_arru_strp[4] $end $var real 64 3 v_real $end -$var real 64 4 v_arr_real(0) $end -$var real 64 5 v_arr_real(1) $end +$var real 64 4 v_arr_real[0] $end +$var real 64 5 v_arr_real[1] $end $var logic 64 6 v_str32x2 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 "" 1 $end @@ -42,9 +42,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end $attrbegin misc 07 "" 2 $end $var logic 3 9 v_enumb $end $var logic 6 : v_enumb2_str $end -$var logic 8 ; unpacked_array(-2) $end -$var logic 8 < unpacked_array(-1) $end -$var logic 8 = unpacked_array(0) $end +$var logic 8 ; unpacked_array[-2] $end +$var logic 8 < unpacked_array[-1] $end +$var logic 8 = unpacked_array[0] $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 ? b $end @@ -67,8 +67,8 @@ $var bit 1 D global_bit $end $upscope $end $upscope $end $enddefinitions $end -$dumpvars #0 +$dumpvars 1D b00000000000000000000000000000100 C b00000000000000000000000000000011 B @@ -105,6 +105,7 @@ b0000 $ b00 # b00000000000000000000000000000000 " 0! +$end #10 1! b00000000000000000000000000000001 " diff --git a/test_regress/t/t_trace_complex_fst_sc.out b/test_regress/t/t_trace_complex_fst_sc.out index f3da1ace4..f56182246 100644 --- a/test_regress/t/t_trace_complex_fst_sc.out +++ b/test_regress/t/t_trace_complex_fst_sc.out @@ -1,5 +1,5 @@ $date - Mon Apr 19 17:05:53 2021 + Wed Aug 11 12:40:52 2021 $end $version @@ -18,19 +18,19 @@ $var logic 2 % v_unip_strp $end $var logic 2 & v_arrp $end $var logic 4 ' v_arrp_arrp $end $var logic 4 ( v_arrp_strp $end -$var logic 1 ) v_arru(1) $end -$var logic 1 * v_arru(2) $end -$var logic 1 + v_arru_arru(3)(1) $end -$var logic 1 , v_arru_arru(3)(2) $end -$var logic 1 - v_arru_arru(4)(1) $end -$var logic 1 . v_arru_arru(4)(2) $end -$var logic 2 / v_arru_arrp(3) $end -$var logic 2 0 v_arru_arrp(4) $end -$var logic 2 1 v_arru_strp(3) $end -$var logic 2 2 v_arru_strp(4) $end +$var logic 1 ) v_arru[1] $end +$var logic 1 * v_arru[2] $end +$var logic 1 + v_arru_arru[3][1] $end +$var logic 1 , v_arru_arru[3][2] $end +$var logic 1 - v_arru_arru[4][1] $end +$var logic 1 . v_arru_arru[4][2] $end +$var logic 2 / v_arru_arrp[3] $end +$var logic 2 0 v_arru_arrp[4] $end +$var logic 2 1 v_arru_strp[3] $end +$var logic 2 2 v_arru_strp[4] $end $var real 64 3 v_real $end -$var real 64 4 v_arr_real(0) $end -$var real 64 5 v_arr_real(1) $end +$var real 64 4 v_arr_real[0] $end +$var real 64 5 v_arr_real[1] $end $var logic 64 6 v_str32x2 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 "" 1 $end @@ -41,9 +41,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end $attrbegin misc 07 "" 2 $end $var logic 3 9 v_enumb $end $var logic 6 : v_enumb2_str $end -$var logic 8 ; unpacked_array(-2) $end -$var logic 8 < unpacked_array(-1) $end -$var logic 8 = unpacked_array(0) $end +$var logic 8 ; unpacked_array[-2] $end +$var logic 8 < unpacked_array[-1] $end +$var logic 8 = unpacked_array[0] $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 ? b $end @@ -66,8 +66,8 @@ $var bit 1 D global_bit $end $upscope $end $upscope $end $enddefinitions $end -$dumpvars #0 +$dumpvars 1D b00000000000000000000000000000100 C b00000000000000000000000000000011 B @@ -104,6 +104,7 @@ b0000 $ b00 # b00000000000000000000000000000000 " 0! +$end #10 1! b00000000000000000000000000000001 " diff --git a/test_regress/t/t_trace_complex_old_api.pl b/test_regress/t/t_trace_complex_old_api.pl index bdf9a0dec..4150e31af 100755 --- a/test_regress/t/t_trace_complex_old_api.pl +++ b/test_regress/t/t_trace_complex_old_api.pl @@ -28,10 +28,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); diff --git a/test_regress/t/t_trace_complex_params.out b/test_regress/t/t_trace_complex_params.out index 8d2cd1890..4fd754aed 100644 --- a/test_regress/t/t_trace_complex_params.out +++ b/test_regress/t/t_trace_complex_params.out @@ -1,7 +1,6 @@ $version Generated by VerilatedVcd $end -$date Mon Nov 16 17:51:08 2020 - $end -$timescale 1ps $end +$date Wed Aug 11 12:41:11 2021 $end +$timescale 1ps $end $scope module top $end $var wire 1 = clk $end @@ -12,24 +11,24 @@ $timescale 1ps $end $var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 = clk $end $var wire 32 $ cyc [31:0] $end - $var wire 8 E unpacked_array(-1) [7:0] $end - $var wire 8 D unpacked_array(-2) [7:0] $end - $var wire 8 F unpacked_array(0) [7:0] $end - $var real 64 1 v_arr_real(0) $end - $var real 64 3 v_arr_real(1) $end + $var wire 8 E unpacked_array[-1] [7:0] $end + $var wire 8 D unpacked_array[-2] [7:0] $end + $var wire 8 F unpacked_array[0] [7:0] $end + $var real 64 1 v_arr_real[0] $end + $var real 64 3 v_arr_real[1] $end $var wire 2 ( v_arrp [2:1] $end $var wire 4 ) v_arrp_arrp [3:0] $end $var wire 4 * v_arrp_strp [3:0] $end - $var wire 1 > v_arru(1) $end - $var wire 1 ? v_arru(2) $end - $var wire 2 + v_arru_arrp(3) [2:1] $end - $var wire 2 , v_arru_arrp(4) [2:1] $end - $var wire 1 @ v_arru_arru(3)(1) $end - $var wire 1 A v_arru_arru(3)(2) $end - $var wire 1 B v_arru_arru(4)(1) $end - $var wire 1 C v_arru_arru(4)(2) $end - $var wire 2 - v_arru_strp(3) [1:0] $end - $var wire 2 . v_arru_strp(4) [1:0] $end + $var wire 1 > v_arru[1] $end + $var wire 1 ? v_arru[2] $end + $var wire 2 + v_arru_arrp[3] [2:1] $end + $var wire 2 , v_arru_arrp[4] [2:1] $end + $var wire 1 @ v_arru_arru[3][1] $end + $var wire 1 A v_arru_arru[3][2] $end + $var wire 1 B v_arru_arru[4][1] $end + $var wire 1 C v_arru_arru[4][2] $end + $var wire 2 - v_arru_strp[3] [1:0] $end + $var wire 2 . v_arru_strp[4] [1:0] $end $var wire 3 9 v_enumb [2:0] $end $var wire 6 : v_enumb2_str [5:0] $end $var wire 32 7 v_enumed [31:0] $end diff --git a/test_regress/t/t_trace_complex_params_fst.out b/test_regress/t/t_trace_complex_params_fst.out index d57c690c6..1825f3bd9 100644 --- a/test_regress/t/t_trace_complex_params_fst.out +++ b/test_regress/t/t_trace_complex_params_fst.out @@ -1,5 +1,5 @@ $date - Mon Nov 16 17:51:08 2020 + Wed Aug 11 12:41:14 2021 $end $version @@ -19,19 +19,19 @@ $var logic 2 % v_unip_strp $end $var logic 2 & v_arrp $end $var logic 4 ' v_arrp_arrp $end $var logic 4 ( v_arrp_strp $end -$var logic 1 ) v_arru(1) $end -$var logic 1 * v_arru(2) $end -$var logic 1 + v_arru_arru(3)(1) $end -$var logic 1 , v_arru_arru(3)(2) $end -$var logic 1 - v_arru_arru(4)(1) $end -$var logic 1 . v_arru_arru(4)(2) $end -$var logic 2 / v_arru_arrp(3) $end -$var logic 2 0 v_arru_arrp(4) $end -$var logic 2 1 v_arru_strp(3) $end -$var logic 2 2 v_arru_strp(4) $end +$var logic 1 ) v_arru[1] $end +$var logic 1 * v_arru[2] $end +$var logic 1 + v_arru_arru[3][1] $end +$var logic 1 , v_arru_arru[3][2] $end +$var logic 1 - v_arru_arru[4][1] $end +$var logic 1 . v_arru_arru[4][2] $end +$var logic 2 / v_arru_arrp[3] $end +$var logic 2 0 v_arru_arrp[4] $end +$var logic 2 1 v_arru_strp[3] $end +$var logic 2 2 v_arru_strp[4] $end $var real 64 3 v_real $end -$var real 64 4 v_arr_real(0) $end -$var real 64 5 v_arr_real(1) $end +$var real 64 4 v_arr_real[0] $end +$var real 64 5 v_arr_real[1] $end $var logic 64 6 v_str32x2 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 "" 1 $end @@ -42,9 +42,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end $attrbegin misc 07 "" 2 $end $var logic 3 9 v_enumb $end $var logic 6 : v_enumb2_str $end -$var logic 8 ; unpacked_array(-2) $end -$var logic 8 < unpacked_array(-1) $end -$var logic 8 = unpacked_array(0) $end +$var logic 8 ; unpacked_array[-2] $end +$var logic 8 < unpacked_array[-1] $end +$var logic 8 = unpacked_array[0] $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 ? b $end @@ -67,8 +67,8 @@ $var bit 1 D global_bit $end $upscope $end $upscope $end $enddefinitions $end -$dumpvars #0 +$dumpvars 1D b00000000000000000000000000000100 C b00000000000000000000000000000011 B @@ -105,6 +105,7 @@ b0000 $ b00 # b00000000000000000000000000000000 " 0! +$end #10 1! b00000000000000000000000000000001 " diff --git a/test_regress/t/t_trace_complex_params_fst_sc.out b/test_regress/t/t_trace_complex_params_fst_sc.out index b5e67d184..fd56fca23 100644 --- a/test_regress/t/t_trace_complex_params_fst_sc.out +++ b/test_regress/t/t_trace_complex_params_fst_sc.out @@ -1,5 +1,5 @@ $date - Mon Apr 19 17:07:10 2021 + Wed Aug 11 12:41:17 2021 $end $version @@ -18,19 +18,19 @@ $var logic 2 % v_unip_strp $end $var logic 2 & v_arrp $end $var logic 4 ' v_arrp_arrp $end $var logic 4 ( v_arrp_strp $end -$var logic 1 ) v_arru(1) $end -$var logic 1 * v_arru(2) $end -$var logic 1 + v_arru_arru(3)(1) $end -$var logic 1 , v_arru_arru(3)(2) $end -$var logic 1 - v_arru_arru(4)(1) $end -$var logic 1 . v_arru_arru(4)(2) $end -$var logic 2 / v_arru_arrp(3) $end -$var logic 2 0 v_arru_arrp(4) $end -$var logic 2 1 v_arru_strp(3) $end -$var logic 2 2 v_arru_strp(4) $end +$var logic 1 ) v_arru[1] $end +$var logic 1 * v_arru[2] $end +$var logic 1 + v_arru_arru[3][1] $end +$var logic 1 , v_arru_arru[3][2] $end +$var logic 1 - v_arru_arru[4][1] $end +$var logic 1 . v_arru_arru[4][2] $end +$var logic 2 / v_arru_arrp[3] $end +$var logic 2 0 v_arru_arrp[4] $end +$var logic 2 1 v_arru_strp[3] $end +$var logic 2 2 v_arru_strp[4] $end $var real 64 3 v_real $end -$var real 64 4 v_arr_real(0) $end -$var real 64 5 v_arr_real(1) $end +$var real 64 4 v_arr_real[0] $end +$var real 64 5 v_arr_real[1] $end $var logic 64 6 v_str32x2 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 "" 1 $end @@ -41,9 +41,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end $attrbegin misc 07 "" 2 $end $var logic 3 9 v_enumb $end $var logic 6 : v_enumb2_str $end -$var logic 8 ; unpacked_array(-2) $end -$var logic 8 < unpacked_array(-1) $end -$var logic 8 = unpacked_array(0) $end +$var logic 8 ; unpacked_array[-2] $end +$var logic 8 < unpacked_array[-1] $end +$var logic 8 = unpacked_array[0] $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 ? b $end @@ -66,8 +66,8 @@ $var bit 1 D global_bit $end $upscope $end $upscope $end $enddefinitions $end -$dumpvars #0 +$dumpvars 1D b00000000000000000000000000000100 C b00000000000000000000000000000011 B @@ -104,6 +104,7 @@ b0000 $ b00 # b00000000000000000000000000000000 " 0! +$end #10 1! b00000000000000000000000000000001 " diff --git a/test_regress/t/t_trace_complex_portable.pl b/test_regress/t/t_trace_complex_portable.pl index ec7e5462e..56c794042 100755 --- a/test_regress/t/t_trace_complex_portable.pl +++ b/test_regress/t/t_trace_complex_portable.pl @@ -28,10 +28,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); diff --git a/test_regress/t/t_trace_complex_structs.out b/test_regress/t/t_trace_complex_structs.out index 6fc0af14a..c421a6293 100644 --- a/test_regress/t/t_trace_complex_structs.out +++ b/test_regress/t/t_trace_complex_structs.out @@ -1,7 +1,6 @@ $version Generated by VerilatedVcd $end -$date Mon Nov 16 17:51:09 2020 - $end -$timescale 1ps $end +$date Wed Aug 11 12:41:22 2021 $end +$timescale 1ps $end $scope module top $end $var wire 1 I clk $end @@ -12,22 +11,22 @@ $timescale 1ps $end $var wire 1 S LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 I clk $end $var wire 32 $ cyc [31:0] $end - $var wire 8 Q unpacked_array(-1) [7:0] $end - $var wire 8 P unpacked_array(-2) [7:0] $end - $var wire 8 R unpacked_array(0) [7:0] $end - $var real 64 < v_arr_real(0) $end - $var real 64 > v_arr_real(1) $end + $var wire 8 Q unpacked_array[-1] [7:0] $end + $var wire 8 P unpacked_array[-2] [7:0] $end + $var wire 8 R unpacked_array[0] [7:0] $end + $var real 64 < v_arr_real[0] $end + $var real 64 > v_arr_real[1] $end $var wire 2 - v_arrp [2:1] $end - $var wire 2 . v_arrp_arrp(3) [2:1] $end - $var wire 2 / v_arrp_arrp(4) [2:1] $end - $var wire 1 J v_arru(1) $end - $var wire 1 K v_arru(2) $end - $var wire 2 4 v_arru_arrp(3) [2:1] $end - $var wire 2 5 v_arru_arrp(4) [2:1] $end - $var wire 1 L v_arru_arru(3)(1) $end - $var wire 1 M v_arru_arru(3)(2) $end - $var wire 1 N v_arru_arru(4)(1) $end - $var wire 1 O v_arru_arru(4)(2) $end + $var wire 2 . v_arrp_arrp[3] [2:1] $end + $var wire 2 / v_arrp_arrp[4] [2:1] $end + $var wire 1 J v_arru[1] $end + $var wire 1 K v_arru[2] $end + $var wire 2 4 v_arru_arrp[3] [2:1] $end + $var wire 2 5 v_arru_arrp[4] [2:1] $end + $var wire 1 L v_arru_arru[3][1] $end + $var wire 1 M v_arru_arru[3][2] $end + $var wire 1 N v_arru_arru[4][1] $end + $var wire 1 O v_arru_arru[4][2] $end $var wire 3 D v_enumb [2:0] $end $var wire 32 B v_enumed [31:0] $end $var wire 32 C v_enumed2 [31:0] $end @@ -38,19 +37,19 @@ $timescale 1ps $end $var wire 32 H a [31:0] $end $upscope $end $upscope $end - $scope struct v_arrp_strp(3) $end + $scope struct v_arrp_strp[3] $end $var wire 1 1 b0 $end $var wire 1 0 b1 $end $upscope $end - $scope struct v_arrp_strp(4) $end + $scope struct v_arrp_strp[4] $end $var wire 1 3 b0 $end $var wire 1 2 b1 $end $upscope $end - $scope struct v_arru_strp(3) $end + $scope struct v_arru_strp[3] $end $var wire 1 7 b0 $end $var wire 1 6 b1 $end $upscope $end - $scope struct v_arru_strp(4) $end + $scope struct v_arru_strp[4] $end $var wire 1 9 b0 $end $var wire 1 8 b1 $end $upscope $end @@ -58,16 +57,12 @@ $timescale 1ps $end $var wire 3 E a [2:0] $end $var wire 3 F b [2:0] $end $upscope $end - $scope struct v_str32x2(0) $end + $scope struct v_str32x2[0] $end $var wire 32 @ data [31:0] $end $upscope $end - $scope struct v_str32x2(1) $end + $scope struct v_str32x2[1] $end $var wire 32 A data [31:0] $end $upscope $end - $scope struct v_strp $end - $var wire 1 & b0 $end - $var wire 1 % b1 $end - $upscope $end $scope struct v_strp_strp $end $scope struct x0 $end $var wire 1 * b0 $end @@ -78,7 +73,11 @@ $timescale 1ps $end $var wire 1 ' b1 $end $upscope $end $upscope $end - $scope struct v_unip_strp $end + $scope struct v_strp $end + $var wire 1 & b0 $end + $var wire 1 % b1 $end + $upscope $end + $scope union v_unip_strp $end $scope struct x0 $end $var wire 1 , b0 $end $var wire 1 + b1 $end diff --git a/test_regress/t/t_trace_complex_structs.pl b/test_regress/t/t_trace_complex_structs.pl index 6234bcdde..dbbf55c04 100755 --- a/test_regress/t/t_trace_complex_structs.pl +++ b/test_regress/t/t_trace_complex_structs.pl @@ -25,10 +25,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); diff --git a/test_regress/t/t_trace_complex_structs_fst.out b/test_regress/t/t_trace_complex_structs_fst.out index 48f9b2fed..8ba8df6f3 100644 --- a/test_regress/t/t_trace_complex_structs_fst.out +++ b/test_regress/t/t_trace_complex_structs_fst.out @@ -1,5 +1,5 @@ $date - Mon Nov 16 17:51:13 2020 + Wed Aug 11 12:41:25 2021 $end $version @@ -38,39 +38,39 @@ $var logic 1 * b0 $end $upscope $end $upscope $end $var logic 2 + v_arrp $end -$var logic 2 , v_arrp_arrp(3) $end -$var logic 2 - v_arrp_arrp(4) $end -$scope struct v_arrp_strp(3) $end +$var logic 2 , v_arrp_arrp[3] $end +$var logic 2 - v_arrp_arrp[4] $end +$scope struct v_arrp_strp[3] $end $var logic 1 . b1 $end $var logic 1 / b0 $end $upscope $end -$scope struct v_arrp_strp(4) $end +$scope struct v_arrp_strp[4] $end $var logic 1 0 b1 $end $var logic 1 1 b0 $end $upscope $end -$var logic 1 2 v_arru(1) $end -$var logic 1 3 v_arru(2) $end -$var logic 1 4 v_arru_arru(3)(1) $end -$var logic 1 5 v_arru_arru(3)(2) $end -$var logic 1 6 v_arru_arru(4)(1) $end -$var logic 1 7 v_arru_arru(4)(2) $end -$var logic 2 8 v_arru_arrp(3) $end -$var logic 2 9 v_arru_arrp(4) $end -$scope struct v_arru_strp(3) $end +$var logic 1 2 v_arru[1] $end +$var logic 1 3 v_arru[2] $end +$var logic 1 4 v_arru_arru[3][1] $end +$var logic 1 5 v_arru_arru[3][2] $end +$var logic 1 6 v_arru_arru[4][1] $end +$var logic 1 7 v_arru_arru[4][2] $end +$var logic 2 8 v_arru_arrp[3] $end +$var logic 2 9 v_arru_arrp[4] $end +$scope struct v_arru_strp[3] $end $var logic 1 : b1 $end $var logic 1 ; b0 $end $upscope $end -$scope struct v_arru_strp(4) $end +$scope struct v_arru_strp[4] $end $var logic 1 < b1 $end $var logic 1 = b0 $end $upscope $end $var real 64 > v_real $end -$var real 64 ? v_arr_real(0) $end -$var real 64 @ v_arr_real(1) $end -$scope struct v_str32x2(0) $end +$var real 64 ? v_arr_real[0] $end +$var real 64 @ v_arr_real[1] $end +$scope struct v_str32x2[0] $end $var logic 32 A data $end $upscope $end -$scope struct v_str32x2(1) $end +$scope struct v_str32x2[1] $end $var logic 32 B data $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $upscope $end @@ -87,9 +87,9 @@ $var logic 3 F a $end $attrbegin misc 07 "" 2 $end $var logic 3 G b $end $upscope $end -$var logic 8 H unpacked_array(-2) $end -$var logic 8 I unpacked_array(-1) $end -$var logic 8 J unpacked_array(0) $end +$var logic 8 H unpacked_array[-2] $end +$var logic 8 I unpacked_array[-1] $end +$var logic 8 J unpacked_array[0] $end $var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 L b $end diff --git a/test_regress/t/t_trace_complex_structs_fst_sc.out b/test_regress/t/t_trace_complex_structs_fst_sc.out index d666dae4d..515dd4625 100644 --- a/test_regress/t/t_trace_complex_structs_fst_sc.out +++ b/test_regress/t/t_trace_complex_structs_fst_sc.out @@ -1,5 +1,5 @@ $date - Thu Apr 1 15:22:14 2021 + Wed Aug 11 12:41:29 2021 $end $version @@ -37,39 +37,39 @@ $var logic 1 * b0 $end $upscope $end $upscope $end $var logic 2 + v_arrp $end -$var logic 2 , v_arrp_arrp(3) $end -$var logic 2 - v_arrp_arrp(4) $end -$scope struct v_arrp_strp(3) $end +$var logic 2 , v_arrp_arrp[3] $end +$var logic 2 - v_arrp_arrp[4] $end +$scope struct v_arrp_strp[3] $end $var logic 1 . b1 $end $var logic 1 / b0 $end $upscope $end -$scope struct v_arrp_strp(4) $end +$scope struct v_arrp_strp[4] $end $var logic 1 0 b1 $end $var logic 1 1 b0 $end $upscope $end -$var logic 1 2 v_arru(1) $end -$var logic 1 3 v_arru(2) $end -$var logic 1 4 v_arru_arru(3)(1) $end -$var logic 1 5 v_arru_arru(3)(2) $end -$var logic 1 6 v_arru_arru(4)(1) $end -$var logic 1 7 v_arru_arru(4)(2) $end -$var logic 2 8 v_arru_arrp(3) $end -$var logic 2 9 v_arru_arrp(4) $end -$scope struct v_arru_strp(3) $end +$var logic 1 2 v_arru[1] $end +$var logic 1 3 v_arru[2] $end +$var logic 1 4 v_arru_arru[3][1] $end +$var logic 1 5 v_arru_arru[3][2] $end +$var logic 1 6 v_arru_arru[4][1] $end +$var logic 1 7 v_arru_arru[4][2] $end +$var logic 2 8 v_arru_arrp[3] $end +$var logic 2 9 v_arru_arrp[4] $end +$scope struct v_arru_strp[3] $end $var logic 1 : b1 $end $var logic 1 ; b0 $end $upscope $end -$scope struct v_arru_strp(4) $end +$scope struct v_arru_strp[4] $end $var logic 1 < b1 $end $var logic 1 = b0 $end $upscope $end $var real 64 > v_real $end -$var real 64 ? v_arr_real(0) $end -$var real 64 @ v_arr_real(1) $end -$scope struct v_str32x2(0) $end +$var real 64 ? v_arr_real[0] $end +$var real 64 @ v_arr_real[1] $end +$scope struct v_str32x2[0] $end $var logic 32 A data $end $upscope $end -$scope struct v_str32x2(1) $end +$scope struct v_str32x2[1] $end $var logic 32 B data $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $upscope $end @@ -86,9 +86,9 @@ $var logic 3 F a $end $attrbegin misc 07 "" 2 $end $var logic 3 G b $end $upscope $end -$var logic 8 H unpacked_array(-2) $end -$var logic 8 I unpacked_array(-1) $end -$var logic 8 J unpacked_array(0) $end +$var logic 8 H unpacked_array[-2] $end +$var logic 8 I unpacked_array[-1] $end +$var logic 8 J unpacked_array[0] $end $var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $scope module unnamedblk1 $end $var integer 32 L b $end diff --git a/test_regress/t/t_trace_complex_threads_1.pl b/test_regress/t/t_trace_complex_threads_1.pl index 3c7085576..9a6e6d621 100755 --- a/test_regress/t/t_trace_complex_threads_1.pl +++ b/test_regress/t/t_trace_complex_threads_1.pl @@ -26,10 +26,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); -file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); +file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); diff --git a/test_regress/t/t_trace_fst.out b/test_regress/t/t_trace_fst.out index dde4f07e0..16e4dc7d7 100644 --- a/test_regress/t/t_trace_fst.out +++ b/test_regress/t/t_trace_fst.out @@ -1,5 +1,5 @@ $date - Sun Apr 19 04:15:36 2020 + Tue Aug 10 15:48:30 2021 $end $version @@ -39,9 +39,9 @@ $var wire 1 ! clk $end $var wire 1 $ rstn $end $var wire 5 " state $end $var logic 5 6 state_w $end -$var logic 5 7 state_array(0) $end -$var logic 5 8 state_array(1) $end -$var logic 5 9 state_array(2) $end +$var logic 5 7 state_array[0] $end +$var logic 5 8 state_array[1] $end +$var logic 5 9 state_array[2] $end $scope module unnamedblk2 $end $var int 32 : i $end $upscope $end @@ -52,43 +52,45 @@ $upscope $end $upscope $end $upscope $end $enddefinitions $end +#0 $dumpvars -0! -b00000 " -b00000000000000000000000000000000 # -0$ -r1.23 % -r4.56 & -b00000000000000000000000000000000 ' -0( -0) -b00000000000000000000000000000000 * -b0000000000000000 + -b0000000000000000000000000000000000000000000000000000000000000000 , -b00000000 - -b00000000000000000000000001111011 . -b00000000000000000000000111001000 / -00 -11 -02 -13 -04 -05 -b00000 6 -b00000 7 -b00000 8 -b00000 9 -b00000000000000000000000000000000 : b00000000000000000000000000000000 ; +b00000000000000000000000000000000 : +b00000 9 +b00000 8 +b00000 7 +b00000 6 +05 +04 +13 +02 +11 +00 +b00000000000000000000000111001000 / +b00000000000000000000000001111011 . +b00000000 - +b0000000000000000000000000000000000000000000000000000000000000000 , +b0000000000000000 + +b00000000000000000000000000000000 * +0) +0( +b00000000000000000000000000000000 ' +r4.56 & +r1.23 % +0$ +b00000000000000000000000000000000 # +b00000 " +0! +$end #10 -b00000000000000000000000000000011 ; -b00001 9 -b00001 8 -b00001 7 -b10100 6 -b00000000000000000000000000000001 # -b00001 " 1! +b00001 " +b00000000000000000000000000000001 # +b10100 6 +b00001 7 +b00001 8 +b00001 9 +b00000000000000000000000000000011 ; #15 0! #20 @@ -145,15 +147,15 @@ b00000000000000000000000000001011 # #120 1! b00000000000000000000000000001100 # -b01010 6 b10100 9 +b01010 6 b00000000000000000000000000000010 : #125 0! #130 1! -b01010 9 b00101 6 +b01010 9 b00000000000000000000000000001101 # b10100 8 #135 @@ -162,18 +164,18 @@ b10100 8 1! b01010 8 b00000000000000000000000000001110 # -b10110 6 b00101 9 -b10100 " +b10110 6 b10100 7 +b10100 " #145 0! #150 1! -b01010 7 b01010 " -b10110 9 +b01010 7 b01011 6 +b10110 9 b00000000000000000000000000001111 # b00101 8 #155 @@ -182,18 +184,18 @@ b00101 8 1! b10110 8 b00000000000000000000000000010000 # -b10001 6 b01011 9 -b00101 " +b10001 6 b00101 7 +b00101 " #165 0! #170 1! -b10110 7 b10110 " -b10001 9 +b10110 7 b11100 6 +b10001 9 b00000000000000000000000000010001 # b01011 8 #175 @@ -202,18 +204,18 @@ b01011 8 1! b10001 8 b00000000000000000000000000010010 # -b01110 6 b11100 9 -b01011 " +b01110 6 b01011 7 +b01011 " #185 0! #190 1! -b10001 7 b10001 " -b01110 9 +b10001 7 b00111 6 +b01110 9 b00000000000000000000000000010011 # b11100 8 #195 @@ -222,18 +224,18 @@ b11100 8 1! b01110 8 b00000000000000000000000000010100 # -b10111 6 b00111 9 -b11100 " +b10111 6 b11100 7 +b11100 " #205 0! #210 1! -b01110 7 b01110 " -b10111 9 +b01110 7 b11111 6 +b10111 9 b00000000000000000000000000010101 # b00111 8 #215 @@ -242,18 +244,18 @@ b00111 8 1! b10111 8 b00000000000000000000000000010110 # -b11011 6 b11111 9 -b00111 " +b11011 6 b00111 7 +b00111 " #225 0! #230 1! -b10111 7 b10111 " -b11011 9 +b10111 7 b11001 6 +b11011 9 b00000000000000000000000000010111 # b11111 8 #235 @@ -262,18 +264,18 @@ b11111 8 1! b11011 8 b00000000000000000000000000011000 # -b11000 6 b11001 9 -b11111 " +b11000 6 b11111 7 +b11111 " #245 0! #250 1! -b11011 7 b11011 " -b11000 9 +b11011 7 b01100 6 +b11000 9 b00000000000000000000000000011001 # b11001 8 #255 @@ -282,18 +284,18 @@ b11001 8 1! b11000 8 b00000000000000000000000000011010 # -b00110 6 b01100 9 -b11001 " +b00110 6 b11001 7 +b11001 " #265 0! #270 1! -b11000 7 b11000 " -b00110 9 +b11000 7 b00011 6 +b00110 9 b00000000000000000000000000011011 # b01100 8 #275 @@ -302,18 +304,18 @@ b01100 8 1! b00110 8 b00000000000000000000000000011100 # -b10101 6 b00011 9 -b01100 " +b10101 6 b01100 7 +b01100 " #285 0! #290 1! -b00110 7 b00110 " -b10101 9 +b00110 7 b11110 6 +b10101 9 b00000000000000000000000000011101 # b00011 8 #295 @@ -322,18 +324,18 @@ b00011 8 1! b10101 8 b00000000000000000000000000011110 # -b01111 6 b11110 9 -b00011 " +b01111 6 b00011 7 +b00011 " #305 0! #310 1! -b10101 7 b10101 " -b01111 9 +b10101 7 b10011 6 +b01111 9 b00000000000000000000000000011111 # b11110 8 #315 @@ -342,18 +344,18 @@ b11110 8 1! b01111 8 b00000000000000000000000000100000 # -b11101 6 b10011 9 -b11110 " +b11101 6 b11110 7 +b11110 " #325 0! #330 1! -b01111 7 b01111 " -b11101 9 +b01111 7 b11010 6 +b11101 9 b00000000000000000000000000100001 # b10011 8 #335 @@ -362,18 +364,18 @@ b10011 8 1! b11101 8 b00000000000000000000000000100010 # -b01101 6 b11010 9 -b10011 " +b01101 6 b10011 7 +b10011 " #345 0! #350 1! -b11101 7 b11101 " -b01101 9 +b11101 7 b10010 6 +b01101 9 b00000000000000000000000000100011 # b11010 8 #355 @@ -382,18 +384,18 @@ b11010 8 1! b01101 8 b00000000000000000000000000100100 # -b01001 6 b10010 9 -b11010 " +b01001 6 b11010 7 +b11010 " #365 0! #370 1! -b01101 7 b01101 " -b01001 9 +b01101 7 b10000 6 +b01001 9 b00000000000000000000000000100101 # b10010 8 #375 @@ -402,18 +404,18 @@ b10010 8 1! b01001 8 b00000000000000000000000000100110 # -b01000 6 b10000 9 -b10010 " +b01000 6 b10010 7 +b10010 " #385 0! #390 1! -b01001 7 b01001 " -b01000 9 +b01001 7 b00100 6 +b01000 9 b00000000000000000000000000100111 # b10000 8 #395 @@ -422,18 +424,18 @@ b10000 8 1! b01000 8 b00000000000000000000000000101000 # -b00010 6 b00100 9 -b10000 " +b00010 6 b10000 7 +b10000 " #405 0! #410 1! -b01000 7 b01000 " -b00010 9 +b01000 7 b00001 6 +b00010 9 b00000000000000000000000000101001 # b00100 8 #415 @@ -442,18 +444,18 @@ b00100 8 1! b00010 8 b00000000000000000000000000101010 # -b10100 6 b00001 9 -b00100 " +b10100 6 b00100 7 +b00100 " #425 0! #430 1! -b00010 7 b00010 " -b10100 9 +b00010 7 b01010 6 +b10100 9 b00000000000000000000000000101011 # b00001 8 #435 @@ -462,18 +464,18 @@ b00001 8 1! b10100 8 b00000000000000000000000000101100 # -b00101 6 b01010 9 -b00001 " +b00101 6 b00001 7 +b00001 " #445 0! #450 1! -b10100 7 b10100 " -b00101 9 +b10100 7 b10110 6 +b00101 9 b00000000000000000000000000101101 # b01010 8 #455 @@ -482,18 +484,18 @@ b01010 8 1! b00101 8 b00000000000000000000000000101110 # -b01011 6 b10110 9 -b01010 " +b01011 6 b01010 7 +b01010 " #465 0! #470 1! -b00101 7 b00101 " -b01011 9 +b00101 7 b10001 6 +b01011 9 b00000000000000000000000000101111 # b10110 8 #475 @@ -502,18 +504,18 @@ b10110 8 1! b01011 8 b00000000000000000000000000110000 # -b11100 6 b10001 9 -b10110 " +b11100 6 b10110 7 +b10110 " #485 0! #490 1! -b01011 7 b01011 " -b11100 9 +b01011 7 b01110 6 +b11100 9 b00000000000000000000000000110001 # b10001 8 #495 @@ -522,18 +524,18 @@ b10001 8 1! b11100 8 b00000000000000000000000000110010 # -b00111 6 b01110 9 -b10001 " +b00111 6 b10001 7 +b10001 " #505 0! #510 1! -b11100 7 b11100 " -b00111 9 +b11100 7 b10111 6 +b00111 9 b00000000000000000000000000110011 # b01110 8 #515 @@ -542,18 +544,18 @@ b01110 8 1! b00111 8 b00000000000000000000000000110100 # -b11111 6 b10111 9 -b01110 " +b11111 6 b01110 7 +b01110 " #525 0! #530 1! -b00111 7 b00111 " -b11111 9 +b00111 7 b11011 6 +b11111 9 b00000000000000000000000000110101 # b10111 8 #535 @@ -562,18 +564,18 @@ b10111 8 1! b11111 8 b00000000000000000000000000110110 # -b11001 6 b11011 9 -b10111 " +b11001 6 b10111 7 +b10111 " #545 0! #550 1! -b11111 7 b11111 " -b11001 9 +b11111 7 b11000 6 +b11001 9 b00000000000000000000000000110111 # b11011 8 #555 @@ -582,18 +584,18 @@ b11011 8 1! b11001 8 b00000000000000000000000000111000 # -b01100 6 b11000 9 -b11011 " +b01100 6 b11011 7 +b11011 " #565 0! #570 1! -b11001 7 b11001 " -b01100 9 +b11001 7 b00110 6 +b01100 9 b00000000000000000000000000111001 # b11000 8 #575 @@ -602,18 +604,18 @@ b11000 8 1! b01100 8 b00000000000000000000000000111010 # -b00011 6 b00110 9 -b11000 " +b00011 6 b11000 7 +b11000 " #585 0! #590 1! -b01100 7 b01100 " -b00011 9 +b01100 7 b10101 6 +b00011 9 b00000000000000000000000000111011 # b00110 8 #595 @@ -622,18 +624,18 @@ b00110 8 1! b00011 8 b00000000000000000000000000111100 # -b11110 6 b10101 9 -b00110 " +b11110 6 b00110 7 +b00110 " #605 0! #610 1! -b00011 7 b00011 " -b11110 9 +b00011 7 b01111 6 +b11110 9 b00000000000000000000000000111101 # b10101 8 #615 @@ -642,18 +644,18 @@ b10101 8 1! b11110 8 b00000000000000000000000000111110 # -b10011 6 b01111 9 -b10101 " +b10011 6 b10101 7 +b10101 " #625 0! #630 1! -b11110 7 b11110 " -b10011 9 +b11110 7 b11101 6 +b10011 9 b00000000000000000000000000111111 # b01111 8 #635 @@ -662,18 +664,18 @@ b01111 8 1! b10011 8 b00000000000000000000000001000000 # -b11010 6 b11101 9 -b01111 " +b11010 6 b01111 7 +b01111 " #645 0! #650 1! -b10011 7 b10011 " -b11010 9 +b10011 7 b01101 6 +b11010 9 b00000000000000000000000001000001 # b11101 8 #655 @@ -682,18 +684,18 @@ b11101 8 1! b11010 8 b00000000000000000000000001000010 # -b10010 6 b01101 9 -b11101 " +b10010 6 b11101 7 +b11101 " #665 0! #670 1! -b11010 7 b11010 " -b10010 9 +b11010 7 b01001 6 +b10010 9 b00000000000000000000000001000011 # b01101 8 #675 @@ -702,18 +704,18 @@ b01101 8 1! b10010 8 b00000000000000000000000001000100 # -b10000 6 b01001 9 -b01101 " +b10000 6 b01101 7 +b01101 " #685 0! #690 1! -b10010 7 b10010 " -b10000 9 +b10010 7 b01000 6 +b10000 9 b00000000000000000000000001000101 # b01001 8 #695 @@ -722,18 +724,18 @@ b01001 8 1! b10000 8 b00000000000000000000000001000110 # -b00100 6 b01000 9 -b01001 " +b00100 6 b01001 7 +b01001 " #705 0! #710 1! -b10000 7 b10000 " -b00100 9 +b10000 7 b00010 6 +b00100 9 b00000000000000000000000001000111 # b01000 8 #715 @@ -742,18 +744,18 @@ b01000 8 1! b00100 8 b00000000000000000000000001001000 # -b00001 6 b00010 9 -b01000 " +b00001 6 b01000 7 +b01000 " #725 0! #730 1! -b00100 7 b00100 " -b00001 9 +b00100 7 b10100 6 +b00001 9 b00000000000000000000000001001001 # b00010 8 #735 @@ -762,18 +764,18 @@ b00010 8 1! b00001 8 b00000000000000000000000001001010 # -b01010 6 b10100 9 -b00010 " +b01010 6 b00010 7 +b00010 " #745 0! #750 1! -b00001 7 b00001 " -b01010 9 +b00001 7 b00101 6 +b01010 9 b00000000000000000000000001001011 # b10100 8 #755 @@ -782,18 +784,18 @@ b10100 8 1! b01010 8 b00000000000000000000000001001100 # -b10110 6 b00101 9 -b10100 " +b10110 6 b10100 7 +b10100 " #765 0! #770 1! -b01010 7 b01010 " -b10110 9 +b01010 7 b01011 6 +b10110 9 b00000000000000000000000001001101 # b00101 8 #775 @@ -802,18 +804,18 @@ b00101 8 1! b10110 8 b00000000000000000000000001001110 # -b10001 6 b01011 9 -b00101 " +b10001 6 b00101 7 +b00101 " #785 0! #790 1! -b10110 7 b10110 " -b10001 9 +b10110 7 b11100 6 +b10001 9 b00000000000000000000000001001111 # b01011 8 #795 @@ -822,18 +824,18 @@ b01011 8 1! b10001 8 b00000000000000000000000001010000 # -b01110 6 b11100 9 -b01011 " +b01110 6 b01011 7 +b01011 " #805 0! #810 1! -b10001 7 b10001 " -b01110 9 +b10001 7 b00111 6 +b01110 9 b00000000000000000000000001010001 # b11100 8 #815 @@ -842,18 +844,18 @@ b11100 8 1! b01110 8 b00000000000000000000000001010010 # -b10111 6 b00111 9 -b11100 " +b10111 6 b11100 7 +b11100 " #825 0! #830 1! -b01110 7 b01110 " -b10111 9 +b01110 7 b11111 6 +b10111 9 b00000000000000000000000001010011 # b00111 8 #835 @@ -862,18 +864,18 @@ b00111 8 1! b10111 8 b00000000000000000000000001010100 # -b11011 6 b11111 9 -b00111 " +b11011 6 b00111 7 +b00111 " #845 0! #850 1! -b10111 7 b10111 " -b11011 9 +b10111 7 b11001 6 +b11011 9 b00000000000000000000000001010101 # b11111 8 #855 @@ -882,18 +884,18 @@ b11111 8 1! b11011 8 b00000000000000000000000001010110 # -b11000 6 b11001 9 -b11111 " +b11000 6 b11111 7 +b11111 " #865 0! #870 1! -b11011 7 b11011 " -b11000 9 +b11011 7 b01100 6 +b11000 9 b00000000000000000000000001010111 # b11001 8 #875 @@ -902,18 +904,18 @@ b11001 8 1! b11000 8 b00000000000000000000000001011000 # -b00110 6 b01100 9 -b11001 " +b00110 6 b11001 7 +b11001 " #885 0! #890 1! -b11000 7 b11000 " -b00110 9 +b11000 7 b00011 6 +b00110 9 b00000000000000000000000001011001 # b01100 8 #895 @@ -922,18 +924,18 @@ b01100 8 1! b00110 8 b00000000000000000000000001011010 # -b10101 6 b00011 9 -b01100 " +b10101 6 b01100 7 +b01100 " #905 0! #910 1! -b00110 7 b00110 " -b10101 9 +b00110 7 b11110 6 +b10101 9 b00000000000000000000000001011011 # b00011 8 #915 @@ -942,18 +944,18 @@ b00011 8 1! b10101 8 b00000000000000000000000001011100 # -b01111 6 b11110 9 -b00011 " +b01111 6 b00011 7 +b00011 " #925 0! #930 1! -b10101 7 b10101 " -b01111 9 +b10101 7 b10011 6 +b01111 9 b00000000000000000000000001011101 # b11110 8 #935 @@ -962,18 +964,18 @@ b11110 8 1! b01111 8 b00000000000000000000000001011110 # -b11101 6 b10011 9 -b11110 " +b11101 6 b11110 7 +b11110 " #945 0! #950 1! -b01111 7 b01111 " -b11101 9 +b01111 7 b11010 6 +b11101 9 b00000000000000000000000001011111 # b10011 8 #955 @@ -982,18 +984,18 @@ b10011 8 1! b11101 8 b00000000000000000000000001100000 # -b01101 6 b11010 9 -b10011 " +b01101 6 b10011 7 +b10011 " #965 0! #970 1! -b11101 7 b11101 " -b01101 9 +b11101 7 b10010 6 +b01101 9 b00000000000000000000000001100001 # b11010 8 #975 @@ -1002,18 +1004,18 @@ b11010 8 1! b01101 8 b00000000000000000000000001100010 # -b01001 6 b10010 9 -b11010 " +b01001 6 b11010 7 +b11010 " #985 0! #990 1! -b01101 7 b01101 " -b01001 9 +b01101 7 b10000 6 +b01001 9 b00000000000000000000000001100011 # b10010 8 #995 @@ -1022,7 +1024,7 @@ b10010 8 1! b01001 8 b00000000000000000000000001100100 # -b01000 6 b10000 9 -b10010 " +b01000 6 b10010 7 +b10010 " diff --git a/test_regress/t/t_trace_fst_cmake.out b/test_regress/t/t_trace_fst_cmake.out index dde4f07e0..d3e911409 100644 --- a/test_regress/t/t_trace_fst_cmake.out +++ b/test_regress/t/t_trace_fst_cmake.out @@ -1,5 +1,5 @@ $date - Sun Apr 19 04:15:36 2020 + Tue Aug 10 15:48:40 2021 $end $version @@ -39,9 +39,9 @@ $var wire 1 ! clk $end $var wire 1 $ rstn $end $var wire 5 " state $end $var logic 5 6 state_w $end -$var logic 5 7 state_array(0) $end -$var logic 5 8 state_array(1) $end -$var logic 5 9 state_array(2) $end +$var logic 5 7 state_array[0] $end +$var logic 5 8 state_array[1] $end +$var logic 5 9 state_array[2] $end $scope module unnamedblk2 $end $var int 32 : i $end $upscope $end @@ -52,43 +52,45 @@ $upscope $end $upscope $end $upscope $end $enddefinitions $end +#0 $dumpvars -0! -b00000 " -b00000000000000000000000000000000 # -0$ -r1.23 % -r4.56 & -b00000000000000000000000000000000 ' -0( -0) -b00000000000000000000000000000000 * -b0000000000000000 + -b0000000000000000000000000000000000000000000000000000000000000000 , -b00000000 - -b00000000000000000000000001111011 . -b00000000000000000000000111001000 / -00 -11 -02 -13 -04 -05 -b00000 6 -b00000 7 -b00000 8 -b00000 9 -b00000000000000000000000000000000 : b00000000000000000000000000000000 ; +b00000000000000000000000000000000 : +b00000 9 +b00000 8 +b00000 7 +b00000 6 +05 +04 +13 +02 +11 +00 +b00000000000000000000000111001000 / +b00000000000000000000000001111011 . +b00000000 - +b0000000000000000000000000000000000000000000000000000000000000000 , +b0000000000000000 + +b00000000000000000000000000000000 * +0) +0( +b00000000000000000000000000000000 ' +r4.56 & +r1.23 % +0$ +b00000000000000000000000000000000 # +b00000 " +0! +$end #10 -b00000000000000000000000000000011 ; -b00001 9 -b00001 8 -b00001 7 -b10100 6 -b00000000000000000000000000000001 # -b00001 " 1! +b00001 " +b00000000000000000000000000000001 # +b10100 6 +b00001 7 +b00001 8 +b00001 9 +b00000000000000000000000000000011 ; #15 0! #20 @@ -145,15 +147,15 @@ b00000000000000000000000000001011 # #120 1! b00000000000000000000000000001100 # -b01010 6 b10100 9 +b01010 6 b00000000000000000000000000000010 : #125 0! #130 1! -b01010 9 b00101 6 +b01010 9 b00000000000000000000000000001101 # b10100 8 #135 @@ -162,18 +164,18 @@ b10100 8 1! b01010 8 b00000000000000000000000000001110 # -b10110 6 b00101 9 -b10100 " +b10110 6 b10100 7 +b10100 " #145 0! #150 1! -b01010 7 b01010 " -b10110 9 +b01010 7 b01011 6 +b10110 9 b00000000000000000000000000001111 # b00101 8 #155 @@ -182,18 +184,18 @@ b00101 8 1! b10110 8 b00000000000000000000000000010000 # -b10001 6 b01011 9 -b00101 " +b10001 6 b00101 7 +b00101 " #165 0! #170 1! -b10110 7 b10110 " -b10001 9 +b10110 7 b11100 6 +b10001 9 b00000000000000000000000000010001 # b01011 8 #175 @@ -202,18 +204,18 @@ b01011 8 1! b10001 8 b00000000000000000000000000010010 # -b01110 6 b11100 9 -b01011 " +b01110 6 b01011 7 +b01011 " #185 0! #190 1! -b10001 7 b10001 " -b01110 9 +b10001 7 b00111 6 +b01110 9 b00000000000000000000000000010011 # b11100 8 #195 @@ -222,18 +224,18 @@ b11100 8 1! b01110 8 b00000000000000000000000000010100 # -b10111 6 b00111 9 -b11100 " +b10111 6 b11100 7 +b11100 " #205 0! #210 1! -b01110 7 b01110 " -b10111 9 +b01110 7 b11111 6 +b10111 9 b00000000000000000000000000010101 # b00111 8 #215 @@ -242,18 +244,18 @@ b00111 8 1! b10111 8 b00000000000000000000000000010110 # -b11011 6 b11111 9 -b00111 " +b11011 6 b00111 7 +b00111 " #225 0! #230 1! -b10111 7 b10111 " -b11011 9 +b10111 7 b11001 6 +b11011 9 b00000000000000000000000000010111 # b11111 8 #235 @@ -262,18 +264,18 @@ b11111 8 1! b11011 8 b00000000000000000000000000011000 # -b11000 6 b11001 9 -b11111 " +b11000 6 b11111 7 +b11111 " #245 0! #250 1! -b11011 7 b11011 " -b11000 9 +b11011 7 b01100 6 +b11000 9 b00000000000000000000000000011001 # b11001 8 #255 @@ -282,18 +284,18 @@ b11001 8 1! b11000 8 b00000000000000000000000000011010 # -b00110 6 b01100 9 -b11001 " +b00110 6 b11001 7 +b11001 " #265 0! #270 1! -b11000 7 b11000 " -b00110 9 +b11000 7 b00011 6 +b00110 9 b00000000000000000000000000011011 # b01100 8 #275 @@ -302,18 +304,18 @@ b01100 8 1! b00110 8 b00000000000000000000000000011100 # -b10101 6 b00011 9 -b01100 " +b10101 6 b01100 7 +b01100 " #285 0! #290 1! -b00110 7 b00110 " -b10101 9 +b00110 7 b11110 6 +b10101 9 b00000000000000000000000000011101 # b00011 8 #295 @@ -322,18 +324,18 @@ b00011 8 1! b10101 8 b00000000000000000000000000011110 # -b01111 6 b11110 9 -b00011 " +b01111 6 b00011 7 +b00011 " #305 0! #310 1! -b10101 7 b10101 " -b01111 9 +b10101 7 b10011 6 +b01111 9 b00000000000000000000000000011111 # b11110 8 #315 @@ -342,18 +344,18 @@ b11110 8 1! b01111 8 b00000000000000000000000000100000 # -b11101 6 b10011 9 -b11110 " +b11101 6 b11110 7 +b11110 " #325 0! #330 1! -b01111 7 b01111 " -b11101 9 +b01111 7 b11010 6 +b11101 9 b00000000000000000000000000100001 # b10011 8 #335 @@ -362,18 +364,18 @@ b10011 8 1! b11101 8 b00000000000000000000000000100010 # -b01101 6 b11010 9 -b10011 " +b01101 6 b10011 7 +b10011 " #345 0! #350 1! -b11101 7 b11101 " -b01101 9 +b11101 7 b10010 6 +b01101 9 b00000000000000000000000000100011 # b11010 8 #355 @@ -382,18 +384,18 @@ b11010 8 1! b01101 8 b00000000000000000000000000100100 # -b01001 6 b10010 9 -b11010 " +b01001 6 b11010 7 +b11010 " #365 0! #370 1! -b01101 7 b01101 " -b01001 9 +b01101 7 b10000 6 +b01001 9 b00000000000000000000000000100101 # b10010 8 #375 @@ -402,18 +404,18 @@ b10010 8 1! b01001 8 b00000000000000000000000000100110 # -b01000 6 b10000 9 -b10010 " +b01000 6 b10010 7 +b10010 " #385 0! #390 1! -b01001 7 b01001 " -b01000 9 +b01001 7 b00100 6 +b01000 9 b00000000000000000000000000100111 # b10000 8 #395 @@ -422,18 +424,18 @@ b10000 8 1! b01000 8 b00000000000000000000000000101000 # -b00010 6 b00100 9 -b10000 " +b00010 6 b10000 7 +b10000 " #405 0! #410 1! -b01000 7 b01000 " -b00010 9 +b01000 7 b00001 6 +b00010 9 b00000000000000000000000000101001 # b00100 8 #415 @@ -442,18 +444,18 @@ b00100 8 1! b00010 8 b00000000000000000000000000101010 # -b10100 6 b00001 9 -b00100 " +b10100 6 b00100 7 +b00100 " #425 0! #430 1! -b00010 7 b00010 " -b10100 9 +b00010 7 b01010 6 +b10100 9 b00000000000000000000000000101011 # b00001 8 #435 @@ -462,18 +464,18 @@ b00001 8 1! b10100 8 b00000000000000000000000000101100 # -b00101 6 b01010 9 -b00001 " +b00101 6 b00001 7 +b00001 " #445 0! #450 1! -b10100 7 b10100 " -b00101 9 +b10100 7 b10110 6 +b00101 9 b00000000000000000000000000101101 # b01010 8 #455 @@ -482,18 +484,18 @@ b01010 8 1! b00101 8 b00000000000000000000000000101110 # -b01011 6 b10110 9 -b01010 " +b01011 6 b01010 7 +b01010 " #465 0! #470 1! -b00101 7 b00101 " -b01011 9 +b00101 7 b10001 6 +b01011 9 b00000000000000000000000000101111 # b10110 8 #475 @@ -502,18 +504,18 @@ b10110 8 1! b01011 8 b00000000000000000000000000110000 # -b11100 6 b10001 9 -b10110 " +b11100 6 b10110 7 +b10110 " #485 0! #490 1! -b01011 7 b01011 " -b11100 9 +b01011 7 b01110 6 +b11100 9 b00000000000000000000000000110001 # b10001 8 #495 @@ -522,18 +524,18 @@ b10001 8 1! b11100 8 b00000000000000000000000000110010 # -b00111 6 b01110 9 -b10001 " +b00111 6 b10001 7 +b10001 " #505 0! #510 1! -b11100 7 b11100 " -b00111 9 +b11100 7 b10111 6 +b00111 9 b00000000000000000000000000110011 # b01110 8 #515 @@ -542,18 +544,18 @@ b01110 8 1! b00111 8 b00000000000000000000000000110100 # -b11111 6 b10111 9 -b01110 " +b11111 6 b01110 7 +b01110 " #525 0! #530 1! -b00111 7 b00111 " -b11111 9 +b00111 7 b11011 6 +b11111 9 b00000000000000000000000000110101 # b10111 8 #535 @@ -562,18 +564,18 @@ b10111 8 1! b11111 8 b00000000000000000000000000110110 # -b11001 6 b11011 9 -b10111 " +b11001 6 b10111 7 +b10111 " #545 0! #550 1! -b11111 7 b11111 " -b11001 9 +b11111 7 b11000 6 +b11001 9 b00000000000000000000000000110111 # b11011 8 #555 @@ -582,18 +584,18 @@ b11011 8 1! b11001 8 b00000000000000000000000000111000 # -b01100 6 b11000 9 -b11011 " +b01100 6 b11011 7 +b11011 " #565 0! #570 1! -b11001 7 b11001 " -b01100 9 +b11001 7 b00110 6 +b01100 9 b00000000000000000000000000111001 # b11000 8 #575 @@ -602,18 +604,18 @@ b11000 8 1! b01100 8 b00000000000000000000000000111010 # -b00011 6 b00110 9 -b11000 " +b00011 6 b11000 7 +b11000 " #585 0! #590 1! -b01100 7 b01100 " -b00011 9 +b01100 7 b10101 6 +b00011 9 b00000000000000000000000000111011 # b00110 8 #595 @@ -622,18 +624,18 @@ b00110 8 1! b00011 8 b00000000000000000000000000111100 # -b11110 6 b10101 9 -b00110 " +b11110 6 b00110 7 +b00110 " #605 0! #610 1! -b00011 7 b00011 " -b11110 9 +b00011 7 b01111 6 +b11110 9 b00000000000000000000000000111101 # b10101 8 #615 @@ -642,18 +644,18 @@ b10101 8 1! b11110 8 b00000000000000000000000000111110 # -b10011 6 b01111 9 -b10101 " +b10011 6 b10101 7 +b10101 " #625 0! #630 1! -b11110 7 b11110 " -b10011 9 +b11110 7 b11101 6 +b10011 9 b00000000000000000000000000111111 # b01111 8 #635 @@ -662,18 +664,18 @@ b01111 8 1! b10011 8 b00000000000000000000000001000000 # -b11010 6 b11101 9 -b01111 " +b11010 6 b01111 7 +b01111 " #645 0! #650 1! -b10011 7 b10011 " -b11010 9 +b10011 7 b01101 6 +b11010 9 b00000000000000000000000001000001 # b11101 8 #655 @@ -682,18 +684,18 @@ b11101 8 1! b11010 8 b00000000000000000000000001000010 # -b10010 6 b01101 9 -b11101 " +b10010 6 b11101 7 +b11101 " #665 0! #670 1! -b11010 7 b11010 " -b10010 9 +b11010 7 b01001 6 +b10010 9 b00000000000000000000000001000011 # b01101 8 #675 @@ -702,18 +704,18 @@ b01101 8 1! b10010 8 b00000000000000000000000001000100 # -b10000 6 b01001 9 -b01101 " +b10000 6 b01101 7 +b01101 " #685 0! #690 1! -b10010 7 b10010 " -b10000 9 +b10010 7 b01000 6 +b10000 9 b00000000000000000000000001000101 # b01001 8 #695 @@ -722,18 +724,18 @@ b01001 8 1! b10000 8 b00000000000000000000000001000110 # -b00100 6 b01000 9 -b01001 " +b00100 6 b01001 7 +b01001 " #705 0! #710 1! -b10000 7 b10000 " -b00100 9 +b10000 7 b00010 6 +b00100 9 b00000000000000000000000001000111 # b01000 8 #715 @@ -742,18 +744,18 @@ b01000 8 1! b00100 8 b00000000000000000000000001001000 # -b00001 6 b00010 9 -b01000 " +b00001 6 b01000 7 +b01000 " #725 0! #730 1! -b00100 7 b00100 " -b00001 9 +b00100 7 b10100 6 +b00001 9 b00000000000000000000000001001001 # b00010 8 #735 @@ -762,18 +764,18 @@ b00010 8 1! b00001 8 b00000000000000000000000001001010 # -b01010 6 b10100 9 -b00010 " +b01010 6 b00010 7 +b00010 " #745 0! #750 1! -b00001 7 b00001 " -b01010 9 +b00001 7 b00101 6 +b01010 9 b00000000000000000000000001001011 # b10100 8 #755 @@ -782,18 +784,18 @@ b10100 8 1! b01010 8 b00000000000000000000000001001100 # -b10110 6 b00101 9 -b10100 " +b10110 6 b10100 7 +b10100 " #765 0! #770 1! -b01010 7 b01010 " -b10110 9 +b01010 7 b01011 6 +b10110 9 b00000000000000000000000001001101 # b00101 8 #775 @@ -802,18 +804,18 @@ b00101 8 1! b10110 8 b00000000000000000000000001001110 # -b10001 6 b01011 9 -b00101 " +b10001 6 b00101 7 +b00101 " #785 0! #790 1! -b10110 7 b10110 " -b10001 9 +b10110 7 b11100 6 +b10001 9 b00000000000000000000000001001111 # b01011 8 #795 @@ -822,18 +824,18 @@ b01011 8 1! b10001 8 b00000000000000000000000001010000 # -b01110 6 b11100 9 -b01011 " +b01110 6 b01011 7 +b01011 " #805 0! #810 1! -b10001 7 b10001 " -b01110 9 +b10001 7 b00111 6 +b01110 9 b00000000000000000000000001010001 # b11100 8 #815 @@ -842,18 +844,18 @@ b11100 8 1! b01110 8 b00000000000000000000000001010010 # -b10111 6 b00111 9 -b11100 " +b10111 6 b11100 7 +b11100 " #825 0! #830 1! -b01110 7 b01110 " -b10111 9 +b01110 7 b11111 6 +b10111 9 b00000000000000000000000001010011 # b00111 8 #835 @@ -862,18 +864,18 @@ b00111 8 1! b10111 8 b00000000000000000000000001010100 # -b11011 6 b11111 9 -b00111 " +b11011 6 b00111 7 +b00111 " #845 0! #850 1! -b10111 7 b10111 " -b11011 9 +b10111 7 b11001 6 +b11011 9 b00000000000000000000000001010101 # b11111 8 #855 @@ -882,18 +884,18 @@ b11111 8 1! b11011 8 b00000000000000000000000001010110 # -b11000 6 b11001 9 -b11111 " +b11000 6 b11111 7 +b11111 " #865 0! #870 1! -b11011 7 b11011 " -b11000 9 +b11011 7 b01100 6 +b11000 9 b00000000000000000000000001010111 # b11001 8 #875 @@ -902,18 +904,18 @@ b11001 8 1! b11000 8 b00000000000000000000000001011000 # -b00110 6 b01100 9 -b11001 " +b00110 6 b11001 7 +b11001 " #885 0! #890 1! -b11000 7 b11000 " -b00110 9 +b11000 7 b00011 6 +b00110 9 b00000000000000000000000001011001 # b01100 8 #895 @@ -922,18 +924,18 @@ b01100 8 1! b00110 8 b00000000000000000000000001011010 # -b10101 6 b00011 9 -b01100 " +b10101 6 b01100 7 +b01100 " #905 0! #910 1! -b00110 7 b00110 " -b10101 9 +b00110 7 b11110 6 +b10101 9 b00000000000000000000000001011011 # b00011 8 #915 @@ -942,18 +944,18 @@ b00011 8 1! b10101 8 b00000000000000000000000001011100 # -b01111 6 b11110 9 -b00011 " +b01111 6 b00011 7 +b00011 " #925 0! #930 1! -b10101 7 b10101 " -b01111 9 +b10101 7 b10011 6 +b01111 9 b00000000000000000000000001011101 # b11110 8 #935 @@ -962,18 +964,18 @@ b11110 8 1! b01111 8 b00000000000000000000000001011110 # -b11101 6 b10011 9 -b11110 " +b11101 6 b11110 7 +b11110 " #945 0! #950 1! -b01111 7 b01111 " -b11101 9 +b01111 7 b11010 6 +b11101 9 b00000000000000000000000001011111 # b10011 8 #955 @@ -982,18 +984,18 @@ b10011 8 1! b11101 8 b00000000000000000000000001100000 # -b01101 6 b11010 9 -b10011 " +b01101 6 b10011 7 +b10011 " #965 0! #970 1! -b11101 7 b11101 " -b01101 9 +b11101 7 b10010 6 +b01101 9 b00000000000000000000000001100001 # b11010 8 #975 @@ -1002,18 +1004,18 @@ b11010 8 1! b01101 8 b00000000000000000000000001100010 # -b01001 6 b10010 9 -b11010 " +b01001 6 b11010 7 +b11010 " #985 0! #990 1! -b01101 7 b01101 " -b01001 9 +b01101 7 b10000 6 +b01001 9 b00000000000000000000000001100011 # b10010 8 #995 @@ -1022,7 +1024,7 @@ b10010 8 1! b01001 8 b00000000000000000000000001100100 # -b01000 6 b10000 9 -b10010 " +b01000 6 b10010 7 +b10010 " diff --git a/test_regress/t/t_trace_fst_sc.out b/test_regress/t/t_trace_fst_sc.out index 3fe026e70..28581fdda 100644 --- a/test_regress/t/t_trace_fst_sc.out +++ b/test_regress/t/t_trace_fst_sc.out @@ -1,5 +1,5 @@ $date - Thu Apr 1 14:28:55 2021 + Wed Aug 11 00:05:19 2021 $end $version @@ -37,9 +37,9 @@ $var wire 1 ! clk $end $var wire 1 # rstn $end $var wire 5 5 state $end $var logic 5 6 state_w $end -$var logic 5 7 state_array(0) $end -$var logic 5 8 state_array(1) $end -$var logic 5 9 state_array(2) $end +$var logic 5 7 state_array[0] $end +$var logic 5 8 state_array[1] $end +$var logic 5 9 state_array[2] $end $scope module unnamedblk2 $end $var int 32 : i $end $upscope $end diff --git a/test_regress/t/t_trace_fst_sc_cmake.out b/test_regress/t/t_trace_fst_sc_cmake.out index 3fe026e70..79ed28e84 100644 --- a/test_regress/t/t_trace_fst_sc_cmake.out +++ b/test_regress/t/t_trace_fst_sc_cmake.out @@ -1,5 +1,5 @@ $date - Thu Apr 1 14:28:55 2021 + Wed Aug 11 02:14:06 2021 $end $version @@ -37,9 +37,9 @@ $var wire 1 ! clk $end $var wire 1 # rstn $end $var wire 5 5 state $end $var logic 5 6 state_w $end -$var logic 5 7 state_array(0) $end -$var logic 5 8 state_array(1) $end -$var logic 5 9 state_array(2) $end +$var logic 5 7 state_array[0] $end +$var logic 5 8 state_array[1] $end +$var logic 5 9 state_array[2] $end $scope module unnamedblk2 $end $var int 32 : i $end $upscope $end diff --git a/test_regress/t/t_trace_packed_struct_fst.out b/test_regress/t/t_trace_packed_struct_fst.out index ac5cfac00..05ed7013f 100644 --- a/test_regress/t/t_trace_packed_struct_fst.out +++ b/test_regress/t/t_trace_packed_struct_fst.out @@ -1,5 +1,5 @@ $date - Sun Apr 19 04:15:38 2020 + Wed Aug 11 12:42:37 2021 $end $version @@ -13,21 +13,23 @@ $var wire 1 ! clk $end $scope module t $end $var wire 1 ! clk $end $var int 32 " cnt $end -$var parameter 96 # v(0) $end -$var parameter 96 $ v(1) $end -$var parameter 96 % v(2) $end +$var parameter 96 # v[0] $end +$var parameter 96 $ v[1] $end +$var parameter 96 % v[2] $end $upscope $end $upscope $end $enddefinitions $end +#0 $dumpvars -0! -b00000000000000000000000000000000 " -b001100000000000000000000000000100011000000000000000000000000000100110000000000000000000000000000 # -b001000000000000000000000000000100010000000000000000000000000000100100000000000000000000000000000 $ b000100000000000000000000000000100001000000000000000000000000000100010000000000000000000000000000 % +b001000000000000000000000000000100010000000000000000000000000000100100000000000000000000000000000 $ +b001100000000000000000000000000100011000000000000000000000000000100110000000000000000000000000000 # +b00000000000000000000000000000000 " +0! +$end #10 -b00000000000000000000000000000001 " 1! +b00000000000000000000000000000001 " #15 0! #20 diff --git a/test_regress/t/t_trace_packed_struct_fst_sc.out b/test_regress/t/t_trace_packed_struct_fst_sc.out index 7c9ef71f8..c42a1574d 100644 --- a/test_regress/t/t_trace_packed_struct_fst_sc.out +++ b/test_regress/t/t_trace_packed_struct_fst_sc.out @@ -1,5 +1,5 @@ $date - Thu Apr 1 15:33:45 2021 + Wed Aug 11 12:42:40 2021 $end $version @@ -12,9 +12,9 @@ $scope module top $end $scope module t $end $var wire 1 ! clk $end $var int 32 " cnt $end -$var parameter 96 # v(0) $end -$var parameter 96 $ v(1) $end -$var parameter 96 % v(2) $end +$var parameter 96 # v[0] $end +$var parameter 96 $ v[1] $end +$var parameter 96 % v[2] $end $upscope $end $upscope $end $enddefinitions $end diff --git a/test_regress/t/t_trace_public.out b/test_regress/t/t_trace_public.out index 01536b3b7..e9ef906b0 100644 --- a/test_regress/t/t_trace_public.out +++ b/test_regress/t/t_trace_public.out @@ -1,31 +1,30 @@ -$version Generated by SpTraceVcd $end -$date Tue Nov 3 09:34:23 2009 - $end +$version Generated by VerilatedVcd $end +$date Tue Aug 10 15:49:51 2021 $end $timescale 1ps $end $scope module top $end - $var wire 1 6 CLK $end - $var wire 1 7 RESET $end + $var wire 1 5 CLK $end + $var wire 1 6 RESET $end $scope module t $end - $var wire 1 6 CLK $end + $var wire 1 5 CLK $end $var wire 1 # RESET $end - $var wire 32 $ val [31:0] $end - $var wire 2 3 vec(3) [2:1] $end - $var wire 2 4 vec(4) [2:1] $end + $var wire 32 & val [31:0] $end + $var wire 2 $ vec[3] [2:1] $end + $var wire 2 % vec[4] [2:1] $end $scope module glbl $end - $var wire 1 5 GSR $end + $var wire 1 7 GSR $end $upscope $end $scope module little $end - $var wire 1 6 clk $end - $var wire 128 / i128 [63:190] $end - $var wire 49 - i48 [1:49] $end - $var wire 8 , i8 [0:7] $end + $var wire 1 5 clk $end + $var wire 128 1 i128 [63:190] $end + $var wire 49 / i48 [1:49] $end + $var wire 8 . i8 [0:7] $end $upscope $end $scope module neg $end - $var wire 1 6 clk $end - $var wire 128 ( i128 [63:-64] $end - $var wire 48 & i48 [-1:-48] $end - $var wire 8 % i8 [0:-7] $end + $var wire 1 5 clk $end + $var wire 128 * i128 [63:-64] $end + $var wire 48 ( i48 [-1:-48] $end + $var wire 8 ' i8 [0:-7] $end $upscope $end $upscope $end $upscope $end @@ -34,63 +33,63 @@ $enddefinitions $end #0 1# -b00000000000000000000000000000000 $ -b00000000 % -b000000000000000000000000000000000000000000000000 & -b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 ( -b00000000 , -b0000000000000000000000000000000000000000000000000 - -b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 / -b00 3 -b00 4 -15 +b00 $ +b00 % +b00000000000000000000000000000000 & +b00000000 ' +b000000000000000000000000000000000000000000000000 ( +b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 * +b00000000 . +b0000000000000000000000000000000000000000000000000 / +b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 1 +05 +16 17 -06 #1 #2 #3 -b11111111 % -b111111111111111111111111111111111111111111111111 & -b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 ( -b11111111 , -b1111111111111111111111111111111111111111111111111 - -b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 / -16 +b11111111 ' +b111111111111111111111111111111111111111111111111 ( +b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 * +b11111111 . +b1111111111111111111111111111111111111111111111111 / +b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 1 +15 #4 #5 #6 -06 -#7 05 +#7 +07 #8 #9 0# -b00000000 % -b000000000000000000000000000000000000000000000000 & -b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 ( -b00000000 , -b0000000000000000000000000000000000000000000000000 - -b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 / -07 -16 +b00000000 ' +b000000000000000000000000000000000000000000000000 ( +b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 * +b00000000 . +b0000000000000000000000000000000000000000000000000 / +b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 1 +15 +06 #10 #11 #12 -06 +05 #13 #14 #15 -b00000000000000000000000000000001 $ -b11111111 % -b111111111111111111111111111111111111111111111111 & -b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 ( -b11111111 , -b1111111111111111111111111111111111111111111111111 - -b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 / -16 +b00000000000000000000000000000001 & +b11111111 ' +b111111111111111111111111111111111111111111111111 ( +b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 * +b11111111 . +b1111111111111111111111111111111111111111111111111 / +b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 1 +15 #16 #17 #18 -06 +05 #19 #20