diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-07-09 10:22:49 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-07-09 10:22:49 -0700 |
| commit | c91cb735620537c9f573be52cefe6267d0a9cfd8 (patch) | |
| tree | 82ffd4f014504e4b003c14fba8594f748f2beafe /kernel | |
| parent | c68b9092100280dbc059526a88f9d8e2902ff6a3 (diff) | |
| parent | e95ce1f7af269447943cf1798c03b02a0c5aa1a2 (diff) | |
| download | yosys-c91cb735620537c9f573be52cefe6267d0a9cfd8.tar.gz yosys-c91cb735620537c9f573be52cefe6267d0a9cfd8.tar.bz2 yosys-c91cb735620537c9f573be52cefe6267d0a9cfd8.zip | |
Merge remote-tracking branch 'origin/master' into xc7mux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rtlil.h | 2 | ||||
| -rw-r--r-- | kernel/yosys.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/rtlil.h b/kernel/rtlil.h index f4fcf5dcf..82cbfaf28 100644 --- a/kernel/rtlil.h +++ b/kernel/rtlil.h @@ -1327,7 +1327,7 @@ public: #endif }; -struct RTLIL::CaseRule +struct RTLIL::CaseRule : public RTLIL::AttrObject { std::vector<RTLIL::SigSpec> compare; std::vector<RTLIL::SigSig> actions; diff --git a/kernel/yosys.cc b/kernel/yosys.cc index f95c0127b..a42a7c0b8 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -1273,6 +1273,10 @@ struct ScriptCmdPass : public Pass { log("If only one label is specified (without ':') then only the block\n"); log("marked with that label (until the next label) is executed.\n"); log("\n"); + log("In \"-scriptwire\" mode, the commands on the selected wire(s) will be executed\n"); + log("in the scope of (and thus, relative to) the wires' owning module(s). This\n"); + log("'-module' mode can be exited by using the 'cd' command.\n"); + log("\n"); } void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE { |