mirror of
https://github.com/YosysHQ/yosys
synced 2025-08-03 01:40:23 +00:00
Merge f78cd9d13f
into 366cb5e6dd
This commit is contained in:
commit
fd2e0ba97e
2 changed files with 51 additions and 14 deletions
|
@ -20,12 +20,15 @@ struct RaiseErrorPass : public Pass {
|
|||
log(" -stderr\n");
|
||||
log(" Log error messages directly to stderr instead of using 'log_error'.\n");
|
||||
log("\n");
|
||||
log(" -always\n");
|
||||
log(" Raise an error even if the 'raise_error' attribute is missing.\n");
|
||||
log("\n");
|
||||
}
|
||||
void execute(vector<string> args, RTLIL::Design *design) override
|
||||
{
|
||||
log_header(design, "Executing RAISE_ERROR pass.\n");
|
||||
|
||||
bool use_stderr = false;
|
||||
bool use_stderr = false, always = false;
|
||||
|
||||
int argidx;
|
||||
for (argidx = 1; argidx < GetSize(args); argidx++)
|
||||
|
@ -34,6 +37,10 @@ struct RaiseErrorPass : public Pass {
|
|||
use_stderr = true;
|
||||
continue;
|
||||
}
|
||||
if (args[argidx] == "-always") {
|
||||
always = true;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -55,27 +62,40 @@ struct RaiseErrorPass : public Pass {
|
|||
if (err_obj != nullptr) break;
|
||||
}
|
||||
|
||||
|
||||
if (err_obj == nullptr && !always) {
|
||||
log("'raise_error' attribute not found\n");
|
||||
return;
|
||||
}
|
||||
|
||||
int err_no = 1;
|
||||
string err_msg = "";
|
||||
if (err_obj != nullptr) {
|
||||
log("Raising error from '%s'.\n", log_id(err_obj));
|
||||
auto err_no = err_obj->attributes[ID::raise_error].as_int();
|
||||
if (err_no < 256) {
|
||||
log_flush();
|
||||
} else {
|
||||
auto err_msg = err_obj->get_string_attribute(ID::raise_error);
|
||||
if (use_stderr) {
|
||||
std::cerr << err_msg << std::endl;
|
||||
err_no = 1;
|
||||
} else {
|
||||
log_error("%s\n", err_msg.c_str());
|
||||
}
|
||||
err_no = err_obj->attributes[ID::raise_error].as_int();
|
||||
if (err_no > 256) {
|
||||
err_msg = err_obj->get_string_attribute(ID::raise_error);
|
||||
err_no = 1;
|
||||
}
|
||||
} else {
|
||||
err_msg = "No 'raise_error' attribute found";
|
||||
}
|
||||
|
||||
if (err_msg.size() > 0) {
|
||||
if (use_stderr) {
|
||||
std::cerr << err_msg << std::endl;
|
||||
} else {
|
||||
log_error("%s\n", err_msg.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
if (err_no < 256) {
|
||||
log_flush();
|
||||
#if defined(_MSC_VER)
|
||||
_exit(err_no);
|
||||
#else
|
||||
_Exit(err_no);
|
||||
#endif
|
||||
} else {
|
||||
log("'raise_error' attribute not found\n");
|
||||
}
|
||||
}
|
||||
} RaiseErrorPass;
|
||||
|
|
|
@ -14,12 +14,24 @@ EOF
|
|||
select -assert-mod-count 3 =*
|
||||
design -stash read
|
||||
|
||||
# empty design does not raise_error
|
||||
design -reset
|
||||
logger -expect log "'raise_error' attribute not found" 1
|
||||
raise_error
|
||||
logger -check-expected
|
||||
|
||||
# raise_error with int exits with status
|
||||
design -load read
|
||||
bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 7
|
||||
select -assert-mod-count 1 =*
|
||||
select -assert-mod-count 1 top
|
||||
|
||||
# raise_error -always still uses 'raise_error' attribute if possible
|
||||
design -load read
|
||||
bugpoint -suffix error -yosys ../../yosys -command "raise_error -always" -expect-return 7
|
||||
select -assert-mod-count 1 =*
|
||||
select -assert-mod-count 1 top
|
||||
|
||||
# raise_error with string prints message and exits with 1
|
||||
design -load read
|
||||
rename top abc
|
||||
|
@ -41,3 +53,8 @@ rename top abc
|
|||
bugpoint -suffix error -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
|
||||
select -assert-mod-count 1 =*
|
||||
select -assert-mod-count 1 other
|
||||
|
||||
# empty design can raise_error -always
|
||||
design -reset
|
||||
bugpoint -suffix error -yosys ../../yosys -command "raise_error -always" -grep "ERROR: No 'raise_error' attribute found" -expect-return 1
|
||||
bugpoint -suffix error -yosys ../../yosys -command "raise_error -always -stderr" -err-grep "No 'raise_error' attribute found" -expect-return 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue