riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed ilang parser for new RTLIL API

This commit is contained in:
Clifford Wolf 2014-07-27 11:56:35 +02:00
parent 49f72421d5
commit 6b34215efd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontends/ilang/parser.y
View File

@ -87,12 +87,12 @@ design:
module: module:
TOK_MODULE TOK_ID EOL { TOK_MODULE TOK_ID EOL {
if (current_design->modules.count($2) != 0) if (current_design->modules_.count($2) != 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of module %s.", $2).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of module %s.", $2).c_str());
current_module = new RTLIL::Module; current_module = new RTLIL::Module;
current_module->name = $2; current_module->name = $2;
current_module->attributes = attrbuf; current_module->attributes = attrbuf;
current_design->modules[$2] = current_module; current_design->modules_[$2] = current_module;
attrbuf.clear(); attrbuf.clear();
free($2); free($2);
} module_body TOK_END { } module_body TOK_END {
@ -125,7 +125,7 @@ wire_stmt:
current_wire->attributes = attrbuf; current_wire->attributes = attrbuf;
attrbuf.clear(); attrbuf.clear();
} wire_options TOK_ID EOL { } wire_options TOK_ID EOL {
if (current_module->wires.count($4) != 0) if (current_module->wires_.count($4) != 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of wire %s.", $4).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of wire %s.", $4).c_str());
current_module->rename(current_wire, $4); current_module->rename(current_wire, $4);
free($4); free($4);
@ -179,7 +179,7 @@ memory_options:
cell_stmt: cell_stmt:
TOK_CELL TOK_ID TOK_ID EOL { TOK_CELL TOK_ID TOK_ID EOL {
if (current_module->cells.count($3) != 0) if (current_module->cells_.count($3) != 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of cell %s.", $3).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of cell %s.", $3).c_str());
current_cell = current_module->addCell($3, $2); current_cell = current_module->addCell($3, $2);
current_cell->attributes = attrbuf; current_cell->attributes = attrbuf;
@ -357,21 +357,21 @@ sigspec:
delete $1; delete $1;
} | } |
TOK_ID { TOK_ID {
if (current_module->wires.count($1) == 0) if (current_module->wires_.count($1) == 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str());
$$ = new RTLIL::SigSpec(current_module->wires[$1]); $$ = new RTLIL::SigSpec(current_module->wires_[$1]);
free($1); free($1);
} | } |
TOK_ID '[' TOK_INT ']' { TOK_ID '[' TOK_INT ']' {
if (current_module->wires.count($1) == 0) if (current_module->wires_.count($1) == 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str());
$$ = new RTLIL::SigSpec(current_module->wires[$1], $3); $$ = new RTLIL::SigSpec(current_module->wires_[$1], $3);
free($1); free($1);
} | } |
TOK_ID '[' TOK_INT ':' TOK_INT ']' { TOK_ID '[' TOK_INT ':' TOK_INT ']' {
if (current_module->wires.count($1) == 0) if (current_module->wires_.count($1) == 0)
rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: wire %s not found", $1).c_str());
$$ = new RTLIL::SigSpec(current_module->wires[$1], $5, $3 - $5 + 1); $$ = new RTLIL::SigSpec(current_module->wires_[$1], $5, $3 - $5 + 1);
free($1); free($1);
} | } |
'{' sigspec_list '}' { '{' sigspec_list '}' {