fix bugs of last commit

src/db_mgr/CMakeLists.txt

@@ -28,3 +28,8 @@ target_link_libraries(db_mgr
   PRIVATE
     db_mgr_verilog_parser
 )
+
+# target_compile_options(db_mgr
+#   PRIVATE
+#     -D_GLIBCXX_USE_CXX11_ABI=0  # to avoid the std::string bug
+# )
\ No newline at end of file

src/db_mgr/include/db_mgr/db_mgr.h

@@ -63,10 +63,8 @@ public:
                     bool cont_on_err,
                     bool is_floorplan,
                     bool is_incr); // incr: incremental
-  // bool readVerilog(const char* design_name,
-  //                  const char* v_file);
-  bool readVerilog(const std::string& design_name,
-                   const std::string& v_file);
+  bool readVerilog(const char* design_name,
+                   const char* v_file);
   
   void setCurrentBlock(const char* design);
   void setCurrentBlock(odb::dbDatabase* db);

src/db_mgr/src/db_mgr.cpp

@@ -210,16 +210,14 @@ bool DbMgr::readBlockDef(const char* block_name,
   return true;
 }
 
-// bool DbMgr::readVerilog(const char* design_name,
-//                         const char* v_file)
-bool DbMgr::readVerilog(const std::string& design_name,
-                        const std::string& v_file)
+bool DbMgr::readVerilog(const char* design_name,
+                        const char* v_file)
 {
-  if (design_name.c_str()!= nullptr) {
-    if (haveBlockDB(design_name.c_str())) {
-      setCurrentBlock(design_name.c_str());
+  if (design_name != nullptr) {
+    if (haveBlockDB(design_name)) {
+      setCurrentBlock(design_name);
     } else {
-      setCurrentBlock(createBlockDB(design_name.c_str()));
+      setCurrentBlock(createBlockDB(design_name));
     }
   } else {
     if (current_block_db_ == nullptr) {
@@ -228,8 +226,12 @@ bool DbMgr::readVerilog(const std::string& design_name,
     }
   }
   verilog_parser_->setOdb(current_block_db_);
-  return true;
-  // return verilog_parser_->read(design_name, v_file);
+  /*
+  const std::string design_name_str(design_name, std::strlen(design_name));
+  const std::string v_file_str(v_file, std::strlen(v_file));
+  return verilog_parser_->read(design_name_str, v_file_str);
+  */
+  return verilog_parser_->read(design_name, v_file);
 }
 
 } // namespace db_mgr

src/db_mgr/src/db_mgr.i

@@ -36,12 +36,10 @@ bool delete_blk_db(const char* block_name)
   return getDbMgr()->deleteBlockDB(block_name);
 }
 
-/*
-bool read_verilog(const std::string& design, const std::string& v_file)
+bool read_verilog(const char* design, const char* v_file)
 {
   return getDbMgr()->readVerilog(design, v_file);
 }
-*/
 
 } // namespace db_mgr
 

src/db_mgr/src/db_mgr.tcl

@@ -61,5 +61,5 @@ proc read_verilog { args } {
     set design $keys(-design)
   }
   set filename [file nativename [lindex $args 0]]
-  # db_mgr::read_verilog $design $filename
+  db_mgr::read_verilog $design $filename
 }

src/db_mgr/src/parsers/verilog_parser/CMakeLists.txt

@@ -4,7 +4,6 @@ target_sources(db_mgr_verilog_parser
   PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/verilog_database.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/verilog_parser.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_bison.cpp
 )
 
 target_include_directories(db_mgr_verilog_parser

src/db_mgr/src/parsers/verilog_parser/verilog_database.cpp

@@ -24,17 +24,6 @@ VDb::~VDb()
   current_module_ = nullptr;
 }
 
-/*
-bool VDb::read(const std::string& design_name, 
-                   const std::string& v_file)
-{
-  if (current_block_->getConstName() != design_name) {
-    return false;
-  }
-  return VerilogParser::read(*this, v_file);
-}
-*/
-
 void VDb::setOdb(odb::dbDatabase* odb)
 {
   odb_ = odb;

src/db_mgr/src/parsers/verilog_parser/verilog_database.h

@@ -20,10 +20,6 @@ public:
   VDb();
   VDb(odb::dbDatabase* odb);
   ~VDb();
-  /*
-  bool read(const std::string& design_name,
-            const std::string& v_file);
-  */
   void setOdb(odb::dbDatabase* odb);
   void setLogger(utl::Logger* logger);
 

src/db_mgr/src/parsers/verilog_parser/verilog_parser.cpp

@@ -3,6 +3,8 @@
 #include "utl/Logger.h"
 #include "db.h"
 
+#include <cstring>
+
 #define _GLIBCXX_USE_CXX11_ABI 0
 
 namespace eda {
@@ -31,6 +33,14 @@ void VParser::setOdb(odb::dbDatabase* db)
   }
 }
 
+bool VParser::read(const char* design_name, 
+                   const char* v_file)
+{
+  std::string design_name_str(design_name, std::strlen(design_name));
+  std::string v_file_str(v_file, std::strlen(v_file));
+  return read(design_name_str, v_file_str);
+}
+
 bool VParser::read(std::string const& design_name, 
                    std::string const& v_file)
 {

src/db_mgr/src/parsers/verilog_parser/verilog_parser.h

@@ -28,6 +28,8 @@ public:
   ~VParser();
   bool read(std::string const& design_name,
             std::string const& v_file);
+  bool read(const char* design_name,
+            const char* v_file);
   void setLogger(utl::Logger* logger);
   void setOdb(odb::dbDatabase* db);