ruby-vpi 17.0.0 → 18.0.0

data/ext/swig_wrap.cin

@@ -1529,24 +1529,23 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 #define SWIGTYPE_p_f_p_struct_t_cb_data__int swig_types[2]
 #define SWIGTYPE_p_int swig_types[3]
 #define SWIGTYPE_p_p_char swig_types[4]
-#define SWIGTYPE_p_p_f___void swig_types[5]
-#define SWIGTYPE_p_s_vpi_value_value swig_types[6]
-#define SWIGTYPE_p_short swig_types[7]
-#define SWIGTYPE_p_t_cb_data swig_types[8]
-#define SWIGTYPE_p_t_vpi_delay swig_types[9]
-#define SWIGTYPE_p_t_vpi_error_info swig_types[10]
-#define SWIGTYPE_p_t_vpi_strengthval swig_types[11]
-#define SWIGTYPE_p_t_vpi_systf_data swig_types[12]
-#define SWIGTYPE_p_t_vpi_time swig_types[13]
-#define SWIGTYPE_p_t_vpi_value swig_types[14]
-#define SWIGTYPE_p_t_vpi_vecval swig_types[15]
-#define SWIGTYPE_p_t_vpi_vlog_info swig_types[16]
-#define SWIGTYPE_p_unsigned_char swig_types[17]
-#define SWIGTYPE_p_unsigned_int swig_types[18]
-#define SWIGTYPE_p_unsigned_short swig_types[19]
-#define SWIGTYPE_p_void swig_types[20]
-static swig_type_info *swig_types[22];
-static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0};
+#define SWIGTYPE_p_s_vpi_value_value swig_types[5]
+#define SWIGTYPE_p_short swig_types[6]
+#define SWIGTYPE_p_t_cb_data swig_types[7]
+#define SWIGTYPE_p_t_vpi_delay swig_types[8]
+#define SWIGTYPE_p_t_vpi_error_info swig_types[9]
+#define SWIGTYPE_p_t_vpi_strengthval swig_types[10]
+#define SWIGTYPE_p_t_vpi_systf_data swig_types[11]
+#define SWIGTYPE_p_t_vpi_time swig_types[12]
+#define SWIGTYPE_p_t_vpi_value swig_types[13]
+#define SWIGTYPE_p_t_vpi_vecval swig_types[14]
+#define SWIGTYPE_p_t_vpi_vlog_info swig_types[15]
+#define SWIGTYPE_p_unsigned_char swig_types[16]
+#define SWIGTYPE_p_unsigned_int swig_types[17]
+#define SWIGTYPE_p_unsigned_short swig_types[18]
+#define SWIGTYPE_p_void swig_types[19]
+static swig_type_info *swig_types[21];
+static swig_module_info swig_module = {swig_types, 20, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -6086,24 +6085,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-vlog_startup_routines_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(vlog_startup_routines), SWIGTYPE_p_p_f___void,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-vlog_startup_routines_set(VALUE self, VALUE _val) {
-  SWIG_exception_fail(SWIG_ArgError(SWIG_AttributeError), "in variable '""read-only vlog_startup_routines""' of type '""void (*[])()""'");
-  return _val;
-fail:
-  return Qnil;
-}
-
-
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -6112,7 +6093,6 @@ static swig_type_info _swigt__p_f_p_char__int = {"_p_f_p_char__int", "int (*)(ch
 static swig_type_info _swigt__p_f_p_struct_t_cb_data__int = {"_p_f_p_struct_t_cb_data__int", "int (*)(struct t_cb_data *)|PLI_INT32 (*)(struct t_cb_data *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|PLI_INT32 *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **|PLI_BYTE8 **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_f___void = {"_p_p_f___void", "void (**)()", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_s_vpi_value_value = {"_p_s_vpi_value_value", "s_vpi_value_value *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *|PLI_INT16 *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_t_cb_data = {"_p_t_cb_data", "struct t_cb_data *|p_cb_data", 0, 0, (void*)0, 0};
@@ -6135,7 +6115,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_struct_t_cb_data__int,
   &_swigt__p_int,
   &_swigt__p_p_char,
-  &_swigt__p_p_f___void,
   &_swigt__p_s_vpi_value_value,
   &_swigt__p_short,
   &_swigt__p_t_cb_data,
@@ -6158,7 +6137,6 @@ static swig_cast_info _swigc__p_f_p_char__int[] = {  {&_swigt__p_f_p_char__int,
 static swig_cast_info _swigc__p_f_p_struct_t_cb_data__int[] = {  {&_swigt__p_f_p_struct_t_cb_data__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_f___void[] = {  {&_swigt__p_p_f___void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_s_vpi_value_value[] = {  {&_swigt__p_s_vpi_value_value, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_t_cb_data[] = {  {&_swigt__p_t_cb_data, 0, 0, 0},{0, 0, 0, 0}};
@@ -6181,7 +6159,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_struct_t_cb_data__int,
   _swigc__p_int,
   _swigc__p_p_char,
-  _swigc__p_p_f___void,
   _swigc__p_s_vpi_value_value,
   _swigc__p_short,
   _swigc__p_t_cb_data,
@@ -7101,8 +7078,6 @@ SWIGEXPORT void Init_vpi(void) {
   rb_define_module_function(mVpi, "vpi_mcd_flush", _wrap_vpi_mcd_flush, -1);
   rb_define_module_function(mVpi, "vpi_control", _wrap_vpi_control, -1);
   rb_define_module_function(mVpi, "vpi_handle_by_multi_index", _wrap_vpi_handle_by_multi_index, -1);
-  rb_define_singleton_method(mVpi, "vlog_startup_routines", vlog_startup_routines_get, 0);
-  rb_define_singleton_method(mVpi, "vlog_startup_routines=", vlog_startup_routines_set, 1);
   rb_define_const(mVpi, "Vlog_relay_ruby", SWIG_NewFunctionPtrObj((void *)vlog_relay_ruby, SWIGTYPE_p_f_p_struct_t_cb_data__int));
 }
 

data/lib/ruby-vpi/pli.tab

@@ -0,0 +1 @@
+acc=read_write,write_net,force:*

data/lib/ruby-vpi/runner.rb

@@ -26,7 +26,7 @@ require 'ruby-vpi/util'
   end
 
 # auto-detect and set default parameters
-  runnerPath = caller.reject {|s| s =~ /:in \`/}.first.rstrip_from(':')
+  runnerPath = caller.grep(/runner.rake/).first.rstrip_from(':')
   @target    = File.basename(runnerPath).rstrip_from('_')
 
   task :setup
@@ -55,6 +55,9 @@ require 'ruby-vpi/util'
   ENV['RUBYVPI_BOOT_LOADER'] = File.join(File.dirname(__FILE__), 'runner_boot_loader.rb')
   ENV['RUBYVPI_BOOT_TARGET'] = @target
 
+# check if the machine is 64-bit
+  @archIs64 = -1.size == 8
+
 
 require 'rake/clean'
 require 'ruby-vpi'
@@ -66,7 +69,7 @@ LOADER_FUNC = 'vlog_startup_routines_bootstrap'
 
 # Returns the path to the Ruby-VPI object file for the given simulator.
 def object_file_path aSimId # :nodoc:
-  path = File.join(OBJECT_PATH, aSimId.to_s)
+  path = File.expand_path File.join(OBJECT_PATH, "#{aSimId}.so")
 
   unless File.exist? path
     raise "Object file #{path.inspect} is missing. Rebuild Ruby-VPI."
@@ -76,7 +79,7 @@ def object_file_path aSimId # :nodoc:
 end
 
 # Returns an array of include-directory options.
-def expand_include_dir_options aSimId # :nodoc:
+def expand_incdir_options aSimId # :nodoc:
   prefix = aSimId == :ivl ? '-I' : '+incdir+'
   @incdirs.map {|i| prefix + i}
 end
@@ -91,7 +94,11 @@ end
 
 desc "Simulate with #{RubyVPI::SIMULATORS[:cver].name}."
 task :cver => :setup do
-  sh 'cver', SIMULATOR_ARGUMENTS[:cver], "+loadvpi=#{object_file_path(:cver)}:#{LOADER_FUNC}", expand_include_dir_options(:cver), @sources
+  sh 'cver',
+    "+loadvpi=#{object_file_path(:cver)}:#{LOADER_FUNC}",
+    SIMULATOR_ARGUMENTS[:cver],
+    expand_incdir_options(:cver),
+    @sources
 end
 
 CLOBBER.include 'verilog.log'
@@ -100,7 +107,10 @@ CLOBBER.include 'verilog.log'
 desc "Simulate with #{RubyVPI::SIMULATORS[:ivl].name}."
 task :ivl => :setup do
   cp object_file_path(:ivl), 'ruby-vpi.vpi'
-  sh 'iverilog', SIMULATOR_ARGUMENTS[:ivl], '-mruby-vpi', expand_include_dir_options(:ivl), @sources
+  sh %w[iverilog -mruby-vpi],
+    SIMULATOR_ARGUMENTS[:ivl],
+    expand_incdir_options(:ivl),
+    @sources
   sh 'vvp -M. a.out'
 end
 
@@ -109,7 +119,13 @@ CLEAN.include 'ruby-vpi.vpi', 'a.out'
 
 desc "Simulate with #{RubyVPI::SIMULATORS[:vcs].name}."
 task :vcs => :setup do
-  sh %w(vcs -R +v2k +vpi), SIMULATOR_ARGUMENTS[:vcs], '-load', "#{object_file_path(:vcs)}:#{LOADER_FUNC}", expand_include_dir_options(:vcs), @sources
+  sh %w[vcs -R +v2k +vpi +cli],
+    '-P', File.join(File.dirname(__FILE__), 'pli.tab'),
+    '-load', "#{object_file_path(:vcs)}:#{LOADER_FUNC}",
+    ('-full64' if @archIs64),
+    SIMULATOR_ARGUMENTS[:vcs],
+    expand_incdir_options(:vcs),
+    @sources
 end
 
 CLEAN.include 'csrc', 'simv*'
@@ -118,17 +134,25 @@ CLEAN.include 'csrc', 'simv*'
 desc "Simulate with #{RubyVPI::SIMULATORS[:vsim].name}."
 task :vsim => :setup do
   sh 'vlib work'
-  sh 'vlog', expand_include_dir_options(:vsim), @sources
-  sh 'vsim', SIMULATOR_ARGUMENTS[:vsim], '-c', @target, '-pli', object_file_path(:vsim), '-do', 'run -all'
+  sh 'vlog', expand_incdir_options(:vsim), @sources
+  sh %w[vsim -do run\ -all],
+    '-pli', object_file_path(:vsim),
+    '-c', @target,
+    SIMULATOR_ARGUMENTS[:vsim]
 end
 
-CLEAN.include 'work'
+CLEAN.include 'work', 'vsim.wlf'
 CLOBBER.include 'transcript'
 
 
 desc "Simulate with #{RubyVPI::SIMULATORS[:ncsim].name}."
 task :ncsim => :setup do
-  sh 'ncverilog', SIMULATOR_ARGUMENTS[:ncsim], "+loadvpi=#{object_file_path(:ncsim)}:#{LOADER_FUNC}", '+access+rwc', expand_include_dir_options(:ncsim), @sources
+  sh %w[ncverilog +access+rwc +plinowarn],
+    "+loadvpi=#{object_file_path(:ncsim)}:#{LOADER_FUNC}",
+    ('+nc64bit' if @archIs64),
+    SIMULATOR_ARGUMENTS[:ncsim],
+    expand_incdir_options(:ncsim),
+    @sources
 end
 
 CLEAN.include 'INCA_libs'