Merge branch 'vector4_format'

nickg · Apr 21, 2008 · 5ab0c20 · 5ab0c20
2 parents 35e511d + 935c3dc
commit 5ab0c20
Show file tree

Hide file tree

Showing 15 changed files with 453 additions and 1,186 deletions.
diff --git a/vvp/compile.cc b/vvp/compile.cc
@@ -1444,10 +1444,10 @@ void compile_resolver(char*label, char*type, unsigned argc, struct symb_s*argv)
 	    obj = new resolv_functor(vvp_scalar_t(BIT4_1, 5));
 
       } else if (strcmp(type,"triand") == 0) {
-	    obj = new table_functor_s(ft_TRIAND);
+	    obj = new resolv_triand;
 
       } else if (strcmp(type,"trior") == 0) {
-	    obj = new table_functor_s(ft_TRIOR);
+	    obj = new resolv_trior;
 
       } else {
 	    fprintf(stderr, "invalid resolver type: %s\n", type);