From 185e5d8f428d203bfda8650c21f613c0205fb2fc Mon Sep 17 00:00:00 2001
From: Geza Lore <gezalore@gmail.com>
Date: Tue, 9 Nov 2021 21:29:28 +0000
Subject: [PATCH] Make 'bit', 'logic' and 'time' types unsigned by default

IEEE 1800-2017 6.11.3 says these types are unsigned. Until now these
types were treated as not having a signedness (NOSIGN), and nodes having
these types were later resolved by V3Width to be unsigned. This is a bit
problematic when creating nodes of these types after V3Width. Treating
these types as unsigned from the get go is fine, and actually improves
generated code slightly.
---
 src/V3Ast.h                            |   3 +-
 test_regress/t/t_xml_debugcheck.out    | 257 ++++++++++++-------------
 test_regress/t/t_xml_flat_vlvbound.out |  67 ++++---
 3 files changed, 163 insertions(+), 164 deletions(-)

diff --git a/src/V3Ast.h b/src/V3Ast.h
index be0a03321..ac027182c 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -504,7 +504,8 @@ public:
     }
     bool isUnsigned() const {
         return m_e == CHANDLE || m_e == EVENTVALUE || m_e == STRING || m_e == SCOPEPTR
-               || m_e == CHARPTR || m_e == UINT32 || m_e == UINT64;
+               || m_e == CHARPTR || m_e == UINT32 || m_e == UINT64 || m_e == BIT || m_e == LOGIC
+               || m_e == TIME;
     }
     bool isFourstate() const {
         return m_e == INTEGER || m_e == LOGIC || m_e == LOGIC_IMPLICIT || m_e == TIME;
diff --git a/test_regress/t/t_xml_debugcheck.out b/test_regress/t/t_xml_debugcheck.out
index 3b62af357..791baf602 100644
--- a/test_regress/t/t_xml_debugcheck.out
+++ b/test_regress/t/t_xml_debugcheck.out
@@ -104,10 +104,10 @@
                   </begin>
                 </if>
                 <if fl="d68" loc="d,68,6,68,8">
-                  <neq fl="d68" loc="d,68,19,68,22" dtype_id="11">
+                  <neq fl="d68" loc="d,68,19,68,22" dtype_id="8">
                     <const fl="d68" loc="d,68,24,68,27" name="4&apos;h3" dtype_id="5"/>
                     <arraysel fl="d68" loc="d,68,13,68,17" dtype_id="5">
-                      <varref fl="d68" loc="d,68,13,68,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d68" loc="d,68,13,68,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d68" loc="d,68,13,68,17" dtype_id="10">
                         <const fl="d68" loc="d,68,13,68,17" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d68" loc="d,68,11,68,12" dtype_id="10">
@@ -120,7 +120,7 @@
                     <display fl="d68" loc="d,68,36,68,42" displaytype="$write">
                       <sformatf fl="d68" loc="d,68,36,68,42" name="%%Error: t/t_enum_type_methods.v:68:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                         <arraysel fl="d68" loc="d,68,117,68,121" dtype_id="5">
-                          <varref fl="d68" loc="d,68,117,68,121" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d68" loc="d,68,117,68,121" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d68" loc="d,68,117,68,121" dtype_id="10">
                             <const fl="d68" loc="d,68,117,68,121" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d68" loc="d,68,115,68,116" dtype_id="10">
@@ -134,10 +134,10 @@
                   </begin>
                 </if>
                 <if fl="d69" loc="d,69,6,69,8">
-                  <neq fl="d69" loc="d,69,22,69,25" dtype_id="11">
+                  <neq fl="d69" loc="d,69,22,69,25" dtype_id="8">
                     <const fl="d69" loc="d,69,27,69,30" name="4&apos;h3" dtype_id="5"/>
                     <arraysel fl="d69" loc="d,69,13,69,17" dtype_id="5">
-                      <varref fl="d69" loc="d,69,13,69,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d69" loc="d,69,13,69,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d69" loc="d,69,13,69,17" dtype_id="10">
                         <const fl="d69" loc="d,69,13,69,17" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d69" loc="d,69,11,69,12" dtype_id="10">
@@ -150,7 +150,7 @@
                     <display fl="d69" loc="d,69,39,69,45" displaytype="$write">
                       <sformatf fl="d69" loc="d,69,39,69,45" name="%%Error: t/t_enum_type_methods.v:69:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                         <arraysel fl="d69" loc="d,69,120,69,124" dtype_id="5">
-                          <varref fl="d69" loc="d,69,120,69,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d69" loc="d,69,120,69,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d69" loc="d,69,120,69,124" dtype_id="10">
                             <const fl="d69" loc="d,69,120,69,124" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d69" loc="d,69,118,69,119" dtype_id="10">
@@ -164,14 +164,14 @@
                   </begin>
                 </if>
                 <if fl="d70" loc="d,70,6,70,8">
-                  <neq fl="d70" loc="d,70,22,70,25" dtype_id="11">
+                  <neq fl="d70" loc="d,70,22,70,25" dtype_id="8">
                     <const fl="d70" loc="d,70,27,70,30" name="4&apos;h4" dtype_id="5"/>
                     <arraysel fl="d70" loc="d,70,13,70,17" dtype_id="5">
-                      <varref fl="d70" loc="d,70,13,70,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d70" loc="d,70,13,70,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d70" loc="d,70,13,70,17" dtype_id="10">
                         <const fl="d70" loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
                         <arraysel fl="d70" loc="d,70,13,70,17" dtype_id="10">
-                          <varref fl="d70" loc="d,70,13,70,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d70" loc="d,70,13,70,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d70" loc="d,70,13,70,17" dtype_id="10">
                             <const fl="d70" loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d70" loc="d,70,11,70,12" dtype_id="10">
@@ -186,11 +186,11 @@
                     <display fl="d70" loc="d,70,39,70,45" displaytype="$write">
                       <sformatf fl="d70" loc="d,70,39,70,45" name="%%Error: t/t_enum_type_methods.v:70:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                         <arraysel fl="d70" loc="d,70,120,70,124" dtype_id="5">
-                          <varref fl="d70" loc="d,70,120,70,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d70" loc="d,70,120,70,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d70" loc="d,70,120,70,124" dtype_id="10">
                             <const fl="d70" loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
                             <arraysel fl="d70" loc="d,70,120,70,124" dtype_id="10">
-                              <varref fl="d70" loc="d,70,120,70,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d70" loc="d,70,120,70,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d70" loc="d,70,120,70,124" dtype_id="10">
                                 <const fl="d70" loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d70" loc="d,70,118,70,119" dtype_id="10">
@@ -206,10 +206,10 @@
                   </begin>
                 </if>
                 <if fl="d71" loc="d,71,6,71,8">
-                  <neq fl="d71" loc="d,71,19,71,22" dtype_id="11">
+                  <neq fl="d71" loc="d,71,19,71,22" dtype_id="8">
                     <const fl="d71" loc="d,71,24,71,27" name="4&apos;h4" dtype_id="5"/>
                     <arraysel fl="d71" loc="d,71,13,71,17" dtype_id="5">
-                      <varref fl="d71" loc="d,71,13,71,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                      <varref fl="d71" loc="d,71,13,71,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                       <and fl="d71" loc="d,71,13,71,17" dtype_id="10">
                         <const fl="d71" loc="d,71,13,71,17" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d71" loc="d,71,11,71,12" dtype_id="10">
@@ -222,7 +222,7 @@
                     <display fl="d71" loc="d,71,36,71,42" displaytype="$write">
                       <sformatf fl="d71" loc="d,71,36,71,42" name="%%Error: t/t_enum_type_methods.v:71:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                         <arraysel fl="d71" loc="d,71,117,71,121" dtype_id="5">
-                          <varref fl="d71" loc="d,71,117,71,121" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d71" loc="d,71,117,71,121" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d71" loc="d,71,117,71,121" dtype_id="10">
                             <const fl="d71" loc="d,71,117,71,121" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d71" loc="d,71,115,71,116" dtype_id="10">
@@ -236,10 +236,10 @@
                   </begin>
                 </if>
                 <if fl="d72" loc="d,72,6,72,8">
-                  <neq fl="d72" loc="d,72,22,72,25" dtype_id="11">
+                  <neq fl="d72" loc="d,72,22,72,25" dtype_id="8">
                     <const fl="d72" loc="d,72,27,72,30" name="4&apos;h4" dtype_id="5"/>
                     <arraysel fl="d72" loc="d,72,13,72,17" dtype_id="5">
-                      <varref fl="d72" loc="d,72,13,72,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                      <varref fl="d72" loc="d,72,13,72,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                       <and fl="d72" loc="d,72,13,72,17" dtype_id="10">
                         <const fl="d72" loc="d,72,13,72,17" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d72" loc="d,72,11,72,12" dtype_id="10">
@@ -252,7 +252,7 @@
                     <display fl="d72" loc="d,72,39,72,45" displaytype="$write">
                       <sformatf fl="d72" loc="d,72,39,72,45" name="%%Error: t/t_enum_type_methods.v:72:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                         <arraysel fl="d72" loc="d,72,120,72,124" dtype_id="5">
-                          <varref fl="d72" loc="d,72,120,72,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d72" loc="d,72,120,72,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d72" loc="d,72,120,72,124" dtype_id="10">
                             <const fl="d72" loc="d,72,120,72,124" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d72" loc="d,72,118,72,119" dtype_id="10">
@@ -266,14 +266,14 @@
                   </begin>
                 </if>
                 <if fl="d73" loc="d,73,6,73,8">
-                  <neq fl="d73" loc="d,73,22,73,25" dtype_id="11">
+                  <neq fl="d73" loc="d,73,22,73,25" dtype_id="8">
                     <const fl="d73" loc="d,73,27,73,30" name="4&apos;h3" dtype_id="5"/>
                     <arraysel fl="d73" loc="d,73,13,73,17" dtype_id="5">
-                      <varref fl="d73" loc="d,73,13,73,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                      <varref fl="d73" loc="d,73,13,73,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                       <and fl="d73" loc="d,73,13,73,17" dtype_id="10">
                         <const fl="d73" loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
                         <arraysel fl="d73" loc="d,73,13,73,17" dtype_id="10">
-                          <varref fl="d73" loc="d,73,13,73,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d73" loc="d,73,13,73,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d73" loc="d,73,13,73,17" dtype_id="10">
                             <const fl="d73" loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d73" loc="d,73,11,73,12" dtype_id="10">
@@ -288,11 +288,11 @@
                     <display fl="d73" loc="d,73,39,73,45" displaytype="$write">
                       <sformatf fl="d73" loc="d,73,39,73,45" name="%%Error: t/t_enum_type_methods.v:73:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                         <arraysel fl="d73" loc="d,73,120,73,124" dtype_id="5">
-                          <varref fl="d73" loc="d,73,120,73,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d73" loc="d,73,120,73,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d73" loc="d,73,120,73,124" dtype_id="10">
                             <const fl="d73" loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
                             <arraysel fl="d73" loc="d,73,120,73,124" dtype_id="10">
-                              <varref fl="d73" loc="d,73,120,73,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d73" loc="d,73,120,73,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d73" loc="d,73,120,73,124" dtype_id="10">
                                 <const fl="d73" loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d73" loc="d,73,118,73,119" dtype_id="10">
@@ -354,10 +354,10 @@
                       </begin>
                     </if>
                     <if fl="d78" loc="d,78,6,78,8">
-                      <neq fl="d78" loc="d,78,19,78,22" dtype_id="11">
+                      <neq fl="d78" loc="d,78,19,78,22" dtype_id="8">
                         <const fl="d78" loc="d,78,24,78,27" name="4&apos;h4" dtype_id="5"/>
                         <arraysel fl="d78" loc="d,78,13,78,17" dtype_id="5">
-                          <varref fl="d78" loc="d,78,13,78,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d78" loc="d,78,13,78,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d78" loc="d,78,13,78,17" dtype_id="10">
                             <const fl="d78" loc="d,78,13,78,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d78" loc="d,78,11,78,12" dtype_id="10">
@@ -370,7 +370,7 @@
                         <display fl="d78" loc="d,78,36,78,42" displaytype="$write">
                           <sformatf fl="d78" loc="d,78,36,78,42" name="%%Error: t/t_enum_type_methods.v:78:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                             <arraysel fl="d78" loc="d,78,117,78,121" dtype_id="5">
-                              <varref fl="d78" loc="d,78,117,78,121" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d78" loc="d,78,117,78,121" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d78" loc="d,78,117,78,121" dtype_id="10">
                                 <const fl="d78" loc="d,78,117,78,121" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d78" loc="d,78,115,78,116" dtype_id="10">
@@ -384,10 +384,10 @@
                       </begin>
                     </if>
                     <if fl="d79" loc="d,79,6,79,8">
-                      <neq fl="d79" loc="d,79,22,79,25" dtype_id="11">
+                      <neq fl="d79" loc="d,79,22,79,25" dtype_id="8">
                         <const fl="d79" loc="d,79,27,79,30" name="4&apos;h4" dtype_id="5"/>
                         <arraysel fl="d79" loc="d,79,13,79,17" dtype_id="5">
-                          <varref fl="d79" loc="d,79,13,79,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d79" loc="d,79,13,79,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d79" loc="d,79,13,79,17" dtype_id="10">
                             <const fl="d79" loc="d,79,13,79,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d79" loc="d,79,11,79,12" dtype_id="10">
@@ -400,7 +400,7 @@
                         <display fl="d79" loc="d,79,39,79,45" displaytype="$write">
                           <sformatf fl="d79" loc="d,79,39,79,45" name="%%Error: t/t_enum_type_methods.v:79:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                             <arraysel fl="d79" loc="d,79,120,79,124" dtype_id="5">
-                              <varref fl="d79" loc="d,79,120,79,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d79" loc="d,79,120,79,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d79" loc="d,79,120,79,124" dtype_id="10">
                                 <const fl="d79" loc="d,79,120,79,124" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d79" loc="d,79,118,79,119" dtype_id="10">
@@ -414,14 +414,14 @@
                       </begin>
                     </if>
                     <if fl="d80" loc="d,80,6,80,8">
-                      <neq fl="d80" loc="d,80,22,80,25" dtype_id="11">
+                      <neq fl="d80" loc="d,80,22,80,25" dtype_id="8">
                         <const fl="d80" loc="d,80,27,80,30" name="4&apos;h1" dtype_id="5"/>
                         <arraysel fl="d80" loc="d,80,13,80,17" dtype_id="5">
-                          <varref fl="d80" loc="d,80,13,80,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d80" loc="d,80,13,80,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d80" loc="d,80,13,80,17" dtype_id="10">
                             <const fl="d80" loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
                             <arraysel fl="d80" loc="d,80,13,80,17" dtype_id="10">
-                              <varref fl="d80" loc="d,80,13,80,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d80" loc="d,80,13,80,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d80" loc="d,80,13,80,17" dtype_id="10">
                                 <const fl="d80" loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d80" loc="d,80,11,80,12" dtype_id="10">
@@ -436,11 +436,11 @@
                         <display fl="d80" loc="d,80,39,80,45" displaytype="$write">
                           <sformatf fl="d80" loc="d,80,39,80,45" name="%%Error: t/t_enum_type_methods.v:80:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                             <arraysel fl="d80" loc="d,80,120,80,124" dtype_id="5">
-                              <varref fl="d80" loc="d,80,120,80,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d80" loc="d,80,120,80,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d80" loc="d,80,120,80,124" dtype_id="10">
                                 <const fl="d80" loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
                                 <arraysel fl="d80" loc="d,80,120,80,124" dtype_id="10">
-                                  <varref fl="d80" loc="d,80,120,80,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                  <varref fl="d80" loc="d,80,120,80,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                                   <and fl="d80" loc="d,80,120,80,124" dtype_id="10">
                                     <const fl="d80" loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d80" loc="d,80,118,80,119" dtype_id="10">
@@ -456,10 +456,10 @@
                       </begin>
                     </if>
                     <if fl="d81" loc="d,81,6,81,8">
-                      <neq fl="d81" loc="d,81,19,81,22" dtype_id="11">
+                      <neq fl="d81" loc="d,81,19,81,22" dtype_id="8">
                         <const fl="d81" loc="d,81,24,81,27" name="4&apos;h1" dtype_id="5"/>
                         <arraysel fl="d81" loc="d,81,13,81,17" dtype_id="5">
-                          <varref fl="d81" loc="d,81,13,81,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d81" loc="d,81,13,81,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d81" loc="d,81,13,81,17" dtype_id="10">
                             <const fl="d81" loc="d,81,13,81,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d81" loc="d,81,11,81,12" dtype_id="10">
@@ -472,7 +472,7 @@
                         <display fl="d81" loc="d,81,36,81,42" displaytype="$write">
                           <sformatf fl="d81" loc="d,81,36,81,42" name="%%Error: t/t_enum_type_methods.v:81:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                             <arraysel fl="d81" loc="d,81,117,81,121" dtype_id="5">
-                              <varref fl="d81" loc="d,81,117,81,121" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d81" loc="d,81,117,81,121" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d81" loc="d,81,117,81,121" dtype_id="10">
                                 <const fl="d81" loc="d,81,117,81,121" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d81" loc="d,81,115,81,116" dtype_id="10">
@@ -486,10 +486,10 @@
                       </begin>
                     </if>
                     <if fl="d82" loc="d,82,6,82,8">
-                      <neq fl="d82" loc="d,82,22,82,25" dtype_id="11">
+                      <neq fl="d82" loc="d,82,22,82,25" dtype_id="8">
                         <const fl="d82" loc="d,82,27,82,30" name="4&apos;h1" dtype_id="5"/>
                         <arraysel fl="d82" loc="d,82,13,82,17" dtype_id="5">
-                          <varref fl="d82" loc="d,82,13,82,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d82" loc="d,82,13,82,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d82" loc="d,82,13,82,17" dtype_id="10">
                             <const fl="d82" loc="d,82,13,82,17" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d82" loc="d,82,11,82,12" dtype_id="10">
@@ -502,7 +502,7 @@
                         <display fl="d82" loc="d,82,39,82,45" displaytype="$write">
                           <sformatf fl="d82" loc="d,82,39,82,45" name="%%Error: t/t_enum_type_methods.v:82:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                             <arraysel fl="d82" loc="d,82,120,82,124" dtype_id="5">
-                              <varref fl="d82" loc="d,82,120,82,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d82" loc="d,82,120,82,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d82" loc="d,82,120,82,124" dtype_id="10">
                                 <const fl="d82" loc="d,82,120,82,124" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d82" loc="d,82,118,82,119" dtype_id="10">
@@ -516,14 +516,14 @@
                       </begin>
                     </if>
                     <if fl="d83" loc="d,83,6,83,8">
-                      <neq fl="d83" loc="d,83,22,83,25" dtype_id="11">
+                      <neq fl="d83" loc="d,83,22,83,25" dtype_id="8">
                         <const fl="d83" loc="d,83,27,83,30" name="4&apos;h4" dtype_id="5"/>
                         <arraysel fl="d83" loc="d,83,13,83,17" dtype_id="5">
-                          <varref fl="d83" loc="d,83,13,83,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                          <varref fl="d83" loc="d,83,13,83,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                           <and fl="d83" loc="d,83,13,83,17" dtype_id="10">
                             <const fl="d83" loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
                             <arraysel fl="d83" loc="d,83,13,83,17" dtype_id="10">
-                              <varref fl="d83" loc="d,83,13,83,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d83" loc="d,83,13,83,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d83" loc="d,83,13,83,17" dtype_id="10">
                                 <const fl="d83" loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d83" loc="d,83,11,83,12" dtype_id="10">
@@ -538,11 +538,11 @@
                         <display fl="d83" loc="d,83,39,83,45" displaytype="$write">
                           <sformatf fl="d83" loc="d,83,39,83,45" name="%%Error: t/t_enum_type_methods.v:83:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                             <arraysel fl="d83" loc="d,83,120,83,124" dtype_id="5">
-                              <varref fl="d83" loc="d,83,120,83,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d83" loc="d,83,120,83,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d83" loc="d,83,120,83,124" dtype_id="10">
                                 <const fl="d83" loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
                                 <arraysel fl="d83" loc="d,83,120,83,124" dtype_id="10">
-                                  <varref fl="d83" loc="d,83,120,83,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                  <varref fl="d83" loc="d,83,120,83,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                   <and fl="d83" loc="d,83,120,83,124" dtype_id="10">
                                     <const fl="d83" loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d83" loc="d,83,118,83,119" dtype_id="10">
@@ -604,10 +604,10 @@
                           </begin>
                         </if>
                         <if fl="d88" loc="d,88,6,88,8">
-                          <neq fl="d88" loc="d,88,19,88,22" dtype_id="11">
+                          <neq fl="d88" loc="d,88,19,88,22" dtype_id="8">
                             <const fl="d88" loc="d,88,24,88,27" name="4&apos;h1" dtype_id="5"/>
                             <arraysel fl="d88" loc="d,88,13,88,17" dtype_id="5">
-                              <varref fl="d88" loc="d,88,13,88,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d88" loc="d,88,13,88,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d88" loc="d,88,13,88,17" dtype_id="10">
                                 <const fl="d88" loc="d,88,13,88,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d88" loc="d,88,11,88,12" dtype_id="10">
@@ -620,7 +620,7 @@
                             <display fl="d88" loc="d,88,36,88,42" displaytype="$write">
                               <sformatf fl="d88" loc="d,88,36,88,42" name="%%Error: t/t_enum_type_methods.v:88:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                                 <arraysel fl="d88" loc="d,88,117,88,121" dtype_id="5">
-                                  <varref fl="d88" loc="d,88,117,88,121" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                  <varref fl="d88" loc="d,88,117,88,121" name="__Venumtab_enum_next0" dtype_id="11"/>
                                   <and fl="d88" loc="d,88,117,88,121" dtype_id="10">
                                     <const fl="d88" loc="d,88,117,88,121" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d88" loc="d,88,115,88,116" dtype_id="10">
@@ -634,10 +634,10 @@
                           </begin>
                         </if>
                         <if fl="d89" loc="d,89,6,89,8">
-                          <neq fl="d89" loc="d,89,22,89,25" dtype_id="11">
+                          <neq fl="d89" loc="d,89,22,89,25" dtype_id="8">
                             <const fl="d89" loc="d,89,27,89,30" name="4&apos;h1" dtype_id="5"/>
                             <arraysel fl="d89" loc="d,89,13,89,17" dtype_id="5">
-                              <varref fl="d89" loc="d,89,13,89,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d89" loc="d,89,13,89,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d89" loc="d,89,13,89,17" dtype_id="10">
                                 <const fl="d89" loc="d,89,13,89,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d89" loc="d,89,11,89,12" dtype_id="10">
@@ -650,7 +650,7 @@
                             <display fl="d89" loc="d,89,39,89,45" displaytype="$write">
                               <sformatf fl="d89" loc="d,89,39,89,45" name="%%Error: t/t_enum_type_methods.v:89:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                                 <arraysel fl="d89" loc="d,89,120,89,124" dtype_id="5">
-                                  <varref fl="d89" loc="d,89,120,89,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                  <varref fl="d89" loc="d,89,120,89,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                                   <and fl="d89" loc="d,89,120,89,124" dtype_id="10">
                                     <const fl="d89" loc="d,89,120,89,124" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d89" loc="d,89,118,89,119" dtype_id="10">
@@ -664,14 +664,14 @@
                           </begin>
                         </if>
                         <if fl="d90" loc="d,90,6,90,8">
-                          <neq fl="d90" loc="d,90,22,90,25" dtype_id="11">
+                          <neq fl="d90" loc="d,90,22,90,25" dtype_id="8">
                             <const fl="d90" loc="d,90,27,90,30" name="4&apos;h3" dtype_id="5"/>
                             <arraysel fl="d90" loc="d,90,13,90,17" dtype_id="5">
-                              <varref fl="d90" loc="d,90,13,90,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                              <varref fl="d90" loc="d,90,13,90,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                               <and fl="d90" loc="d,90,13,90,17" dtype_id="10">
                                 <const fl="d90" loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
                                 <arraysel fl="d90" loc="d,90,13,90,17" dtype_id="10">
-                                  <varref fl="d90" loc="d,90,13,90,17" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                  <varref fl="d90" loc="d,90,13,90,17" name="__Venumtab_enum_next0" dtype_id="11"/>
                                   <and fl="d90" loc="d,90,13,90,17" dtype_id="10">
                                     <const fl="d90" loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d90" loc="d,90,11,90,12" dtype_id="10">
@@ -686,11 +686,11 @@
                             <display fl="d90" loc="d,90,39,90,45" displaytype="$write">
                               <sformatf fl="d90" loc="d,90,39,90,45" name="%%Error: t/t_enum_type_methods.v:90:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                                 <arraysel fl="d90" loc="d,90,120,90,124" dtype_id="5">
-                                  <varref fl="d90" loc="d,90,120,90,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                  <varref fl="d90" loc="d,90,120,90,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                                   <and fl="d90" loc="d,90,120,90,124" dtype_id="10">
                                     <const fl="d90" loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
                                     <arraysel fl="d90" loc="d,90,120,90,124" dtype_id="10">
-                                      <varref fl="d90" loc="d,90,120,90,124" name="__Venumtab_enum_next0" dtype_id="12"/>
+                                      <varref fl="d90" loc="d,90,120,90,124" name="__Venumtab_enum_next0" dtype_id="11"/>
                                       <and fl="d90" loc="d,90,120,90,124" dtype_id="10">
                                         <const fl="d90" loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
                                         <ccast fl="d90" loc="d,90,118,90,119" dtype_id="10">
@@ -706,10 +706,10 @@
                           </begin>
                         </if>
                         <if fl="d91" loc="d,91,6,91,8">
-                          <neq fl="d91" loc="d,91,19,91,22" dtype_id="11">
+                          <neq fl="d91" loc="d,91,19,91,22" dtype_id="8">
                             <const fl="d91" loc="d,91,24,91,27" name="4&apos;h3" dtype_id="5"/>
                             <arraysel fl="d91" loc="d,91,13,91,17" dtype_id="5">
-                              <varref fl="d91" loc="d,91,13,91,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d91" loc="d,91,13,91,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d91" loc="d,91,13,91,17" dtype_id="10">
                                 <const fl="d91" loc="d,91,13,91,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d91" loc="d,91,11,91,12" dtype_id="10">
@@ -722,7 +722,7 @@
                             <display fl="d91" loc="d,91,36,91,42" displaytype="$write">
                               <sformatf fl="d91" loc="d,91,36,91,42" name="%%Error: t/t_enum_type_methods.v:91:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                                 <arraysel fl="d91" loc="d,91,117,91,121" dtype_id="5">
-                                  <varref fl="d91" loc="d,91,117,91,121" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                  <varref fl="d91" loc="d,91,117,91,121" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                   <and fl="d91" loc="d,91,117,91,121" dtype_id="10">
                                     <const fl="d91" loc="d,91,117,91,121" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d91" loc="d,91,115,91,116" dtype_id="10">
@@ -736,10 +736,10 @@
                           </begin>
                         </if>
                         <if fl="d92" loc="d,92,6,92,8">
-                          <neq fl="d92" loc="d,92,22,92,25" dtype_id="11">
+                          <neq fl="d92" loc="d,92,22,92,25" dtype_id="8">
                             <const fl="d92" loc="d,92,27,92,30" name="4&apos;h3" dtype_id="5"/>
                             <arraysel fl="d92" loc="d,92,13,92,17" dtype_id="5">
-                              <varref fl="d92" loc="d,92,13,92,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d92" loc="d,92,13,92,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d92" loc="d,92,13,92,17" dtype_id="10">
                                 <const fl="d92" loc="d,92,13,92,17" name="32&apos;h7" dtype_id="6"/>
                                 <ccast fl="d92" loc="d,92,11,92,12" dtype_id="10">
@@ -752,7 +752,7 @@
                             <display fl="d92" loc="d,92,39,92,45" displaytype="$write">
                               <sformatf fl="d92" loc="d,92,39,92,45" name="%%Error: t/t_enum_type_methods.v:92:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                                 <arraysel fl="d92" loc="d,92,120,92,124" dtype_id="5">
-                                  <varref fl="d92" loc="d,92,120,92,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                  <varref fl="d92" loc="d,92,120,92,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                   <and fl="d92" loc="d,92,120,92,124" dtype_id="10">
                                     <const fl="d92" loc="d,92,120,92,124" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d92" loc="d,92,118,92,119" dtype_id="10">
@@ -766,14 +766,14 @@
                           </begin>
                         </if>
                         <if fl="d93" loc="d,93,6,93,8">
-                          <neq fl="d93" loc="d,93,22,93,25" dtype_id="11">
+                          <neq fl="d93" loc="d,93,22,93,25" dtype_id="8">
                             <const fl="d93" loc="d,93,27,93,30" name="4&apos;h1" dtype_id="5"/>
                             <arraysel fl="d93" loc="d,93,13,93,17" dtype_id="5">
-                              <varref fl="d93" loc="d,93,13,93,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                              <varref fl="d93" loc="d,93,13,93,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                               <and fl="d93" loc="d,93,13,93,17" dtype_id="10">
                                 <const fl="d93" loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
                                 <arraysel fl="d93" loc="d,93,13,93,17" dtype_id="10">
-                                  <varref fl="d93" loc="d,93,13,93,17" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                  <varref fl="d93" loc="d,93,13,93,17" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                   <and fl="d93" loc="d,93,13,93,17" dtype_id="10">
                                     <const fl="d93" loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
                                     <ccast fl="d93" loc="d,93,11,93,12" dtype_id="10">
@@ -788,11 +788,11 @@
                             <display fl="d93" loc="d,93,39,93,45" displaytype="$write">
                               <sformatf fl="d93" loc="d,93,39,93,45" name="%%Error: t/t_enum_type_methods.v:93:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                                 <arraysel fl="d93" loc="d,93,120,93,124" dtype_id="5">
-                                  <varref fl="d93" loc="d,93,120,93,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                  <varref fl="d93" loc="d,93,120,93,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                   <and fl="d93" loc="d,93,120,93,124" dtype_id="10">
                                     <const fl="d93" loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
                                     <arraysel fl="d93" loc="d,93,120,93,124" dtype_id="10">
-                                      <varref fl="d93" loc="d,93,120,93,124" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                                      <varref fl="d93" loc="d,93,120,93,124" name="__Venumtab_enum_prev1" dtype_id="12"/>
                                       <and fl="d93" loc="d,93,120,93,124" dtype_id="10">
                                         <const fl="d93" loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
                                         <ccast fl="d93" loc="d,93,118,93,119" dtype_id="10">
@@ -855,10 +855,10 @@
           <varref fl="d31" loc="d,31,7,31,8" name="t.e" dtype_id="5"/>
         </assign>
         <if fl="d37" loc="d,37,10,37,12">
-          <neq fl="d37" loc="d,37,26,37,29" dtype_id="11">
+          <neq fl="d37" loc="d,37,26,37,29" dtype_id="8">
             <const fl="d37" loc="d,37,31,37,34" name="4&apos;h4" dtype_id="5"/>
             <arraysel fl="d37" loc="d,37,17,37,21" dtype_id="5">
-              <varref fl="d37" loc="d,37,17,37,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d37" loc="d,37,17,37,21" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d37" loc="d,37,17,37,21" dtype_id="10">
                 <const fl="d37" loc="d,37,17,37,21" name="32&apos;h7" dtype_id="6"/>
                 <ccast fl="d37" loc="d,37,15,37,16" dtype_id="10">
@@ -871,7 +871,7 @@
             <display fl="d37" loc="d,37,43,37,49" displaytype="$write">
               <sformatf fl="d37" loc="d,37,43,37,49" name="%%Error: t/t_enum_type_methods.v:37:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                 <arraysel fl="d37" loc="d,37,124,37,128" dtype_id="5">
-                  <varref fl="d37" loc="d,37,124,37,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d37" loc="d,37,124,37,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d37" loc="d,37,124,37,128" dtype_id="10">
                     <const fl="d37" loc="d,37,124,37,128" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d37" loc="d,37,122,37,123" dtype_id="10">
@@ -885,14 +885,14 @@
           </begin>
         </if>
         <if fl="d38" loc="d,38,10,38,12">
-          <neq fl="d38" loc="d,38,34,38,37" dtype_id="11">
+          <neq fl="d38" loc="d,38,34,38,37" dtype_id="8">
             <const fl="d38" loc="d,38,39,38,42" name="4&apos;h1" dtype_id="5"/>
             <arraysel fl="d38" loc="d,38,25,38,29" dtype_id="5">
-              <varref fl="d38" loc="d,38,25,38,29" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d38" loc="d,38,25,38,29" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d38" loc="d,38,25,38,29" dtype_id="10">
                 <const fl="d38" loc="d,38,25,38,29" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d38" loc="d,38,17,38,21" dtype_id="10">
-                  <varref fl="d38" loc="d,38,17,38,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d38" loc="d,38,17,38,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d38" loc="d,38,17,38,21" dtype_id="10">
                     <const fl="d38" loc="d,38,17,38,21" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d38" loc="d,38,15,38,16" dtype_id="10">
@@ -907,11 +907,11 @@
             <display fl="d38" loc="d,38,51,38,57" displaytype="$write">
               <sformatf fl="d38" loc="d,38,51,38,57" name="%%Error: t/t_enum_type_methods.v:38:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                 <arraysel fl="d38" loc="d,38,140,38,144" dtype_id="5">
-                  <varref fl="d38" loc="d,38,140,38,144" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d38" loc="d,38,140,38,144" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d38" loc="d,38,140,38,144" dtype_id="10">
                     <const fl="d38" loc="d,38,140,38,144" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d38" loc="d,38,132,38,136" dtype_id="10">
-                      <varref fl="d38" loc="d,38,132,38,136" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d38" loc="d,38,132,38,136" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d38" loc="d,38,132,38,136" dtype_id="10">
                         <const fl="d38" loc="d,38,132,38,136" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d38" loc="d,38,130,38,131" dtype_id="10">
@@ -927,14 +927,14 @@
           </begin>
         </if>
         <if fl="d39" loc="d,39,10,39,12">
-          <neq fl="d39" loc="d,39,26,39,29" dtype_id="11">
+          <neq fl="d39" loc="d,39,26,39,29" dtype_id="8">
             <const fl="d39" loc="d,39,31,39,34" name="4&apos;h1" dtype_id="5"/>
             <arraysel fl="d39" loc="d,39,17,39,21" dtype_id="5">
-              <varref fl="d39" loc="d,39,17,39,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d39" loc="d,39,17,39,21" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d39" loc="d,39,17,39,21" dtype_id="10">
                 <const fl="d39" loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d39" loc="d,39,17,39,21" dtype_id="10">
-                  <varref fl="d39" loc="d,39,17,39,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d39" loc="d,39,17,39,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d39" loc="d,39,17,39,21" dtype_id="10">
                     <const fl="d39" loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d39" loc="d,39,15,39,16" dtype_id="10">
@@ -949,11 +949,11 @@
             <display fl="d39" loc="d,39,43,39,49" displaytype="$write">
               <sformatf fl="d39" loc="d,39,43,39,49" name="%%Error: t/t_enum_type_methods.v:39:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                 <arraysel fl="d39" loc="d,39,124,39,128" dtype_id="5">
-                  <varref fl="d39" loc="d,39,124,39,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d39" loc="d,39,124,39,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d39" loc="d,39,124,39,128" dtype_id="10">
                     <const fl="d39" loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d39" loc="d,39,124,39,128" dtype_id="10">
-                      <varref fl="d39" loc="d,39,124,39,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d39" loc="d,39,124,39,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d39" loc="d,39,124,39,128" dtype_id="10">
                         <const fl="d39" loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d39" loc="d,39,122,39,123" dtype_id="10">
@@ -969,18 +969,18 @@
           </begin>
         </if>
         <if fl="d40" loc="d,40,10,40,12">
-          <neq fl="d40" loc="d,40,42,40,45" dtype_id="11">
+          <neq fl="d40" loc="d,40,42,40,45" dtype_id="8">
             <const fl="d40" loc="d,40,47,40,50" name="4&apos;h3" dtype_id="5"/>
             <arraysel fl="d40" loc="d,40,33,40,37" dtype_id="5">
-              <varref fl="d40" loc="d,40,33,40,37" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d40" loc="d,40,33,40,37" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d40" loc="d,40,33,40,37" dtype_id="10">
                 <const fl="d40" loc="d,40,33,40,37" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d40" loc="d,40,25,40,29" dtype_id="10">
-                  <varref fl="d40" loc="d,40,25,40,29" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d40" loc="d,40,25,40,29" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d40" loc="d,40,25,40,29" dtype_id="10">
                     <const fl="d40" loc="d,40,25,40,29" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d40" loc="d,40,17,40,21" dtype_id="10">
-                      <varref fl="d40" loc="d,40,17,40,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d40" loc="d,40,17,40,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d40" loc="d,40,17,40,21" dtype_id="10">
                         <const fl="d40" loc="d,40,17,40,21" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d40" loc="d,40,15,40,16" dtype_id="10">
@@ -997,15 +997,15 @@
             <display fl="d40" loc="d,40,59,40,65" displaytype="$write">
               <sformatf fl="d40" loc="d,40,59,40,65" name="%%Error: t/t_enum_type_methods.v:40:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                 <arraysel fl="d40" loc="d,40,156,40,160" dtype_id="5">
-                  <varref fl="d40" loc="d,40,156,40,160" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d40" loc="d,40,156,40,160" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d40" loc="d,40,156,40,160" dtype_id="10">
                     <const fl="d40" loc="d,40,156,40,160" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d40" loc="d,40,148,40,152" dtype_id="10">
-                      <varref fl="d40" loc="d,40,148,40,152" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d40" loc="d,40,148,40,152" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d40" loc="d,40,148,40,152" dtype_id="10">
                         <const fl="d40" loc="d,40,148,40,152" name="32&apos;h7" dtype_id="6"/>
                         <arraysel fl="d40" loc="d,40,140,40,144" dtype_id="10">
-                          <varref fl="d40" loc="d,40,140,40,144" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d40" loc="d,40,140,40,144" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d40" loc="d,40,140,40,144" dtype_id="10">
                             <const fl="d40" loc="d,40,140,40,144" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d40" loc="d,40,138,40,139" dtype_id="10">
@@ -1023,18 +1023,18 @@
           </begin>
         </if>
         <if fl="d41" loc="d,41,10,41,12">
-          <neq fl="d41" loc="d,41,34,41,37" dtype_id="11">
+          <neq fl="d41" loc="d,41,34,41,37" dtype_id="8">
             <const fl="d41" loc="d,41,39,41,42" name="4&apos;h3" dtype_id="5"/>
             <arraysel fl="d41" loc="d,41,25,41,29" dtype_id="5">
-              <varref fl="d41" loc="d,41,25,41,29" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d41" loc="d,41,25,41,29" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d41" loc="d,41,25,41,29" dtype_id="10">
                 <const fl="d41" loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d41" loc="d,41,25,41,29" dtype_id="10">
-                  <varref fl="d41" loc="d,41,25,41,29" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d41" loc="d,41,25,41,29" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d41" loc="d,41,25,41,29" dtype_id="10">
                     <const fl="d41" loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d41" loc="d,41,17,41,21" dtype_id="10">
-                      <varref fl="d41" loc="d,41,17,41,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d41" loc="d,41,17,41,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d41" loc="d,41,17,41,21" dtype_id="10">
                         <const fl="d41" loc="d,41,17,41,21" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d41" loc="d,41,15,41,16" dtype_id="10">
@@ -1051,15 +1051,15 @@
             <display fl="d41" loc="d,41,51,41,57" displaytype="$write">
               <sformatf fl="d41" loc="d,41,51,41,57" name="%%Error: t/t_enum_type_methods.v:41:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                 <arraysel fl="d41" loc="d,41,140,41,144" dtype_id="5">
-                  <varref fl="d41" loc="d,41,140,41,144" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d41" loc="d,41,140,41,144" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d41" loc="d,41,140,41,144" dtype_id="10">
                     <const fl="d41" loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d41" loc="d,41,140,41,144" dtype_id="10">
-                      <varref fl="d41" loc="d,41,140,41,144" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d41" loc="d,41,140,41,144" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d41" loc="d,41,140,41,144" dtype_id="10">
                         <const fl="d41" loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
                         <arraysel fl="d41" loc="d,41,132,41,136" dtype_id="10">
-                          <varref fl="d41" loc="d,41,132,41,136" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d41" loc="d,41,132,41,136" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d41" loc="d,41,132,41,136" dtype_id="10">
                             <const fl="d41" loc="d,41,132,41,136" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d41" loc="d,41,130,41,131" dtype_id="10">
@@ -1077,18 +1077,18 @@
           </begin>
         </if>
         <if fl="d42" loc="d,42,10,42,12">
-          <neq fl="d42" loc="d,42,26,42,29" dtype_id="11">
+          <neq fl="d42" loc="d,42,26,42,29" dtype_id="8">
             <const fl="d42" loc="d,42,31,42,34" name="4&apos;h3" dtype_id="5"/>
             <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="5">
-              <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+              <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="11"/>
               <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
                 <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                  <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
                     <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                      <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d42" loc="d,42,17,42,21" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
                         <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d42" loc="d,42,15,42,16" dtype_id="10">
@@ -1105,15 +1105,15 @@
             <display fl="d42" loc="d,42,43,42,49" displaytype="$write">
               <sformatf fl="d42" loc="d,42,43,42,49" name="%%Error: t/t_enum_type_methods.v:42:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
                 <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="5">
-                  <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                  <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                   <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
                     <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                      <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                      <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                       <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
                         <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
                         <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                          <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="12"/>
+                          <varref fl="d42" loc="d,42,124,42,128" name="__Venumtab_enum_next0" dtype_id="11"/>
                           <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
                             <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
                             <ccast fl="d42" loc="d,42,122,42,123" dtype_id="10">
@@ -1131,10 +1131,10 @@
           </begin>
         </if>
         <if fl="d43" loc="d,43,10,43,12">
-          <neq fl="d43" loc="d,43,23,43,26" dtype_id="11">
+          <neq fl="d43" loc="d,43,23,43,26" dtype_id="8">
             <const fl="d43" loc="d,43,28,43,31" name="4&apos;h1" dtype_id="5"/>
             <arraysel fl="d43" loc="d,43,17,43,21" dtype_id="5">
-              <varref fl="d43" loc="d,43,17,43,21" name="__Venumtab_enum_prev1" dtype_id="13"/>
+              <varref fl="d43" loc="d,43,17,43,21" name="__Venumtab_enum_prev1" dtype_id="12"/>
               <and fl="d43" loc="d,43,17,43,21" dtype_id="10">
                 <const fl="d43" loc="d,43,17,43,21" name="32&apos;h7" dtype_id="6"/>
                 <ccast fl="d43" loc="d,43,15,43,16" dtype_id="10">
@@ -1147,7 +1147,7 @@
             <display fl="d43" loc="d,43,40,43,46" displaytype="$write">
               <sformatf fl="d43" loc="d,43,40,43,46" name="%%Error: t/t_enum_type_methods.v:43:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                 <arraysel fl="d43" loc="d,43,121,43,125" dtype_id="5">
-                  <varref fl="d43" loc="d,43,121,43,125" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d43" loc="d,43,121,43,125" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d43" loc="d,43,121,43,125" dtype_id="10">
                     <const fl="d43" loc="d,43,121,43,125" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d43" loc="d,43,119,43,120" dtype_id="10">
@@ -1161,10 +1161,10 @@
           </begin>
         </if>
         <if fl="d44" loc="d,44,10,44,12">
-          <neq fl="d44" loc="d,44,26,44,29" dtype_id="11">
+          <neq fl="d44" loc="d,44,26,44,29" dtype_id="8">
             <const fl="d44" loc="d,44,31,44,34" name="4&apos;h1" dtype_id="5"/>
             <arraysel fl="d44" loc="d,44,17,44,21" dtype_id="5">
-              <varref fl="d44" loc="d,44,17,44,21" name="__Venumtab_enum_prev1" dtype_id="13"/>
+              <varref fl="d44" loc="d,44,17,44,21" name="__Venumtab_enum_prev1" dtype_id="12"/>
               <and fl="d44" loc="d,44,17,44,21" dtype_id="10">
                 <const fl="d44" loc="d,44,17,44,21" name="32&apos;h7" dtype_id="6"/>
                 <ccast fl="d44" loc="d,44,15,44,16" dtype_id="10">
@@ -1177,7 +1177,7 @@
             <display fl="d44" loc="d,44,43,44,49" displaytype="$write">
               <sformatf fl="d44" loc="d,44,43,44,49" name="%%Error: t/t_enum_type_methods.v:44:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
                 <arraysel fl="d44" loc="d,44,124,44,128" dtype_id="5">
-                  <varref fl="d44" loc="d,44,124,44,128" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d44" loc="d,44,124,44,128" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d44" loc="d,44,124,44,128" dtype_id="10">
                     <const fl="d44" loc="d,44,124,44,128" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d44" loc="d,44,122,44,123" dtype_id="10">
@@ -1191,14 +1191,14 @@
           </begin>
         </if>
         <if fl="d45" loc="d,45,10,45,12">
-          <neq fl="d45" loc="d,45,34,45,37" dtype_id="11">
+          <neq fl="d45" loc="d,45,34,45,37" dtype_id="8">
             <const fl="d45" loc="d,45,39,45,42" name="4&apos;h4" dtype_id="5"/>
             <arraysel fl="d45" loc="d,45,25,45,29" dtype_id="5">
-              <varref fl="d45" loc="d,45,25,45,29" name="__Venumtab_enum_prev1" dtype_id="13"/>
+              <varref fl="d45" loc="d,45,25,45,29" name="__Venumtab_enum_prev1" dtype_id="12"/>
               <and fl="d45" loc="d,45,25,45,29" dtype_id="10">
                 <const fl="d45" loc="d,45,25,45,29" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d45" loc="d,45,17,45,21" dtype_id="10">
-                  <varref fl="d45" loc="d,45,17,45,21" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d45" loc="d,45,17,45,21" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d45" loc="d,45,17,45,21" dtype_id="10">
                     <const fl="d45" loc="d,45,17,45,21" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d45" loc="d,45,15,45,16" dtype_id="10">
@@ -1213,11 +1213,11 @@
             <display fl="d45" loc="d,45,51,45,57" displaytype="$write">
               <sformatf fl="d45" loc="d,45,51,45,57" name="%%Error: t/t_enum_type_methods.v:45:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                 <arraysel fl="d45" loc="d,45,140,45,144" dtype_id="5">
-                  <varref fl="d45" loc="d,45,140,45,144" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d45" loc="d,45,140,45,144" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d45" loc="d,45,140,45,144" dtype_id="10">
                     <const fl="d45" loc="d,45,140,45,144" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d45" loc="d,45,132,45,136" dtype_id="10">
-                      <varref fl="d45" loc="d,45,132,45,136" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                      <varref fl="d45" loc="d,45,132,45,136" name="__Venumtab_enum_prev1" dtype_id="12"/>
                       <and fl="d45" loc="d,45,132,45,136" dtype_id="10">
                         <const fl="d45" loc="d,45,132,45,136" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d45" loc="d,45,130,45,131" dtype_id="10">
@@ -1233,14 +1233,14 @@
           </begin>
         </if>
         <if fl="d46" loc="d,46,10,46,12">
-          <neq fl="d46" loc="d,46,26,46,29" dtype_id="11">
+          <neq fl="d46" loc="d,46,26,46,29" dtype_id="8">
             <const fl="d46" loc="d,46,31,46,34" name="4&apos;h4" dtype_id="5"/>
             <arraysel fl="d46" loc="d,46,17,46,21" dtype_id="5">
-              <varref fl="d46" loc="d,46,17,46,21" name="__Venumtab_enum_prev1" dtype_id="13"/>
+              <varref fl="d46" loc="d,46,17,46,21" name="__Venumtab_enum_prev1" dtype_id="12"/>
               <and fl="d46" loc="d,46,17,46,21" dtype_id="10">
                 <const fl="d46" loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
                 <arraysel fl="d46" loc="d,46,17,46,21" dtype_id="10">
-                  <varref fl="d46" loc="d,46,17,46,21" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d46" loc="d,46,17,46,21" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d46" loc="d,46,17,46,21" dtype_id="10">
                     <const fl="d46" loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
                     <ccast fl="d46" loc="d,46,15,46,16" dtype_id="10">
@@ -1255,11 +1255,11 @@
             <display fl="d46" loc="d,46,43,46,49" displaytype="$write">
               <sformatf fl="d46" loc="d,46,43,46,49" name="%%Error: t/t_enum_type_methods.v:46:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
                 <arraysel fl="d46" loc="d,46,124,46,128" dtype_id="5">
-                  <varref fl="d46" loc="d,46,124,46,128" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                  <varref fl="d46" loc="d,46,124,46,128" name="__Venumtab_enum_prev1" dtype_id="12"/>
                   <and fl="d46" loc="d,46,124,46,128" dtype_id="10">
                     <const fl="d46" loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
                     <arraysel fl="d46" loc="d,46,124,46,128" dtype_id="10">
-                      <varref fl="d46" loc="d,46,124,46,128" name="__Venumtab_enum_prev1" dtype_id="13"/>
+                      <varref fl="d46" loc="d,46,124,46,128" name="__Venumtab_enum_prev1" dtype_id="12"/>
                       <and fl="d46" loc="d,46,124,46,128" dtype_id="10">
                         <const fl="d46" loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
                         <ccast fl="d46" loc="d,46,122,46,123" dtype_id="10">
@@ -1347,7 +1347,7 @@
           <begin>
             <assign fl="d51" loc="d,51,45,51,46" dtype_id="5">
               <arraysel fl="d51" loc="d,51,49,51,53" dtype_id="5">
-                <varref fl="d51" loc="d,51,49,51,53" name="__Venumtab_enum_next0" dtype_id="12"/>
+                <varref fl="d51" loc="d,51,49,51,53" name="__Venumtab_enum_next0" dtype_id="11"/>
                 <and fl="d51" loc="d,51,49,51,53" dtype_id="10">
                   <const fl="d51" loc="d,51,49,51,53" name="32&apos;h7" dtype_id="6"/>
                   <ccast fl="d51" loc="d,51,47,51,48" dtype_id="10">
@@ -1419,7 +1419,7 @@
         <if fl="d14" loc="d,14,10,14,13">
           <and fl="d14" loc="d,14,10,14,13" dtype_id="1">
             <varref fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="1"/>
-            <const fl="d14" loc="d,14,10,14,13" name="8&apos;hfe" dtype_id="14"/>
+            <const fl="d14" loc="d,14,10,14,13" name="8&apos;hfe" dtype_id="13"/>
           </and>
           <begin>
             <cstmt fl="d14" loc="d,14,10,14,13">
@@ -1442,7 +1442,7 @@
       <cuse fl="a0" loc="a,0,0,0,0" name="$unit"/>
     </module>
     <package fl="a0" loc="a,0,0,0,0" name="$unit" origName="__024unit">
-      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="12" vartype="" origName="__Venumtab_enum_next0">
+      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11" vartype="" origName="__Venumtab_enum_next0">
         <initarray>
           <inititem index="1">
             <const fl="d18" loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
@@ -1455,7 +1455,7 @@
           </inititem>
         </initarray>
       </var>
-      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="13" vartype="" origName="__Venumtab_enum_prev1">
+      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12" vartype="" origName="__Venumtab_enum_prev1">
         <initarray>
           <inititem index="1">
             <const fl="d19" loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
@@ -1484,10 +1484,10 @@
       <scope fl="a0" loc="a,0,0,0,0" name="$unit"/>
       <cfunc fl="a0" loc="a,0,0,0,0" name="_ctor_var_reset">
         <creset fl="d16" loc="d,16,12,16,16">
-          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="12"/>
+          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
         </creset>
         <creset fl="d16" loc="d,16,12,16,16">
-          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="13"/>
+          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
         </creset>
         <creset fl="d16" loc="d,16,12,16,16">
           <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
@@ -1511,7 +1511,7 @@
       <basicdtype fl="d32" loc="d,32,24,32,27" id="1" name="logic"/>
       <basicdtype fl="d52" loc="d,52,9,52,10" id="6" name="logic" left="31" right="0"/>
       <basicdtype fl="d16" loc="d,16,17,16,18" id="2" name="logic" left="3" right="0"/>
-      <enumdtype fl="d16" loc="d,16,12,16,16" id="15" name="t.my_t" sub_dtype_id="2">
+      <enumdtype fl="d16" loc="d,16,12,16,16" id="14" name="t.my_t" sub_dtype_id="2">
         <enumitem fl="d17" loc="d,17,10,17,13" name="E01" dtype_id="5">
           <const fl="d17" loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
         </enumitem>
@@ -1523,15 +1523,15 @@
         </enumitem>
       </enumdtype>
       <basicdtype fl="d22" loc="d,22,4,22,11" id="3" name="integer" left="31" right="0" signed="true"/>
-      <refdtype fl="d23" loc="d,23,4,23,8" id="16" name="my_t" sub_dtype_id="2"/>
+      <refdtype fl="d23" loc="d,23,4,23,8" id="15" name="my_t" sub_dtype_id="2"/>
       <basicdtype fl="d27" loc="d,27,4,27,10" id="4" name="string"/>
-      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="12" sub_dtype_id="2">
+      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="11" sub_dtype_id="2">
         <range fl="d16" loc="d,16,12,16,16">
           <const fl="d16" loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
           <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
         </range>
       </unpackarraydtype>
-      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="13" sub_dtype_id="2">
+      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="12" sub_dtype_id="2">
         <range fl="d16" loc="d,16,12,16,16">
           <const fl="d16" loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
           <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
@@ -1543,13 +1543,12 @@
           <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
         </range>
       </unpackarraydtype>
-      <refdtype fl="d51" loc="d,51,12,51,16" id="17" name="my_t" sub_dtype_id="2"/>
+      <refdtype fl="d51" loc="d,51,12,51,16" id="16" name="my_t" sub_dtype_id="2"/>
       <basicdtype fl="d22" loc="d,22,17,22,18" id="7" name="logic" left="31" right="0" signed="true"/>
       <basicdtype fl="d64" loc="d,64,3,64,4" id="5" name="logic" left="31" right="0"/>
       <basicdtype fl="d62" loc="d,62,14,62,16" id="8" name="logic" left="31" right="0"/>
       <basicdtype fl="d67" loc="d,67,13,67,17" id="10" name="logic" left="31" right="0"/>
-      <basicdtype fl="d68" loc="d,68,19,68,22" id="11" name="logic" left="31" right="0"/>
-      <basicdtype fl="d14" loc="d,14,10,14,13" id="14" name="logic" left="7" right="0"/>
+      <basicdtype fl="d14" loc="d,14,10,14,13" id="13" name="logic" left="7" right="0"/>
     </typetable>
     <constpool>
       <module fl="a0" loc="a,0,0,0,0" name="@CONST-POOL@" origName="@CONST-POOL@">
diff --git a/test_regress/t/t_xml_flat_vlvbound.out b/test_regress/t/t_xml_flat_vlvbound.out
index aafd3bcf6..0ccd4afa3 100644
--- a/test_regress/t/t_xml_flat_vlvbound.out
+++ b/test_regress/t/t_xml_flat_vlvbound.out
@@ -77,37 +77,37 @@
                 </gts>
               </begin>
               <begin>
-                <assign fl="d19" loc="d,19,14,19,15" dtype_id="6">
-                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="6">
-                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="7"/>
-                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="7">
+                <assign fl="d19" loc="d,19,14,19,15" dtype_id="5">
+                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="5">
+                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
+                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="6">
                       <varref fl="d19" loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
-                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="8">
+                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="7">
                         <muls fl="d19" loc="d,19,22,19,23" dtype_id="4">
                           <const fl="d19" loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
                           <varref fl="d19" loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                         </muls>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="9"/>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="9"/>
+                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
+                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
                       </sel>
                       <const fl="d19" loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
                     </sel>
                   </eq>
-                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="6">
+                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="5">
                     <varref fl="d19" loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
-                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="10">
+                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="9">
                       <varref fl="d19" loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="9"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="9"/>
+                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
+                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
                     </sel>
-                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="9"/>
+                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
                   </sel>
                 </assign>
               </begin>
               <begin>
                 <assign fl="d18" loc="d,18,24,18,26" dtype_id="3">
-                  <add fl="d18" loc="d,18,24,18,26" dtype_id="9">
-                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="9"/>
+                  <add fl="d18" loc="d,18,24,18,26" dtype_id="8">
+                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
                     <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                   </add>
                   <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
@@ -143,37 +143,37 @@
                 </gts>
               </begin>
               <begin>
-                <assign fl="d19" loc="d,19,14,19,15" dtype_id="6">
-                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="6">
-                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="7"/>
-                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="7">
+                <assign fl="d19" loc="d,19,14,19,15" dtype_id="5">
+                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="5">
+                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
+                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="6">
                       <varref fl="d19" loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
-                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="8">
+                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="7">
                         <muls fl="d19" loc="d,19,22,19,23" dtype_id="4">
                           <const fl="d19" loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
                           <varref fl="d19" loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                         </muls>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="9"/>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="9"/>
+                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
+                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
                       </sel>
                       <const fl="d19" loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
                     </sel>
                   </eq>
-                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="6">
+                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="5">
                     <varref fl="d19" loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
-                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="10">
+                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="9">
                       <varref fl="d19" loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="9"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="9"/>
+                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
+                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
                     </sel>
-                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="9"/>
+                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
                   </sel>
                 </assign>
               </begin>
               <begin>
                 <assign fl="d18" loc="d,18,24,18,26" dtype_id="3">
-                  <add fl="d18" loc="d,18,24,18,26" dtype_id="9">
-                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="9"/>
+                  <add fl="d18" loc="d,18,24,18,26" dtype_id="8">
+                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
                     <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                   </add>
                   <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
@@ -201,16 +201,15 @@
       <var fl="d17" loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3" vartype="integer" origName="__Vfunc_vlvbound_test__DOT__foo__1__i"/>
     </module>
     <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d18" loc="d,18,18,18,19" id="6" name="logic"/>
-      <basicdtype fl="d19" loc="d,19,34,19,39" id="7" name="logic" left="1" right="0"/>
+      <basicdtype fl="d18" loc="d,18,18,18,19" id="5" name="logic"/>
+      <basicdtype fl="d19" loc="d,19,34,19,39" id="6" name="logic" left="1" right="0"/>
       <basicdtype fl="d9" loc="d,9,11,9,16" id="1" name="logic" left="15" right="0"/>
       <basicdtype fl="d11" loc="d,11,12,11,17" id="2" name="logic" left="6" right="0"/>
       <basicdtype fl="d17" loc="d,17,5,17,12" id="3" name="integer" left="31" right="0" signed="true"/>
-      <basicdtype fl="d19" loc="d,19,10,19,11" id="10" name="logic" left="2" right="0" signed="true"/>
-      <basicdtype fl="d19" loc="d,19,11,19,12" id="9" name="logic" left="31" right="0"/>
-      <basicdtype fl="d19" loc="d,19,20,19,21" id="8" name="logic" left="3" right="0" signed="true"/>
+      <basicdtype fl="d19" loc="d,19,10,19,11" id="9" name="logic" left="2" right="0" signed="true"/>
+      <basicdtype fl="d19" loc="d,19,11,19,12" id="8" name="logic" left="31" right="0"/>
+      <basicdtype fl="d19" loc="d,19,20,19,21" id="7" name="logic" left="3" right="0" signed="true"/>
       <basicdtype fl="d18" loc="d,18,12,18,13" id="4" name="logic" left="31" right="0" signed="true"/>
-      <basicdtype fl="d18" loc="d,18,18,18,19" id="5" name="logic"/>
     </typetable>
   </netlist>
 </verilator_xml>