Moved some stuff to kernel/yosys.{h,cc}, using Yosys:: namespace
authorClifford Wolf <clifford@clifford.at>
Thu, 31 Jul 2014 11:19:47 +0000 (13:19 +0200)
committerClifford Wolf <clifford@clifford.at>
Thu, 31 Jul 2014 11:19:47 +0000 (13:19 +0200)
41 files changed:
backends/ilang/ilang_backend.cc
backends/ilang/ilang_backend.h
frontends/ast/ast.cc
frontends/ast/ast.h
frontends/ast/genrtlil.cc
frontends/ast/simplify.cc
frontends/ilang/ilang_frontend.cc
frontends/ilang/ilang_frontend.h
frontends/ilang/parser.y
frontends/liberty/liberty.cc
frontends/verific/verific.cc
frontends/verilog/const2ast.cc
frontends/verilog/lexer.l
frontends/verilog/parser.y
frontends/verilog/preproc.cc
frontends/verilog/verilog_frontend.cc
frontends/verilog/verilog_frontend.h
frontends/vhdl2verilog/vhdl2verilog.cc
kernel/calc.cc
kernel/driver.cc
kernel/log.cc
kernel/log.h
kernel/register.cc
kernel/register.h
kernel/rtlil.cc
kernel/rtlil.h
kernel/sigtools.h
kernel/yosys.cc
kernel/yosys.h
libs/subcircuit/subcircuit.cc
passes/abc/abc.cc
passes/cmds/design.cc
passes/fsm/fsm_extract.cc
passes/memory/memory_collect.cc
passes/memory/memory_dff.cc
passes/memory/memory_map.cc
passes/memory/memory_unpack.cc
passes/proc/proc_dff.cc
passes/proc/proc_mux.cc
passes/techmap/extract.cc
passes/techmap/techmap.cc

index c055c133499df9d5a62bc7beb3a079c49e5217ca..b7088f599473f1ebaef863093a88ba052cb9452f 100644 (file)
@@ -336,7 +336,7 @@ void ILANG_BACKEND::dump_module(FILE *f, std::string indent, const RTLIL::Module
 
 void ILANG_BACKEND::dump_design(FILE *f, const RTLIL::Design *design, bool only_selected, bool flag_m, bool flag_n)
 {
-       int init_autoidx = RTLIL::autoidx;
+       int init_autoidx = autoidx;
 
        if (!flag_m) {
                int count_selected_mods = 0;
@@ -353,7 +353,7 @@ void ILANG_BACKEND::dump_design(FILE *f, const RTLIL::Design *design, bool only_
        if (!only_selected || flag_m) {
                if (only_selected)
                        fprintf(f, "\n");
-               fprintf(f, "autoidx %d\n", RTLIL::autoidx);
+               fprintf(f, "autoidx %d\n", autoidx);
        }
 
        for (auto it = design->modules_.begin(); it != design->modules_.end(); it++) {
@@ -364,7 +364,7 @@ void ILANG_BACKEND::dump_design(FILE *f, const RTLIL::Design *design, bool only_
                }
        }
 
-       log_assert(init_autoidx == RTLIL::autoidx);
+       log_assert(init_autoidx == autoidx);
 }
 
 struct IlangBackend : public Backend {
index fecbcc1fe3a8651b3a369aada1c701b89b3d5267..b0fec4889134aed5955d31f3fd9df39f2fd8ba59 100644 (file)
 #ifndef ILANG_BACKEND_H
 #define ILANG_BACKEND_H
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include <stdio.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 namespace ILANG_BACKEND {
        void dump_const(FILE *f, const RTLIL::Const &data, int width = -1, int offset = 0, bool autoint = true);
        void dump_sigchunk(FILE *f, const RTLIL::SigChunk &chunk, bool autoint = true);
@@ -44,4 +46,6 @@ namespace ILANG_BACKEND {
        void dump_design(FILE *f, const RTLIL::Design *design, bool only_selected, bool flag_m = true, bool flag_n = false);
 }
 
+YOSYS_NAMESPACE_END
+
 #endif
index 5b3214f5c055442079b220223b6a09f04a35cbc2..d548a679c737659085fd649ddab56fbce9705498 100644 (file)
@@ -34,6 +34,8 @@
 #include <stdarg.h>
 #include <math.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 using namespace AST;
 using namespace AST_INTERNAL;
 
@@ -806,7 +808,7 @@ RTLIL::Const AstNode::realAsConst(int width)
 {
        double v = round(realvalue);
        RTLIL::Const result;
-       if (!isfinite(v)) {
+       if (!std::isfinite(v)) {
                result.bits = std::vector<RTLIL::State>(width, RTLIL::State::Sx);
        } else {
                bool is_negative = v < 0;
@@ -1087,3 +1089,5 @@ void AST::use_internal_line_num()
        get_line_num = &internal_get_line_num;
 }
 
+YOSYS_NAMESPACE_END
+
index 6c15c03ab736b41269c8aad76acd82fe02f227fb..83798edf0831f85eca8e7eb722d467bc6786c195 100644 (file)
@@ -33,6 +33,8 @@
 #include <stdint.h>
 #include <set>
 
+YOSYS_NAMESPACE_BEGIN
+
 namespace AST
 {
        // all node types, type2str() must be extended
@@ -285,4 +287,6 @@ namespace AST_INTERNAL
        struct ProcessGenerator;
 }
 
+YOSYS_NAMESPACE_END
+
 #endif
index b7f3363546cf985971c0829822cb40af035c3fef..0cc4f4c479e72697a2a3311e16bb29fb803f31c6 100644 (file)
@@ -34,6 +34,8 @@
 #include <stdarg.h>
 #include <algorithm>
 
+YOSYS_NAMESPACE_BEGIN
+
 using namespace AST;
 using namespace AST_INTERNAL;
 
@@ -41,7 +43,7 @@ using namespace AST_INTERNAL;
 static RTLIL::SigSpec uniop2rtlil(AstNode *that, std::string type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
 {
        std::stringstream sstr;
-       sstr << type << "$" << that->filename << ":" << that->linenum << "$" << (RTLIL::autoidx++);
+       sstr << type << "$" << that->filename << ":" << that->linenum << "$" << (autoidx++);
 
        RTLIL::Cell *cell = current_module->addCell(sstr.str(), type);
        cell->attributes["\\src"] = stringf("%s:%d", that->filename.c_str(), that->linenum);
@@ -75,7 +77,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
        }
 
        std::stringstream sstr;
-       sstr << "$extend" << "$" << that->filename << ":" << that->linenum << "$" << (RTLIL::autoidx++);
+       sstr << "$extend" << "$" << that->filename << ":" << that->linenum << "$" << (autoidx++);
 
        RTLIL::Cell *cell = current_module->addCell(sstr.str(), celltype);
        cell->attributes["\\src"] = stringf("%s:%d", that->filename.c_str(), that->linenum);
@@ -104,7 +106,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 static RTLIL::SigSpec binop2rtlil(AstNode *that, std::string type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
 {
        std::stringstream sstr;
-       sstr << type << "$" << that->filename << ":" << that->linenum << "$" << (RTLIL::autoidx++);
+       sstr << type << "$" << that->filename << ":" << that->linenum << "$" << (autoidx++);
 
        RTLIL::Cell *cell = current_module->addCell(sstr.str(), type);
        cell->attributes["\\src"] = stringf("%s:%d", that->filename.c_str(), that->linenum);
@@ -139,7 +141,7 @@ static RTLIL::SigSpec mux2rtlil(AstNode *that, const RTLIL::SigSpec &cond, const
        log_assert(cond.size() == 1);
 
        std::stringstream sstr;
-       sstr << "$ternary$" << that->filename << ":" << that->linenum << "$" << (RTLIL::autoidx++);
+       sstr << "$ternary$" << that->filename << ":" << that->linenum << "$" << (autoidx++);
 
        RTLIL::Cell *cell = current_module->addCell(sstr.str(), "$mux");
        cell->attributes["\\src"] = stringf("%s:%d", that->filename.c_str(), that->linenum);
@@ -201,7 +203,7 @@ struct AST_INTERNAL::ProcessGenerator
                // generate process and simple root case
                proc = new RTLIL::Process;
                proc->attributes["\\src"] = stringf("%s:%d", always->filename.c_str(), always->linenum);
-               proc->name = stringf("$proc$%s:%d$%d", always->filename.c_str(), always->linenum, RTLIL::autoidx++);
+               proc->name = stringf("$proc$%s:%d$%d", always->filename.c_str(), always->linenum, autoidx++);
                for (auto &attr : always->attributes) {
                        if (attr.second->type != AST_CONSTANT)
                                log_error("Attribute `%s' with non-constant value at %s:%d!\n",
@@ -294,7 +296,7 @@ struct AST_INTERNAL::ProcessGenerator
                                wire_name = stringf("$%d%s[%d:%d]", new_temp_count[chunk.wire]++,
                                                chunk.wire->name.c_str(), chunk.width+chunk.offset-1, chunk.offset);;
                                if (chunk.wire->name.find('$') != std::string::npos)
-                                       wire_name += stringf("$%d", RTLIL::autoidx++);
+                                       wire_name += stringf("$%d", autoidx++);
                        } while (current_module->wires_.count(wire_name) > 0);
 
                        RTLIL::Wire *wire = current_module->addWire(wire_name, chunk.width);
@@ -1189,7 +1191,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
        case AST_MEMRD:
                {
                        std::stringstream sstr;
-                       sstr << "$memrd$" << str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+                       sstr << "$memrd$" << str << "$" << filename << ":" << linenum << "$" << (autoidx++);
 
                        RTLIL::Cell *cell = current_module->addCell(sstr.str(), "$memrd");
                        cell->attributes["\\src"] = stringf("%s:%d", filename.c_str(), linenum);
@@ -1220,7 +1222,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
        case AST_MEMWR:
                {
                        std::stringstream sstr;
-                       sstr << "$memwr$" << str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+                       sstr << "$memwr$" << str << "$" << filename << ":" << linenum << "$" << (autoidx++);
 
                        RTLIL::Cell *cell = current_module->addCell(sstr.str(), "$memwr");
                        cell->attributes["\\src"] = stringf("%s:%d", filename.c_str(), linenum);
@@ -1241,7 +1243,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
                        cell->parameters["\\CLK_ENABLE"] = RTLIL::Const(0);
                        cell->parameters["\\CLK_POLARITY"] = RTLIL::Const(0);
 
-                       cell->parameters["\\PRIORITY"] = RTLIL::Const(RTLIL::autoidx-1);
+                       cell->parameters["\\PRIORITY"] = RTLIL::Const(autoidx-1);
                }
                break;
 
@@ -1257,7 +1259,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
                        log_assert(en.size() == 1);
 
                        std::stringstream sstr;
-                       sstr << "$assert$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+                       sstr << "$assert$" << filename << ":" << linenum << "$" << (autoidx++);
 
                        RTLIL::Cell *cell = current_module->addCell(sstr.str(), "$assert");
                        cell->attributes["\\src"] = stringf("%s:%d", filename.c_str(), linenum);
@@ -1399,3 +1401,5 @@ RTLIL::SigSpec AstNode::genWidthRTLIL(int width, RTLIL::SigSpec *subst_from,  RT
        return sig;
 }
 
+YOSYS_NAMESPACE_END
+
index 5665cd43c08816403db211b096a46d6eea993886..c51692f12e5f0e0825f2cc12866268266fc99d34 100644 (file)
@@ -34,6 +34,8 @@
 #include <stdarg.h>
 #include <math.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 using namespace AST;
 using namespace AST_INTERNAL;
 
@@ -624,7 +626,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
                id2ast->meminfo(mem_width, mem_size, addr_bits);
 
                std::stringstream sstr;
-               sstr << "$mem2bits$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+               sstr << "$mem2bits$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (autoidx++);
                std::string wire_id = sstr.str();
 
                AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
@@ -744,7 +746,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
                                buf = new AstNode(AST_GENBLOCK, body_ast->clone());
                        if (buf->str.empty()) {
                                std::stringstream sstr;
-                               sstr << "$genblock$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+                               sstr << "$genblock$" << filename << ":" << linenum << "$" << (autoidx++);
                                buf->str = sstr.str();
                        }
                        std::map<std::string, std::string> name_map;
@@ -1091,7 +1093,7 @@ skip_dynamic_range_lvalue_expansion:;
        if (stage > 1 && type == AST_ASSERT && current_block != NULL)
        {
                std::stringstream sstr;
-               sstr << "$assert$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+               sstr << "$assert$" << filename << ":" << linenum << "$" << (autoidx++);
                std::string id_check = sstr.str() + "_CHECK", id_en = sstr.str() + "_EN";
 
                AstNode *wire_check = new AstNode(AST_WIRE);
@@ -1166,7 +1168,7 @@ skip_dynamic_range_lvalue_expansion:;
                        (children[0]->children.size() == 1 || children[0]->children.size() == 2))
        {
                std::stringstream sstr;
-               sstr << "$memwr$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+               sstr << "$memwr$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (autoidx++);
                std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA", id_en = sstr.str() + "_EN";
 
                if (type == AST_ASSIGN_EQ)
@@ -1364,27 +1366,27 @@ skip_dynamic_range_lvalue_expansion:;
                                }
 
                                newNode = new AstNode(AST_REALVALUE);
-                               if (str == "\\$ln")         newNode->realvalue = log(x);
-                               else if (str == "\\$log10") newNode->realvalue = log10(x);
-                               else if (str == "\\$exp")   newNode->realvalue = exp(x);
-                               else if (str == "\\$sqrt")  newNode->realvalue = sqrt(x);
-                               else if (str == "\\$pow")   newNode->realvalue = pow(x, y);
-                               else if (str == "\\$floor") newNode->realvalue = floor(x);
-                               else if (str == "\\$ceil")  newNode->realvalue = ceil(x);
-                               else if (str == "\\$sin")   newNode->realvalue = sin(x);
-                               else if (str == "\\$cos")   newNode->realvalue = cos(x);
-                               else if (str == "\\$tan")   newNode->realvalue = tan(x);
-                               else if (str == "\\$asin")  newNode->realvalue = asin(x);
-                               else if (str == "\\$acos")  newNode->realvalue = acos(x);
-                               else if (str == "\\$atan")  newNode->realvalue = atan(x);
-                               else if (str == "\\$atan2") newNode->realvalue = atan2(x, y);
-                               else if (str == "\\$hypot") newNode->realvalue = hypot(x, y);
-                               else if (str == "\\$sinh")  newNode->realvalue = sinh(x);
-                               else if (str == "\\$cosh")  newNode->realvalue = cosh(x);
-                               else if (str == "\\$tanh")  newNode->realvalue = tanh(x);
-                               else if (str == "\\$asinh") newNode->realvalue = asinh(x);
-                               else if (str == "\\$acosh") newNode->realvalue = acosh(x);
-                               else if (str == "\\$atanh") newNode->realvalue = atanh(x);
+                               if (str == "\\$ln")         newNode->realvalue = ::log(x);
+                               else if (str == "\\$log10") newNode->realvalue = ::log10(x);
+                               else if (str == "\\$exp")   newNode->realvalue = ::exp(x);
+                               else if (str == "\\$sqrt")  newNode->realvalue = ::sqrt(x);
+                               else if (str == "\\$pow")   newNode->realvalue = ::pow(x, y);
+                               else if (str == "\\$floor") newNode->realvalue = ::floor(x);
+                               else if (str == "\\$ceil")  newNode->realvalue = ::ceil(x);
+                               else if (str == "\\$sin")   newNode->realvalue = ::sin(x);
+                               else if (str == "\\$cos")   newNode->realvalue = ::cos(x);
+                               else if (str == "\\$tan")   newNode->realvalue = ::tan(x);
+                               else if (str == "\\$asin")  newNode->realvalue = ::asin(x);
+                               else if (str == "\\$acos")  newNode->realvalue = ::acos(x);
+                               else if (str == "\\$atan")  newNode->realvalue = ::atan(x);
+                               else if (str == "\\$atan2") newNode->realvalue = ::atan2(x, y);
+                               else if (str == "\\$hypot") newNode->realvalue = ::hypot(x, y);
+                               else if (str == "\\$sinh")  newNode->realvalue = ::sinh(x);
+                               else if (str == "\\$cosh")  newNode->realvalue = ::cosh(x);
+                               else if (str == "\\$tanh")  newNode->realvalue = ::tanh(x);
+                               else if (str == "\\$asinh") newNode->realvalue = ::asinh(x);
+                               else if (str == "\\$acosh") newNode->realvalue = ::acosh(x);
+                               else if (str == "\\$atanh") newNode->realvalue = ::atanh(x);
                                else log_abort();
                                goto apply_newNode;
                        }
@@ -1423,7 +1425,7 @@ skip_dynamic_range_lvalue_expansion:;
 
                AstNode *decl = current_scope[str];
                std::stringstream sstr;
-               sstr << "$func$" << str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++) << "$";
+               sstr << "$func$" << str << "$" << filename << ":" << linenum << "$" << (autoidx++) << "$";
                std::string prefix = sstr.str();
 
                size_t arg_count = 0;
@@ -1988,7 +1990,7 @@ void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *
                        mem2reg_set.count(children[0]->id2ast) > 0 && children[0]->children[0]->children[0]->type != AST_CONSTANT)
        {
                std::stringstream sstr;
-               sstr << "$mem2reg_wr$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+               sstr << "$mem2reg_wr$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (autoidx++);
                std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
                int mem_width, mem_size, addr_bits;
@@ -2059,7 +2061,7 @@ void AstNode::mem2reg_as_needed_pass2(std::set<AstNode*> &mem2reg_set, AstNode *
                else
                {
                        std::stringstream sstr;
-                       sstr << "$mem2reg_rd$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (RTLIL::autoidx++);
+                       sstr << "$mem2reg_rd$" << children[0]->str << "$" << filename << ":" << linenum << "$" << (autoidx++);
                        std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
                        int mem_width, mem_size, addr_bits;
@@ -2421,3 +2423,5 @@ AstNode *AstNode::eval_const_function(AstNode *fcall)
        return AstNode::mkconst_bits(variables.at(str).val.bits, variables.at(str).is_signed);
 }
 
+YOSYS_NAMESPACE_END
+
index 572a35720498eee05d950c466b9e2a67ce44d551..2d4b99c523d7cca8af16c1b67cd8a8441da8ead2 100644 (file)
@@ -26,6 +26,8 @@
 #include "kernel/register.h"
 #include "kernel/log.h"
 
+YOSYS_NAMESPACE_BEGIN
+
 void rtlil_frontend_ilang_yyerror(char const *s)
 {
        log_error("Parser error in line %d: %s\n", rtlil_frontend_ilang_yyget_lineno(), s);
@@ -57,3 +59,5 @@ struct IlangFrontend : public Frontend {
        }
 } IlangFrontend;
 
+YOSYS_NAMESPACE_END
+
index 5e768c3b9db88b046ba725df485eb39b7c0b209a..317ec0d51fb081b6524164322e6d4440ccc64713 100644 (file)
 #ifndef ILANG_FRONTEND_H
 #define ILANG_FRONTEND_H
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include <stdio.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 namespace ILANG_FRONTEND {
        void ilang_frontend(FILE *f, RTLIL::Design *design);
        extern RTLIL::Design *current_design;
 }
 
+YOSYS_NAMESPACE_END
+
 extern int rtlil_frontend_ilang_yydebug;
 int rtlil_frontend_ilang_yylex(void);
 void rtlil_frontend_ilang_yyerror(char const *s);
index 38d3054b248dddfe5fc15d8ca1b6e340b79c9c4c..ab763b2b175ddc95192eaa65a3a6d13a9ddfda79 100644 (file)
@@ -25,6 +25,7 @@
 %{
 #include <list>
 #include "ilang_frontend.h"
+YOSYS_NAMESPACE_BEGIN
 namespace ILANG_FRONTEND {
        RTLIL::Design *current_design;
        RTLIL::Module *current_module;
@@ -37,6 +38,8 @@ namespace ILANG_FRONTEND {
        std::map<RTLIL::IdString, RTLIL::Const> attrbuf;
 }
 using namespace ILANG_FRONTEND;
+YOSYS_NAMESPACE_END
+USING_YOSYS_NAMESPACE
 %}
 
 %name-prefix "rtlil_frontend_ilang_yy"
@@ -44,8 +47,8 @@ using namespace ILANG_FRONTEND;
 %union {
        char *string;
        int integer;
-       RTLIL::Const *data;
-       RTLIL::SigSpec *sigspec;
+       YOSYS_NAMESPACE_PREFIX RTLIL::Const *data;
+       YOSYS_NAMESPACE_PREFIX RTLIL::SigSpec *sigspec;
 }
 
 %token <string> TOK_ID TOK_VALUE TOK_STRING
@@ -116,7 +119,7 @@ attr_stmt:
 
 autoidx_stmt:
        TOK_AUTOIDX TOK_INT EOL {
-               RTLIL::autoidx = std::max(RTLIL::autoidx, $2);
+               autoidx = std::max(autoidx, $2);
        };
 
 wire_stmt:
index d5f172f0324557712aa3b9abb16bf185fe1cc8ae..da16ab33f748b9c63ab398d0be7ac59beafbf60e 100644 (file)
@@ -21,6 +21,7 @@
 #include "kernel/register.h"
 #include "kernel/log.h"
 
+YOSYS_NAMESPACE_BEGIN
 using namespace PASS_DFFLIBMAP;
 
 struct token_t {
@@ -573,3 +574,5 @@ skip_cell:;
        }
 } LibertyFrontend;
 
+YOSYS_NAMESPACE_END
+
index 80170394ee1cef3068de9df82245560a86255290..6e692c5a17d5b322b8d37d0016c2243e021f697b 100644 (file)
@@ -17,7 +17,7 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/log.h"
 #include <unistd.h>
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <dirent.h>
 
+USING_YOSYS_NAMESPACE
+
 #ifdef YOSYS_ENABLE_VERIFIC
 
 #pragma clang diagnostic push
@@ -768,6 +770,8 @@ static void import_netlist(RTLIL::Design *design, Netlist *nl, std::set<Netlist*
 
 #endif /* YOSYS_ENABLE_VERIFIC */
 
+YOSYS_NAMESPACE_BEGIN
+
 struct VerificPass : public Pass {
        VerificPass() : Pass("verific", "load Verilog and VHDL designs using Verific") { }
        virtual void help()
@@ -945,3 +949,5 @@ struct VerificPass : public Pass {
 #endif
 } VerificPass;
  
+YOSYS_NAMESPACE_END
+
index 446f5e50c151f1e93cda4c06e549a825d2882b7b..a81e3010f80e7813fc20bcf0e1eaa9313d669881 100644 (file)
@@ -39,6 +39,8 @@
 #include <string.h>
 #include <math.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 using namespace AST;
 
 // divide an arbitrary length decimal number by two and return the rest
@@ -210,3 +212,5 @@ AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type)
        return NULL;
 }
 
+YOSYS_NAMESPACE_END
+
index 00deeb0b45c558385308d505d27aece63f378f6c..fdb9bb02cad85a25c4e38f5cbeddc67f80f60b82 100644 (file)
 #include "frontends/ast/ast.h"
 #include "parser.tab.h"
 
+USING_YOSYS_NAMESPACE
 using namespace AST;
 using namespace VERILOG_FRONTEND;
 
+YOSYS_NAMESPACE_BEGIN
 namespace VERILOG_FRONTEND {
        std::vector<std::string> fn_stack;
        std::vector<int> ln_stack;
 }
+YOSYS_NAMESPACE_END
 
 #define SV_KEYWORD(_tok) \
        if (sv_mode) return _tok; \
index ce7b9927295d5c5b3b71647b319bec217e0ccfc5..c62e761e2f7f9ab7dede9353cfb32461efdadb9a 100644 (file)
 #include "verilog_frontend.h"
 #include "kernel/log.h"
 
+USING_YOSYS_NAMESPACE
 using namespace AST;
 using namespace VERILOG_FRONTEND;
 
+YOSYS_NAMESPACE_BEGIN
 namespace VERILOG_FRONTEND {
        int port_counter;
        std::map<std::string, int> port_stubs;
@@ -56,6 +58,7 @@ namespace VERILOG_FRONTEND {
        bool default_nettype_wire;
        bool sv_mode;
 }
+YOSYS_NAMESPACE_END
 
 static void append_attr(AstNode *ast, std::map<std::string, AstNode*> *al)
 {
@@ -89,8 +92,8 @@ static void free_attr(std::map<std::string, AstNode*> *al)
 
 %union {
        std::string *string;
-       struct AstNode *ast;
-       std::map<std::string, AstNode*> *al;
+       struct YOSYS_NAMESPACE_PREFIX AST::AstNode *ast;
+       std::map<std::string, YOSYS_NAMESPACE_PREFIX AST::AstNode*> *al;
        bool boolean;
 }
 
index 2cfa8ca762f443b04468810255625af126eea1de..8efd4d7c32945078cc3560b668426ccebd70f9a5 100644 (file)
@@ -38,6 +38,8 @@
 #include <stdio.h>
 #include <string.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 static std::list<std::string> output_code;
 static std::list<std::string> input_buffer;
 static size_t input_buffer_charp;
@@ -427,3 +429,5 @@ std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::m
        return output;
 }
 
+YOSYS_NAMESPACE_END
+
index cbc594e86cd0874151ea7717139ca93839ede740..4466e1cb6eb7b8f465029d870167202ab77e1c0f 100644 (file)
@@ -34,6 +34,7 @@
 #include <sstream>
 #include <stdarg.h>
 
+YOSYS_NAMESPACE_BEGIN
 using namespace VERILOG_FRONTEND;
 
 // use the Verilog bison/flex parser to generate an AST and use AST::process() to convert it to RTLIL
@@ -376,3 +377,5 @@ struct VerilogDefaults : public Pass {
        }
 } VerilogDefaults;
 
+YOSYS_NAMESPACE_END
+
index 6d01a15326c15d3d5131fc313e7d922d5c7037fb..dac5b3d02902987eb532491cbecd2d6bc46b1a04 100644 (file)
 #ifndef VERILOG_FRONTEND_H
 #define VERILOG_FRONTEND_H
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include "frontends/ast/ast.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <list>
 
+YOSYS_NAMESPACE_BEGIN
+
 namespace VERILOG_FRONTEND
 {
        // this variable is set to a new AST_DESIGN node and then filled with the AST by the bison parser
@@ -53,6 +55,8 @@ namespace VERILOG_FRONTEND
 // the pre-processor
 std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::map<std::string, std::string> pre_defines_map, const std::list<std::string> include_dirs);
 
+YOSYS_NAMESPACE_END
+
 // the usual bison/flex stuff
 extern int frontend_verilog_yydebug;
 int frontend_verilog_yylex(void);
index 63dc85accf0636c4ab6125e065c2369f42aa102e..f0545700ac3d35866fbc4a8b5da2fcffe5667823 100644 (file)
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <limits.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 struct Vhdl2verilogPass : public Pass {
        Vhdl2verilogPass() : Pass("vhdl2verilog", "importing VHDL designs using vhdl2verilog") { }
        virtual void help()
@@ -190,3 +192,5 @@ struct Vhdl2verilogPass : public Pass {
        }
 } Vhdl2verilogPass;
  
+YOSYS_NAMESPACE_END
+
index b3ff3cf2a04fa6283c67b951610b774a8df5c3f9..29717aad5d91193c9ae85bd093de49db87f2f015 100644 (file)
 // Schneier, Bruce (1996). Applied Cryptography: Protocols, Algorithms, and Source Code in C,
 // Second Edition (2nd ed.). Wiley. ISBN 978-0-471-11709-4, page 244
 
-#include "kernel/log.h"
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include "libs/bigint/BigIntegerLibrary.hh"
 
+YOSYS_NAMESPACE_BEGIN
+
 static void extend(RTLIL::Const &arg, int width, bool is_signed)
 {
        RTLIL::State padding = RTLIL::State::S0;
@@ -592,3 +593,5 @@ RTLIL::Const RTLIL::const_neg(const RTLIL::Const &arg1, const RTLIL::Const&, boo
        return RTLIL::const_sub(zero, arg1_ext, false, signed1, result_len);
 }
 
+YOSYS_NAMESPACE_END
+
index d9ef2223832da7e6be6413922aea928847859b0f..01ade7d467d66a5f1e6543bfea9506ffd24007bc 100644 (file)
  *
  */
 
-#include <stdio.h>
+#include "kernel/yosys.h"
+
 #include <readline/readline.h>
 #include <readline/history.h>
+
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <limits.h>
 #include <errno.h>
 
-#include <algorithm>
-#include <exception>
-
-#include "kernel/yosys.h"
-
-bool fgetline(FILE *f, std::string &buffer)
-{
-       buffer = "";
-       char block[4096];
-       while (1) {
-               if (fgets(block, 4096, f) == NULL)
-                       return false;
-               buffer += block;
-               if (buffer.size() > 0 && (buffer[buffer.size()-1] == '\n' ||  buffer[buffer.size()-1] == '\r')) {
-                       while (buffer.size() > 0 && (buffer[buffer.size()-1] == '\n' ||  buffer[buffer.size()-1] == '\r'))
-                               buffer.resize(buffer.size()-1);
-                       return true;
-               }
-       }
-}
-
-static void handle_label(std::string &command, bool &from_to_active, const std::string &run_from, const std::string &run_to)
-{
-       int pos = 0;
-       std::string label;
-
-       while (pos < SIZE(command) && (command[pos] == ' ' || command[pos] == '\t'))
-               pos++;
-
-       while (pos < SIZE(command) && command[pos] != ' ' && command[pos] != '\t' && command[pos] != '\r' && command[pos] != '\n')
-               label += command[pos++];
-
-       if (label.back() == ':' && SIZE(label) > 1)
-       {
-               label = label.substr(0, SIZE(label)-1);
-               command = command.substr(pos);
-
-               if (label == run_from)
-                       from_to_active = true;
-               else if (label == run_to || (run_from == run_to && !run_from.empty()))
-                       from_to_active = false;
-       }
-}
-
-static void run_frontend(std::string filename, std::string command, RTLIL::Design *design, std::string *backend_command, std::string *from_to_label)
-{
-       if (command == "auto") {
-               if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
-                       command = "verilog";
-               else if (filename.size() > 2 && filename.substr(filename.size()-3) == ".sv")
-                       command = "verilog -sv";
-               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
-                       command = "ilang";
-               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".ys")
-                       command = "script";
-               else if (filename == "-")
-                       command = "script";
-               else
-                       log_error("Can't guess frontend for input file `%s' (missing -f option)!\n", filename.c_str());
-       }
-
-       if (command == "script")
-       {
-               std::string run_from, run_to;
-               bool from_to_active = true;
-
-               if (from_to_label != NULL) {
-                       size_t pos = from_to_label->find(':');
-                       if (pos == std::string::npos) {
-                               run_from = *from_to_label;
-                               run_to = *from_to_label;
-                       } else {
-                               run_from = from_to_label->substr(0, pos);
-                               run_to = from_to_label->substr(pos+1);
-                       }
-                       from_to_active = run_from.empty();
-               }
-
-               log("\n-- Executing script file `%s' --\n", filename.c_str());
-
-               FILE *f = stdin;
-
-               if (filename != "-")
-                       f = fopen(filename.c_str(), "r");
-
-               if (f == NULL)
-                       log_error("Can't open script file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
-
-               FILE *backup_script_file = Frontend::current_script_file;
-               Frontend::current_script_file = f;
-
-               try {
-                       std::string command;
-                       while (fgetline(f, command)) {
-                               while (!command.empty() && command[command.size()-1] == '\\') {
-                                       std::string next_line;
-                                       if (!fgetline(f, next_line))
-                                               break;
-                                       command.resize(command.size()-1);
-                                       command += next_line;
-                               }
-                               handle_label(command, from_to_active, run_from, run_to);
-                               if (from_to_active)
-                                       Pass::call(design, command);
-                       }
-
-                       if (!command.empty()) {
-                               handle_label(command, from_to_active, run_from, run_to);
-                               if (from_to_active)
-                                       Pass::call(design, command);
-                       }
-               }
-               catch (log_cmd_error_expection) {
-                       Frontend::current_script_file = backup_script_file;
-                       throw log_cmd_error_expection();
-               }
-
-               Frontend::current_script_file = backup_script_file;
-
-               if (filename != "-")
-                       fclose(f);
-
-               if (backend_command != NULL && *backend_command == "auto")
-                       *backend_command = "";
-
-               return;
-       }
-
-       if (filename == "-") {
-               log("\n-- Parsing stdin using frontend `%s' --\n", command.c_str());
-       } else {
-               log("\n-- Parsing `%s' using frontend `%s' --\n", filename.c_str(), command.c_str());
-       }
-
-       Frontend::frontend_call(design, NULL, filename, command);
-}
-
-static void run_pass(std::string command, RTLIL::Design *design)
-{
-       log("\n-- Running pass `%s' --\n", command.c_str());
-
-       Pass::call(design, command);
-}
-
-static void run_backend(std::string filename, std::string command, RTLIL::Design *design)
-{
-       if (command == "auto") {
-               if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
-                       command = "verilog";
-               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
-                       command = "ilang";
-               else if (filename.size() > 5 && filename.substr(filename.size()-5) == ".blif")
-                       command = "blif";
-               else if (filename == "-")
-                       command = "ilang";
-               else if (filename.empty())
-                       return;
-               else
-                       log_error("Can't guess backend for output file `%s' (missing -b option)!\n", filename.c_str());
-       }
-
-       if (filename.empty())
-               filename = "-";
-
-       if (filename == "-") {
-               log("\n-- Writing to stdout using backend `%s' --\n", command.c_str());
-       } else {
-               log("\n-- Writing to `%s' using backend `%s' --\n", filename.c_str(), command.c_str());
-       }
-
-       Backend::backend_call(design, NULL, filename, command);
-}
-
-static char *readline_cmd_generator(const char *text, int state)
-{
-       static std::map<std::string, Pass*>::iterator it;
-       static int len;
-
-       if (!state) {
-               it = REGISTER_INTERN::pass_register.begin();
-               len = strlen(text);
-       }
-
-       for (; it != REGISTER_INTERN::pass_register.end(); it++) {
-               if (it->first.substr(0, len) == text)
-                       return strdup((it++)->first.c_str());
-       }
-       return NULL;
-}
-
-static char *readline_obj_generator(const char *text, int state)
-{
-       static std::vector<char*> obj_names;
-       static size_t idx;
-
-       if (!state)
-       {
-               idx = 0;
-               obj_names.clear();
-
-               RTLIL::Design *design = yosys_get_design();
-               int len = strlen(text);
-
-               if (design->selected_active_module.empty())
-               {
-                       for (auto &it : design->modules_)
-                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
-                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
-               }
-               else
-               if (design->modules_.count(design->selected_active_module) > 0)
-               {
-                       RTLIL::Module *module = design->modules_.at(design->selected_active_module);
-
-                       for (auto &it : module->wires_)
-                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
-                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
-
-                       for (auto &it : module->memories)
-                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
-                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
-
-                       for (auto &it : module->cells_)
-                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
-                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
-
-                       for (auto &it : module->processes)
-                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
-                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
-               }
-
-               std::sort(obj_names.begin(), obj_names.end());
-       }
-
-       if (idx < obj_names.size())
-               return strdup(obj_names[idx++]);
-
-       idx = 0;
-       obj_names.clear();
-       return NULL;
-}
-
-static char **readline_completion(const char *text, int start, int)
-{
-       if (start == 0)
-               return rl_completion_matches(text, readline_cmd_generator);
-       if (strncmp(rl_line_buffer, "read_", 5) && strncmp(rl_line_buffer, "write_", 6))
-               return rl_completion_matches(text, readline_obj_generator);
-       return NULL;
-}
-
-const char *create_prompt(RTLIL::Design *design, int recursion_counter)
-{
-       static char buffer[100];
-       std::string str = "\n";
-       if (recursion_counter > 1)
-               str += stringf("(%d) ", recursion_counter);
-       str += "yosys";
-       if (!design->selected_active_module.empty())
-               str += stringf(" [%s]", RTLIL::id2cstr(design->selected_active_module));
-       if (!design->selection_stack.empty() && !design->selection_stack.back().full_selection) {
-               if (design->selected_active_module.empty())
-                       str += "*";
-               else if (design->selection_stack.back().selected_modules.size() != 1 || design->selection_stack.back().selected_members.size() != 0 ||
-                               design->selection_stack.back().selected_modules.count(design->selected_active_module) == 0)
-                       str += "*";
-       }
-       snprintf(buffer, 100, "%s> ", str.c_str());
-       return buffer;
-}
-
-static void shell(RTLIL::Design *design)
-{
-       static int recursion_counter = 0;
-
-       recursion_counter++;
-       log_cmd_error_throw = true;
-
-       rl_readline_name = "yosys";
-       rl_attempted_completion_function = readline_completion;
-       rl_basic_word_break_characters = " \t\n";
-
-       char *command = NULL;
-       while ((command = readline(create_prompt(design, recursion_counter))) != NULL)
-       {
-               if (command[strspn(command, " \t\r\n")] == 0)
-                       continue;
-               add_history(command);
-
-               char *p = command + strspn(command, " \t\r\n");
-               if (!strncmp(p, "exit", 4)) {
-                       p += 4;
-                       p += strspn(p, " \t\r\n");
-                       if (*p == 0)
-                               break;
-               }
-
-               try {
-                       log_assert(design->selection_stack.size() == 1);
-                       Pass::call(design, command);
-               } catch (log_cmd_error_expection) {
-                       while (design->selection_stack.size() > 1)
-                               design->selection_stack.pop_back();
-                       log_reset_stack();
-               }
-       }
-       if (command == NULL)
-               printf("exit\n");
-
-       recursion_counter--;
-       log_cmd_error_throw = false;
-}
-
-struct ShellPass : public Pass {
-       ShellPass() : Pass("shell", "enter interactive command mode") { }
-       virtual void help() {
-               log("\n");
-               log("    shell\n");
-               log("\n");
-               log("This command enters the interactive command mode. This can be useful\n");
-               log("in a script to interrupt the script at a certain point and allow for\n");
-               log("interactive inspection or manual synthesis of the design at this point.\n");
-               log("\n");
-               log("The command prompt of the interactive shell indicates the current\n");
-               log("selection (see 'help select'):\n");
-               log("\n");
-               log("    yosys>\n");
-               log("        the entire design is selected\n");
-               log("\n");
-               log("    yosys*>\n");
-               log("        only part of the design is selected\n");
-               log("\n");
-               log("    yosys [modname]>\n");
-               log("        the entire module 'modname' is selected using 'select -module modname'\n");
-               log("\n");
-               log("    yosys [modname]*>\n");
-               log("        only part of current module 'modname' is selected\n");
-               log("\n");
-               log("When in interactive shell, some errors (e.g. invalid command arguments)\n");
-               log("do not terminate yosys but return to the command prompt.\n");
-               log("\n");
-               log("This command is the default action if nothing else has been specified\n");
-               log("on the command line.\n");
-               log("\n");
-               log("Press Ctrl-D or type 'exit' to leave the interactive shell.\n");
-               log("\n");
-       }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
-               extra_args(args, 1, design, false);
-               shell(design);
-       }
-} ShellPass;
-
-struct HistoryPass : public Pass {
-       HistoryPass() : Pass("history", "show last interactive commands") { }
-       virtual void help() {
-               log("\n");
-               log("    history\n");
-               log("\n");
-               log("This command prints all commands in the shell history buffer. This are\n");
-               log("all commands executed in an interactive session, but not the commands\n");
-               log("from executed scripts.\n");
-               log("\n");
-       }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
-               extra_args(args, 1, design, false);
-               for(HIST_ENTRY **list = history_list(); *list != NULL; list++)
-                       log("%s\n", (*list)->line);
-       }
-} HistoryPass;
-
-struct ScriptPass : public Pass {
-       ScriptPass() : Pass("script", "execute commands from script file") { }
-       virtual void help() {
-               log("\n");
-               log("    script <filename> [<from_label>:<to_label>]\n");
-               log("\n");
-               log("This command executes the yosys commands in the specified file.\n");
-               log("\n");
-               log("The 2nd argument can be used to only execute the section of the\n");
-               log("file between the specified labels. An empty from label is synonymous\n");
-               log("for the beginning of the file and an empty to label is synonymous\n");
-               log("for the end of the file.\n");
-               log("\n");
-               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");
-       }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
-               if (args.size() < 2)
-                       log_cmd_error("Missing script file.\n");
-               else if (args.size() == 2)
-                       run_frontend(args[1], "script", design, NULL, NULL);
-               else if (args.size() == 3)
-                       run_frontend(args[1], "script", design, NULL, &args[2]);
-               else
-                       extra_args(args, 2, design, false);
-       }
-} ScriptPass;
-
-#ifdef YOSYS_ENABLE_TCL
-static Tcl_Interp *yosys_tcl_interp = NULL;
-
-static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *argv[])
-{
-       std::vector<std::string> args;
-       for (int i = 1; i < argc; i++)
-               args.push_back(argv[i]);
-
-       if (args.size() >= 1 && args[0] == "-import") {
-               for (auto &it : REGISTER_INTERN::pass_register) {
-                       std::string tcl_command_name = it.first;
-                       if (tcl_command_name == "proc")
-                               tcl_command_name = "procs";
-                       Tcl_CmdInfo info;
-                       if (Tcl_GetCommandInfo(interp, tcl_command_name.c_str(), &info) != 0) {
-                               log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first.c_str());
-                       } else {
-                               std::string tcl_script = stringf("proc %s args { yosys %s {*}$args }", tcl_command_name.c_str(), it.first.c_str());
-                               Tcl_Eval(interp, tcl_script.c_str());
-                       }
-               }
-               return TCL_OK;
-       }
-
-       if (args.size() == 1) {
-               Pass::call(yosys_get_design(), args[0]);
-               return TCL_OK;
-       }
-
-       Pass::call(yosys_get_design(), args);
-       return TCL_OK;
-}
-
-extern Tcl_Interp *yosys_get_tcl_interp()
-{
-       if (yosys_tcl_interp == NULL) {
-               yosys_tcl_interp = Tcl_CreateInterp();
-               Tcl_CreateCommand(yosys_tcl_interp, "yosys", tcl_yosys_cmd, NULL, NULL);
-       }
-       return yosys_tcl_interp;
-}
-
-struct TclPass : public Pass {
-       TclPass() : Pass("tcl", "execute a TCL script file") { }
-       virtual void help() {
-               log("\n");
-               log("    tcl <filename>\n");
-               log("\n");
-               log("This command executes the tcl commands in the specified file.\n");
-               log("Use 'yosys cmd' to run the yosys command 'cmd' from tcl.\n");
-               log("\n");
-               log("The tcl command 'yosys -import' can be used to import all yosys\n");
-               log("commands directly as tcl commands to the tcl shell. The yosys\n");
-               log("command 'proc' is wrapped using the tcl command 'procs' in order\n");
-               log("to avoid a name collision with the tcl builting command 'proc'.\n");
-               log("\n");
-       }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
-               if (args.size() < 2)
-                       log_cmd_error("Missing script file.\n");
-               if (args.size() > 2)
-                       extra_args(args, 1, design, false);
-               if (Tcl_EvalFile(yosys_get_tcl_interp(), args[1].c_str()) != TCL_OK)
-                       log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(yosys_get_tcl_interp()));
-       }
-} TclPass;
-#endif
-
-static RTLIL::Design *yosys_design = NULL;
-
-extern RTLIL::Design *yosys_get_design()
-{
-       return yosys_design;
-}
-
-#if defined(__linux__)
-std::string proc_self_dirname ()
-{
-       char path [PATH_MAX];
-       ssize_t buflen = readlink("/proc/self/exe", path, sizeof(path));
-       if (buflen < 0) {
-               log_cmd_error("readlink(\"/proc/self/exe\") failed: %s", strerror(errno));
-               log_abort();
-       }
-       while (buflen > 0 && path[buflen-1] != '/')
-               buflen--;
-       return std::string(path, buflen);
-}
-#elif defined(__APPLE__)
-#include <mach-o/dyld.h>
-std::string proc_self_dirname ()
-{
-       char * path = NULL;
-       uint32_t buflen = 0;
-       while (_NSGetExecutablePath(path, &buflen) != 0)
-               path = (char *) realloc((void *) path, buflen);
-       while (buflen > 0 && path[buflen-1] != '/')
-               buflen--;
-       return std::string(path, buflen);
-}
-#else
-       #error Dont know how to determine process executable base path!
-#endif
-
-std::string proc_share_dirname ()
-{
-       std::string proc_self_path = proc_self_dirname();
-       std::string proc_share_path = proc_self_path + "share/";
-       if (access(proc_share_path.c_str(), X_OK) == 0)
-               return proc_share_path;
-       proc_share_path = proc_self_path + "../share/yosys/";
-       if (access(proc_share_path.c_str(), X_OK) == 0)
-               return proc_share_path;
-       log_cmd_error("proc_share_dirname: unable to determine share/ directory!");
-       log_abort();
-}
+USING_YOSYS_NAMESPACE
 
 int main(int argc, char **argv)
 {
@@ -739,11 +226,7 @@ int main(int argc, char **argv)
                log("\n");
        }
 
-       Pass::init_register();
-
-       yosys_design = new RTLIL::Design;
-       yosys_design->selection_stack.push_back(RTLIL::Selection());
-       log_push();
+       yosys_setup();
 
        if (optind == argc && passes_commands.size() == 0 && scriptfile.empty()) {
                if (!got_output_filename)
@@ -804,7 +287,6 @@ int main(int argc, char **argv)
        log("\nEnd of script.\n");
        if (call_abort)
                abort();
-       log_pop();
 
        if (!history_file.empty()) {
                if (history_offset > 0) {
@@ -819,25 +301,11 @@ int main(int argc, char **argv)
        if (hist_list != NULL)
                free(hist_list);
 
-       for (auto f : log_files)
-               if (f != stderr)
-                       fclose(f);
-       log_errfile = NULL;
-       log_files.clear();
-
-       Pass::done_register();
+       yosys_shutdown();
 
        for (auto mod : loaded_modules)
                dlclose(mod);
 
-#ifdef YOSYS_ENABLE_TCL
-       if (yosys_tcl_interp != NULL) {
-               Tcl_DeleteInterp(yosys_tcl_interp);
-               Tcl_Finalize();
-               yosys_tcl_interp = NULL;
-       }
-#endif
-
        return 0;
 }
 
index 5fe0d0863b80016a9f68553851f0842f0066fe0a..64dd7a92a850ce3ca2a6dd975e6ee7411ebfc65c 100644 (file)
@@ -28,6 +28,8 @@
 #include <vector>
 #include <list>
 
+YOSYS_NAMESPACE_BEGIN
+
 std::vector<FILE*> log_files;
 FILE *log_errfile = NULL;
 bool log_time = false;
@@ -233,7 +235,7 @@ std::map<std::string, std::pair<std::string, int>> get_coverage_data()
 {
        std::map<std::string, std::pair<std::string, int>> coverage_data;
 
-       for (auto &it : REGISTER_INTERN::pass_register) {
+       for (auto &it : pass_register) {
                std::string key = stringf("passes.%s", it.first.c_str());
                coverage_data[key].first = stringf("%s:%d:%s", __FILE__, __LINE__, __FUNCTION__);
                coverage_data[key].second += it.second->call_counter;
@@ -260,3 +262,5 @@ std::map<std::string, std::pair<std::string, int>> get_coverage_data()
        return coverage_data;
 }
 
+YOSYS_NAMESPACE_END
+
index a491d067d028deecf5900eba704cd6db9cab69a2..0109faf626eed04921344ac10a796eef087e92ff 100644 (file)
@@ -28,6 +28,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+YOSYS_NAMESPACE_BEGIN
+
 #define S__LINE__sub2(x) #x
 #define S__LINE__sub1(x) S__LINE__sub2(x)
 #define S__LINE__ S__LINE__sub1(__LINE__)
@@ -40,8 +42,6 @@ extern bool log_time;
 extern bool log_cmd_error_throw;
 extern int log_verbose_level;
 
-std::string stringf(const char *fmt, ...);
-
 void logv(const char *format, va_list ap);
 void logv_header(const char *format, va_list ap);
 void logv_error(const char *format, va_list ap) __attribute__ ((noreturn));
@@ -246,4 +246,6 @@ void log_dump_args_worker(const char *p, T first, Args ... args)
        log("\n"); \
 } while (0)
 
+YOSYS_NAMESPACE_END
+
 #endif
index c7bd2cce7034a755fabb7d1ab5657bc2fc2c9b32..7469b3e81c8d4e74ef3b0c2bba0f1ead0cf945f4 100644 (file)
  *
  */
 
-#include "kernel/compatibility.h"
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
-using namespace REGISTER_INTERN;
+YOSYS_NAMESPACE_BEGIN
+
 #define MAX_REG_COUNT 1000
 
-namespace REGISTER_INTERN
-{
-       bool echo_mode = false;
-       Pass *first_queued_pass;
+bool echo_mode = false;
+Pass *first_queued_pass;
 
-       std::map<std::string, Frontend*> frontend_register;
-       std::map<std::string, Pass*> pass_register;
-       std::map<std::string, Backend*> backend_register;
-}
+std::map<std::string, Frontend*> frontend_register;
+std::map<std::string, Pass*> pass_register;
+std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
@@ -552,7 +548,7 @@ struct HelpPass : public Pass {
        {
                if (args.size() == 1) {
                        log("\n");
-                       for (auto &it : REGISTER_INTERN::pass_register)
+                       for (auto &it : pass_register)
                                log("    %-20s %s\n", it.first.c_str(), it.second->short_help.c_str());
                        log("\n");
                        log("Type 'help <command>' for more information on a command.\n");
@@ -562,7 +558,7 @@ struct HelpPass : public Pass {
 
                if (args.size() == 2) {
                        if (args[1] == "-all") {
-                               for (auto &it : REGISTER_INTERN::pass_register) {
+                               for (auto &it : pass_register) {
                                        log("\n\n");
                                        log("%s  --  %s\n", it.first.c_str(), it.second->short_help.c_str());
                                        for (size_t i = 0; i < it.first.size() + it.second->short_help.size() + 6; i++)
@@ -575,7 +571,7 @@ struct HelpPass : public Pass {
                        else if (args[1] == "-write-tex-command-reference-manual") {
                                FILE *f = fopen("command-reference-manual.tex", "wt");
                                fprintf(f, "%% Generated using the yosys 'help -write-tex-command-reference-manual' command.\n\n");
-                               for (auto &it : REGISTER_INTERN::pass_register) {
+                               for (auto &it : pass_register) {
                                        size_t memsize;
                                        char *memptr;
                                        FILE *memf = open_memstream(&memptr, &memsize);
@@ -591,7 +587,7 @@ struct HelpPass : public Pass {
                        // this option is undocumented as it is for internal use only
                        else if (args[1] == "-write-web-command-reference-manual") {
                                FILE *f = fopen("templates/cmd_index.in", "wt");
-                               for (auto &it : REGISTER_INTERN::pass_register) {
+                               for (auto &it : pass_register) {
                                        size_t memsize;
                                        char *memptr;
                                        FILE *memf = open_memstream(&memptr, &memsize);
@@ -604,10 +600,10 @@ struct HelpPass : public Pass {
                                }
                                fclose(f);
                        }
-                       else if (REGISTER_INTERN::pass_register.count(args[1]) == 0)
+                       else if (pass_register.count(args[1]) == 0)
                                log("No such command: %s\n", args[1].c_str());
                        else
-                               REGISTER_INTERN::pass_register.at(args[1])->help();
+                               pass_register.at(args[1])->help();
                        return;
                }
 
@@ -648,3 +644,5 @@ struct EchoPass : public Pass {
        }
 } EchoPass;
  
+YOSYS_NAMESPACE_END
+
index 41780bfb929f824fe39d9af8e3dd49bc52f3f410..17942ca96afa9bf57e9816087c90feda76683e72 100644 (file)
 #ifndef REGISTER_H
 #define REGISTER_H
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include <stdio.h>
 #include <string>
 #include <vector>
 #include <map>
 
+YOSYS_NAMESPACE_BEGIN
+
 struct Pass
 {
        std::string pass_name, short_help;
@@ -94,10 +96,10 @@ struct Backend : Pass
 // implemented in passes/cmds/select.cc
 extern void handle_extra_select_args(Pass *pass, std::vector<std::string> args, size_t argidx, size_t args_size, RTLIL::Design *design);
 
-namespace REGISTER_INTERN {
-       extern std::map<std::string, Pass*> pass_register;
-       extern std::map<std::string, Frontend*> frontend_register;
-       extern std::map<std::string, Backend*> backend_register;
-}
+extern std::map<std::string, Pass*> pass_register;
+extern std::map<std::string, Frontend*> frontend_register;
+extern std::map<std::string, Backend*> backend_register;
+
+YOSYS_NAMESPACE_END
 
 #endif
index f864d88c09be91ae75fc0c201758499432a1ca58..82fa7aec231fa0029fc16635cf90a7c65e465e19 100644 (file)
  *
  */
 
-#include "kernel/compatibility.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
 #include "frontends/verilog/verilog_frontend.h"
 #include "backends/ilang/ilang_backend.h"
 
 #include <string.h>
 #include <algorithm>
 
-int RTLIL::autoidx = 1;
+YOSYS_NAMESPACE_BEGIN
 
 RTLIL::Const::Const()
 {
@@ -2736,3 +2734,5 @@ RTLIL::Process *RTLIL::Process::clone() const
        return new_proc;
 }
 
+YOSYS_NAMESPACE_END
+
index 7bd75bd1d64a8c162935d5096c6dfc2486b7f15b..4d8581c721ee74795827b0306f7ecfa333a47c83 100644 (file)
@@ -22,6 +22,8 @@
 #ifndef RTLIL_H
 #define RTLIL_H
 
+YOSYS_NAMESPACE_BEGIN
+
 namespace RTLIL
 {
        enum State : unsigned char {
@@ -50,8 +52,6 @@ namespace RTLIL
                CONST_FLAG_REAL   = 4   // unused -- to be used for parameters
        };
 
-       extern int autoidx;
-
        struct Const;
        struct Selection;
        struct Design;
@@ -123,18 +123,6 @@ namespace RTLIL
                return str.c_str();
        }
 
-       static IdString new_id(std::string file, int line, std::string func) __attribute__((unused));
-       static IdString new_id(std::string file, int line, std::string func) {
-               std::string str = "$auto$";
-               size_t pos = file.find_last_of('/');
-               str += pos != std::string::npos ? file.substr(pos+1) : file;
-               str += stringf(":%d:%s$%d", line, func.c_str(), autoidx++);
-               return str;
-       }
-
-#define NEW_ID \
-       RTLIL::new_id(__FILE__, __LINE__, __FUNCTION__)
-
        template <typename T> struct sort_by_name {
                bool operator()(T *a, T *b) const {
                        return a->name < b->name;
@@ -969,4 +957,6 @@ void RTLIL::Process::rewrite_sigspecs(T functor)
                it->rewrite_sigspecs(functor);
 }
 
+YOSYS_NAMESPACE_END
+
 #endif
index 79a9fb238bb517c099aa918390405f5980625d33..b691749a857a25f16e8beab5da26d6cc47ed562e 100644 (file)
@@ -20,9 +20,9 @@
 #ifndef SIGTOOLS_H
 #define SIGTOOLS_H
 
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-#include <set>
+#include "kernel/yosys.h"
+
+YOSYS_NAMESPACE_BEGIN
 
 struct SigPool
 {
@@ -398,4 +398,6 @@ struct SigMap
        }
 };
 
+YOSYS_NAMESPACE_END
+
 #endif /* SIGTOOLS_H */
index d2544382693b7c32c89c7f799a58ba78580cec3e..34800ce8e59af0f5772b6fc076cb0dca9346dc8f 100644 (file)
 
 #include "kernel/yosys.h"
 
+#include <readline/readline.h>
+#include <readline/history.h>
+
+#include <unistd.h>
+#include <limits.h>
+
+YOSYS_NAMESPACE_BEGIN
+
+int autoidx = 1;
+RTLIL::Design *yosys_design = NULL;
+
+#ifdef YOSYS_ENABLE_TCL
+Tcl_Interp *yosys_tcl_interp = NULL;
+#endif
+
 std::string stringf(const char *fmt, ...)
 {
        std::string string;
@@ -38,3 +53,553 @@ std::string stringf(const char *fmt, ...)
        return string;
 }
 
+void yosys_setup()
+{
+       Pass::init_register();
+
+       yosys_design = new RTLIL::Design;
+       yosys_design->selection_stack.push_back(RTLIL::Selection());
+       log_push();
+}
+
+void yosys_shutdown()
+{
+       log_pop();
+
+       for (auto f : log_files)
+               if (f != stderr)
+                       fclose(f);
+       log_errfile = NULL;
+       log_files.clear();
+
+       Pass::done_register();
+
+#ifdef YOSYS_ENABLE_TCL
+       if (yosys_tcl_interp != NULL) {
+               Tcl_DeleteInterp(yosys_tcl_interp);
+               Tcl_Finalize();
+               yosys_tcl_interp = NULL;
+       }
+#endif
+}
+
+RTLIL::IdString new_id(std::string file, int line, std::string func)
+{
+       std::string str = "$auto$";
+       size_t pos = file.find_last_of('/');
+       str += pos != std::string::npos ? file.substr(pos+1) : file;
+       str += stringf(":%d:%s$%d", line, func.c_str(), autoidx++);
+       return str;
+}
+
+RTLIL::Design *yosys_get_design()
+{
+       return yosys_design;
+}
+
+const char *create_prompt(RTLIL::Design *design, int recursion_counter)
+{
+       static char buffer[100];
+       std::string str = "\n";
+       if (recursion_counter > 1)
+               str += stringf("(%d) ", recursion_counter);
+       str += "yosys";
+       if (!design->selected_active_module.empty())
+               str += stringf(" [%s]", RTLIL::id2cstr(design->selected_active_module));
+       if (!design->selection_stack.empty() && !design->selection_stack.back().full_selection) {
+               if (design->selected_active_module.empty())
+                       str += "*";
+               else if (design->selection_stack.back().selected_modules.size() != 1 || design->selection_stack.back().selected_members.size() != 0 ||
+                               design->selection_stack.back().selected_modules.count(design->selected_active_module) == 0)
+                       str += "*";
+       }
+       snprintf(buffer, 100, "%s> ", str.c_str());
+       return buffer;
+}
+
+#ifdef YOSYS_ENABLE_TCL
+static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *argv[])
+{
+       std::vector<std::string> args;
+       for (int i = 1; i < argc; i++)
+               args.push_back(argv[i]);
+
+       if (args.size() >= 1 && args[0] == "-import") {
+               for (auto &it : pass_register) {
+                       std::string tcl_command_name = it.first;
+                       if (tcl_command_name == "proc")
+                               tcl_command_name = "procs";
+                       Tcl_CmdInfo info;
+                       if (Tcl_GetCommandInfo(interp, tcl_command_name.c_str(), &info) != 0) {
+                               log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first.c_str());
+                       } else {
+                               std::string tcl_script = stringf("proc %s args { yosys %s {*}$args }", tcl_command_name.c_str(), it.first.c_str());
+                               Tcl_Eval(interp, tcl_script.c_str());
+                       }
+               }
+               return TCL_OK;
+       }
+
+       if (args.size() == 1) {
+               Pass::call(yosys_get_design(), args[0]);
+               return TCL_OK;
+       }
+
+       Pass::call(yosys_get_design(), args);
+       return TCL_OK;
+}
+
+extern Tcl_Interp *yosys_get_tcl_interp()
+{
+       if (yosys_tcl_interp == NULL) {
+               yosys_tcl_interp = Tcl_CreateInterp();
+               Tcl_CreateCommand(yosys_tcl_interp, "yosys", tcl_yosys_cmd, NULL, NULL);
+       }
+       return yosys_tcl_interp;
+}
+
+struct TclPass : public Pass {
+       TclPass() : Pass("tcl", "execute a TCL script file") { }
+       virtual void help() {
+               log("\n");
+               log("    tcl <filename>\n");
+               log("\n");
+               log("This command executes the tcl commands in the specified file.\n");
+               log("Use 'yosys cmd' to run the yosys command 'cmd' from tcl.\n");
+               log("\n");
+               log("The tcl command 'yosys -import' can be used to import all yosys\n");
+               log("commands directly as tcl commands to the tcl shell. The yosys\n");
+               log("command 'proc' is wrapped using the tcl command 'procs' in order\n");
+               log("to avoid a name collision with the tcl builting command 'proc'.\n");
+               log("\n");
+       }
+       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+               if (args.size() < 2)
+                       log_cmd_error("Missing script file.\n");
+               if (args.size() > 2)
+                       extra_args(args, 1, design, false);
+               if (Tcl_EvalFile(yosys_get_tcl_interp(), args[1].c_str()) != TCL_OK)
+                       log_cmd_error("TCL interpreter returned an error: %s\n", Tcl_GetStringResult(yosys_get_tcl_interp()));
+       }
+} TclPass;
+#endif
+
+#if defined(__linux__)
+std::string proc_self_dirname ()
+{
+       char path [PATH_MAX];
+       ssize_t buflen = readlink("/proc/self/exe", path, sizeof(path));
+       if (buflen < 0) {
+               log_cmd_error("readlink(\"/proc/self/exe\") failed: %s", strerror(errno));
+               log_abort();
+       }
+       while (buflen > 0 && path[buflen-1] != '/')
+               buflen--;
+       return std::string(path, buflen);
+}
+#elif defined(__APPLE__)
+#include <mach-o/dyld.h>
+std::string proc_self_dirname ()
+{
+       char * path = NULL;
+       uint32_t buflen = 0;
+       while (_NSGetExecutablePath(path, &buflen) != 0)
+               path = (char *) realloc((void *) path, buflen);
+       while (buflen > 0 && path[buflen-1] != '/')
+               buflen--;
+       return std::string(path, buflen);
+}
+#else
+       #error Dont know how to determine process executable base path!
+#endif
+
+std::string proc_share_dirname ()
+{
+       std::string proc_self_path = proc_self_dirname();
+       std::string proc_share_path = proc_self_path + "share/";
+       if (access(proc_share_path.c_str(), X_OK) == 0)
+               return proc_share_path;
+       proc_share_path = proc_self_path + "../share/yosys/";
+       if (access(proc_share_path.c_str(), X_OK) == 0)
+               return proc_share_path;
+       log_cmd_error("proc_share_dirname: unable to determine share/ directory!");
+       log_abort();
+}
+
+bool fgetline(FILE *f, std::string &buffer)
+{
+       buffer = "";
+       char block[4096];
+       while (1) {
+               if (fgets(block, 4096, f) == NULL)
+                       return false;
+               buffer += block;
+               if (buffer.size() > 0 && (buffer[buffer.size()-1] == '\n' ||  buffer[buffer.size()-1] == '\r')) {
+                       while (buffer.size() > 0 && (buffer[buffer.size()-1] == '\n' ||  buffer[buffer.size()-1] == '\r'))
+                               buffer.resize(buffer.size()-1);
+                       return true;
+               }
+       }
+}
+
+static void handle_label(std::string &command, bool &from_to_active, const std::string &run_from, const std::string &run_to)
+{
+       int pos = 0;
+       std::string label;
+
+       while (pos < SIZE(command) && (command[pos] == ' ' || command[pos] == '\t'))
+               pos++;
+
+       while (pos < SIZE(command) && command[pos] != ' ' && command[pos] != '\t' && command[pos] != '\r' && command[pos] != '\n')
+               label += command[pos++];
+
+       if (label.back() == ':' && SIZE(label) > 1)
+       {
+               label = label.substr(0, SIZE(label)-1);
+               command = command.substr(pos);
+
+               if (label == run_from)
+                       from_to_active = true;
+               else if (label == run_to || (run_from == run_to && !run_from.empty()))
+                       from_to_active = false;
+       }
+}
+
+void run_frontend(std::string filename, std::string command, RTLIL::Design *design, std::string *backend_command, std::string *from_to_label)
+{
+       if (command == "auto") {
+               if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
+                       command = "verilog";
+               else if (filename.size() > 2 && filename.substr(filename.size()-3) == ".sv")
+                       command = "verilog -sv";
+               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
+                       command = "ilang";
+               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".ys")
+                       command = "script";
+               else if (filename == "-")
+                       command = "script";
+               else
+                       log_error("Can't guess frontend for input file `%s' (missing -f option)!\n", filename.c_str());
+       }
+
+       if (command == "script")
+       {
+               std::string run_from, run_to;
+               bool from_to_active = true;
+
+               if (from_to_label != NULL) {
+                       size_t pos = from_to_label->find(':');
+                       if (pos == std::string::npos) {
+                               run_from = *from_to_label;
+                               run_to = *from_to_label;
+                       } else {
+                               run_from = from_to_label->substr(0, pos);
+                               run_to = from_to_label->substr(pos+1);
+                       }
+                       from_to_active = run_from.empty();
+               }
+
+               log("\n-- Executing script file `%s' --\n", filename.c_str());
+
+               FILE *f = stdin;
+
+               if (filename != "-")
+                       f = fopen(filename.c_str(), "r");
+
+               if (f == NULL)
+                       log_error("Can't open script file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
+
+               FILE *backup_script_file = Frontend::current_script_file;
+               Frontend::current_script_file = f;
+
+               try {
+                       std::string command;
+                       while (fgetline(f, command)) {
+                               while (!command.empty() && command[command.size()-1] == '\\') {
+                                       std::string next_line;
+                                       if (!fgetline(f, next_line))
+                                               break;
+                                       command.resize(command.size()-1);
+                                       command += next_line;
+                               }
+                               handle_label(command, from_to_active, run_from, run_to);
+                               if (from_to_active)
+                                       Pass::call(design, command);
+                       }
+
+                       if (!command.empty()) {
+                               handle_label(command, from_to_active, run_from, run_to);
+                               if (from_to_active)
+                                       Pass::call(design, command);
+                       }
+               }
+               catch (log_cmd_error_expection) {
+                       Frontend::current_script_file = backup_script_file;
+                       throw log_cmd_error_expection();
+               }
+
+               Frontend::current_script_file = backup_script_file;
+
+               if (filename != "-")
+                       fclose(f);
+
+               if (backend_command != NULL && *backend_command == "auto")
+                       *backend_command = "";
+
+               return;
+       }
+
+       if (filename == "-") {
+               log("\n-- Parsing stdin using frontend `%s' --\n", command.c_str());
+       } else {
+               log("\n-- Parsing `%s' using frontend `%s' --\n", filename.c_str(), command.c_str());
+       }
+
+       Frontend::frontend_call(design, NULL, filename, command);
+}
+
+void run_pass(std::string command, RTLIL::Design *design)
+{
+       log("\n-- Running pass `%s' --\n", command.c_str());
+
+       Pass::call(design, command);
+}
+
+void run_backend(std::string filename, std::string command, RTLIL::Design *design)
+{
+       if (command == "auto") {
+               if (filename.size() > 2 && filename.substr(filename.size()-2) == ".v")
+                       command = "verilog";
+               else if (filename.size() > 3 && filename.substr(filename.size()-3) == ".il")
+                       command = "ilang";
+               else if (filename.size() > 5 && filename.substr(filename.size()-5) == ".blif")
+                       command = "blif";
+               else if (filename == "-")
+                       command = "ilang";
+               else if (filename.empty())
+                       return;
+               else
+                       log_error("Can't guess backend for output file `%s' (missing -b option)!\n", filename.c_str());
+       }
+
+       if (filename.empty())
+               filename = "-";
+
+       if (filename == "-") {
+               log("\n-- Writing to stdout using backend `%s' --\n", command.c_str());
+       } else {
+               log("\n-- Writing to `%s' using backend `%s' --\n", filename.c_str(), command.c_str());
+       }
+
+       Backend::backend_call(design, NULL, filename, command);
+}
+
+static char *readline_cmd_generator(const char *text, int state)
+{
+       static std::map<std::string, Pass*>::iterator it;
+       static int len;
+
+       if (!state) {
+               it = pass_register.begin();
+               len = strlen(text);
+       }
+
+       for (; it != pass_register.end(); it++) {
+               if (it->first.substr(0, len) == text)
+                       return strdup((it++)->first.c_str());
+       }
+       return NULL;
+}
+
+static char *readline_obj_generator(const char *text, int state)
+{
+       static std::vector<char*> obj_names;
+       static size_t idx;
+
+       if (!state)
+       {
+               idx = 0;
+               obj_names.clear();
+
+               RTLIL::Design *design = yosys_get_design();
+               int len = strlen(text);
+
+               if (design->selected_active_module.empty())
+               {
+                       for (auto &it : design->modules_)
+                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
+                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
+               }
+               else
+               if (design->modules_.count(design->selected_active_module) > 0)
+               {
+                       RTLIL::Module *module = design->modules_.at(design->selected_active_module);
+
+                       for (auto &it : module->wires_)
+                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
+                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
+
+                       for (auto &it : module->memories)
+                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
+                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
+
+                       for (auto &it : module->cells_)
+                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
+                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
+
+                       for (auto &it : module->processes)
+                               if (RTLIL::unescape_id(it.first).substr(0, len) == text)
+                                       obj_names.push_back(strdup(RTLIL::id2cstr(it.first.c_str())));
+               }
+
+               std::sort(obj_names.begin(), obj_names.end());
+       }
+
+       if (idx < obj_names.size())
+               return strdup(obj_names[idx++]);
+
+       idx = 0;
+       obj_names.clear();
+       return NULL;
+}
+
+static char **readline_completion(const char *text, int start, int)
+{
+       if (start == 0)
+               return rl_completion_matches(text, readline_cmd_generator);
+       if (strncmp(rl_line_buffer, "read_", 5) && strncmp(rl_line_buffer, "write_", 6))
+               return rl_completion_matches(text, readline_obj_generator);
+       return NULL;
+}
+
+void shell(RTLIL::Design *design)
+{
+       static int recursion_counter = 0;
+
+       recursion_counter++;
+       log_cmd_error_throw = true;
+
+       rl_readline_name = "yosys";
+       rl_attempted_completion_function = readline_completion;
+       rl_basic_word_break_characters = " \t\n";
+
+       char *command = NULL;
+       while ((command = readline(create_prompt(design, recursion_counter))) != NULL)
+       {
+               if (command[strspn(command, " \t\r\n")] == 0)
+                       continue;
+               add_history(command);
+
+               char *p = command + strspn(command, " \t\r\n");
+               if (!strncmp(p, "exit", 4)) {
+                       p += 4;
+                       p += strspn(p, " \t\r\n");
+                       if (*p == 0)
+                               break;
+               }
+
+               try {
+                       log_assert(design->selection_stack.size() == 1);
+                       Pass::call(design, command);
+               } catch (log_cmd_error_expection) {
+                       while (design->selection_stack.size() > 1)
+                               design->selection_stack.pop_back();
+                       log_reset_stack();
+               }
+       }
+       if (command == NULL)
+               printf("exit\n");
+
+       recursion_counter--;
+       log_cmd_error_throw = false;
+}
+
+struct ShellPass : public Pass {
+       ShellPass() : Pass("shell", "enter interactive command mode") { }
+       virtual void help() {
+               log("\n");
+               log("    shell\n");
+               log("\n");
+               log("This command enters the interactive command mode. This can be useful\n");
+               log("in a script to interrupt the script at a certain point and allow for\n");
+               log("interactive inspection or manual synthesis of the design at this point.\n");
+               log("\n");
+               log("The command prompt of the interactive shell indicates the current\n");
+               log("selection (see 'help select'):\n");
+               log("\n");
+               log("    yosys>\n");
+               log("        the entire design is selected\n");
+               log("\n");
+               log("    yosys*>\n");
+               log("        only part of the design is selected\n");
+               log("\n");
+               log("    yosys [modname]>\n");
+               log("        the entire module 'modname' is selected using 'select -module modname'\n");
+               log("\n");
+               log("    yosys [modname]*>\n");
+               log("        only part of current module 'modname' is selected\n");
+               log("\n");
+               log("When in interactive shell, some errors (e.g. invalid command arguments)\n");
+               log("do not terminate yosys but return to the command prompt.\n");
+               log("\n");
+               log("This command is the default action if nothing else has been specified\n");
+               log("on the command line.\n");
+               log("\n");
+               log("Press Ctrl-D or type 'exit' to leave the interactive shell.\n");
+               log("\n");
+       }
+       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+               extra_args(args, 1, design, false);
+               shell(design);
+       }
+} ShellPass;
+
+struct HistoryPass : public Pass {
+       HistoryPass() : Pass("history", "show last interactive commands") { }
+       virtual void help() {
+               log("\n");
+               log("    history\n");
+               log("\n");
+               log("This command prints all commands in the shell history buffer. This are\n");
+               log("all commands executed in an interactive session, but not the commands\n");
+               log("from executed scripts.\n");
+               log("\n");
+       }
+       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+               extra_args(args, 1, design, false);
+               for(HIST_ENTRY **list = history_list(); *list != NULL; list++)
+                       log("%s\n", (*list)->line);
+       }
+} HistoryPass;
+
+struct ScriptPass : public Pass {
+       ScriptPass() : Pass("script", "execute commands from script file") { }
+       virtual void help() {
+               log("\n");
+               log("    script <filename> [<from_label>:<to_label>]\n");
+               log("\n");
+               log("This command executes the yosys commands in the specified file.\n");
+               log("\n");
+               log("The 2nd argument can be used to only execute the section of the\n");
+               log("file between the specified labels. An empty from label is synonymous\n");
+               log("for the beginning of the file and an empty to label is synonymous\n");
+               log("for the end of the file.\n");
+               log("\n");
+               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");
+       }
+       virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
+               if (args.size() < 2)
+                       log_cmd_error("Missing script file.\n");
+               else if (args.size() == 2)
+                       run_frontend(args[1], "script", design, NULL, NULL);
+               else if (args.size() == 3)
+                       run_frontend(args[1], "script", design, NULL, &args[2]);
+               else
+                       extra_args(args, 2, design, false);
+       }
+} ScriptPass;
+
+YOSYS_NAMESPACE_END
+
index 67629d9b1f5ee97d7b349e14229cd84d56cae6b9..9b36ebcc945133d10a8de5a9d19449b9998eb01e 100644 (file)
@@ -29,6 +29,9 @@
 // If you want to know how to register a command with Yosys, you could read
 // "kernel/register.h", but it would be easier to just look at a simple
 // example instead. A simple one would be "passes/cmds/log.cc".
+//
+// This header is very boring. It just defines some general things that
+// belong nowhere else and includes the interesting headers.
 
 
 #ifndef YOSYS_H
 #include <set>
 #include <vector>
 #include <string>
+#include <algorithm>
 #include <initializer_list>
 
 #if 0
 #  define YOSYS_NAMESPACE_BEGIN  namespace Yosys {
 #  define YOSYS_NAMESPACE_END    }
+#  define YOSYS_NAMESPACE_PREFIX Yosys::
+#  define USING_YOSYS_NAMESPACE  using namespace Yosys;
 #else
 #  define YOSYS_NAMESPACE_BEGIN
 #  define YOSYS_NAMESPACE_END
+#  define YOSYS_NAMESPACE_PREFIX
+#  define USING_YOSYS_NAMESPACE
 #endif
 
 YOSYS_NAMESPACE_BEGIN
 
 std::string stringf(const char *fmt, ...);
-
 #define SIZE(__obj) int(__obj.size())
 
 YOSYS_NAMESPACE_END
@@ -63,20 +70,35 @@ YOSYS_NAMESPACE_END
 
 YOSYS_NAMESPACE_BEGIN
 
+void yosys_setup();
+void yosys_shutdown();
+
 #ifdef YOSYS_ENABLE_TCL
 #include <tcl.h>
-extern Tcl_Interp *yosys_get_tcl_interp();
+Tcl_Interp *yosys_get_tcl_interp();
 #endif
 
+extern int autoidx;
+extern RTLIL::Design *yosys_design;
+
+RTLIL::IdString new_id(std::string file, int line, std::string func);
+
+#define NEW_ID \
+       YOSYS_NAMESPACE_PREFIX new_id(__FILE__, __LINE__, __FUNCTION__)
+
+RTLIL::Design *yosys_get_design();
+std::string proc_self_dirname();
+std::string proc_share_dirname();
+const char *create_prompt(RTLIL::Design *design, int recursion_counter);
+
+void run_frontend(std::string filename, std::string command, RTLIL::Design *design, std::string *backend_command, std::string *from_to_label);
+void run_pass(std::string command, RTLIL::Design *design);
+void run_backend(std::string filename, std::string command, RTLIL::Design *design);
+void shell(RTLIL::Design *design);
+
 // from kernel/version_*.o (cc source generated from Makefile)
 extern const char *yosys_version_str;
 
-// implemented in driver.cc
-extern RTLIL::Design *yosys_get_design();
-extern std::string proc_self_dirname();
-extern std::string proc_share_dirname();
-extern const char *create_prompt(RTLIL::Design *design, int recursion_counter);
-
 // from passes/cmds/design.cc
 extern std::map<std::string, RTLIL::Design*> saved_designs;
 extern std::vector<RTLIL::Design*> pushed_designs;
index da26387925a5444b9f928d8ed0f3e0acab2953af..84f23d636a87b010cc7a1383352cc9130365b533 100644 (file)
@@ -26,8 +26,8 @@
 #include <stdio.h>
 
 #ifdef _YOSYS_
-#  include "kernel/log.h"
-#  define my_printf log
+#  include "kernel/yosys.h"
+#  define my_printf YOSYS_NAMESPACE_PREFIX log
 #else
 #  define my_printf printf
 #endif
index d2be7dcf14f3f3d84ceb32f89fde9a99977f93d2..d204e93c64977e2eb5293b47a7b35e0d121d9aaf 100644 (file)
@@ -313,7 +313,7 @@ static void handle_loops()
                        }
 
                        std::stringstream sstr;
-                       sstr << "$abcloop$" << (RTLIL::autoidx++);
+                       sstr << "$abcloop$" << (autoidx++);
                        RTLIL::Wire *wire = module->addWire(sstr.str());
 
                        bool first_line = true;
@@ -400,7 +400,7 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
                std::string liberty_file, std::string constr_file, bool cleanup, int lut_mode, bool dff_mode, std::string clk_str, bool keepff)
 {
        module = current_module;
-       map_autoidx = RTLIL::autoidx++;
+       map_autoidx = autoidx++;
 
        signal_map.clear();
        signal_list.clear();
index bd1ee68f2677c37d263fcf6e8c7fd0db0206f1a8..79695c635b383785dea001155b07aff5244a3839 100644 (file)
@@ -22,6 +22,8 @@
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
 
+YOSYS_NAMESPACE_BEGIN
+
 std::map<std::string, RTLIL::Design*> saved_designs;
 std::vector<RTLIL::Design*> pushed_designs;
 
@@ -249,3 +251,5 @@ struct DesignPass : public Pass {
        }
 } DesignPass;
 
+YOSYS_NAMESPACE_END
+
index 6da468321de810ddcce14f1518bf77be62a5b63a..718f779b6adef2cbdc7aaabeb8eba7ccc8ecef57 100644 (file)
@@ -270,7 +270,7 @@ static void extract_fsm(RTLIL::Wire *wire)
 
        // create fsm cell
 
-       RTLIL::Cell *fsm_cell = module->addCell(stringf("$fsm$%s$%d", wire->name.c_str(), RTLIL::autoidx++), "$fsm");
+       RTLIL::Cell *fsm_cell = module->addCell(stringf("$fsm$%s$%d", wire->name.c_str(), autoidx++), "$fsm");
        fsm_cell->set("\\CLK", clk);
        fsm_cell->set("\\ARST", arst);
        fsm_cell->parameters["\\CLK_POLARITY"] = RTLIL::Const(clk_polarity ? 1 : 0, 1);
@@ -296,7 +296,7 @@ static void extract_fsm(RTLIL::Wire *wire)
                RTLIL::Cell *cell = module->cells_.at(cellport.first);
                RTLIL::SigSpec port_sig = assign_map(cell->get(cellport.second));
                RTLIL::SigSpec unconn_sig = port_sig.extract(ctrl_out);
-               RTLIL::Wire *unconn_wire = module->addWire(stringf("$fsm_unconnect$%s$%d", log_signal(unconn_sig), RTLIL::autoidx++), unconn_sig.size());
+               RTLIL::Wire *unconn_wire = module->addWire(stringf("$fsm_unconnect$%s$%d", log_signal(unconn_sig), autoidx++), unconn_sig.size());
                port_sig.replace(unconn_sig, RTLIL::SigSpec(unconn_wire), &cell->connections_[cellport.second]);
        }
 }
index 40c68abc1c249e72fc6b82c6699a62da88806640..aecb7bd6c1fd28182835f964b7a7a07378d7f87b 100644 (file)
@@ -126,7 +126,7 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Memory *memory)
        }
 
        std::stringstream sstr;
-       sstr << "$mem$" << memory->name << "$" << (RTLIL::autoidx++);
+       sstr << "$mem$" << memory->name << "$" << (autoidx++);
 
        RTLIL::Cell *mem = module->addCell(sstr.str(), "$mem");
        mem->parameters["\\MEMID"] = RTLIL::Const(memory->name);
index 325056170b6e2f1b2a4dda19b0cd1edf7a4072e5..6cbce781f03d21d4c7d1a1a4592f1939869ac84e 100644 (file)
@@ -113,7 +113,7 @@ static void disconnect_dff(RTLIL::Module *module, RTLIL::SigSpec sig)
        sig.sort_and_unify();
 
        std::stringstream sstr;
-       sstr << "$memory_dff_disconnected$" << (RTLIL::autoidx++);
+       sstr << "$memory_dff_disconnected$" << (autoidx++);
 
        RTLIL::SigSpec new_sig = module->addWire(sstr.str(), sig.size());
 
index 49291656c11a4303b5eb570f48a35e0689bf7005..0000bd507dfd22ac4266426d0680b3415fa0aec8 100644 (file)
@@ -41,7 +41,7 @@ static std::string genid(std::string name, std::string token1 = "", int i = -1,
        if (k >= 0)
                sstr << "[" << k << "]";
 
-       sstr << token4 << "$" << (RTLIL::autoidx++);
+       sstr << token4 << "$" << (autoidx++);
        return sstr.str();
 }
 
index cdf7db04b374647ca00a5309d109435bf440df05..3f675edeab092188bb9ec086d9b6932811b40704 100644 (file)
@@ -31,7 +31,7 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Cell *memory)
        RTLIL::IdString mem_name = RTLIL::escape_id(memory->parameters.at("\\MEMID").decode_string());
 
        while (module->memories.count(mem_name) != 0)
-               mem_name += stringf("_%d", RTLIL::autoidx++);
+               mem_name += stringf("_%d", autoidx++);
 
        RTLIL::Memory *mem = new RTLIL::Memory;
        mem->name = mem_name;
index 91cafe3be08709e2150f9c09b9aef87e1ef5551e..d894b442bdb3ad0fd38e2f90019316c0962ec614 100644 (file)
@@ -122,7 +122,7 @@ static void gen_dffsr_complex(RTLIL::Module *mod, RTLIL::SigSpec sig_d, RTLIL::S
        }
 
        std::stringstream sstr;
-       sstr << "$procdff$" << (RTLIL::autoidx++);
+       sstr << "$procdff$" << (autoidx++);
 
        RTLIL::Cell *cell = mod->addCell(sstr.str(), "$dffsr");
        cell->attributes = proc->attributes;
@@ -144,7 +144,7 @@ static void gen_dffsr(RTLIL::Module *mod, RTLIL::SigSpec sig_in, RTLIL::SigSpec
                bool clk_polarity, bool set_polarity, RTLIL::SigSpec clk, RTLIL::SigSpec set, RTLIL::Process *proc)
 {
        std::stringstream sstr;
-       sstr << "$procdff$" << (RTLIL::autoidx++);
+       sstr << "$procdff$" << (autoidx++);
 
        RTLIL::SigSpec sig_set_inv = mod->addWire(NEW_ID, sig_in.size());
        RTLIL::SigSpec sig_sr_set = mod->addWire(NEW_ID, sig_in.size());
@@ -191,7 +191,7 @@ static void gen_dff(RTLIL::Module *mod, RTLIL::SigSpec sig_in, RTLIL::Const val_
                bool clk_polarity, bool arst_polarity, RTLIL::SigSpec clk, RTLIL::SigSpec *arst, RTLIL::Process *proc)
 {
        std::stringstream sstr;
-       sstr << "$procdff$" << (RTLIL::autoidx++);
+       sstr << "$procdff$" << (autoidx++);
 
        RTLIL::Cell *cell = mod->addCell(sstr.str(), arst ? "$adff" : "$dff");
        cell->attributes = proc->attributes;
index e7661245e48e59708ea4fd66067349e7f2e53e26..b18ce4925a62e857a7dc4dc810e02ab57f8a6b1d 100644 (file)
@@ -57,7 +57,7 @@ static void extract_core_signal(const RTLIL::CaseRule *cs, RTLIL::SigSpec &sig)
 static RTLIL::SigSpec gen_cmp(RTLIL::Module *mod, const RTLIL::SigSpec &signal, const std::vector<RTLIL::SigSpec> &compare, RTLIL::SwitchRule *sw)
 {
        std::stringstream sstr;
-       sstr << "$procmux$" << (RTLIL::autoidx++);
+       sstr << "$procmux$" << (autoidx++);
 
        RTLIL::Wire *cmp_wire = mod->addWire(sstr.str() + "_CMP", 0);
 
@@ -127,7 +127,7 @@ static RTLIL::SigSpec gen_mux(RTLIL::Module *mod, const RTLIL::SigSpec &signal,
        log_assert(when_signal.size() == else_signal.size());
 
        std::stringstream sstr;
-       sstr << "$procmux$" << (RTLIL::autoidx++);
+       sstr << "$procmux$" << (autoidx++);
 
        // the trivial cases
        if (compare.size() == 0 || when_signal == else_signal)
index 19d323341e6b597b1c9635baa27cceee70ce78f3..ed389f2fb8e13b16dc568dc3cd4babb5443f93ea 100644 (file)
@@ -296,7 +296,7 @@ namespace
                SigSet<std::pair<std::string, int>> sig2port;
 
                // create new cell
-               RTLIL::Cell *cell = haystack->addCell(stringf("$extract$%s$%d", needle->name.c_str(), RTLIL::autoidx++), needle->name);
+               RTLIL::Cell *cell = haystack->addCell(stringf("$extract$%s$%d", needle->name.c_str(), autoidx++), needle->name);
 
                // create cell ports
                for (auto &it : needle->wires_) {
index 2aa59e61bde06362fd77c016a800f03ff8874f77..c2e5960ffb13cf843484ff86295139cc3ba8ebf1 100644 (file)
@@ -161,7 +161,7 @@ struct TechmapWorker
                        for (auto &it : tpl->cells_)
                                if (it.first == "\\_TECHMAP_REPLACE_") {
                                        orig_cell_name = cell->name;
-                                       module->rename(cell, stringf("$techmap%d", RTLIL::autoidx++) + cell->name);
+                                       module->rename(cell, stringf("$techmap%d", autoidx++) + cell->name);
                                        break;
                                }