origen_sim 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43f5b6b5fbd5690d6102a112092e4faab826395
-  data.tar.gz: 556101429de33f89de0898a205b5484dc8112af1
+  metadata.gz: fb3fba493270e2d18561a64d5b531809789c10e2
+  data.tar.gz: 7926ba7c5a43cc6b259f57cc7c9da408c573b2da
 SHA512:
-  metadata.gz: baaf314cedd9d9af37b8ee73da872f35381651ad906fbd2607ac55650a04169e8eb04ce61c09bb64621425538e5e0c6dc760d302d5c8214a837d21b4cef6d70a
-  data.tar.gz: 740dcff5b5b89ecf3e41e7e872b6533757c7ee7834bb5cbd73454add475159ee70e2bc8e5962aaef9839b371ade03fc7fab46ca7301e46b846e0b0ef6f33c5a2
+  metadata.gz: 8031c7ea4452ecb7d2b444d03e9f105aac27e6fc873a7021c3611e8200c27f7fa1014a8a7521d6a5c36e93e167802441623e082555838a2c71a310767c9e805b
+  data.tar.gz: feeb3873c4252c403d27721b00d39a8aea90862c85f7a9abb544a1f6aab23e66921d3249c882c99d095a17d5ddb31ff527377b9ecdae8e0d2be62d7d237cfd98

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenSim
   MAJOR = 0
   MINOR = 5
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_sim/commands/build.rb

@@ -59,7 +59,7 @@ unless options[:testrun]
                            files:             "#{Origen.root!}/templates/rtl_v/origen.v.erb",
                            output:            tmp_dir,
                            check_for_changes: false,
-                           options:           { vendor: config[:vendor], top: config[:rtl_top] }
+                           options:           { vendor: config[:vendor], top: config[:rtl_top], incl: config[:incl_files] }
 end
 
 case config[:vendor]
@@ -90,9 +90,15 @@ when :cadence
   Array(config[:rtl_dir] || config[:rtl_dirs]).each do |dir|
     cmd += " -incdir #{dir}"
   end
-  cmd += " #{tmp_dir}/origen.v -top origen -timescale 1ns/1ns"
+  cmd += " #{tmp_dir}/origen.v"
+  if config[:alt_top]
+    cmd += " -top #{config[:alt_top]}"
+  else
+    cmd += ' -top origen'
+  end
+  cmd += ' -timescale 1ns/1ns'
   cmd += " -nclibdirpath #{simulator.compiled_dir}"
-  cmd += " #{Origen.root!}/ext/*.c -ccargs \"-std=gnu99\""
+  cmd += " #{Origen.root!}/ext/*.c -ccargs \"-std=c99\""
   cmd += ' -elaborate -snapshot origen -access +rw'
   cmd += " #{config[:explicit].strip.gsub(/\s+/, ' ')}" if  config[:explicit]
 end

data/templates/rtl_v/origen.v.erb

@@ -157,6 +157,16 @@ module origen;
 
   // Instantiate the DUT
   <%= options[:top].sub(/\..*/, '') %> dut (
+% dut.power_pins.each do |name, pin, options|
+%   unless pin.tie_off
+    .<%= pin.id %>(<%= pin.id %>),
+%   end
+% end
+% dut.ground_pins.each do |name, pin, options|
+%   unless pin.tie_off
+    .<%= pin.id %>(<%= pin.id %>),
+%   end
+% end
 % dut.rtl_pins.each_with_index do |(name, pin, options), i|
 %   if options[:group]
 %     if pin.group_index == 0
@@ -191,4 +201,9 @@ module origen;
   always @(posedge finish) begin
     $finish(2);
   end
+
+%  Array(options[:incl]).each do |f|
+  `include "<%= "#{f}" %>"
+%  end
+
 endmodule

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen