Move CARRY4 to use Verilog to XML scripts

Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py
index c15bffc..f81ebbb 100755
--- a/vlog_to_pbtype.py
+++ b/vlog_to_pbtype.py
@@ -10,7 +10,7 @@
     This will also set the BLIF model to be `.subckt <name>` unless CLASS is
     also specified.
 
-    - `(* CLASS="lut|routing|flipflop|mem" *)` : specify the class of an given
+    - `(* CLASS="lut|routing|mux|flipflop|mem" *)` : specify the class of an given
     instance.
 
     - `(* ALTERNATIVE_TO="module" *)` : specify the module is one of several
@@ -103,15 +103,15 @@
     # Process type and class of module
     mod_cls = mod.CLASS
     if mod_cls == "routing":
-        return "BLK_RX-" + mod.name
+        return "BEL_RX-" + mod.name
     elif mod_cls == "mux":
-        return "BLK_MX-" + mod.name
+        return "BEL_MX-" + mod.name
     elif mod_cls == "flipflop":
-        return "BLK_FF-" + mod.name
+        return "BEL_FF-" + mod.name
     elif mod_cls == "lut":
-        return "BLK_LT-" + mod.name
+        return "BEL_LT-" + mod.name
     elif is_blackbox and not has_modes:
-        return "BLK_BB-" + mod.name
+        return "BEL_BB-" + mod.name
     else:
         #TODO: other types
         return "BLK_IG-" + mod.name
@@ -155,7 +155,7 @@
             module_path = os.path.dirname(module_file)
             module_basename = os.path.basename(module_file)
             # Heuristic for autogenerated files from w.py
-            wm = re.match(r"sim\.([A-Za-z0-9]+)\.v", module_basename)
+            wm = re.match(r"sim\.([A-Za-z0-9_]+)\.v", module_basename)
             if wm:
                 pb_type_path = "%s/pb_type.%s.xml" % (module_path, wm.group(1))
             else: