luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional fixes to the verilog parser, including handling the 

inline-I/O syntax with "wire" (e.g., "input wire [3:0] test")
and addressed the failure to add buses declared in inline I/O
to the list of known buses.
This commit is contained in:
Tim Edwards 2019-09-09 13:42:21 -04:00
parent ea4083893c
commit d38bd77825
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
base/verilog.c
View File

@ -661,7 +661,7 @@ void ReadVerilogFile(char *fname, int filenum, struct cellstack **CellStackPtr,
inlined_decls = (char)0; inlined_decls = (char)0;
if (tp != NULL) { if (tp != NULL) {
struct bus wb; struct bus wb, *nb;
PushStack(tp->name, CellStackPtr); PushStack(tp->name, CellStackPtr);
@ -725,7 +725,8 @@ void ReadVerilogFile(char *fname, int filenum, struct cellstack **CellStackPtr,
else { else {
if (!match(nexttok, "input") && !match(nexttok, "output") && if (!match(nexttok, "input") && !match(nexttok, "output") &&
!match(nexttok, "inout") && !match(nexttok, "real") && !match(nexttok, "inout") && !match(nexttok, "real") &&
!match(nexttok, "logic") && !match(nexttok, "integer")) { !match(nexttok, "wire") && !match(nexttok, "logic") &&
!match(nexttok, "integer")) {
if (match(nexttok, "[")) { if (match(nexttok, "[")) {
if (GetBusTok(&wb) != 0) { if (GetBusTok(&wb) != 0) {
// Didn't parse as a bus, so wing it // Didn't parse as a bus, so wing it
@ -747,6 +748,12 @@ void ReadVerilogFile(char *fname, int filenum, struct cellstack **CellStackPtr,
Port(portname); Port(portname);
} }
} }
/* Also register this port as a bus */
nb = NewBus();
nb->start = wb.start;
nb->end = wb.end;
HashPtrInstall(nexttok, nb, &buses);
wb.start = wb.end = -1; wb.start = wb.end = -1;
} }
else { else {
@ -1328,7 +1335,13 @@ skip_endmodule:
char localnet[100]; char localnet[100];
// Empty parens, so create a new local node // Empty parens, so create a new local node
savetok = (char)1; savetok = (char)1;
sprintf(localnet, "_noconnect_%d_", localcount++); if (arraystart != -1) {
/* No-connect on an instance array must also be an array */
sprintf(localnet, "_noconnect_%d_[%d:%d]", localcount++,
arraystart, arrayend);
}
else
sprintf(localnet, "_noconnect_%d_", localcount++);
new_port->net = strsave(localnet); new_port->net = strsave(localnet);
} }
else { else {