mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-19 04:13:39 +00:00
Code Activity

Merge pull request #2164 from madebr/msvc

Browse source 
Get yosys building on Visual Studio
This commit is contained in:
Miodrag Milanović 2020-06-18 12:44:21 +02:00 • committed by GitHub
commit 2123019ac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontends/verilog/preproc.cc
View file

@ -591,7 +591,7 @@ read_define_args()
default: default:
// The only FSM states are 0-2 and we dealt with 2 at the start of the loop. // The only FSM states are 0-2 and we dealt with 2 at the start of the loop.
__builtin_unreachable(); log_assert(false);
} }
} }

2
frontends/verilog/verilog_parser.y
View file

@ -1481,7 +1481,7 @@ enum_name_decl:
delete $1; delete $1;
SET_AST_NODE_LOC(node, @1, @1); SET_AST_NODE_LOC(node, @1, @1);
delete node->children[0]; delete node->children[0];
node->children[0] = $2 ?: new AstNode(AST_NONE); node->children[0] = $2 ? $2 : new AstNode(AST_NONE);
astbuf2->children.push_back(node); astbuf2->children.push_back(node);
} }
; ;

6
kernel/yosys.h
View file

@ -117,12 +117,12 @@ extern Tcl_Obj *Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *p
# define PATH_MAX MAX_PATH # define PATH_MAX MAX_PATH
# define isatty _isatty # define isatty _isatty
# define fileno _fileno # define fileno _fileno
# else # endif
// mingw includes `wingdi.h` which defines a TRANSPARENT macro
// mingw and msvc include `wingdi.h` which defines a TRANSPARENT macro
// that conflicts with X(TRANSPARENT) entry in kernel/constids.inc // that conflicts with X(TRANSPARENT) entry in kernel/constids.inc
# undef TRANSPARENT # undef TRANSPARENT
#endif #endif
#endif
#ifndef PATH_MAX #ifndef PATH_MAX
# define PATH_MAX 4096 # define PATH_MAX 4096

10
passes/techmap/extract_counter.cc
View file

@ -795,11 +795,11 @@ struct ExtractCounterPass : public Pass {
pool<RTLIL::IdString> _parallel_cells; pool<RTLIL::IdString> _parallel_cells;
CounterExtractionSettings settings CounterExtractionSettings settings
{ {
.parallel_cells = _parallel_cells, _parallel_cells, // parallel_cells
.maxwidth = 64, 64, // maxwidth
.minwidth = 2, 2, // minwidth
.allow_arst = true, true, // allow_arst
.allowed_dirs = 0, 0, // allowed_dirs
}; };
size_t argidx; size_t argidx;