From: Clifford Wolf Date: Sat, 11 Oct 2014 10:13:46 +0000 (+0200) Subject: Renamed "log.cc" to "logcmd.cc" so there aren't two "log.cc" in the source tree X-Git-Tag: yosys-0.4~62 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2b8b48bf3bc6b202c31db62ef5e2b63041e775e;p=yosys.git Renamed "log.cc" to "logcmd.cc" so there aren't two "log.cc" in the source tree --- diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc index eba61d1df..0e62abbc4 100644 --- a/passes/cmds/Makefile.inc +++ b/passes/cmds/Makefile.inc @@ -14,7 +14,7 @@ OBJS += passes/cmds/setattr.o OBJS += passes/cmds/copy.o OBJS += passes/cmds/splice.o OBJS += passes/cmds/scc.o -OBJS += passes/cmds/log.o +OBJS += passes/cmds/logcmd.o OBJS += passes/cmds/tee.o OBJS += passes/cmds/write_file.o OBJS += passes/cmds/connwrappers.o diff --git a/passes/cmds/log.cc b/passes/cmds/log.cc deleted file mode 100644 index 85386f3d2..000000000 --- a/passes/cmds/log.cc +++ /dev/null @@ -1,82 +0,0 @@ -/* - * yosys -- Yosys Open SYnthesis Suite - * - * Copyright (C) 2012 Clifford Wolf - * Copyright (C) 2014 Johann Glaser - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - */ - -#include "kernel/register.h" -#include "kernel/rtlil.h" -#include "kernel/log.h" - -USING_YOSYS_NAMESPACE -PRIVATE_NAMESPACE_BEGIN - -struct LogPass : public Pass { - LogPass() : Pass("log", "print text and log files") { } - virtual void help() - { - // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| - log("\n"); - log(" log string\n"); - log("\n"); - log("Print the given string to the screen and/or the log file. This is useful for TCL\n"); - log("scripts, because the TCL command \"puts\" only goes to stdout but not to\n"); - log("logfiles.\n"); - log("\n"); - log(" -stdout\n"); - log(" Print the output to stdout too. This is useful when all Yosys is executed\n"); - log(" with a script and the -q (quiet operation) argument to notify the user.\n"); - log("\n"); - log(" -stderr\n"); - log(" Print the output to stderr too.\n"); - log("\n"); - log(" -nolog\n"); - log(" Don't use the internal log() command. Use either -stdout or -stderr,\n"); - log(" otherwise no output will be generated at all.\n"); - log("\n"); - log(" -n\n"); - log(" do not append a newline\n"); - log("\n"); - } - virtual void execute(std::vector args, RTLIL::Design*) - { - size_t argidx; - bool to_stdout = false; - bool to_stderr = false; - bool to_log = true; - bool newline = true; - std::string text; - - for (argidx = 1; argidx < args.size(); argidx++) - { - if (args[argidx] == "-stdout") to_stdout = true; - else if (args[argidx] == "-stderr") to_stderr = true; - else if (args[argidx] == "-nolog") to_log = false; - else if (args[argidx] == "-n") newline = false; - else break; - } - for (; argidx < args.size(); argidx++) - text += args[argidx] + ' '; - if (!text.empty()) text.resize(text.size()-1); - - if (to_stdout) fprintf(stdout, (newline ? "%s\n" : "%s"), text.c_str()); - if (to_stderr) fprintf(stderr, (newline ? "%s\n" : "%s"), text.c_str()); - if (to_log) log ( (newline ? "%s\n" : "%s"), text.c_str()); - } -} LogPass; - -PRIVATE_NAMESPACE_END diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc new file mode 100644 index 000000000..85386f3d2 --- /dev/null +++ b/passes/cmds/logcmd.cc @@ -0,0 +1,82 @@ +/* + * yosys -- Yosys Open SYnthesis Suite + * + * Copyright (C) 2012 Clifford Wolf + * Copyright (C) 2014 Johann Glaser + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include "kernel/register.h" +#include "kernel/rtlil.h" +#include "kernel/log.h" + +USING_YOSYS_NAMESPACE +PRIVATE_NAMESPACE_BEGIN + +struct LogPass : public Pass { + LogPass() : Pass("log", "print text and log files") { } + virtual void help() + { + // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| + log("\n"); + log(" log string\n"); + log("\n"); + log("Print the given string to the screen and/or the log file. This is useful for TCL\n"); + log("scripts, because the TCL command \"puts\" only goes to stdout but not to\n"); + log("logfiles.\n"); + log("\n"); + log(" -stdout\n"); + log(" Print the output to stdout too. This is useful when all Yosys is executed\n"); + log(" with a script and the -q (quiet operation) argument to notify the user.\n"); + log("\n"); + log(" -stderr\n"); + log(" Print the output to stderr too.\n"); + log("\n"); + log(" -nolog\n"); + log(" Don't use the internal log() command. Use either -stdout or -stderr,\n"); + log(" otherwise no output will be generated at all.\n"); + log("\n"); + log(" -n\n"); + log(" do not append a newline\n"); + log("\n"); + } + virtual void execute(std::vector args, RTLIL::Design*) + { + size_t argidx; + bool to_stdout = false; + bool to_stderr = false; + bool to_log = true; + bool newline = true; + std::string text; + + for (argidx = 1; argidx < args.size(); argidx++) + { + if (args[argidx] == "-stdout") to_stdout = true; + else if (args[argidx] == "-stderr") to_stderr = true; + else if (args[argidx] == "-nolog") to_log = false; + else if (args[argidx] == "-n") newline = false; + else break; + } + for (; argidx < args.size(); argidx++) + text += args[argidx] + ' '; + if (!text.empty()) text.resize(text.size()-1); + + if (to_stdout) fprintf(stdout, (newline ? "%s\n" : "%s"), text.c_str()); + if (to_stderr) fprintf(stderr, (newline ? "%s\n" : "%s"), text.c_str()); + if (to_log) log ( (newline ? "%s\n" : "%s"), text.c_str()); + } +} LogPass; + +PRIVATE_NAMESPACE_END