From 6c00704a5ef09be46b1f05e2be477e493f37dd38 Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Fri, 14 Aug 2015 13:23:01 -0700 Subject: [PATCH] Another block of spelling fixes Smaller this time --- CHANGELOG | 10 +++++----- CodingReadme | 8 ++++---- README | 20 ++++++++++---------- backends/btor/verilog2btor.sh | 2 +- backends/json/json.cc | 2 +- backends/verilog/verilog_backend.cc | 4 ++-- frontends/ast/ast.cc | 8 ++++---- frontends/verilog/const2ast.cc | 2 +- frontends/verilog/verilog_lexer.l | 4 ++-- manual/PRESENTATION_Intro.tex | 6 +++--- manual/command-reference-manual.tex | 4 ++-- passes/cmds/select.cc | 6 +++--- passes/techmap/techmap.cc | 2 +- techlibs/common/simcells.v | 2 +- techlibs/common/simlib.v | 4 ++-- techlibs/common/techmap.v | 2 +- tests/asicworld/README | 2 +- tests/hana/README | 2 +- tests/realmath/run-test.sh | 2 +- tests/simple/dff_different_styles.v | 2 +- tests/simple/hierarchy.v | 4 ++-- tests/simple/rotate.v | 2 +- tests/simple/vloghammer.v | 4 ++-- tests/tools/autotest.sh | 2 +- 24 files changed, 53 insertions(+), 53 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4ec3499d7..3fb8f38c2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -82,7 +82,7 @@ Yosys 0.3.0 .. Yosys 0.4 * Changes for simple synthesis flows - There is now a "synth" command with a recommended default script - Many improvements in synthesis of arithmetic functions to gates - - Multiplieres and adders with many operands are using carry-save adder trees + - Multipliers and adders with many operands are using carry-save adder trees - Remaining adders are now implemented using Brent-Kung carry look-ahead adders - Various new high-level optimizations on RTL netlist - Various improvements in FSM optimization @@ -98,7 +98,7 @@ Yosys 0.3.0 .. Yosys 0.4 - Added macros for code coverage counters - Added some Makefile magic for pretty make logs - Added "kernel/yosys.h" with all the core definitions - - Chanded a lot of code from FILE* to c++ streams + - Changed a lot of code from FILE* to c++ streams - Added RTLIL::Monitor API and "trace" command - Added "Yosys" C++ namespace @@ -167,7 +167,7 @@ Yosys 0.2.0 .. Yosys 0.3.0 - Added "sat -dump_cnf" feature - Added "sat -initsteps " feature - Added "freduce -stop " feature - - Added "fredure -dump " feature + - Added "freduce -dump " feature * Integration with ABC: - Updated ABC rev to 7600ffb9340c @@ -254,13 +254,13 @@ Yosys 0.1.0 .. Yosys 0.2.0 - Added "expose" command - Added support for @ to sat and eval signal expressions - * Changes in the 'make test' framework and auxilary test tools: + * Changes in the 'make test' framework and auxiliary test tools: - Added autotest.sh -p and -f options - Replaced autotest.sh ISIM support with XSIM support - Added test cases for SAT framework * Added "abbreviated IDs": - - Now $$foo can be abbriviated as $foo. + - Now $$foo can be abbreviated as $foo. - Usually this last part is a unique id (from RTLIL::autoidx) - This abbreviated IDs are now also used in "show" output diff --git a/CodingReadme b/CodingReadme index 54ea368e7..f93d22050 100644 --- a/CodingReadme +++ b/CodingReadme @@ -228,11 +228,11 @@ Formatting of code on its own line for larger blocks, especially blocks that contains blank lines. -- Otherwise stick to the Linux Kernel Coding Stlye: +- Otherwise stick to the Linux Kernel Coding Style: https://www.kernel.org/doc/Documentation/CodingStyle -C++ Langugage +C++ Language ------------- Yosys is written in C++11. At the moment only constructs supported by @@ -262,7 +262,7 @@ Creating the Visual Studio Template Project [ ] Add to source control [X] Console applications - [X] Empty Projcect + [X] Empty Project [ ] SDL checks 2. Open YosysVS Project Properties @@ -303,7 +303,7 @@ Things to do after finalizing the cell interface: - Add support to kernel/satgen.h for the new cell type - Add to manual/CHAPTER_CellLib.tex (or just add a fixme to the bottom) - - Maybe add support to the verilog backend for dumping such cells as expression + - Maybe add support to the Verilog backend for dumping such cells as expression diff --git a/README b/README index fca45d926..5e89922c3 100644 --- a/README +++ b/README @@ -84,7 +84,7 @@ To build Yosys simply type 'make' in this directory. $ sudo make install Note that this also downloads, builds and installs ABC (using yosys-abc -as executeable name). +as executable name). Yosys can be used with the interactive command shell, with synthesis scripts or with command line arguments. Let's perform @@ -98,7 +98,7 @@ commands and "help " to print details on the specified command: yosys> help help -reading the design using the verilog frontend: +reading the design using the Verilog frontend: yosys> read_verilog tests/simple/fiedler-cooley.v @@ -127,7 +127,7 @@ translating netlist to gate logic and perform some simple optimizations: yosys> techmap; opt -write design netlist to a new verilog file: +write design netlist to a new Verilog file: yosys> write_verilog synth.v @@ -223,7 +223,7 @@ The following Verilog-2005 features are not supported by yosys and there are currently no plans to add support for them: -- Non-sythesizable language features as defined in +- Non-synthesizable language features as defined in IEC 62142(E):2005 / IEEE Std. 1364.1(E):2002 - The "tri", "triand", "trior", "wand" and "wor" net types @@ -271,7 +271,7 @@ Verilog Attributes and non-standard features storage element. The register itself will always have all bits set to 'x' (undefined). The variable may only be used as blocking assigned temporary variable within an always block. This is mostly used internally - by yosys to synthesize verilog functions and access arrays. + by yosys to synthesize Verilog functions and access arrays. - The "onehot" attribute on wires mark them as onehot state register. This is used for example for memory port sharing and set by the fsm_map pass. @@ -279,7 +279,7 @@ Verilog Attributes and non-standard features - The "blackbox" attribute on modules is used to mark empty stub modules that have the same ports as the real thing but do not contain information on the internal configuration. This modules are only used by the synthesis - passes to identify input and output ports of cells. The verilog backend + passes to identify input and output ports of cells. The Verilog backend also does not output blackbox modules on default. - The "keep" attribute on cells and wires is used to mark objects that should @@ -315,16 +315,16 @@ Verilog Attributes and non-standard features to simply declare a module port as 'input' or 'output' in the module body. -- When defining a macro with `define, all text between tripple double quotes +- When defining a macro with `define, all text between triple double quotes is interpreted as macro body, even if it contains unescaped newlines. The - tripple double quotes are removed from the macro body. For example: + tipple double quotes are removed from the macro body. For example: `define MY_MACRO(a, b) """ assign a = 23; assign b = 42; """ -- The attribute "via_celltype" can be used to implement a verilog task or +- The attribute "via_celltype" can be used to implement a Verilog task or function by instantiating the specified cell type. The value is the name of the cell type to use. For functions the name of the output port can be specified by appending it to the cell type separated by a whitespace. @@ -364,7 +364,7 @@ Verilog Attributes and non-standard features $ yosys -p 'plugin -a foo -i /lib/libm.so; read_verilog dpitest.v' - Sized constants (the syntax 's?[bodh]) support constant - expressions as . If the expresion is not a simple identifier, it + expressions as . If the expression is not a simple identifier, it must be put in parentheses. Examples: WIDTH'd42, (4+2)'b101010 diff --git a/backends/btor/verilog2btor.sh b/backends/btor/verilog2btor.sh index cfdc066a8..1c537d5bd 100755 --- a/backends/btor/verilog2btor.sh +++ b/backends/btor/verilog2btor.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Script to writing btor from verilog design +# Script to write BTOR from Verilog design # if [ "$#" -ne 3 ]; then diff --git a/backends/json/json.cc b/backends/json/json.cc index 388251e35..9bc936a6c 100644 --- a/backends/json/json.cc +++ b/backends/json/json.cc @@ -329,7 +329,7 @@ struct JsonBackend : public Backend { log("connected to a constant driver are denoted as string \"0\" or \"1\" instead of\n"); log("a number.\n"); log("\n"); - log("For example the following verilog code:\n"); + log("For example the following Verilog code:\n"); log("\n"); log(" module test(input x, y);\n"); log(" (* keep *) foo #(.P(42), .Q(1337))\n"); diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc index 28c54ce0b..c04389f63 100644 --- a/backends/verilog/verilog_backend.cc +++ b/backends/verilog/verilog_backend.cc @@ -17,7 +17,7 @@ * * --- * - * A simple and straightforward verilog backend. + * A simple and straightforward Verilog backend. * * Note that RTLIL processes can't always be mapped easily to a Verilog * process. Therefore this frontend should only be used to export a @@ -966,7 +966,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell) n += wen_width; } } - // Output verilog that looks something like this: + // Output Verilog that looks something like this: // reg [..] _3_; // always @(posedge CLK2) begin // _3_ <= memory[D1ADDR]; diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc index b93a53d27..a45859157 100644 --- a/frontends/ast/ast.cc +++ b/frontends/ast/ast.cc @@ -329,7 +329,7 @@ static std::string id2vl(std::string txt) return txt; } -// dump AST node as verilog pseudo-code +// dump AST node as Verilog pseudo-code void AstNode::dumpVlog(FILE *f, std::string indent) { bool first = true; @@ -894,7 +894,7 @@ static AstModule* process_module(AstNode *ast, bool defer) AstNode *ast_before_simplify = ast->clone(); if (flag_dump_ast1) { - log("Dumping verilog AST before simplification:\n"); + log("Dumping Verilog AST before simplification:\n"); ast->dumpAst(NULL, " "); log("--- END OF AST DUMP ---\n"); } @@ -904,13 +904,13 @@ static AstModule* process_module(AstNode *ast, bool defer) while (ast->simplify(!flag_noopt, false, false, 0, -1, false, false)) { } if (flag_dump_ast2) { - log("Dumping verilog AST after simplification:\n"); + log("Dumping Verilog AST after simplification:\n"); ast->dumpAst(NULL, " "); log("--- END OF AST DUMP ---\n"); } if (flag_dump_vlog) { - log("Dumping verilog AST (as requested by dump_vlog option):\n"); + log("Dumping Verilog AST (as requested by dump_vlog option):\n"); ast->dumpVlog(NULL, " "); log("--- END OF AST DUMP ---\n"); } diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc index d54f1428e..ebecb92f2 100644 --- a/frontends/verilog/const2ast.cc +++ b/frontends/verilog/const2ast.cc @@ -136,7 +136,7 @@ static void my_strtobin(std::vector &data, const char *str, int le } } -// convert the verilog code for a constant to an AST node +// convert the Verilog code for a constant to an AST node AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn_z) { if (warn_z) { diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l index bd7837b3a..a72593583 100644 --- a/frontends/verilog/verilog_lexer.l +++ b/frontends/verilog/verilog_lexer.l @@ -281,7 +281,7 @@ supply1 { return TOK_SUPPLY1; } static bool printed_warning = false; if (!printed_warning) { log_warning("Found one of those horrible `(synopsys|synthesis) full_case' comments.\n" - "Yosys does support them but it is recommended to use verilog `full_case' attributes instead!\n"); + "Yosys does support them but it is recommended to use Verilog `full_case' attributes instead!\n"); printed_warning = true; } return TOK_SYNOPSYS_FULL_CASE; @@ -290,7 +290,7 @@ supply1 { return TOK_SUPPLY1; } static bool printed_warning = false; if (!printed_warning) { log_warning("Found one of those horrible `(synopsys|synthesis) parallel_case' comments.\n" - "Yosys does support them but it is recommended to use verilog `parallel_case' attributes instead!\n"); + "Yosys does support them but it is recommended to use Verilog `parallel_case' attributes instead!\n"); printed_warning = true; } return TOK_SYNOPSYS_PARALLEL_CASE; diff --git a/manual/PRESENTATION_Intro.tex b/manual/PRESENTATION_Intro.tex index 0b7d61a45..555ec9175 100644 --- a/manual/PRESENTATION_Intro.tex +++ b/manual/PRESENTATION_Intro.tex @@ -503,7 +503,7 @@ Commands for executing scripts or entering interactive mode: Commands for reading and elaborating the design: \begin{lstlisting}[xleftmargin=1cm, basicstyle=\ttfamily\fontsize{8pt}{10pt}\selectfont, language=ys] read_ilang # read modules from ilang file - read_verilog # read modules from verilog file + read_verilog # read modules from Verilog file hierarchy # check, expand and clean up design hierarchy \end{lstlisting} @@ -536,7 +536,7 @@ Commands for writing the results: write_edif # write design to EDIF netlist file write_ilang # write design to ilang file write_spice # write design to SPICE netlist file - write_verilog # write design to verilog file + write_verilog # write design to Verilog file \end{lstlisting} \bigskip @@ -761,7 +761,7 @@ Because of the framework characteristics of Yosys, an increasing number of featu become available in one tool. Yosys not only can be used for circuit synthesis but also for formal equivalence checking, SAT solving, and for circuit analysis, to name just a few other application domains. With proprietary software one needs to -learn a new tool for each of this applications. +learn a new tool for each of these applications. \end{itemize} \end{frame} diff --git a/manual/command-reference-manual.tex b/manual/command-reference-manual.tex index 65e418057..dfef1bb05 100644 --- a/manual/command-reference-manual.tex +++ b/manual/command-reference-manual.tex @@ -762,7 +762,7 @@ This pass flattens the design by replacing cells by their implementation. This pass is very similar to the 'techmap' pass. The only difference is that this pass is using the current design as mapping library. -Cells and/or modules with the 'keep_hiearchy' attribute set will not be +Cells and/or modules with the 'keep_hierarchy' attribute set will not be flattened by this command. \end{lstlisting} @@ -3360,7 +3360,7 @@ values referenced above are vectors of this integers. Signal bits that are connected to a constant driver are denoted as string "0" or "1" instead of a number. -For example the following verilog code: +For example the following Verilog code: module test(input x, y); (* keep *) foo #(.P(42), .Q(1337)) diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc index f18e40228..d05000eb1 100644 --- a/passes/cmds/select.cc +++ b/passes/cmds/select.cc @@ -1321,7 +1321,7 @@ struct SelectPass : public Pass { log_cmd_error("No selection to check.\n"); work_stack.back().optimize(design); if (!work_stack.back().empty()) - log_error("Assertation failed: selection is not empty:%s\n", sel_str.c_str()); + log_error("Assertion failed: selection is not empty:%s\n", sel_str.c_str()); return; } @@ -1331,7 +1331,7 @@ struct SelectPass : public Pass { log_cmd_error("No selection to check.\n"); work_stack.back().optimize(design); if (work_stack.back().empty()) - log_error("Assertation failed: selection is empty:%s\n", sel_str.c_str()); + log_error("Assertion failed: selection is empty:%s\n", sel_str.c_str()); return; } @@ -1358,7 +1358,7 @@ struct SelectPass : public Pass { total_count++; } if (assert_count != total_count) - log_error("Assertation failed: selection contains %d elements instead of the asserted %d:%s\n", + log_error("Assertion failed: selection contains %d elements instead of the asserted %d:%s\n", total_count, assert_count, sel_str.c_str()); return; } diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc index 8ba028310..30a6d784f 100644 --- a/passes/techmap/techmap.cc +++ b/passes/techmap/techmap.cc @@ -1102,7 +1102,7 @@ struct FlattenPass : public Pass { log("pass is very similar to the 'techmap' pass. The only difference is that this\n"); log("pass is using the current design as mapping library.\n"); log("\n"); - log("Cells and/or modules with the 'keep_hiearchy' attribute set will not be\n"); + log("Cells and/or modules with the 'keep_hierarchy' attribute set will not be\n"); log("flattened by this command.\n"); log("\n"); } diff --git a/techlibs/common/simcells.v b/techlibs/common/simcells.v index 669706209..9a820f71c 100644 --- a/techlibs/common/simcells.v +++ b/techlibs/common/simcells.v @@ -19,7 +19,7 @@ * * The internal logic cell simulation library. * - * This verilog library contains simple simulation models for the internal + * This Verilog library contains simple simulation models for the internal * logic cells ($_NOT_ , $_AND_ , ...) that are generated by the default technology * mapper (see "techmap.v" in this directory) and expected by the "abc" pass. * diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v index 9de71e6f9..275c469b8 100644 --- a/techlibs/common/simlib.v +++ b/techlibs/common/simlib.v @@ -19,7 +19,7 @@ * * The Simulation Library. * - * This verilog library contains simple simulation models for the internal + * This Verilog library contains simple simulation models for the internal * cells ($not, ...) generated by the frontends and used in most passes. * * This library can be used to verify the internal netlists as generated @@ -1163,7 +1163,7 @@ input A, EN; `ifndef SIMLIB_NOCHECKS always @* begin if (A !== 1'b1 && EN === 1'b1) begin - $display("Assertation %m failed!"); + $display("Assertion %m failed!"); $stop; end end diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v index e4974789e..44467203e 100644 --- a/techlibs/common/techmap.v +++ b/techlibs/common/techmap.v @@ -19,7 +19,7 @@ * * The internal logic cell technology mapper. * - * This verilog library contains the mapping of internal cells (e.g. $not with + * This Verilog library contains the mapping of internal cells (e.g. $not with * variable bit width) to the internal logic cells (such as the single bit $_NOT_ * gate). Usually this logic network is then mapped to the actual technology * using e.g. the "abc" pass. diff --git a/tests/asicworld/README b/tests/asicworld/README index 0e96edb7b..4657e7a27 100644 --- a/tests/asicworld/README +++ b/tests/asicworld/README @@ -1 +1 @@ -Borrowed verilog examples from http://www.asic-world.com/. +Borrowed Verilog examples from http://www.asic-world.com/. diff --git a/tests/hana/README b/tests/hana/README index b2a08fd47..2081fb10f 100644 --- a/tests/hana/README +++ b/tests/hana/README @@ -1,4 +1,4 @@ -This test cases are copied from the hana project: +These test cases are copied from the hana project: https://sourceforge.net/projects/sim-sim/ diff --git a/tests/realmath/run-test.sh b/tests/realmath/run-test.sh index 0997ccb5d..8419688c9 100755 --- a/tests/realmath/run-test.sh +++ b/tests/realmath/run-test.sh @@ -15,7 +15,7 @@ for ((i = 0; i < 100; i++)); do iverilog -o uut_${idx}_tb uut_${idx}_tb.v uut_${idx}.v uut_${idx}_syn.v ./uut_${idx}_tb | tee uut_${idx}.err if test -s uut_${idx}.err; then - echo "Note: Make sure that 'iverilog' is an up-to-date git checkout of icarus verilog." + echo "Note: Make sure that 'iverilog' is an up-to-date git checkout of Icarus Verilog." exit 1 fi rm -f uut_${idx}.err diff --git a/tests/simple/dff_different_styles.v b/tests/simple/dff_different_styles.v index 2f2737c4c..7765d6e2a 100644 --- a/tests/simple/dff_different_styles.v +++ b/tests/simple/dff_different_styles.v @@ -65,7 +65,7 @@ always @(posedge clk, posedge arst1, posedge arst2, negedge arst3) begin end endmodule -// SR-Flip-Flops are on the edge of well defined vewrilog constructs in terms of +// SR-Flip-Flops are on the edge of well defined Verilog constructs in terms of // simulation-implementation mismatches. The following testcases try to cover the // part that is defined and avoid the undefined cases. diff --git a/tests/simple/hierarchy.v b/tests/simple/hierarchy.v index 17888009f..123afaeab 100644 --- a/tests/simple/hierarchy.v +++ b/tests/simple/hierarchy.v @@ -5,10 +5,10 @@ input [3:0] a; input signed [3:0] b; output [7:0] y1, y2, y3, y4; -// this version triggers a bug in icarus verilog +// this version triggers a bug in Icarus Verilog // submod #(-3'sd1, 3'b111 + 3'b001) foo (a, b, y1, y2, y3, y4); -// this version is handled correctly by icarus verilog +// this version is handled correctly by Icarus Verilog submod #(-3'sd1, -3'sd1) foo (a, b, y1, y2, y3, y4); endmodule diff --git a/tests/simple/rotate.v b/tests/simple/rotate.v index eb832e6f5..a2fe00055 100644 --- a/tests/simple/rotate.v +++ b/tests/simple/rotate.v @@ -1,5 +1,5 @@ -// test case taken from amber23 verilog code +// test case taken from amber23 Verilog code module a23_barrel_shift_fpga_rotate(i_in, direction, shift_amount, rot_prod); input [31:0] i_in; diff --git a/tests/simple/vloghammer.v b/tests/simple/vloghammer.v index d1f55fdb4..3bb3cf992 100644 --- a/tests/simple/vloghammer.v +++ b/tests/simple/vloghammer.v @@ -27,14 +27,14 @@ module test04(a, y); assign y = ~(a - 1'b0); endmodule -// .. this test triggers a bug in xilinx isim. +// .. this test triggers a bug in Xilinx ISIM. // module test05(a, y); // input a; // output y; // assign y = 12345 >> {a, 32'd0}; // endmodule -// .. this test triggers a bug in icarus verilog. +// .. this test triggers a bug in Icarus Verilog. // module test06(a, b, c, y); // input signed [3:0] a; // input signed [1:0] b; diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh index 6fdc27928..76668bede 100755 --- a/tests/tools/autotest.sh +++ b/tests/tools/autotest.sh @@ -168,7 +168,7 @@ do else echo "${status_prefix}-> ERROR!" if $warn_iverilog_git; then - echo "Note: Make sure that 'iverilog' is an up-to-date git checkout of icarus verilog." + echo "Note: Make sure that 'iverilog' is an up-to-date git checkout of Icarus Verilog." fi $keeprunning || exit 1 fi -- 2.30.2