Use LogicValue instead of Logic in software .map

intel · Oct 9, 2023 · 9296696 · 9296696
1 parent c3b3af2
commit 9296696
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/src/binary_gray.dart b/lib/src/binary_gray.dart
@@ -40,7 +40,8 @@ class BinaryToGrayConverter extends Module {
         for (var i = 0; i < (1 << inputWidth); i++)
           CaseItem(Const(i, width: inputWidth), [
             grayVal <
-                Const(binaryToGrayMap(Const(i, width: inputWidth)).swizzle(),
+                Const(
+                    binaryToGrayMap(LogicValue.ofInt(i, inputWidth)).swizzle(),
                     width: inputWidth)
           ])
       ])
@@ -60,8 +61,8 @@ class BinaryToGrayConverter extends Module {
   /// If [binary] has no bits, an empty list is returned.
   ///
   /// Returns a list of [LogicValue] representing the Gray code.
-  List<LogicValue> binaryToGrayMap(Logic binary) {
-    final reverseBit = binary.value.toList().swizzle();
+  List<LogicValue> binaryToGrayMap(LogicValue binary) {
+    final reverseBit = binary.toList().swizzle();
     final binList = reverseBit.toList().asMap().entries.map((entry) {
       final currentBit = entry.value;
       final idx = entry.key;
@@ -107,9 +108,10 @@ class GrayToBinaryConverter extends Module {
         [
           for (var i = 0; i < (1 << inputWidth); i++)
             CaseItem(Const(i, width: inputWidth), [
-              // Conditional assignment here
               binaryVal <
-                  Const(grayToBinaryMap(Const(i, width: inputWidth)).swizzle(),
+                  Const(
+                      grayToBinaryMap(LogicValue.ofInt(i, inputWidth))
+                          .swizzle(),
                       width: inputWidth),
             ]),
         ],
@@ -130,8 +132,8 @@ class GrayToBinaryConverter extends Module {
   /// If [gray] has no bits, an empty list is returned.
   ///
   /// Returns a list of [LogicValue] representing the binary representation.
-  List<LogicValue> grayToBinaryMap(Logic gray) {
-    final reverseGray = gray.value.toList().swizzle();
+  List<LogicValue> grayToBinaryMap(LogicValue gray) {
+    final reverseGray = gray.toList().swizzle();
     final grayList = reverseGray.toList();
     var previousBit = LogicValue.zero;