Merge branch 'master' into netgen-1.5

Corrected a bounds check on sub-arrays inside bundles, that prevents
the bundle from being parsed correctly when any sub-array is only one bit wide.
2026-08-22 14:07:07 +02:00 · 2020-08-04 03:00:31 -04:00 · 2020-08-03 22:57:19 -04:00 · 2020-08-03 11:49:09 -04:00
2 changed files with 18 additions and 5 deletions
@@ -1 +1 @@
-1.5.153
+1.5.154
@@ -1225,7 +1225,12 @@ skip_endmodule:
 		    lhs = LookupObject(nodename, CurrentCell);
 		    *aptr = '[';
 		}
-		else strcpy(noderoot, nexttok);
+		else {
+		    strcpy(noderoot, nexttok);
+		    /* Set LHS to the start of the vector */
+		    sprintf(nodename, "%s[%d]", nexttok, wb.start);
+		    lhs = LookupObject(nodename, CurrentCell);
+		}
 	    }
 	    else {
 		lhs = LookupObject(nexttok, CurrentCell);
@@ -1290,13 +1295,21 @@ skip_endmodule:
 			if (rhs != NULL) {
 			    Printf("Improper assignment;  left-hand side cannot "
 					"be parsed.\n");
-			    Printf("Right-hand side is \"%s\".\n", rhs->name);
+			    if (j != -1)
+			    	Printf("Right-hand side is \"%s\".\n", assignroot);
+			    else
+			    	Printf("Right-hand side is \"%s\".\n", rhs->name);
+			    Printf("Improper expression is \"%s\".\n", nexttok);
 			    break;
 			}
 			if (lhs != NULL) {
 			    Printf("Improper assignment;  right-hand side cannot "
 					"be parsed.\n");
-			    Printf("Left-hand side is \"%s\".\n", lhs->name);
+			    if (i != -1)
+			    	Printf("Left-hand side is \"%s\".\n", noderoot);
+			    else
+			    	Printf("Left-hand side is \"%s\".\n", lhs->name);
+			    Printf("Improper expression is \"%s\".\n", nexttok);
 			    /* Not parsable, probably behavioral verilog? */
 			    Printf("Module '%s' is not structural verilog, "
 				    "making black-box.\n", model);
@@ -1854,7 +1867,7 @@ nextinst:
 		     if (is_bundle &&
 			    ((i == -1) ||
 			    ((wbb.start > wbb.end) && (i < wbb.end)) ||
-			    ((wbb.start < wbb.end) && (i > wbb.end)))) {
+			    ((wbb.start <= wbb.end) && (i > wbb.end)))) {
 		         if (bptr) *bptr = '[';

 			 netname = cptr + 1;
Author	SHA1	Message	Date
Tim Edwards	ed5276d67b	Merge branch 'master' into netgen-1.5	2020-08-04 03:00:31 -04:00
Tim Edwards	82be18ec4b	Corrected a bounds check on sub-arrays inside bundles, that prevents the bundle from being parsed correctly when any sub-array is only one bit wide.	2020-08-03 22:57:19 -04:00
Tim Edwards	4ee3a1464b	Corrected the left-hand side assignment for "assign" statements and corrected the error statement so that it refers both to the (corrected) left-hand side and also the portion of the right-hand side that cannot be parsed as structural verilog.	2020-08-03 11:49:09 -04:00
@@ -1 +1 @@
 .5.153
 .5.154