Generate x out for x select on wide muxes.

vvp/draw_tt.c

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: draw_tt.c,v 1.13 2002/08/12 01:35:08 steve Exp $"
+#ident "$Id: draw_tt.c,v 1.14 2002/08/29 03:04:01 steve Exp $"
 #endif
 
 # include  <stdio.h>
@@ -284,6 +284,44 @@ static void draw_NMOS(void)
       printf("};\n");
 }
 
+static void draw_MUXX(void)
+{
+      unsigned i0, i1, i2, i3;
+
+      printf("const unsigned char ft_MUXX[64] = {");
+
+      for (i3 = 0 ;  i3 < 4 ;  i3 += 1)
+	    for (i2 = 0 ;  i2 < 4 ;  i2 += 1) {
+		  printf("\n    ");
+		  for (i1 = 0 ;  i1 < 4 ;  i1 += 1) {
+			unsigned idx = (i3 << 4) | (i2 << 2) | i1;
+			unsigned char byte = 0;
+
+			for (i0 = 0 ; i0 < 4 ;  i0 += 1) {
+			      unsigned val;
+			      if (i3 == 0)
+				    val = 3;
+			      else if (i3 == 2)
+				    val = 2;
+			      else if (i3 == 3)
+				    val = 2;
+			      else if (i2 >= 2) {
+				    val = 2;
+			      } else if (i2 == 0)
+				    val = i0;
+			      else
+				    val = i1;
+
+			      byte |= val << (i0*2);
+			}
+
+			printf("0x%02x, ", byte);
+		  }
+	    }
+
+      printf("};\n");
+}
+
 static void draw_MUXZ(void)
 {
       unsigned i0, i1, i2, i3;
@@ -628,6 +666,7 @@ main()
       draw_BUFZ();
       draw_PMOS();
       draw_NMOS();
+      draw_MUXX();
       draw_MUXZ();
       draw_EEQ();
       draw_NAND();
@@ -643,6 +682,9 @@ main()
 
 /*
  * $Log: draw_tt.c,v $
+ * Revision 1.14  2002/08/29 03:04:01  steve
+ *  Generate x out for x select on wide muxes.
+ *
  * Revision 1.13  2002/08/12 01:35:08  steve
  *  conditional ident string using autoconfig.
  *

vvp/logic.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: logic.cc,v 1.10 2002/08/12 01:35:08 steve Exp $"
+#ident "$Id: logic.cc,v 1.11 2002/08/29 03:04:01 steve Exp $"
 #endif
 
 # include  "logic.h"
@@ -112,6 +112,9 @@ void compile_functor(char*label, char*type,
       } else if (strcmp(type, "RNMOS") == 0) {
 	    obj = new vvp_rnmos_s;
 
+      } else if (strcmp(type, "MUXX") == 0) {
+	    obj = new table_functor_s(ft_MUXX);
+
       } else if (strcmp(type, "MUXZ") == 0) {
 	    obj = new table_functor_s(ft_MUXZ);
 
@@ -164,6 +167,9 @@ void compile_functor(char*label, char*type,
 
 /*
  * $Log: logic.cc,v $
+ * Revision 1.11  2002/08/29 03:04:01  steve
+ *  Generate x out for x select on wide muxes.
+ *
  * Revision 1.10  2002/08/12 01:35:08  steve
  *  conditional ident string using autoconfig.
  *

vvp/logic.h

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: logic.h,v 1.5 2002/08/12 01:35:08 steve Exp $"
+#ident "$Id: logic.h,v 1.6 2002/08/29 03:04:01 steve Exp $"
 #endif
 
 # include  "functor.h"
@@ -51,6 +51,7 @@ extern const unsigned char ft_BUFIF1[];
 extern const unsigned char ft_BUFZ[];
 extern const unsigned char ft_PMOS[];
 extern const unsigned char ft_NMOS[];
+extern const unsigned char ft_MUXX[];
 extern const unsigned char ft_MUXZ[];
 extern const unsigned char ft_EEQ[];
 extern const unsigned char ft_NAND[];
@@ -63,6 +64,9 @@ extern const unsigned char ft_var[];
 
 /*
  * $Log: logic.h,v $
+ * Revision 1.6  2002/08/29 03:04:01  steve
+ *  Generate x out for x select on wide muxes.
+ *
  * Revision 1.5  2002/08/12 01:35:08  steve
  *  conditional ident string using autoconfig.
  *