Merge pull request #410 from diffblue/force-system-verilog

ebmc: add --systemverilog command-line option

regression/verilog/force-system-verilog/main1.desc

@@ -0,0 +1,8 @@
+CORE
+main1.v
+--systemverilog
+^EXIT=10$
+^SIGNAL=0$
+^no properties$
+--
+^warning: ignoring

regression/verilog/force-system-verilog/main1.v

@@ -0,0 +1,5 @@
+module main;
+  // 'logic' is a SystemVerilog keyword
+  logic some_logic;
+  initial some_logic = 1;
+endmodule

src/ebmc/ebmc_parse_options.cpp

@@ -363,6 +363,7 @@ void ebmc_parse_optionst::help()
     " {y--show-properties}           \t list the properties in the model\n"
     " {y--property} {uid}            \t check the property with given ID\n"
     " {y-I} {upath}                  \t set include path\n"
+    " {y--systemverilog}             \t force SystemVerilog instead of Verilog\n"
     " {y--reset} {uexpr}             \t set up module reset\n"
     " {y--liveness-to-safety}        \t translate liveness properties to safety properties\n"
     "\n"

src/ebmc/ebmc_parse_options.h

@@ -46,7 +46,7 @@ class ebmc_parse_optionst:public parse_options_baset
         "(random-traces)(trace-steps):(random-seed):(number-of-traces):"
         "(random-trace)(random-waveform)"
         "(liveness-to-safety)"
-        "I:(preprocess)",
+        "I:(preprocess)(systemverilog)",
         argc,
         argv,
         std::string("EBMC ") + EBMC_VERSION),

src/ebmc/transition_system.cpp

@@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/get_module.h>
 #include <util/message.h>
 #include <util/namespace.h>
+#include <util/options.h>
 #include <util/unicode.h>
 
 #include <langapi/language.h>
@@ -107,6 +108,11 @@ int preprocess(const cmdlinet &cmdline, message_handlert &message_handler)
     return 1;
   }
 
+  optionst options;
+  options.set_option("force-systemverilog", cmdline.isset("systemverilog"));
+
+  language->set_language_options(options, message_handler);
+
   if(language->preprocess(infile, filename, std::cout, message_handler))
   {
     message.error() << "PREPROCESSING FAILED" << messaget::eom;
@@ -116,7 +122,8 @@ int preprocess(const cmdlinet &cmdline, message_handlert &message_handler)
   return 0;
 }
 
-bool parse(
+static bool parse(
+  const cmdlinet &cmdline,
   const std::string &filename,
   language_filest &language_files,
   message_handlert &message_handler)
@@ -147,6 +154,11 @@ bool parse(
 
   languaget &language = *lf.language;
 
+  optionst options;
+  options.set_option("force-systemverilog", cmdline.isset("systemverilog"));
+
+  language.set_language_options(options, message_handler);
+
   message.status() << "Parsing " << filename << messaget::eom;
 
   if(language.parse(infile, filename, message_handler))
@@ -167,7 +179,7 @@ bool parse(
 {
   for(unsigned i = 0; i < cmdline.args.size(); i++)
   {
-    if(parse(cmdline.args[i], language_files, message_handler))
+    if(parse(cmdline, cmdline.args[i], language_files, message_handler))
       return true;
   }
   return false;

src/verilog/verilog_language.cpp

@@ -20,6 +20,25 @@ Author: Daniel Kroening, [email protected]
 
 /*******************************************************************\
 
+Function: verilog_languaget::set_language_options
+
+  Inputs:
+
+ Outputs:
+
+ Purpose:
+
+\*******************************************************************/
+
+void verilog_languaget::set_language_options(
+  const optionst &options,
+  message_handlert &message_handler)
+{
+  force_systemverilog = options.get_bool_option("force-systemverilog");
+}
+
+/*******************************************************************\
+
 Function: verilog_languaget::parse
 
   Inputs:
@@ -46,8 +65,8 @@ bool verilog_languaget::parse(
   verilog_parser.in=&str;
   verilog_parser.log.set_message_handler(message_handler);
   verilog_parser.grammar=verilog_parsert::LANGUAGE;
-  
-  if(has_suffix(path, ".sv"))
+
+  if(has_suffix(path, ".sv") || force_systemverilog)
     verilog_parser.mode=verilog_parsert::SYSTEM_VERILOG;
 
   verilog_scanner_init();

src/verilog/verilog_language.h

@@ -79,6 +79,8 @@ class verilog_languaget:public languaget
     return { "v", "sv" };
   }
 
+  void set_language_options(const optionst &, message_handlert &) override;
+
   verilog_parse_treet &get_parse_tree()
   {
     return parse_tree;
@@ -92,6 +94,7 @@ class verilog_languaget:public languaget
   }
 
 protected:
+  bool force_systemverilog = false;
   verilog_parse_treet parse_tree;
 };