From d2a18e01f2359f66a1ea3b240fea9ba4a2097ebf Mon Sep 17 00:00:00 2001
From: Zachary Snow <zach@zachjs.com>
Date: Thu, 3 Jun 2021 21:18:32 -0400
Subject: [PATCH] replace integer unsigned with size-32 reg

---
 src/Convert/Unsigned.hs    | 2 ++
 test/basic/typeof_signed.v | 6 +++---
 test/lib/functions.sh      | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Convert/Unsigned.hs b/src/Convert/Unsigned.hs
index 36efd97..cb11928 100644
--- a/src/Convert/Unsigned.hs
+++ b/src/Convert/Unsigned.hs
@@ -24,4 +24,6 @@ convertType :: Type -> Type
 convertType (Implicit        Unsigned rs) = Implicit        Unspecified rs
 convertType (IntegerVector t Unsigned rs) = IntegerVector t Unspecified rs
 convertType (Net           t Unsigned rs) = Net           t Unspecified rs
+convertType (IntegerAtom TInteger Unsigned) =
+    IntegerVector TReg Unspecified [(RawNum 31, RawNum 0)]
 convertType other = other
diff --git a/test/basic/typeof_signed.v b/test/basic/typeof_signed.v
index 3078e7e..0584cf8 100644
--- a/test/basic/typeof_signed.v
+++ b/test/basic/typeof_signed.v
@@ -1,6 +1,6 @@
 `define MAKE_PRIM(typ, base, size) \
     base [size-1:0] typ``_unspecified = 1; \
-    base unsigned [size-1:0] typ``_unsigned = 1; \
+    base [size-1:0] typ``_unsigned = 1; \
     base signed [size-1:0] typ``_signed = 1;
 
 module top;
@@ -18,8 +18,8 @@ module top;
     `MAKE_PRIM(shortint, reg, 16)
     `MAKE_PRIM(int, reg, 32)
     integer integer_unspecified = 1;
-    integer unsigned integer_unsigned = 1;
-    integer signed integer_signed = 1;
+    reg [31:0] integer_unsigned = 1;
+    integer integer_signed = 1;
     `MAKE_PRIM(longint, reg, 64)
 
     `MAKE_PRIM(bit, wire, 1)
diff --git a/test/lib/functions.sh b/test/lib/functions.sh
index 012ab70..c4fb31c 100644
--- a/test/lib/functions.sh
+++ b/test/lib/functions.sh
@@ -54,8 +54,8 @@ assertConverts() {
     assertTrue "2nd conversion of $ac_file failed" $?
     diff $ac_tmpa $ac_tmpb > /dev/null
     assertTrue "conversion of $ac_file not stable after the first iteration" $?
-    # using sed to remove quoted strings and integer unsigned
-    filtered=`sed -E -e 's/"([^"]|\")+"//g' -e 's/integer unsigned/integer/g' $ac_tmpa`
+    # using sed to remove quoted strings
+    filtered=`sed -E 's/"([^"]|\")+"//g' $ac_tmpa`
     # check for various things iverilog accepts which we don't want to output
     prefix="conversion of $ac_file still contains"
     assertNotMatch "$filtered" "$prefix dimension queries" \