HDLRuby 2.4.20 → 2.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6292fe897c939784b2d10ae3e69e69eec7149be02fbc077b9ae789af840825
-  data.tar.gz: cd3ead86ae5b63976cab3d45db537f60a984ca65b0355dadaa755d1b6cbe0b89
+  metadata.gz: 28c1956d124429de349aede3dce3644cca530400479dedb09bedc3326a1fdb76
+  data.tar.gz: cd76438901da8bff407b7db4abef07399192c19f0349af0c9e0e545a1a22cf1d
 SHA512:
-  metadata.gz: 7d33e055f706df8d06d6bd7578002a399c695f5a6705fce523a033a8d9954a74b44e1a337ac851a49a68a0c8d5a3fe42326a26b5d92003bb7d17dc90f5ed27a8
-  data.tar.gz: 8f49e18b9dbfd2ce0a5676e558c6054258809876f610ec3e35eda8ad4bf18ba9834aa11c6229ceb5e75b42649a353603da854a57b9f72432dc0b6459b1e35d61
+  metadata.gz: 89ccd495fa050a3f552ea73e52f726a08f56f5a937691209622a4d008a62905134d3a4765265ee07ff4c8aca59bc097221d4f75fc9da445ba3115fe6aee293ea
+  data.tar.gz: 47150e816409de410e41f8aa5a22e7bcc514ac88d2798d0282cb1efa5f660ec0e20d35015f807c43e7823ef4ae406125aba45bcd28b2acaf740991528549c413

data/lib/HDLRuby/hdr_samples/with_connector_memory.rb

@@ -40,10 +40,14 @@ system :channel_connector do
 
     serializer(typ,clk.negedge,[reader_inputs_x,reader_inputs_h],writer_inputs_serializer)
 
-    # merger([typ]*2,clk.negedge,[reader_inputs_x,reader_inputs_h], writer_inputs_meger)
-
-    # duplicator(typ,clk.negedge,reader_inputs_r,[])
-
+    mem_rom(typ, columns[0], clk, rst, inputs_x, rinc: :rst, winc: :rst).(:rom_inputs_r) # 入力値を格納するrom(x)
+    mem_dual(typ, columns[0], clk, rst, rinc: :rst, winc: :rst).(:ram_duplicator0) #
+    mem_dual(typ, columns[0], clk, rst, rinc: :rst, winc: :rst).(:ram_duplicator1) #
+    reader_inputs_r    = rom_inputs_r.branch(:rinc)
+    writer_duplicator0 = ram_duplicator0.branch(:winc)
+    writer_duplicator1 = ram_duplicator1.branch(:winc)
+
+    duplicator(typ,clk.posedge,reader_inputs_r,[writer_duplicator0, writer_duplicator1])
 
     timed do
       # リセット

data/lib/HDLRuby/std/connector.rb

@@ -13,7 +13,7 @@ module HDLRuby::High::Std
     # duplicator using a handshake protocol. If set to nil, the duplicator
     # runs automatically.
     function :duplicator do |typ, ev, in_ch, out_chs, req = nil, ack = nil|
-        ev = ev.poswedge unless ev.is_a?(Event)
+        ev = ev.posedge unless ev.is_a?(Event)
         inner :in_ack
         inner :in_req
         out_acks = out_chs.size.times.map { |i| inner(:"out_ack#{i}") }

data/lib/HDLRuby/std/memory.rb

@@ -289,9 +289,10 @@ HDLRuby::High::Std.channel(:mem_rom) do |typ,size,clk,rst,content,
             rst  = send(rst_name)
             top_block.unshift do
                 # Initialize the address so that the next access is at address 0.
-                hif(rst==1) { abus_r <= -1 }
-                # Reset so switch of the access trigger.
-                trig_r <= 0
+                # hif(rst==1) { abus_r <= -1 }
+                # # Reset so switch of the access trigger.
+                # trig_r <= 0
+                hif(rst==1) { abus_r <= -1; trig_r <= 0 }
             end
             # The read procedure.
         #     par do
@@ -317,6 +318,7 @@ HDLRuby::High::Std.channel(:mem_rom) do |typ,size,clk,rst,content,
                         # blk.call if blk
                         seq do
                             # abus_r <= abus_r + 1
+                            trig_r <= 0
                             target <= dbus_r
                             blk.call if blk
                         end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.20"
+  VERSION = "2.4.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.20
+  version: 2.4.21
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler