caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change assert to error

Browse Source
This commit is contained in:
Ross Schlaikjer 2020-04-07 14:42:27 -04:00
parent e46b990251
commit fc591421f9
No known key found for this signature in database
GPG Key ID: 3C4CAA5FEDEF28DA
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ecp5/pack.cc
View File

@ -2972,6 +2972,7 @@ bool Arch::pack()
void Arch::assignArchInfo() void Arch::assignArchInfo()
{ {
Context *ctx = getCtx();
for (auto cell : sorted(cells)) { for (auto cell : sorted(cells)) {
CellInfo *ci = cell.second; CellInfo *ci = cell.second;
if (ci->type == id_TRELLIS_SLICE) { if (ci->type == id_TRELLIS_SLICE) {
@ -3008,10 +3009,12 @@ void Arch::assignArchInfo()
// Output register mode (REGMODE_{A,B}). Valid options are 'NOREG' and 'OUTREG'. // Output register mode (REGMODE_{A,B}). Valid options are 'NOREG' and 'OUTREG'.
std::string regmode_a = str_or_default(ci->params, id("REGMODE_A"), "NOREG"); std::string regmode_a = str_or_default(ci->params, id("REGMODE_A"), "NOREG");
if (regmode_a != "NOREG" && regmode_a != "OUTREG") if (regmode_a != "NOREG" && regmode_a != "OUTREG")
NPNR_ASSERT_FALSE_STR("bad DP16KD REGMODE_A configuration '" + regmode_a + "'"); log_error("DP16KD %s has invalid REGMODE_A configuration '%s'\n", ci->name.c_str(ctx),
regmode_a.c_str());
std::string regmode_b = str_or_default(ci->params, id("REGMODE_B"), "NOREG"); std::string regmode_b = str_or_default(ci->params, id("REGMODE_B"), "NOREG");
if (regmode_b != "NOREG" && regmode_b != "OUTREG") if (regmode_b != "NOREG" && regmode_b != "OUTREG")
NPNR_ASSERT_FALSE_STR("bad DP16KD REGMODE_B configuration '" + regmode_b + "'"); log_error("DP16KD %s has invalid REGMODE_B configuration '%s'\n", ci->name.c_str(ctx),
regmode_b.c_str());
ci->ramInfo.is_output_a_registered = regmode_a == "OUTREG"; ci->ramInfo.is_output_a_registered = regmode_a == "OUTREG";
ci->ramInfo.is_output_b_registered = regmode_b == "OUTREG"; ci->ramInfo.is_output_b_registered = regmode_b == "OUTREG";