axi_tdl 0.1.0 → 0.1.8

data/lib/tdl/class_hdl/hdl_redefine_opertor.rb

@@ -47,6 +47,20 @@ module ClassHDL
                 @tree << arg 
             end  
             @belong_to_module = belong_to_module
+            unless @belong_to_module
+                raise TdlError.new("OpertorChain must have belong_to_module")
+            end
+        end
+
+        def instance_inspect
+            str = ["self belong_to_module:#{belong_to_module.module_name}"]
+            index = 0
+            @tree.each do |node|
+                bl = "#{node[0].respond_to?(:belong_to_module) ? "belong_to_module:#{node[0].belong_to_module.module_name }" : '' }"
+                str << "{{ tree[#{index}][1]node[1]SYMB{#{node[1].to_s}} tree[#{index}][0]node[0]#{node[0].to_s} #{node[0].class} #{bl}}}"
+                index += 1
+            end
+            str.join(" ")
         end
 
         ClassHDL::OP_SYMBOLS.each do |os|
@@ -103,17 +117,20 @@ module ClassHDL
             # self.nege = true
             # return self
             self.slaver = true
-            new_op = OpertorChain.new(["~(#{self.instance})".to_nq])
+            bel = belong_to_module || ( @tree[0][0].respond_to?(:belong_to_module) && @tree[0][0].belong_to_module )
+            new_op = OpertorChain.new(["~(#{self.instance(:assign, bel)})".to_nq])
         end
 
         def brackets
             self.slaver = true
-            new_op = OpertorChain.new(["(#{self.instance})".to_nq], belong_to_module)
+            bel = ( @tree[0][0].respond_to?(:belong_to_module) && @tree[0][0].belong_to_module )
+            new_op = OpertorChain.new(["(#{self.instance(:assign, belong_to_module || bel)})".to_nq], belong_to_module)
         end
 
         def clog2
             self.slaver = true
-            new_op = OpertorChain.new(["$clog2(#{self.instance})".to_nq],belong_to_module)
+            bel = belong_to_module || ( @tree[0][0].respond_to?(:belong_to_module) && @tree[0][0].belong_to_module )
+            new_op = OpertorChain.new(["$clog2(#{self.instance(:aasign, bel)})".to_nq],belong_to_module)
         end
 
         def self.define_op_flag(ruby_op,hdl_op)
@@ -143,10 +160,13 @@ module ClassHDL
 
 
         def to_s 
-            instance(type=:cond)
+            instance(type=:cond,belong_to_module || ( @tree[0][0].respond_to?(:belong_to_module) && @tree[0][0].belong_to_module ) )
         end
 
-        def instance(type=:assign)
+        def instance(type=:assign,block_belong_to_module=nil,show=nil)
+            unless block_belong_to_module
+                raise TdlError.new("OpertorChain must has block_belong_to_module")
+            end
             AssignDefOpertor.with_rollback_opertors(:old) do 
                 str = ''
                 # both_symb_used = false
@@ -160,39 +180,75 @@ module ClassHDL
                                 sb = " = "
                             end 
                         else 
-                            # if(node[1].respond_to?(:belong_to_module) && node[1].belong_to_module && node[1].belong_to_module != belong_to_module)
-                            #     sb = "#{node[1].root_ref.to_s}"
-                            # else
-                                sb = "#{node[1].to_s}"
-                            # end
+
+                            sb = "#{node[1].to_s}"
                         end
                     else
-                        # if(node[1].respond_to?(:belong_to_module) && node[1].belong_to_module && node[1].belong_to_module != belong_to_module)
-                        #     sb = "#{node[1].root_ref.to_s}"
-                        # else
-                            sb = "#{node[1].to_s}"
-                        # end
+                        sb = "#{node[1].to_s}"
+                    end
+
+                    if cnt==1 && show 
+                        puts "tree[1][1]<#{node[1]}> 使用 #{sb}"
                     end
                     
                     unless node[0].is_a? OpertorChain
                         ## 判断是不是属于 Var <= "String" 形式
                         if (@tree.length == 2) && node[0].instance_of?(String) && !@slaver
                             str += (sb + '"' + node[0].to_s + '"')
+                            if show 
+                                puts "tree 长度等于2; tree[#{cnt}][0] is string; op is not slaver"
+                            end
                         elsif node[0].instance_of?(String)
                             # "如果是字符串 则原始输出"
                             str += (sb + '"' + node[0].to_s + '"')
+                            if show 
+                                puts "tree[#{cnt}][0] is string"
+                            end
                         else 
                             # str += (sb + node[0].to_s)
-                            if(node[0].respond_to?(:root_ref) && node[0].respond_to?(:belong_to_module) && node[0].belong_to_module && (node[0].belong_to_module != belong_to_module) && node[0].belong_to_module.top_tb_ref? )
+                            if block_belong_to_module
+                                if (node[0].respond_to?(:root_ref) && node[0].respond_to?(:belong_to_module) && node[0].belong_to_module && (node[0].belong_to_module != block_belong_to_module) && node[0].belong_to_module.top_tb_ref? )
+                                    
+                                    str += (sb + node[0].root_ref)
+
+                                    if show 
+                                        puts "tree[#{cnt}][0].belong_to_module<#{node[0].belong_to_module.module_name}> != block_belong_to_module<#{block_belong_to_module.module_name}>"
+                                    end
+                                    ## 反向添加到 TestUnitModule
+                                    if block_belong_to_module.is_a?(TestUnitModule)
+                                        block_belong_to_module.add_root_ref_ele(node[0])
+                                        if show 
+                                            puts "block_belong_to_module<#{block_belong_to_module.module_name}> is TestUnitModule"
+                                        end
+                                    end
+                                else  
+                                    str += (sb + node[0].to_s)
+                                    if show
+                                        mmm =  node[0].respond_to?(:belong_to_module) && node[0].belong_to_module.module_name
+                                        puts "tree[#{cnt}][0]<#{node[0].class}>: ref_root<#{node[0].respond_to?(:root_ref).to_s}> belong_to_module<#{mmm}> block_belong_to_module<#{block_belong_to_module.module_name}> ...."
+                                    end
+                                end
+                            elsif(node[0].respond_to?(:root_ref) && node[0].respond_to?(:belong_to_module) && node[0].belong_to_module && (node[0].belong_to_module != belong_to_module) && node[0].belong_to_module.top_tb_ref? )
                                 # sb = "#{node[1].root_ref.to_s}"
                                 str += (sb + node[0].root_ref)
+
+                                if show 
+                                    puts "tree[#{cnt}][0].belong_to_module<#{node[0].belong_to_module.module_name}> != op.belong_to_module<#{belong_to_module.module_name}>"
+                                end
+
                                 ## 反向添加到 TestUnitModule
                                 if belong_to_module.is_a?(TestUnitModule)
                                     belong_to_module.add_root_ref_ele(node[0])
+                                    if show 
+                                        puts "tree[#{cnt}][0]: op.belong_to_module<#{belong_to_module.module_name}> is TestUnitModule"
+                                    end
                                 end
                             else
                                 # sb = "#{node[1].to_s}"
                                 str += (sb + node[0].to_s)
+                                if show 
+                                    puts "tree[#{cnt}][0]: op.belong_to_module<#{belong_to_module.module_name}> ..."
+                                end
                             end
                         end
                     else 
@@ -203,13 +259,17 @@ module ClassHDL
                         # if node[0].tree.length>2 && ["&","|","<",">"].include?(node[0].tree[1][1])
 
                         # else
+                    
                         if sb =~/(\||&){2,2}/
-                            str += " #{sb}#{node[0].instance(:slaver).to_s}"
+                            str += " #{sb}#{node[0].instance(:slaver,block_belong_to_module || belong_to_module).to_s}"
                         else
-                            str += "#{sb}(#{node[0].instance(:slaver).to_s})"
+                            str += "#{sb}(#{node[0].instance(:slaver,block_belong_to_module || belong_to_module).to_s})"
                         end
-                        # end
-                        # str += "#{sb}(#{"Node"})"
+                        
+                        if show 
+                            puts "tree[#{cnt}][0] is op, block_belong_to_module<#{block_belong_to_module.to_s}> op.belong_to_module<#{belong_to_module.to_s}>"
+                        end
+
                     end
                     cnt += 1
                 end
@@ -235,8 +295,10 @@ module ClassHDL
 
     module AssignDefOpertor
         @@included_class = []
-        @@curr_assign_block = HDLAssignBlock.new(nil) ##HDLAssignBlock ##HDLAlwaysCombBlock
-        @@curr_assign_block_stack = [HDLAssignBlock.new(nil) ]
+        @@curr_assign_block = HDLAssignBlock.new(true) ##HDLAssignBlock ##HDLAlwaysCombBlock
+        # @@curr_assign_block = nil
+        @@curr_assign_block_stack = [HDLAssignBlock.new(true) ]
+        # @@curr_assign_block_stack = []
         @@curr_opertor_stack = [:old]
 
         def self.curr_opertor_stack
@@ -296,7 +358,18 @@ module ClassHDL
                         b.slaver = true 
                     end
                     ## 当 进行 X < Y 等运算时OpertorChain 需要获取 assign block的 belong_to_module
-                    new_op = OpertorChain.new(nil,@@curr_assign_block && @@curr_assign_block.belong_to_module) 
+                    if @@curr_assign_block 
+                        bblm = @@curr_assign_block.belong_to_module
+                    elsif self.respond_to?(:belong_to_module)
+                        bblm = self.belong_to_module
+                    elsif b.respond_to?(:belong_to_module)
+                        bblm = b.belong_to_module
+                        
+                    else
+                        bblm = nil 
+                    end
+
+                    new_op = OpertorChain.new(nil, bblm) 
                     new_op.tree.push([self])
                     new_op.tree.push([b,symb])
                     if @@curr_assign_block
@@ -511,7 +584,7 @@ class BaseElm
                             
                             @_array_chain_hash_[name.to_s] = rel
                         end
-                        TdlSpace::ArrayChain.new(@_array_chain_hash_[name.to_s],[])
+                        TdlSpace::ArrayChain.create(obj: @_array_chain_hash_[name.to_s], lchain:[], belong_to_module: self.belong_to_module)
                     end
                 end
             end
@@ -576,9 +649,8 @@ module TdlSpace
             end
             ClassHDL::AssignDefOpertor.with_rollback_opertors(:old) do
                 unless b 
-                    ArrayChain.new(obj,chain+[a])
+                    ArrayChain.create(obj: obj,lchain: chain+[a],belong_to_module: belong_to_module)
                 else 
-                    # ArrayChain.new(&obj,chain,[a,b])
                     @end_slice = [a,b]
                     self
                 end
@@ -610,7 +682,7 @@ module TdlSpace
         end
 
         def ~
-            ArrayChain.new("~#{self.to_s}")
+            ArrayChain.create(obj: "~#{self.to_s}", belong_to_module: belong_to_module)
         end
     end 
 end

data/lib/tdl/class_hdl/hdl_struct.rb

@@ -158,7 +158,7 @@ module ClassHDL
 
         def [](a)
             if dimension
-                return TdlSpace::ArrayChain.new(self,[a])
+                return TdlSpace::ArrayChain.create(obj:self,lchain:[a],belong_to_module: belong_to_module)
             else  
                 raise TdlError.new "#{@name} dimenson is nil "
             end
@@ -171,7 +171,7 @@ module ClassHDL
                 self.define_singleton_method(e.name) do 
                     # RedefOpertor.with_normal_operators do
                     ClassHDL::AssignDefOpertor.with_rollback_opertors(:old) do 
-                        TdlSpace::ArrayChain.new("#{@name}.#{e.to_s}".to_nq)
+                        TdlSpace::ArrayChain.create(obj:"#{@name}.#{e.to_s}".to_nq, belong_to_module: self.belong_to_module)
                     end
                 end
             end

data/lib/tdl/elements/Reset.rb

@@ -5,7 +5,7 @@ class Reset < SignalElm
     attr_reader :name,:active
     attr_accessor :id,:ghost,:port,:dsize
 
-    def initialize(name:"system_rst",active:"LOW",port:false,dsize:1)
+    def initialize(name:"system_rst",active:"LOW",port:false,dsize:1, belong_to_module: nil)
         name_legal?(name)
         # @id = GlobalParam.CurrTdlModule.BindEleClassVars.Reset.id
         @dsize = dsize
@@ -15,14 +15,10 @@ class Reset < SignalElm
         if @active.eql?("low") && @active.eql?("high")
             raise TdlError.new("RESET ACTIVE PARA #{@active} ERROR")
         end
-        # if @port
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Reset.ports << self if @id != 0
-        # else
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Reset.inst_stack << method(:inst).to_proc
-        # end
-        # if @id == 2
-        #     raise TdlError.new("____________")
-        # end
+        @belong_to_module = belong_to_module
+        unless @belong_to_module 
+            raise TdlError.new("Reset<#{name}> dnot have belong_to_module")
+        end
     end
 
     # def signal

data/lib/tdl/elements/clock.rb

@@ -5,7 +5,7 @@ class Clock < SignalElm
     attr_reader :name
     attr_accessor :id,:ghost,:port,:dsize,:freqM,:jitter
 
-    def initialize(name:"system_clock",freqM:100.0,port:false,dsize:1,jitter: 0.01)
+    def initialize(name:"system_clock",freqM:100.0,port:false,dsize:1,jitter: 0.01, belong_to_module: nil)
         name_legal?(name)
         # @id = GlobalParam.CurrTdlModule.BindEleClassVars.Clock.id
         @name = name
@@ -13,14 +13,10 @@ class Clock < SignalElm
         @port = port
         @dsize = dsize
         @jitter = jitter
-        # if @port
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Clock.ports << self if @id != 0
-        # else
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Clock.inst_stack << method(:inst).to_proc
-        # end
-        # if @id == 0
-        #     raise TdlError.new(" ID ")
-        # end
+        @belong_to_module = belong_to_module
+        unless @belong_to_module 
+            raise TdlError.new("Clock<#{name}> dnot have belong_to_module")
+        end
     end
 
     # def port_length

data/lib/tdl/elements/data_inf.rb

@@ -567,23 +567,6 @@ end
 
 class DataInf_C ## signals in interface
 
-    # def valid
-    #     RedefOpertor.with_normal_operators do 
-    #         # raise TdlError.new("\nARRAY Don't have 'valid'") unless @dimension.empty?
-    #         # NqString.new(signal.concat ".valid") 
-    #         if @dimension.empty?
-    #             NqString.new(signal.concat ".valid") 
-    #         else 
-    #             unless @_array_chain_hash_
-    #                 rel = generate_inf_to_signals('valid',width=1)
-    #                 @_array_chain_hash_ = {}
-    #                 @_array_chain_hash_['valid'] = rel
-    #             end
-    #             TdlSpace::ArrayChain.new(@_array_chain_hash_['valid'],[])
-    #         end
-    #     end
-    # end
-
     define_arraychain_tail_method('valid')
     define_arraychain_tail_method('ready',width=1,rv=true)
     define_arraychain_tail_method('vld_rdy')

data/lib/tdl/elements/logic.rb

@@ -21,7 +21,7 @@ class Logic < SignalElm
     # attr_reader :dsize
     attr_accessor :name,:dsize,:id,:ghost,:type
     attr_reader :dimension,:port
-    def initialize(name:"tmp",dsize:1,port: false,default: nil,msb_high: true,dimension: [],type: "logic")
+    def initialize(name:"tmp",dsize:1,port: false,default: nil,msb_high: true,dimension: [],type: "logic",belong_to_module: nil)
         @name   = name
         # @id = GlobalParam.CurrTdlModule.BindEleClassVars.Logic.id
         @dsize = dsize
@@ -37,31 +37,12 @@ class Logic < SignalElm
             yield
         end
 
-        # if @port && (@port != :origin)
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Logic.ports << self if @id != 0
-        # else
-        #     # @@inst_stack << method(:inst).to_proc
-        #     GlobalParam.CurrTdlModule.BindEleClassVars.Logic.inst_stack << lambda{ inst() }
-        # end
-        # define_method(:signal) do |h,l|
-        #     if h
-        #         hh = h
-        #     else
-        #         hh = dsize-1
-        #     end
-        #
-        #     if l
-        #         ll = l
-        #     else
-        #         l = 0
-        #     end
-        #
-        #     if dsize == 1
-        #         "#{name}_id#{@id}"
-        #     else
-        #         "#{name}_id#{@id}[#{hh}:#{ll}]"
-        #     end
-        # end
+        @belong_to_module = belong_to_module
+
+        unless @belong_to_module
+            raise TdlError.new("Logic<#{@name}> be not belong_to_module")
+        end
+
     end
 
     def copy(name:@name.to_s,dsize:@dsize,port:@port,default:@default,msb_high:@msb_high,dimension:@dimension,type:@type,belong_to_module:@belong_to_module)
@@ -98,12 +79,9 @@ class Logic < SignalElm
             b.slaver = true
         end
 
-        # RedefOpertor.with_normal_operators do
-        #     TdlSpace::ArrayChain.new(self,a,b)
-        # end
-        # end
+        
         ClassHDL::AssignDefOpertor.with_rollback_opertors(:old) do 
-            TdlSpace::ArrayChain.new(self,a,b)
+            TdlSpace::ArrayChain.create(obj: self,lchain: a, end_slice: b, belong_to_module: belong_to_module)
         end
     end
 

data/lib/tdl/elements/mail_box.rb

@@ -4,11 +4,16 @@ class MailBox < BaseElm
     # include AlwaysBlock
     # include RedefOpertor
     attr_accessor :ghost
-    def initialize(name:'mbox',depth:100)
+    def initialize(name:'mbox',depth:100, belong_to_module: nil )
         @name = name
 
         @depth = depth
 
+        @belong_to_module = belong_to_module
+        unless @belong_to_module 
+            raise TdlError.new("Clock<#{name}> dnot have belong_to_module")
+        end
+
     end
 
     def signal

data/lib/tdl/elements/originclass.rb

@@ -8,8 +8,9 @@ module TdlSpace
     end
 
     class ArrayChain
-        attr_reader :obj,:chain,:end_slice
-        def initialize(obj="tmp",lchain=[],end_slice=false)
+        attr_reader :obj,:chain,:end_slice,:belong_to_module
+        def initialize(obj="tmp",lchain=[],end_slice=false,belong_to_module=nil)
+            @belong_to_module=belong_to_module
             @obj = obj
             if !end_slice
                 if lchain.is_a? Array
@@ -25,48 +26,19 @@ module TdlSpace
             else
                 raise TdlError.new("数组下标类型出错")
             end
+
+            unless @belong_to_module
+                raise TdlError.new "ArrayChain<#{obj.to_s}> 必须添加 belong_to_module"
+            end
         end
 
-        # def [](a,b=false)
-        #     if a.is_a? ClassHDL::OpertorChain
-        #         a.slaver = true
-        #     end
-    
-        #     if b.is_a? ClassHDL::OpertorChain
-        #         b.slaver = true
-        #     end
-
-        #     if @end_slice
-        #         raise TdlError.new("数组下标已经被用片选[#{@end_slice[0]},#{@end_slice[1]}]终结")
-        #     end
-        #     RedefOpertor.with_normal_operators do
-        #         unless b 
-        #             ArrayChain.new(obj,chain+[a])
-        #         else 
-        #             # ArrayChain.new(&obj,chain,[a,b])
-        #             @end_slice = [a,b]
-        #             self
-        #         end
-        #     end
-        # end
-
-        # def to_s
-        #     RedefOpertor.with_normal_operators do
-        #         str = ""
-        #         chain.each do |e|
-        #             unless e.is_a? ArrayChainSignalMethod
-        #                 str += "[#{e.to_s}]"
-        #             else 
-        #                 str += ".#{e.name.to_s}"
-        #             end
-        #         end
-        #         if @end_slice
-        #             str += "[#{@end_slice[0]}:#{@end_slice[1]}]"
-        #         end
-
-        #         "#{obj.to_s}#{str}".to_nq
-        #     end
-        # end
+        def self.create(obj: "tmp",lchain: [],end_slice: false,belong_to_module: nil)
+            ArrayChain.new(obj, lchain, end_slice, belong_to_module)
+        end
+
+        def root_ref(&block)
+            "#{belong_to_module.root_ref(&block)}.#{to_s}".to_nq
+        end
 
         def inspect
             self.to_s
@@ -86,9 +58,7 @@ module TdlSpace
             end
             ## 判断 obj是否响应方法
             if @obj.respond_to?(method) && !method.to_s.eql?("inst_name")
-                # ArrayChain.new(@obj.to_s,lchain=@chain + [ArrayChainSignalMethod.new(method)])
-                # ArrayChain.new(@obj.to_s,lchain=@chain.dup.concat([ArrayChainSignalMethod.new(method)]))
-                ArrayChain.new(@obj,lchain=@chain.dup.concat([ArrayChainSignalMethod.new(method)]))
+                ArrayChain.create(obj: @obj,lchain:@chain.dup.concat([ArrayChainSignalMethod.new(method)]) ,belong_to_module: belong_to_module)
             else 
             
                 # raise TdlError.new("ArrayChain 没有末尾方法 #{method} #{arg}")
@@ -212,7 +182,7 @@ class BaseElm < AxiTdl::SdlModuleActiveBaseElm
                             
                             @_array_chain_hash_[name.to_s] = rel
                         end
-                        TdlSpace::ArrayChain.new(@_array_chain_hash_[name.to_s],[])
+                        TdlSpace::ArrayChain.create(obj: @_array_chain_hash_[name.to_s],lchain:[],belong_to_module: self.belong_to_module)
                     end
                 end
             end
@@ -484,7 +454,7 @@ class InfElm
 
         return signal if @dimension.empty?
         
-        TdlSpace::ArrayChain.new(self,a,b)
+        TdlSpace::ArrayChain.create(obj: self,lchain: a, end_slice: b, belong_to_module: belong_to_module)
     end
 
     def self.same_name_socket(way,mix,inf_array,base_new_inf=nil,belong_to_module=nil)