Address comments. Add tests.

Author: carlosedp

core/src/main/scala/chisel3/StrongEnum.scala

@@ -279,7 +279,7 @@ abstract class EnumFactory {
   protected def do_Value(name: String): Type = {
     val result = new Type
 
-    val resId = if (!oneHot) id else BigInt(1 << id.toInt)
+    val resId = if (!oneHot) id else BigInt(1) << id.toInt
 
     // We have to use UnknownWidth here, because we don't actually know what the final width will be
     result.bindToLiteral(resId, UnknownWidth())

src/test/scala/chiselTests/OneHotMuxSpec.scala

@@ -4,6 +4,7 @@ package chiselTests
 
 import chisel3._
 import chisel3.experimental.FixedPoint
+import chisel3.experimental.ChiselEnum1H
 import chisel3.internal.ChiselException
 import chisel3.testers.BasicTester
 import chisel3.util.{Mux1H, UIntToOH}
@@ -51,6 +52,9 @@ class OneHotMuxSpec extends AnyFreeSpec with Matchers with ChiselRunners {
       })
     }
   }
+  "one hot mux with OneHotEnum should work" in {
+    assertTesterPasses(new OneHotEnumMux1HTester)
+  }
 
 }
 
@@ -304,3 +308,22 @@ class UIntToOHTester extends BasicTester {
 
   stop()
 }
+
+
+class OneHotEnumMux1HTester extends BasicTester {
+   object selector extends ChiselEnum1H {
+     val s0, s1, s2, s3 = Value
+   }
+   val selectorVal = Wire(UInt(selector.getWidth.W))
+   selectorVal := selector.s1.asUInt
+   val hotValue = chisel3.util.Mux1H(selectorVal.asUInt,
+      Seq(
+       2.U,
+       4.U,
+       8.U,
+       11.U,
+     ))
+    assert(hotValue === 4.U)
+
+    stop()
+  }

src/test/scala/chiselTests/StrongEnum.scala

@@ -4,6 +4,7 @@ package chiselTests
 
 import chisel3._
 import chisel3.experimental.ChiselEnum
+import chisel3.experimental.ChiselEnum1H
 import chisel3.internal.firrtl.UnknownWidth
 import chisel3.internal.naming.chiselName
 import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage}
@@ -513,6 +514,18 @@ class StrongEnumSpec extends ChiselFlatSpec with Utils {
   it should "correctly check if the enumeration is one of the values in a given sequence" in {
     assertTesterPasses(new IsOneOfTester)
   }
+
+  it should "check OneHot enums values" in {
+    object OneHotEnum extends ChiselEnum1H {
+	    val VAL1, VAL2, VAL3 = Value
+    }
+
+    var r = 1
+    for (enumVal <- OneHotEnum.all) {
+      assert(enumVal.litValue === r)
+      r = r << 1
+    }
+  }
 }
 
 class StrongEnumAnnotator extends Module {