mirror of https://github.com/YosysHQ/yosys.git
Merge branch 'YosysHQ:main' into main
This commit is contained in:
commit
7191be492c
2
Makefile
2
Makefile
|
|
@ -176,7 +176,7 @@ ifeq ($(OS), Haiku)
|
|||
CXXFLAGS += -D_DEFAULT_SOURCE
|
||||
endif
|
||||
|
||||
YOSYS_VER := 0.52+137
|
||||
YOSYS_VER := 0.52+139
|
||||
YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
|
||||
YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2)
|
||||
YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'.' -f3)
|
||||
|
|
|
|||
|
|
@ -1769,7 +1769,7 @@ value<BitsY> shr_uu(const value<BitsA> &a, const value<BitsB> &b) {
|
|||
template<size_t BitsY, size_t BitsA, size_t BitsB>
|
||||
CXXRTL_ALWAYS_INLINE
|
||||
value<BitsY> shr_su(const value<BitsA> &a, const value<BitsB> &b) {
|
||||
return a.shr(b).template scast<BitsY>();
|
||||
return a.template scast<BitsY>().shr(b);
|
||||
}
|
||||
|
||||
template<size_t BitsY, size_t BitsA, size_t BitsB>
|
||||
|
|
|
|||
|
|
@ -2249,7 +2249,8 @@ cell_parameter:
|
|||
node->children.push_back($1);
|
||||
} |
|
||||
'.' TOK_ID '(' ')' {
|
||||
// just ignore empty parameters
|
||||
// delete unused TOK_ID
|
||||
delete $2;
|
||||
} |
|
||||
'.' TOK_ID '(' expr ')' {
|
||||
AstNode *node = new AstNode(AST_PARASET);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
logger -expect-no-warnings
|
||||
read_verilog << EOF
|
||||
module bar (
|
||||
input portname
|
||||
);
|
||||
parameter paramname = 7;
|
||||
endmodule
|
||||
|
||||
module empty (
|
||||
);
|
||||
bar #() barinstance ();
|
||||
endmodule
|
||||
|
||||
module implicit (
|
||||
);
|
||||
bar #(.paramname()) barinstance (.portname());
|
||||
endmodule
|
||||
|
||||
module explicit (
|
||||
input a
|
||||
);
|
||||
bar #(.paramname(3)) barinstance (.portname(a));
|
||||
endmodule
|
||||
EOF
|
||||
Loading…
Reference in New Issue