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

Add YS_FALLTHROUGH macro to mark case fall-through 

C++17 introduced [[fallthrough]], GCC and clang had their own vendored
attributes before that. MSVC doesn't seem to have such a warning at all.
This commit is contained in:
Xiretza 2020-05-04 21:12:30 +02:00
parent a299e606f8
commit 695150b037
No known key found for this signature in database
GPG Key ID: E51A6C6A1EB378ED
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/cxxrtl/cxxrtl.cc
View File

@ -2346,16 +2346,22 @@ struct CxxrtlBackend : public Backend {
case 6: case 6:
worker.max_opt_level = true; worker.max_opt_level = true;
worker.run_proc_flatten = true; worker.run_proc_flatten = true;
YS_FALLTHROUGH
case 5: case 5:
worker.run_opt_clean_purge = true; worker.run_opt_clean_purge = true;
YS_FALLTHROUGH
case 4: case 4:
worker.localize_public = true; worker.localize_public = true;
YS_FALLTHROUGH
case 3: case 3:
worker.elide_public = true; worker.elide_public = true;
YS_FALLTHROUGH
case 2: case 2:
worker.localize_internal = true; worker.localize_internal = true;
YS_FALLTHROUGH
case 1: case 1:
worker.elide_internal = true; worker.elide_internal = true;
YS_FALLTHROUGH
case 0: case 0:
break; break;
default: default:

4
backends/firrtl/firrtl.cc
View File

@ -343,7 +343,7 @@ struct FirrtlWorker
switch (dir) { switch (dir) {
case FD_INOUT: case FD_INOUT:
log_warning("Instance port connection %s.%s is INOUT; treating as OUT\n", cell_type.c_str(), log_signal(it->second)); log_warning("Instance port connection %s.%s is INOUT; treating as OUT\n", cell_type.c_str(), log_signal(it->second));
/* FALLTHRU */ YS_FALLTHROUGH
case FD_OUT: case FD_OUT:
sourceExpr = firstName; sourceExpr = firstName;
sinkExpr = secondExpr; sinkExpr = secondExpr;
@ -351,7 +351,7 @@ struct FirrtlWorker
break; break;
case FD_NODIRECTION: case FD_NODIRECTION:
log_warning("Instance port connection %s.%s is NODIRECTION; treating as IN\n", cell_type.c_str(), log_signal(it->second)); log_warning("Instance port connection %s.%s is NODIRECTION; treating as IN\n", cell_type.c_str(), log_signal(it->second));
/* FALLTHRU */ YS_FALLTHROUGH
case FD_IN: case FD_IN:
sourceExpr = secondExpr; sourceExpr = secondExpr;
sinkExpr = firstName; sinkExpr = firstName;

7
frontends/ast/genrtlil.cc
View File

@ -923,7 +923,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
} }
break; break;
} }
/* fall through */ YS_FALLTHROUGH
// everything should have been handled above -> print error if not. // everything should have been handled above -> print error if not.
default: default:
@ -1019,7 +1019,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
if (GetSize(children) >= 1 && children[0]->type == AST_CONSTANT) { if (GetSize(children) >= 1 && children[0]->type == AST_CONSTANT) {
current_module->parameter_default_values[str] = children[0]->asParaConst(); current_module->parameter_default_values[str] = children[0]->asParaConst();
} }
/* fall through */ YS_FALLTHROUGH
case AST_LOCALPARAM: case AST_LOCALPARAM:
if (flag_pwires) if (flag_pwires)
{ {
@ -1807,7 +1807,8 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
is_signed = sign_hint; is_signed = sign_hint;
return SigSpec(wire); return SigSpec(wire);
} }
} /* fall through */ }
YS_FALLTHROUGH
// everything should have been handled above -> print error if not. // everything should have been handled above -> print error if not.
default: default:

2
frontends/ast/simplify.cc
View File

@ -91,7 +91,7 @@ std::string AstNode::process_format_str(const std::string &sformat, int next_arg
case 'D': case 'D':
if (got_len) if (got_len)
goto unsupported_format; goto unsupported_format;
/* fall through */ YS_FALLTHROUGH
case 'x': case 'x':
case 'X': case 'X':
if (next_arg >= GetSize(children)) if (next_arg >= GetSize(children))

10
kernel/yosys.h
View File

@ -155,6 +155,16 @@ extern Tcl_Obj *Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *p
# define YS_NORETURN # define YS_NORETURN
#endif #endif
#if __cplusplus >= 201703L
# define YS_FALLTHROUGH [[fallthrough]];
#elif defined(__GNUC__)
# define YS_FALLTHROUGH [[gnu::fallthrough]];
#elif defined(__clang__)
# define YS_FALLTHROUGH [[clang::fallthrough]];
#else
# define YS_FALLTHROUGH
#endif
YOSYS_NAMESPACE_BEGIN YOSYS_NAMESPACE_BEGIN
// Note: All headers included in hashlib.h must be included // Note: All headers included in hashlib.h must be included