Merge pull request #1658 from SAY-5/fix-gh1542-wide-enum2

Support 2-state enums wider than 64 bits

Author: caryr

ivtest/ivltests/br_gh1542.v

@@ -0,0 +1,26 @@
+// Check that a 2-state enum wider than 64 bits is supported.
+
+module test;
+  typedef enum bit [64:0] {
+    LOW = 65'h1,
+    HIGH = 65'h1_0000_0000_0000_0001
+  } code_t;
+
+  code_t value;
+  bit failed = 1'b0;
+
+  initial begin
+    value = HIGH;
+    if (value !== 65'h1_0000_0000_0000_0001 || value.name() != "HIGH") begin
+      $display("FAILED: value=%h name=%s", value, value.name());
+      failed = 1'b1;
+    end
+    if (value.next() !== LOW || value.prev() !== LOW) begin
+      $display("FAILED: next=%h prev=%h", value.next(), value.prev());
+      failed = 1'b1;
+    end
+    if (!failed) begin
+      $display("PASSED");
+    end
+  end
+endmodule

ivtest/regress-vvp.list

@@ -116,6 +116,7 @@ br_gh1385c			vvp_tests/br_gh1385c.json
 br_gh1407			vvp_tests/br_gh1407.json
 br_gh1512			vvp_tests/br_gh1512.json
 br_gh1541			vvp_tests/br_gh1541.json
+br_gh1542			vvp_tests/br_gh1542.json
 br_gh1554a			vvp_tests/br_gh1554a.json
 br_gh1554b			vvp_tests/br_gh1554b.json
 br_gh1557			vvp_tests/br_gh1557.json

ivtest/vvp_tests/br_gh1542.json

@@ -0,0 +1,10 @@
+{
+    "type"          : "normal",
+    "source"        : "br_gh1542.v",
+    "iverilog-args" : [ "-g2005-sv" ],
+    "vlog95" : {
+        "__comment"     : "Enum expressions are not supported",
+        "type"          : "CE",
+        "iverilog-args" : [ "-pallowsigned=1" ]
+    }
+}

tgt-vvp/draw_enum.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2010-2026 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -24,13 +24,16 @@
 # include  <assert.h>
 # include  <inttypes.h>
 
-// HERE: This still needs work! Fall back to <width>'b format for
-//       very large constants. We also should pass the file and
+// HERE: This still needs work! We should pass the file and
 //       line number information for the enum type and the MSB and
 //       LSB should be used instead of the width.
+
+static void draw_enum4_value(ivl_enumtype_t enumtype, unsigned idx);
+
 /*
  * If it fits we always print this as a uint64_t the run time will turn
- * it back into a signed value when needed.
+ * it back into a signed value when needed. Wider values are printed in
+ * the <width>'b format.
  */
 static void draw_enum2_value(ivl_enumtype_t enumtype, unsigned idx)
 {
@@ -39,9 +42,11 @@ static void draw_enum2_value(ivl_enumtype_t enumtype, unsigned idx)
       const char*bit;
       unsigned len = strlen(bits);
 
-// HERE: If this doesn't fit then write it as a enum4 and modify the run
-//       time to deal with the conversion.
-      assert(len <= sizeof(uint64_t)*8);
+      if (len > sizeof(uint64_t)*8) {
+	    draw_enum4_value(enumtype, idx);
+	    return;
+      }
+
       val = 0;
       for (bit = bits, mask = 1 ; *bit != 0 ; bit += 1, mask <<= 1) {
 	    if (*bit == '1')

vvp/enum_type.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2025 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2010-2026 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -147,9 +147,14 @@ void compile_enum2_type(char*label, long width, bool signed_flag,
       size_t idx = 0;
       for (list<struct enum_name_s>::iterator cur = names->begin()
 		 ; cur != names->end() ;  ++cur, ++idx) {
-	    assert(cur->val4 == 0);
 	    spec->names[idx].name = cur->text;
-	    spec->names[idx].val2 = vvp_vector2_t(cur->val2, width);
+	    if (cur->val4) {
+		  spec->names[idx].val2 = vvp_vector2_t(vector4_from_text(cur->val4, width));
+		  free(cur->val4);
+		  cur->val4 = 0;
+	    } else {
+		  spec->names[idx].val2 = vvp_vector2_t(cur->val2, width);
+	    }
 	    spec->names[idx].is_signed = signed_flag;
       }