diff options
| author | Claire Xen <claire@clairexen.net> | 2022-02-11 16:03:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 16:03:12 +0100 |
| commit | 49545c73f7f5a5cf73d287fd371f2ff39311f621 (patch) | |
| tree | d0f20b8def36e551c6735d4fc6033aaa2633fe80 /misc | |
| parent | 90b40aa51f7d666792d4f0b1830ee75b81678a1f (diff) | |
| parent | e0165188669fcef2c5784c9916683889a2164e5d (diff) | |
| download | yosys-49545c73f7f5a5cf73d287fd371f2ff39311f621.tar.gz yosys-49545c73f7f5a5cf73d287fd371f2ff39311f621.tar.bz2 yosys-49545c73f7f5a5cf73d287fd371f2ff39311f621.zip | |
Merge branch 'master' into clk2ff-better-names
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/create_vcxsrc.sh | 15 | ||||
| -rw-r--r-- | misc/py_wrap_generator.py | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh index 924d2722e..e3c1ad991 100644 --- a/misc/create_vcxsrc.sh +++ b/misc/create_vcxsrc.sh @@ -6,12 +6,21 @@ yosysver="$2" gitsha="$3" rm -rf YosysVS-Tpl-v2.zip YosysVS -wget http://www.clifford.at/yosys/nogit/YosysVS-Tpl-v2.zip +wget https://yosyshq.net/yosys/nogit/YosysVS-Tpl-v2.zip +wget https://zlib.net/zlib-1.2.11.tar.gz unzip YosysVS-Tpl-v2.zip rm -f YosysVS-Tpl-v2.zip -mv YosysVS "$vcxsrc" +tar xvfz zlib-1.2.11.tar.gz +mv YosysVS "$vcxsrc" +mkdir -p "$vcxsrc"/yosys +mkdir -p "$vcxsrc"/yosys/libs/zlib +mv zlib-1.2.11/* "$vcxsrc"/yosys/libs/zlib/. +rm -rf zlib-1.2.11 +pushd "$vcxsrc"/yosys +ls libs/zlib/*.c | sed 's,.*:,,; s,//*,/,g; s,/[^/]*/\.\./,/,g; y, \\,\n\n,;' | grep '^[^/]' >> ../../srcfiles.txt +popd { n=$(grep -B999 '<ItemGroup>' "$vcxsrc"/YosysVS/YosysVS.vcxproj | wc -l) head -n$n "$vcxsrc"/YosysVS/YosysVS.vcxproj @@ -35,7 +44,7 @@ Want to use a git working copy for the yosys source code? Open "Git Bash" in this directory and run: mv yosys yosys.bak - git clone https://github.com/cliffordwolf/yosys.git yosys + git clone https://github.com/YosysHQ/yosys.git yosys cd yosys git checkout -B master $(git rev-parse HEAD | cut -c1-10) unzip ../genfiles.zip diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py index 38bd6129e..4d9a60113 100644 --- a/misc/py_wrap_generator.py +++ b/misc/py_wrap_generator.py @@ -1,7 +1,7 @@ # # yosys -- Yosys Open SYnthesis Suite # -# Copyright (C) 2012 Clifford Wolf <clifford@clifford.at> +# Copyright (C) 2012 Claire Xenia Wolf <claire@yosyshq.com> # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -997,7 +997,7 @@ sources = [ Source("kernel/cost",[]) ] -blacklist_methods = ["YOSYS_NAMESPACE::Pass::run_register", "YOSYS_NAMESPACE::Module::Pow", "YOSYS_NAMESPACE::Module::Bu0", "YOSYS_NAMESPACE::CaseRule::optimize"] +blacklist_methods = ["YOSYS_NAMESPACE::Pass::run_register", "YOSYS_NAMESPACE::Module::Pow"] enum_names = ["State","SyncType","ConstFlags"] @@ -2243,7 +2243,7 @@ def gen_wrappers(filename, debug_level_ = 0): """/* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2012 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above |